Merge branch 'master' into imgbot

mesg-foundation · Apr 30, 2020 · f1b28ee · f1b28ee
2 parents b0fc23e + a957428
commit f1b28ee
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 134 deletions.
diff --git a/components/Article.vue b/components/Article.vue
@@ -1,5 +1,13 @@
 <template>
-  <a :href="article.url" :id="article.id" target="_blank" flex column quarter mb1>
+  <a
+    :href="`${article.url}?utm_source=mesg.com&utm_medium=home_showcase_articles&utm_campaign=blog_articles`"
+    :id="article.id"
+    target="_blank"
+    flex
+    column
+    quarter
+    mb1
+  >
     <img :src="article.feature_image" :alt="article.title" mb1 />
     <div>
       <div class="tag-date" flex row align-center>

diff --git a/components/Banner.vue b/components/Banner.vue
@@ -0,0 +1,53 @@
+<template>
+  <a href="https://mesg-ecosystem.devpost.com/" target="_blank">
+    <div class="banner" flex row justify-center align-center>
+      <div class="banner-content" flex row justify-center align-center>
+        <p>Join us online for the MESG Ecosystem Hackathon running from March 1st to April 26th on Devpost. Win up to $9,000 in prizes!</p>
+        <i class="fal fa-external-link-alt"></i>
+      </div>
+    </div>
+  </a>
+</template>
+
+<style lang="scss" scoped>
+@import "~/assets/_variables";
+
+a {
+  text-decoration: none;
+  transition: 2s ease-in;
+  &:hover {
+    .banner {
+      background: linear-gradient(
+        to right,
+        scale-color($blue, $lightness: -10%),
+        scale-color($green, $lightness: -10%)
+      );
+    }
+  }
+  .banner {
+    padding: 16px 60px;
+    width: 100%;
+    transition: 2s ease-in;
+    background: linear-gradient(to right, $blue, $green);
+    .banner-content {
+      max-width: auto;
+    }
+    p {
+      width: auto;
+      text-align: center;
+      margin-right: 0;
+      color: $white;
+      font-size: 15px;
+      font-weight: bold;
+    }
+    .fa-external-link-alt {
+      position: absolute;
+      top: 20px;
+      right: 20px;
+      color: $white;
+      max-width: 17px;
+      margin-left: calc(#{$margin} / 2);
+    }
+  }
+}
+</style>
diff --git a/components/Footer.vue b/components/Footer.vue
@@ -26,10 +26,10 @@
             </li>
             <li flex column quarter>
               <a href="#" class="category" mb1>Developers</a>
-              <a :href="externalLinks.getStarted" target="_blank">Get started</a>
-              <a :href="externalLinks.marketplace" target="_blank">Marketplace</a>
-              <a :href="externalLinks.documentation" target="_blank">Documentation</a>
-              <a :href="externalLinks.tutorials" target="_blank">Tutorials</a>
+              <a :href="externalLinks.quickStartFooter" target="_blank">Get started</a>
+              <a :href="externalLinks.marketplaceFooter" target="_blank">Marketplace</a>
+              <a :href="externalLinks.documentationFooter" target="_blank">Documentation</a>
+              <a :href="externalLinks.tutorialsFooter" target="_blank">Tutorials</a>
               <a :href="externalLinks.github" target="_blank">Github</a>
             </li>
             <li flex column quarter>
@@ -38,13 +38,13 @@
               <nuxt-link :to="links.token">Token</nuxt-link>
               <nuxt-link :to="links.roadmap">Roadmap</nuxt-link>
               <nuxt-link :to="links.faq">Help Center</nuxt-link>
-              <a :href="externalLinks.blog" target="_blank">Blog</a>
+              <a :href="externalLinks.blogFooter" target="_blank">Blog</a>
               <a :href="externalLinks.press" target="_blank">Press & Media</a>
             </li>
             <li flex column quarter>
               <a href="#" class="category" mb1>Community</a>
               <nuxt-link :to="links.contributions">Contributions Hub</nuxt-link>
-              <a :href="externalLinks.forum" target="_blank">Forum</a>
+              <a :href="externalLinks.forumFooter" target="_blank">Forum</a>
               <a :href="externalLinks.discord" target="_blank">Discord</a>
             </li>
           </ul>
@@ -70,9 +70,9 @@ export default {
     }),
     icons() {
       return [
-        { href: this.externalLinks.blog, icon: "fab fa-medium" },
+        { href: this.externalLinks.blogFooter, icon: "fab fa-medium" },
         { href: this.externalLinks.github, icon: "fab fa-github" },
-        { href: this.externalLinks.forum, icon: "fas fa-comments" },
+        { href: this.externalLinks.forumFooter, icon: "fas fa-comments" },
         { href: this.externalLinks.discord, icon: "fab fa-discord" },
         { href: this.externalLinks.twitter, icon: "fab fa-twitter" },
         { href: this.externalLinks.telegram, icon: "fab fa-telegram-plane" },

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -1,18 +1,25 @@
 <template>
   <div>
-    <Menu :logo="require('~/assets/MESG-logo-horizontal-purple.svg')" :items="menu" is-nuxt />
+    <Menu
+      :logo="require('~/assets/MESG-logo-horizontal-purple.svg')"
+      :items="menu"
+      is-nuxt
+      class="menu"
+    />
     <nuxt />
     <Footer />
   </div>
 </template>
 
 
 <script>
+import Banner from "~/components/Banner";
 import Menu from "@mesg-components/menu";
 import Footer from "~/components/Footer";
 import { mapGetters } from "vuex";
 export default {
   components: {
+    Banner,
     Menu,
     Footer
   },
@@ -21,3 +28,4 @@ export default {
   })
 };
 </script>
+
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -88,6 +88,7 @@ module.exports = {
   generate: {
     routes: [
       ...[
+        'expand-dao-functionalities',
         'plasma-exit-challenge',
         'send-messages-from-a-satellite',
         'enhance-zapier-workflows',

diff --git a/pages/foundation.vue b/pages/foundation.vue
@@ -66,18 +66,8 @@
       </Container>
       <div class="outer-background" mb3>
         <Container>
-          <div flex row wrap class="founders">
-            <div v-for="(member, i) in team.members.founders" :key="i" third mb2 fill-height>
-              <Member
-                :src="member.src"
-                :to="member.linkedin"
-                :title="member.title"
-                :text="member.description"
-              />
-            </div>
-          </div>
-          <div class="team" flex row wrap>
-            <div v-for="(member, i) in team.members.other" :key="i" quarter mb2 fill-height>
+          <div flex row wrap>
+            <div v-for="(member, i) in team.members" :key="i" third mb2 fill-height>
               <Member
                 :src="member.src"
                 :to="member.linkedin"
@@ -207,9 +197,6 @@ export default {
     .title {
       padding-bottom: 0;
     }
-    .founders {
-      margin-bottom: calc(#{$margin} * 2);
-    }
   }
   #documents {
     margin-bottom: 0 !important;

diff --git a/pages/get-started.vue b/pages/get-started.vue
@@ -2,7 +2,7 @@
   <div>
     <Header :image="require('~/assets/getstarted.svg')" :title="title" :description="description">
       <div>
-        <Button :href="externalLinks.getStarted" primary target="_blank" mt2>Quick start</Button>
+        <Button :href="externalLinks.quickStartCTAHead" primary target="_blank" mt2>Quick start</Button>
       </div>
     </Header>
 
@@ -102,7 +102,7 @@
           <div flex column half>
             <div class="title-link" flex row space-between align-center mb1>
               <h3>Tutorials</h3>
-              <a :href="externalLinks.tutorials" target="_blank" class="link">See all</a>
+              <a :href="externalLinks.tutorialsGetStarted" target="_blank" class="link">See all</a>
             </div>
             <p
               mb1
@@ -163,7 +163,7 @@
       icon="fal fa-book"
       title="Get started"
       description="Don’t know where to begin? Get going with the quickstart guide on our documentation."
-      :links="[{ title: 'Quick start' , href: externalLinks.getStarted }]"
+      :links="[{ title: 'Quick start' , href: externalLinks.quickStartCTABottom }]"
       mb1
     />
   </div>

diff --git a/pages/index.vue b/pages/index.vue
@@ -34,7 +34,7 @@
             <nav flex column quarter>
               <Button
                 white
-                href="https://blog.mesg.com/token-utility-in-the-mesg-economy/"
+                href="https://blog.mesg.com/token-utility-in-the-mesg-economy/?utm_source=mesg.com&utm_medium=home_cta&utm_campaign=mesg_economy"
                 target="_blank"
                 class="track-button"
               >Discover</Button>
@@ -103,7 +103,7 @@
           <div flex row mobile-column mb2>
             <Article v-for="article in articles" :key="article.id" :article="article" />
           </div>
-          <Button secondary :href="externalLinks.blog" target="_blank">Read our blog</Button>
+          <Button secondary :href="externalLinks.blogHome" target="_blank">Read our blog</Button>
         </div>
       </Container>
     </section>

diff --git a/pages/mesg-marketplace.vue b/pages/mesg-marketplace.vue
@@ -9,7 +9,12 @@
         <span flex class="label">{{ marketplace.label }}</span>
       </template>
       <div>
-        <Button :href="externalLinks.marketplace" target="_blank" primary mt2>MESG Marketplace</Button>
+        <Button
+          :href="externalLinks.marketplaceCTAHead"
+          target="_blank"
+          primary
+          mt2
+        >MESG Marketplace</Button>
       </div>
     </Header>
 
@@ -98,7 +103,7 @@
       icon="fal fa-store"
       title="Marketplace"
       description="MESG Marketplace beta is out now. Earn tokens when your services are used or save time by purchasing access to services."
-      :links="[{ title: 'MESG Marketplace' , href: externalLinks.marketplace }]"
+      :links="[{ title: 'MESG Marketplace' , href: externalLinks.marketplaceCTABottom }]"
       mb1
     />
   </div>

diff --git a/pages/showcase/index.vue b/pages/showcase/index.vue
@@ -35,7 +35,11 @@
             <p
               mb2
             >Find new services to implement in your applications. Any service from the Marketplace featuring any technology or language and can be added to any process or application.</p>
-            <Button secondary :href="externalLinks.marketplace" target="_blank">MESG Marketplace</Button>
+            <Button
+              secondary
+              :href="externalLinks.marketplaceShowcase"
+              target="_blank"
+            >MESG Marketplace</Button>
           </div>
         </div>
       </Container>
@@ -48,7 +52,7 @@
           <div flex row mobile-column mb2>
             <Article v-for="article in articles" :key="article.id" :article="article" />
           </div>
-          <Button secondary :href="externalLinks.blog" target="_blank">Read our blog</Button>
+          <Button secondary :href="externalLinks.blogShowcase" target="_blank">Read our blog</Button>
         </div>
       </Container>
     </section>

diff --git a/pages/token.vue b/pages/token.vue
@@ -62,7 +62,7 @@
           :src="require('~/assets/token/token-distribution.svg')"
           title="Token distribution"
           action="ATD website"
-          :href="externalLinks.atd"
+          :href="externalLinks.atdToken"
         >
           <template v-slot:right>
             <h4 mb2>Total token supply 250MM</h4>