Merge branch 'development'

content/page/home/header/header.md

@@ -4,4 +4,14 @@ title: ''
 subtitle: Welcome to ThreeFold
 ---
 
-We are building the next generation peer-to-peer internet infrastructure. After creating a powerful and super sustainable operating system that can host all of humanity's digital needs and data in smart contracts, we are now creating a fair, equal and private Internet experience to free humanity from the tech giants that exploit our data.
+With our game-changing technology and incredible partners, together we are building a better Internet – for humanity and for our planet. 
+<br/>
+<br/>
+The ThreeFold peer-to-peer (P2P) Internet delivers on privacy and security, gives us all back ownership of our digital lives, can be made available everywhere in the world, and uses much less energy than today's solution. 
+<br/>
+<br/>
+It is the foundation for a more fair and equal tomorrow. 
+<br/>
+And it is available, today!
+
+<!-- We are building the next generation peer-to-peer internet infrastructure. After creating a powerful and super sustainable operating system that can host all of humanity's digital needs and data in smart contracts, we are now creating a fair, equal and private Internet experience to free humanity from the tech giants that exploit our data.

content/page/home/home.md

@@ -3,6 +3,7 @@ id: home
 header_altImg: ''
 solution_image: ./home_header.png
 header: home_header
+logos: [logo1, logo2, logo3, logo4, logo5, logo6] #you can continue adding logos as needed
 productsMain: product
 productData: [product1, product6, product3, product2, product5, product4]
 header_title: Join the P2P Economy
@@ -13,7 +14,6 @@ link: https://farming.threefold.io/token #link for button
 comparisonMain: comparison
 comparisonSecs: [section1, section2, section3]
 brandPanel: brand_panel
-logos: [logo1, logo2, logo3, logo4, logo5, logo6] #you can continue adding logos as needed
 solution_image2: ./cta_image.png
 cta: home_cta
 ---

gridsome.config.js

@@ -109,6 +109,14 @@ module.exports = {
             }
         },
 
+        {
+            use: '@gridsome/source-filesystem',
+            options: {
+                typeName: 'ComparisonMain',
+                path: './content/page/**/comparison/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',
@@ -342,6 +350,13 @@ module.exports = {
                 ]
             }
         },
+        {
+            use: 'gridsome-plugin-matomo',
+            options: {
+                host: 'https://analytics.threefold.io',
+                siteId: 5
+            }
+        }
     ],
     chainWebpack: config => {
         config.resolve.alias.set('@images', '@/assets/images')
@@ -428,4 +443,4 @@ module.exports = {
             ]
         }
     }
-}
+}

package.json

@@ -15,6 +15,7 @@
     "core-js": "^3.6.5",
     "gridsome": "^0.7.3",
     "gridsome-plugin-flexsearch": "github:hamdy/gridsome-plugin-flexsearch",
+    "gridsome-plugin-matomo": "^0.1.0",
     "gridsome-plugin-remark-prismjs-all": "^0.3.5",
     "gridsome-plugin-tailwindcss": "^3.0.1",
     "gridsome-source-graphql": "^1.0.2",
@@ -26,13 +27,12 @@
     "tailwindcss-gradients": "^3.0.0",
     "tailwindcss-tables": "^0.4.0",
     "v-tooltip": "^2.0.3",
-    "vue-markdown": "^2.2.4"
+    "vue-markdown": "^2.2.4",
-  },
-  "devDependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.30",
     "@fortawesome/free-brands-svg-icons": "^5.14.0",
     "@fortawesome/free-solid-svg-icons": "^5.14.0",
     "@fortawesome/vue-fontawesome": "^2.0.0",
     "node-sass": "^5.0.0"
-  }
+  },
+  "devDependencies": {}
 }

src/pages/Index.vue

@@ -9,6 +9,11 @@
       v-if="$page.markdownPage.header"
       :header="$page.markdownPage.header"
     />
+
+    <logoShowcase
+      v-if="$page.markdownPage.logos.length > 0"
+      :logos="$page.markdownPage.logos"
+    />
     
     <ShowcaseProducts
         :main="$page.markdownPage.productsMain"
@@ -18,6 +23,7 @@
           $page.markdownPage.productData.length > 0
         "
     />
+
     <Header
       :title="$page.markdownPage.header_title"
       :image="$page.markdownPage.header_image"
@@ -47,11 +53,6 @@
       :card="card"
     /> -->
 
-    <logoShowcase
-      v-if="$page.markdownPage.logos.length > 0"
-      :logos="$page.markdownPage.logos"
-    />
-
     <!-- <InTheNews
       v-if="$page.markdownPage.inTheNews"
       :news="$page.markdownPage.inTheNews"