Merge branch 'development' of github.com:threefoldfoundation/www_threefold_io into development

gridsome.config.js

@@ -109,6 +109,14 @@ module.exports = {
             }
         },
 
+        {
+            use: '@gridsome/source-filesystem',
+            options: {
+                typeName: 'ComparisonMain',
+                path: './content/page/**/comparison/main/main.md',
+            }
+        },
+
         {
             use: '@gridsome/source-filesystem',
             options: {
@@ -176,7 +184,7 @@ module.exports = {
                     logos: 'Logo',
                     cta: 'Cta',
                     signup: 'SignUp',
-                    comparisonMain: 'Comparison',
+                    comparisonMain: 'ComparisonMain',
                     comparisonSecs: 'Comparison',
                     howItWorksMain_2: 'HowItWorks_2',
                     howItWorks_2: 'HowItWorks_2',
@@ -186,7 +194,7 @@ module.exports = {
                     plans: 'Plans',
                     inTheNews: 'InTheNews',
                     brandPanel: 'BrandPanel',
-                    allSlides : 'About'
+                    allSlides: 'About'
                 }
             }
         },
@@ -250,7 +258,7 @@ module.exports = {
         },
 
         {
-             use: '@gridsome/source-filesystem',
+            use: '@gridsome/source-filesystem',
             options: {
                 typeName: 'News',
                 path: './content/news/**/*.md',
@@ -345,7 +353,7 @@ module.exports = {
         {
             use: 'gridsome-plugin-matomo',
             options: {
-		host: 'https://analytics.threefold.io',
+                host: 'https://analytics.threefold.io',
                 siteId: 5
             }
         }
@@ -435,4 +443,4 @@ module.exports = {
             ]
         }
     }
-}
+}

src/components/custom/sections/Comparison.vue

@@ -28,7 +28,7 @@
     <div>
       <g-link
         v-if="main.button"
-        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full" 
+        class="bg-blue-900 text-sm learn-button hover:bg-blue-800 text-gray-100 px-12 py-2 mr-5 rounded shadow rounded-full"
         :to="main.link"
         >{{ main.button }}</g-link
       >

src/pages/Index.vue

@@ -1,78 +1,74 @@
 <template>
   <Layout :hideHeader="true" :disableScroll="true">
-      <g-image
+    <g-image
       v-if="$page.markdownPage.solution_image"
       :src="$page.markdownPage.solution_image.src"
     />
     <div class="container sm:pxi-0 mx-auto overflow-x-hidden py-5">
-    <SolutionsHeader
+      <SolutionsHeader
-      v-if="$page.markdownPage.header"
+        v-if="$page.markdownPage.header"
-      :header="$page.markdownPage.header"
+        :header="$page.markdownPage.header"
-    />
+      />
 
-    <logoShowcase
+      <logoShowcase
-      v-if="$page.markdownPage.logos.length > 0"
+        v-if="$page.markdownPage.logos.length > 0"
-      :logos="$page.markdownPage.logos"
+        :logos="$page.markdownPage.logos"
-    />
+      />
-    
+
-    <ShowcaseProducts
+      <ShowcaseProducts
         :main="$page.markdownPage.productsMain"
         :products="$page.markdownPage.productData"
         v-if="
           $page.markdownPage.productData &&
           $page.markdownPage.productData.length > 0
         "
-    />
+      />
 
-    <Header
+      <Header
-      :title="$page.markdownPage.header_title"
+        :title="$page.markdownPage.header_title"
-      :image="$page.markdownPage.header_image"
+        :image="$page.markdownPage.header_image"
-      :altImg="$page.markdownPage.header_altImg"
+        :altImg="$page.markdownPage.header_altImg"
-      :excerpt="$page.markdownPage.header_excerpt"
+        :excerpt="$page.markdownPage.header_excerpt"
-      :button="$page.markdownPage.button"
+        :button="$page.markdownPage.button"
-      :link="$page.markdownPage.link"
+        :link="$page.markdownPage.link"
-    />
+      />
-    
+
-    <Comparison
+      <Comparison
         v-if="
           $page.markdownPage.comparisonSecs &&
           $page.markdownPage.comparisonSecs.length > 0
         "
         :main="$page.markdownPage.comparisonMain"
         :sections="$page.markdownPage.comparisonSecs"
-    />
+      />
-      
+
-    <BrandPanel
+      <BrandPanel
         :brand="$page.markdownPage.brandPanel"
         v-if="$page.markdownPage.brandPanel"
-    />
+      />
 
-    <!-- <NewCard
+      <!-- <NewCard
       v-for="card in $page.markdownPage.cards"
       :key="card.id"
       :card="card"
     /> -->
 
-    <!-- <InTheNews
+      <!-- <InTheNews
       v-if="$page.markdownPage.inTheNews"
       :news="$page.markdownPage.inTheNews"
     /> -->
 
-    <!-- <SignUp
+      <!-- <SignUp
       v-if="$page.markdownPage.signup"
       :signup="$page.markdownPage.signup"
     /> -->
-
     </div>
-      <g-image
+    <g-image
       v-if="$page.markdownPage.solution_image2"
       :src="$page.markdownPage.solution_image2.src"
     />
 
-    <CallToAction 
+    <CallToAction v-if="$page.markdownPage.cta" :cta="$page.markdownPage.cta" />
-      v-if="$page.markdownPage.cta" 
-      :cta="$page.markdownPage.cta" 
-    />
   </Layout>
 </template>
 

src/templates/Team.vue

@@ -1,6 +1,6 @@
 <template>
   <Layout>
-    <TagFilterHeader :tags="memberships" selected="all" v-if="$page.memberships.edges.length > 1"/>
+    <!-- <TagFilterHeader :tags="memberships" selected="all" v-if="$page.memberships.edges.length > 1"/> -->
     <div class="container sm:pxi-0 mx-auto mt-8 overflow-x-hidden">
       <div class="flex flex-wrap with-large pt-8 pb-8 mx-4 sm:-mx-4">
         <PostListItem