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

content/navigation/navigation.md

@@ -46,4 +46,7 @@ navLinks:
 social:
   - icon: telegram-plane
     link: '' #telegaram link
+
+  - icon: linkedin
+    link: '' #linkedin link
 ---

content/page/home/home.md

@@ -2,6 +2,7 @@
 id: home
 header_title: BIG TITLE
 header_image: ./image_name.png
+header_altImg: BIG TITLE
 header_excerpt: Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
 button: Button
 link: '' #link for button

content/page/home/logos/logo1/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo1
 image: ./logo.png
+url: '/'
 ---

content/page/home/logos/logo2/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo2
 image: ./logo.png
+url: '/'
 ---

content/page/home/logos/logo3/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo3
 image: ./logo.png
+url: '/'
 ---

content/page/home/logos/logo4/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo4
 image: ./logo.png
+url: '/'
 ---

content/page/home/logos/logo5/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo5
 image: ./logo.png
+url: '/'
 ---

content/page/home/logos/logo6/logo.md

@@ -1,4 +1,5 @@
 ---
 id: logo6
 image: ./logo.png
+url: '/'
 ---

content/page/page2/page2.md

@@ -8,7 +8,7 @@ featuresMain: features
 features: [feature1, feature2, feature3, feature4, feature5]	
 comparisonMain: comparison
 comparisonSecs: [section1, section2, section3]
-productMain: product
+productsMain: product
 productData: [product1, product2, product3]
 brandPanel: brand_panel
 ---

content/page/page2/productData/main/main.md

@@ -1,5 +1,5 @@
 ---
 id: product
-title: Title
+title: product
 subtitle: Subtitle
 ---

content/page/page2/productData/product1/product1.md

@@ -1,5 +1,6 @@
 ---
 id: product1
 title: Title
-content: Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s
+image : ./image_name.png
 ---
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s

content/page/page2/productData/product2/product2.md

@@ -1,5 +1,6 @@
 ---
 id: product2
 title: Title
-content: Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s
+image : ./image_name.png
 ---
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s

content/page/page2/productData/product3/product3.md

@@ -1,5 +1,6 @@
 ---
 id: product3
 title: Title
-content: Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s
+image : ./image_name.png
 ---
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s

src/components/marketing/sections/cta-sections/ShowcaseProducts.vue

@@ -1,14 +1,13 @@
 <template>
-  <div class="py-8 mb-5">
+  <div class="py-12 mb-5">
     <div class="w-full text-center">
       <p v-if="main !== null" class="text-sm tracking-widest text-gray-700">{{ main.subtitle }}</p>
       <h1 v-if="main !== null" class="text-4xl mt-2 mb-6 leading-tight font-heading">
         {{ main.title }}
       </h1>
-      <g-image v-if="main !== null" :src="img(main.image)" class="hidden md:block" />
     </div>
 
-    <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:hidden">
+    <div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
       <div
         v-for="(product, idx) in products"
         :key="idx"
@@ -18,7 +17,7 @@
           class="m-auto max-w-sm rounded overflow-hidden shadow-lg hover:bg-white transition duration-500 bg-white"
         >
           <div class="px-2 py-2">
-            <g-image :src="img(product.image)" />
+            <g-image class="py-4" :src="img(product.image)" />
             <!-- <div class="font-bold text-xl mb-2">{{ product.title }}</div> -->
             <p v-html="product.content" class="text-gray-700 text-base"></p>
           </div>

src/components/marketing/sections/cta-sections/logoShowcase.vue

@@ -1,13 +1,20 @@
 <template>
   <section class="pt-8 px-4 text-center">
     <div class="max-w-2xl mx-auto mb-8">
-      <h2 class="text-4xl leading-tight mb-6 font-semibold font-heading">Our Partners</h2>
+      <h2 class="text-4xl leading-tight mb-6 font-semibold font-heading">
+        Meet some of our partners
+      </h2>
       <p class="text-gray-400 leading-relaxed"></p>
     </div>
     <div class="flex flex-wrap -mx-8">
-      <div v-for="(logo ,idx) in logos" :key="idx" class="w-1/2 md:w-1/6 px-8 mb-8">
+      <g-link
-        <img :src="logo.image.src" alt />
+        v-for="(logo, idx) in logos"
-      </div>
+        :key="idx"
+        :to="logo.url"
+        class="w-1/2 md:w-1/6 px-8 mb-8"
+      >
+        <g-image :src="img(logo.image)" />
+      </g-link>
     </div>
   </section>
 </template>
