conflict resolved x2

1 files changed, 37 insertions, 0 deletions

diff --git a/Website/pages/index.vue b/Website/pages/index.vue
index 4ceda36..b3e0d98 100644
--- a/Website/pages/index.vue
+++ b/Website/pages/index.vue
@@ -46,6 +46,12 @@
       <v-icon style="margin-right: 0.5em">mdi-discord</v-icon>
       Discord
     </v-btn>
+    <div id="sponsors">
+      <h3>Sponsors:</h3>
+      <p v-for="sponsor in sponsors" style="margin: 0px 0px ">
+        <a :href="sponsor.link">{{sponsor.name}}</a>
+      </p>
+    </div>
   </div>
 </template>
 
@@ -71,6 +77,9 @@ export default {
 </script>
 
 <style scoped>
+#sponsors {
+  margin-top: 200px;
+}
 #thumbslogo {
   opacity: 0;
   fill: transparent;
@@ -159,3 +168,31 @@ export default {
   }
 }
 </style>
+<<<<<<< HEAD
+=======
+
+<script>
+export default {
+  transition(to, from) {
+    if (!from) return 'swoop-in'
+    let routes = ['index', 'install', 'faq', 'donate', 'links']
+    if (routes.indexOf(to.name) < 0) return 'swoop-out'
+    if (routes.indexOf(from.name) < 0) return 'swoop-in'
+    return routes.indexOf(to.name) > routes.indexOf(from.name) ? 'swoop-left' : 'swoop-right'
+  },
+  data() {
+    return {
+      installLink: "/install",
+      githubLink: "https://github.com/Anarios/return-youtube-dislike",
+      discordLink: "https://discord.gg/mYnESY4Md5",
+      sponsors: [
+        {name: "Piepacker", link: "https://piepacker.com/" },
+        {name: "nodetube", link: "https://github.com/mayeaux/nodetube"},
+        {name: "trig404"},
+        {name: "Peter33"}
+      ]
+    }
+  }
+}
+</script>
+>>>>>>> edb19da7474c6dbfb5cc673785f2135c944c150a