From 68f192077548e81d9005b78a7bba56614eaea37b Mon Sep 17 00:00:00 2001
From: ehab-hassan <hassane@codescalers.com>
Date: Tue, 9 Feb 2021 14:46:47 +0200
Subject: [PATCH] update content markdown

---
 content/page/solution/cards/card1/card1.md    |  4 +-
 content/page/solution/cards/card2/card2.md    |  5 +-
 content/page/solution/cards/card3/card3.md    |  1 -
 content/page/token/cards/card2/card2.md       |  4 +-
 src/components/custom/NewsFilterHeader.vue    |  2 +-
 src/components/custom/sections/Comparison.vue | 11 ++--
 src/components/custom/sections/Features.vue   | 26 +++++----
 src/components/custom/sections/HowItWorks.vue |  7 ++-
 .../sections/cta-sections/NewCard.vue         | 58 +++++++++++--------
 src/templates/MarkdownPage.vue                | 12 ++--
 10 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/content/page/solution/cards/card1/card1.md b/content/page/solution/cards/card1/card1.md
index 4ec9b8612..045b417af 100644
--- a/content/page/solution/cards/card1/card1.md
+++ b/content/page/solution/cards/card1/card1.md
@@ -5,6 +5,6 @@ image: ./solution_card_1.png
 button: Learn More
 link: '/https://wiki.threefold.io/#/threefold_layers'
 order: 1
-excerpt: By starting again from zero, we created a unique lightweight and autonomous OS built from a Linux Kernel. From there, we developed a fully automous system with its own network connection overlay, unique storage algorythm, and storage system that alltogether (1) eliminate backdoors for hackers, (2) eliminate complexity from the model (3) ensure data is fully secured and encrypted.
----
 
+---
+By starting again from zero, we created a unique lightweight and autonomous OS built from a Linux Kernel. From there, we developed a fully automous system with its own network connection overlay, unique storage algorythm, and storage system that alltogether (1) eliminate backdoors for hackers, (2) eliminate complexity from the model (3) ensure data is fully secured and encrypted.
diff --git a/content/page/solution/cards/card2/card2.md b/content/page/solution/cards/card2/card2.md
index 1f651d71e..3889e8af2 100644
--- a/content/page/solution/cards/card2/card2.md
+++ b/content/page/solution/cards/card2/card2.md
@@ -5,5 +5,6 @@ image: ./tft_stats.png
 button: TFT STATISTICS
 link: '/https://tokenstats.threefoldtoken.com/'
 order: 1
-excerpt: TFT is live and actively traded.
----
\ No newline at end of file
+
+---
+TFT is live and actively traded.
\ No newline at end of file
diff --git a/content/page/solution/cards/card3/card3.md b/content/page/solution/cards/card3/card3.md
index 9a650ecdd..83bdfa324 100644
--- a/content/page/solution/cards/card3/card3.md
+++ b/content/page/solution/cards/card3/card3.md
@@ -5,5 +5,4 @@ image: ./card3.jpeg
 button: Start Now
 link: '/blog'
 order: 3
-excerpt: 
 ---
diff --git a/content/page/token/cards/card2/card2.md b/content/page/token/cards/card2/card2.md
index 0932e2f85..6e9e9a42f 100644
--- a/content/page/token/cards/card2/card2.md
+++ b/content/page/token/cards/card2/card2.md
@@ -5,5 +5,5 @@ image: ./live_stats_1.png
 button: TFT STATISTICS
 link: '/https://tokenstats.threefoldtoken.com/'
 order: 1