@@ -15,13 +22,13 @@
 <script>
 export default {
   props: ["logos"],
-  computed: {
+  methods: {
-    img: function() {
+    img(image) {
-      if (!this.image) return "";
+      if (!image) return "";
-      if (this.image.src) return this.image.src;
+      if (image.src) return image.src;
-      return this.image;
+      return image;
-    }
+    },
-  }
+  },
 };
 </script>
 

src/pages/Index.vue

@@ -1,44 +1,41 @@
 <template>
   <Layout :hideHeader="true" :disableScroll="true">
-      <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"
-      />
+    />
-      
-      <SolutionsHeader
-        v-if="$page.markdownPage.header"
-        :header="$page.markdownPage.header"
-      />
-      
-      <NewCard
-        v-for="card in $page.markdownPage.cards"
-        :key="card.id"
-        :card="card"
-      />
-      
-      <CallToAction
-        v-if="$page.markdownPage.cta"
-        :cta="$page.markdownPage.cta"
-      />
-      
-      <logoShowcase
-        v-if="$page.markdownPage.logos.length > 0"
-        :logos="$page.markdownPage.logos"
-      />
 
-      <InTheNews
+    <SolutionsHeader
-        v-if="$page.markdownPage.inTheNews"
+      v-if="$page.markdownPage.header"
-        :news="$page.markdownPage.inTheNews"
+      :header="$page.markdownPage.header"
-      />
+    />
-      
+
-      <SignUp
+    <NewCard
-        v-if="$page.markdownPage.signup"
+      v-for="card in $page.markdownPage.cards"
-        :signup="$page.markdownPage.signup"
+      :key="card.id"
-      />
+      :card="card"
+    />
+
+    <CallToAction v-if="$page.markdownPage.cta" :cta="$page.markdownPage.cta" />
+
+    <logoShowcase
+      v-if="$page.markdownPage.logos.length > 0"
+      :logos="$page.markdownPage.logos"
+    />
+
+    <InTheNews
+      v-if="$page.markdownPage.inTheNews"
+      :news="$page.markdownPage.inTheNews"
+    />
+
+    <SignUp
+      v-if="$page.markdownPage.signup"
+      :signup="$page.markdownPage.signup"
+    />
   </Layout>
 </template>
 
@@ -81,6 +78,7 @@
         logos{
           id
           image
+          url
         }
         inTheNews {
           id

src/templates/MarkdownPage.vue

@@ -12,7 +12,7 @@
         :altImg="$page.markdownPage.header_altImg"
         :excerpt="$page.markdownPage.header_excerpt"
       />
-      
+
       <VerticalNav
         :slides="$page.markdownPage.slides"
         v-if="$page.markdownPage.slides && $page.markdownPage.slides.length > 0"
@@ -23,10 +23,11 @@
         :header="$page.markdownPage.header"
       />
       
-      <g-image
+      <g-image class="m-auto my-4" 
         v-if="$page.markdownPage.solution_image"
         :src="$page.markdownPage.solution_image.src"
       />
+      
 
       <NewCard
         v-for="card in $page.markdownPage.cards"
@@ -49,7 +50,8 @@
       <Comparison
         v-if="
           $page.markdownPage.comparisonSecs &&
-          $page.markdownPage.comparisonSecs.length > 0"
+          $page.markdownPage.comparisonSecs.length > 0
+        "
         :main="$page.markdownPage.comparisonMain"
         :sections="$page.markdownPage.comparisonSecs"
       />
@@ -84,11 +86,11 @@
         :logos="$page.markdownPage.logos"
       />
 
-       <BrandPanel
+      <BrandPanel
         :brand="$page.markdownPage.brandPanel"
         v-if="$page.markdownPage.brandPanel"
       />
-      
+
       <CallToAction
         v-if="$page.markdownPage.cta"
         :cta="$page.markdownPage.cta"
@@ -98,7 +100,7 @@
         v-if="$page.markdownPage.signup"
         :signup="$page.markdownPage.signup"
       />
-      
+
       <GetInTouch
         :contacts="$page.markdownPage.contactData"
         v-if="$page.markdownPage.contactData.length > 0"
@@ -157,7 +159,7 @@
           id
           title
           subtitle
-          image
+      #    image
         }
        productData{
          id
@@ -307,7 +309,7 @@ export default {
     };
   },
   mounted() {
-    // console.log(this.$page.markdownPage.plans);
+    console.log(this.$page.markdownPage);
   },
 };
 </script>

src/templates/Search.vue

@@ -113,7 +113,7 @@ query ($private: Int){
         header_title
         header_excerpt
         path
-        title
+      #  title
         excerpt
       }      
     }