-excerpt: TFT is live and actively traded.
----
\ No newline at end of file
+---
+TFT is live and actively traded.
\ No newline at end of file
diff --git a/src/components/custom/NewsFilterHeader.vue b/src/components/custom/NewsFilterHeader.vue
index 2b7a3d755..32ebb3ec1 100644
--- a/src/components/custom/NewsFilterHeader.vue
+++ b/src/components/custom/NewsFilterHeader.vue
@@ -259,7 +259,7 @@ export default {
     resetAll() {
       this.$emit("resetAll", true);
       this.topic = "All Topics";
-      this.year = "All Year";
+      this.year = "All Years";
       this.month = "All Months";
     },
     close(e) {
diff --git a/src/components/custom/sections/Comparison.vue b/src/components/custom/sections/Comparison.vue
index 54e10784c..a3dfbf2d3 100644
--- a/src/components/custom/sections/Comparison.vue
+++ b/src/components/custom/sections/Comparison.vue
@@ -10,25 +10,24 @@
         v-for="(section, index) in sections"
         :key="index"
       >
-        <img
+        <g-image
           class="w-1/2 mx-auto mb-8 h-32"
           :src="section.svg.src"
           :alt="section.title"
         />
         <h3 class="text-2xl mb-4 font-semibold font-heading">
-          <span
+          <!-- <span
             class="inline-flex items-center justify-center h-12 w-12 mr-2 border rounded-full"
             >{{ index + 1 }}</span
-          >
+          > -->
           <span>{{ section.title }}</span>
         </h3>
-        <p class="text-gray-600">
-          {{ section.excerpt }}
-        </p>
+        <div class="text-gray-700" v-html="section.content"></div>
       </div>
     </div>
     <div>
       <g-link
+        v-if="main.button"
         class="bg-gray-900 learn-button hover:bg-gray-700 text-gray-100 px-5 py-3 mr-3 font-semibold rounded shadow"
         :to="main.link"
         >{{ main.button }}</g-link
diff --git a/src/components/custom/sections/Features.vue b/src/components/custom/sections/Features.vue
index 456a16dad..dfe8f871f 100644
--- a/src/components/custom/sections/Features.vue
+++ b/src/components/custom/sections/Features.vue
@@ -1,38 +1,42 @@
 <template>
   <section class="py-12 px-4">
-    <h2 class="text-3xl text-center mb-12 font-semibold font-heading">
+    <h2 class="text-4xl text-center mb-12 font-semibold font-heading">
       {{ main.title }}
     </h2>
     <div class="flex flex-wrap -mx-4 mb-6">
       <div
         v-for="feature in features"
         :key="feature.id"
-        class="lg:w-1/4 px-4 mb-6"
+        class="lg:w-1/2 px-4 mb-6 text-center"
       >
-        <g-image class="w-10 h-10" :src="feature.svg.src"></g-image>
+        <g-image
+          class="w-10 h-10 mx-auto"
+          v-if="feature.svg"
+          :src="feature.svg.src"
+          :alt="feature.svg"
+        ></g-image>
         <h3 class="text-xl my-3 font-semibold font-heading">
           {{ feature.title }}
         </h3>
-        <p class="text-sm text-gray-600 leading-relaxed">
-          {{ feature.excerpt }}
-        </p>
+        <div
+          v-html="feature.content"
+          class="text-sm text-gray-700 leading-relaxed"
+        ></div>
       </div>
     </div>
-    <div class="text-center">
+    <div class="text-center" v-if="main.btn">
       <g-link
         class="bg-gray-900 learn-button hover:bg-gray-700 text-gray-100 px-5 py-3 mr-3 font-semibold rounded shadow"
         :to="main.link"
         >{{ main.btn }}</g-link
       >
-      <p class="text-sm text-gray-400 mt-5">
-        {{ main.excerpt }}
-      </p>
+      <div v-html="main.content" class="text-sm text-gray-400 mt-5"></div>
     </div>
   </section>
 </template>
 
 <script>
 export default {
-  props: ["main", "features"]
+  props: ["main", "features"],
 };
 </script>
\ No newline at end of file
diff --git a/src/components/custom/sections/HowItWorks.vue b/src/components/custom/sections/HowItWorks.vue
index f5083de06..8a1032165 100644
--- a/src/components/custom/sections/HowItWorks.vue
+++ b/src/components/custom/sections/HowItWorks.vue
@@ -21,9 +21,10 @@
           <h3 class="text-2xl mb-2 font-semibold font-heading">
             {{ howItWorkSec.title }}
           </h3>
-          <p class="text-gray-600 leading-relaxed">
-            {{ howItWorkSec.excerpt }}
-          </p>
+          <div
+            class="text-gray-700 leading-relaxed"
+            v-html="howItWorkSec.content"
+          ></div>
         </div>
       </div>
     </div>
diff --git a/src/components/marketing/sections/cta-sections/NewCard.vue b/src/components/marketing/sections/cta-sections/NewCard.vue
index 549f453eb..81f30d7a6 100644
--- a/src/components/marketing/sections/cta-sections/NewCard.vue
+++ b/src/components/marketing/sections/cta-sections/NewCard.vue
@@ -1,34 +1,46 @@
 <template>
-        <div>
+  <div>
     <div class="lg:py-12 lg:flex lg:justify-center flex flex-col">
-        <div class="bg-white lg:mx-8 lg:flex lg:max-w-5xl lg:shadow-lg lg:rounded-lg">
-            <div class="lg:w-1/2">
-                <div class="h-64 bg-cover lg:rounded-lg lg:h-full" :style="img"></div>
-            </div>
-            <div class="py-12 px-6 max-w-xl lg:max-w-5xl lg:w-1/2">
-                <h2 class="text-3xl text-gray-700 font-bold">{{ card.title }}</h2>
-                <p class="mt-4 text-gray-700">{{ card.excerpt }}</p>
-                <div class="mt-8" v-if="card.link">
-                    <a :href="card.link" class="bg-gray-900 learn-button hover:bg-gray-700 text-gray-100 px-5 py-3 font-semibold rounded">{{ card.button }}</a>
-                </div>
-            </div>
+      <div
+        class="bg-white lg:mx-8 lg:flex lg:max-w-5xl lg:shadow-lg lg:rounded-lg"
+      >
+        <div class="lg:w-1/2">
+          <div class="h-64 bg-cover lg:rounded-lg lg:h-full" :style="img"></div>
         </div>
-    </div> 
-</div>
-
-
+        <div class="py-12 px-6 max-w-xl lg:max-w-5xl lg:w-1/2">
+          <h2 class="text-3xl text-gray-700 font-bold">{{ card.title }}</h2>
+          <div class="mt-4 text-gray-700" v-html="card.content"></div>
+          <div class="mt-8" v-if="card.button">
+            <a
+              v-if="card.link.includes('http')"
+              target="_blank"
+              :href="card.link"
+              class="bg-gray-900 learn-button hover:bg-gray-700 text-gray-100 px-5 py-3 font-semibold rounded"
+              >{{ card.button }}</a
+            >
+            <a
+              v-else
+              :href="card.link"
+              class="bg-gray-900 learn-button hover:bg-gray-700 text-gray-100 px-5 py-3 font-semibold rounded"
+              >{{ card.button }}</a
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-    computed: {
-        img: function(){
-            if(this.card.image.src)
-                return "background-image:url(" + this.card.image.src + ")"
-            return this.card.image
-        }
+  computed: {
+    img: function () {
+      if (this.card.image.src)
+        return "background-image:url(" + this.card.image.src + ")";
+      return this.card.image;
     },
-        
+  },
+
   props: ["card"],
 };
 </script>
\ No newline at end of file
diff --git a/src/templates/MarkdownPage.vue b/src/templates/MarkdownPage.vue
index 61a04c5b1..adbfe1a54 100644
--- a/src/templates/MarkdownPage.vue
+++ b/src/templates/MarkdownPage.vue
@@ -137,7 +137,7 @@
           button
           link
           order
-          excerpt
+          content
         }
        contactData{
          id
@@ -157,7 +157,7 @@
        howItWorks{
          id
          title
-         excerpt
+         content
        }
        howItWorksMain{
          id
@@ -173,7 +173,7 @@
        productData{
          id
          title
-         excerpt
+         content
          image
        }
        brandPanel{
@@ -190,7 +190,7 @@
           title 
           btn 
           link
-          excerpt
+          content
         }
         logos{
           id
@@ -200,7 +200,7 @@
           id
           title 
           svg
-          excerpt
+          content
         }
         cta{
           id
@@ -228,7 +228,7 @@
           id
           svg
           title
-          excerpt
+          content
         }
         roadmap{
           id