diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md index fd49df193..24f4bf6ec 100644 --- a/content/navigation/navigation.md +++ b/content/navigation/navigation.md @@ -17,8 +17,8 @@ navLinks: expandable: false - name: Farm - link: 'https://farming.threefold.io/farm' - external: true + link: /farm + external: false expandable: false - name: TFT diff --git a/content/page/farm/brandPanel/index.md b/content/page/farm/brandPanel/index.md new file mode 100644 index 000000000..95f6bdb3e --- /dev/null +++ b/content/page/farm/brandPanel/index.md @@ -0,0 +1,8 @@ +--- +id: farm_brandPanel +title: Hello, Titan +image: farm_titan.jpg # src/assets/brandPanel/.. +btnTxt : Get a Titan Node +sourceUrl : '' +--- +The Titan node was designed to fit any home or office. It is packed with performance for its price and doesn’t require any technical knowledge. Just order, plug it in and start earning. Yes, that’s it! \ No newline at end of file diff --git a/content/page/farm/brandPanel2/index.md b/content/page/farm/brandPanel2/index.md new file mode 100644 index 000000000..32ef0da0a --- /dev/null +++ b/content/page/farm/brandPanel2/index.md @@ -0,0 +1,11 @@ +--- +id: farm_brandPanel2 +title: GOT QUESTIONS +subtitle : FUTURE FARMER? +image: farm_future.jpg # src/assets/brandPanel/.. +btnTxt : Farming Library +sourceUrl : '' +btnTxt2 : Farming FAQs +sourceUrl2 : '' +--- +We have an extensive library of information about farming and we’ve also gathered the most frequently asked questions and answers around farming in our forum. If you can’t find the answer you’re looking for, just ask away and our experts will get back to you. diff --git a/content/page/farm/brandPanel3/index.md b/content/page/farm/brandPanel3/index.md new file mode 100644 index 000000000..a1586d9d7 --- /dev/null +++ b/content/page/farm/brandPanel3/index.md @@ -0,0 +1,9 @@ +--- +id: farm_brandPanel3 +title: SET UP YOUR +subtitle : OWN NODE +image: setup_nodes .png # src/assets/brandPanel/.. +btnTxt : See Requirements +sourceUrl : '' +--- +ThreeFold’s operating system can run on any Intel or AMD powered computers. From building your own 3Node to using refurbished hardware, define your ideal configurations and start farming today. \ No newline at end of file diff --git a/content/page/farm/cta/farm_map.jpg b/content/page/farm/cta/farm_map.jpg new file mode 100644 index 000000000..bbb7af2a5 Binary files /dev/null and b/content/page/farm/cta/farm_map.jpg differ diff --git a/content/page/farm/cta/index.md b/content/page/farm/cta/index.md new file mode 100644 index 000000000..bb00e5664 --- /dev/null +++ b/content/page/farm/cta/index.md @@ -0,0 +1,9 @@ +--- +id: farm_cta +title: JOIN A WORLD OF FARMERS +image: ./farm_map.jpg +button: '' +link: '' +--- +We are growing fast. + diff --git a/content/page/farm/cta2/farm_graph.jpg b/content/page/farm/cta2/farm_graph.jpg new file mode 100644 index 000000000..dde048f89 Binary files /dev/null and b/content/page/farm/cta2/farm_graph.jpg differ diff --git a/content/page/farm/cta2/index.md b/content/page/farm/cta2/index.md new file mode 100644 index 000000000..06391cf9b --- /dev/null +++ b/content/page/farm/cta2/index.md @@ -0,0 +1,13 @@ +--- +id: farm_cta2 +title: A TOKEN OF +subtitle : IMMEASURABLE VALUE +image: ./farm_graph.jpg +button: '' +link: '' +--- +Anything that exists digitally needs cloud capacity to remain available and accessible. The ThreeFold Grid allows anyone to store data and run applications with unparalleled efficiency and privacy. + +
+ +A limited supply and ‘burning’ mechanism was set to keep the currency scarce and ensure fair incentives for current and future farmers. \ No newline at end of file diff --git a/content/page/farm/farm.md b/content/page/farm/farm.md new file mode 100644 index 000000000..0769353aa --- /dev/null +++ b/content/page/farm/farm.md @@ -0,0 +1,21 @@ +--- +id: farm +metaTitle: ThreeFold | Mission +metaDesc: Farming TFT is done by connection a node or server to the ThreeFold Grid. Yes, it's that simple. Join thousands that make the Internet of tomorrow possible. +metaImg: ./farm_header.jpg +header_slogan: '' +header_title: BE THE +header_title2: internet +header_image: ./farm_header.jpg +button: Become a Farmer +link: '' +header_altImg: threefold +header_excerpt: Farming TFT is done by connection a node or server to the ThreeFold Grid. Yes, it's that simple. Join thousands that make the Internet of tomorrow possible. +productsMain: product_farm +productData: [farm_product1, farm_product2, farm_product3] +cta: farm_cta +cta2: farm_cta2 +brandPanel: farm_brandPanel +brandPanel3: farm_brandPanel3 +brandPanel2 : farm_brandPanel2 +--- diff --git a/content/page/farm/farm_header.jpg b/content/page/farm/farm_header.jpg new file mode 100644 index 000000000..4ee9900fd Binary files /dev/null and b/content/page/farm/farm_header.jpg differ diff --git a/content/page/farm/productData/main/main.md b/content/page/farm/productData/main/main.md new file mode 100644 index 000000000..ceaa308f9 --- /dev/null +++ b/content/page/farm/productData/main/main.md @@ -0,0 +1,7 @@ +--- +id: product_farm +title: "Farm" +subtitle: A new Way of growing the internet. +--- + +3Nodes are servers that provide the compute, storage and network capacity needed to store data and run applications on the global internet. Thanks to ThreeFold’s innovative Proof-of-Capacity model, you are rewarded with TFT for doing this. diff --git a/content/page/farm/productData/product1/plug.png b/content/page/farm/productData/product1/plug.png new file mode 100644 index 000000000..1fe5c0096 Binary files /dev/null and b/content/page/farm/productData/product1/plug.png differ diff --git a/content/page/farm/productData/product1/product1.md b/content/page/farm/productData/product1/product1.md new file mode 100644 index 000000000..57eeb1002 --- /dev/null +++ b/content/page/farm/productData/product1/product1.md @@ -0,0 +1,9 @@ +--- +id: farm_product1 +title: '' +image: ./plug.png +button: '' +link: '' +--- + +All you need to get started is electricity, a network connection, and a 3Node. diff --git a/content/page/farm/productData/product2/offer.png b/content/page/farm/productData/product2/offer.png new file mode 100644 index 000000000..4e7686250 Binary files /dev/null and b/content/page/farm/productData/product2/offer.png differ diff --git a/content/page/farm/productData/product2/product2.md b/content/page/farm/productData/product2/product2.md new file mode 100644 index 000000000..2414e287e --- /dev/null +++ b/content/page/farm/productData/product2/product2.md @@ -0,0 +1,9 @@ +--- +id: farm_product2 +title: '' +image: ./offer.png +button: '' +link: '' +--- + +Your capacity will be automatically detected by the OS and registered in the blockchain. diff --git a/content/page/farm/productData/product3/earn.png b/content/page/farm/productData/product3/earn.png new file mode 100644 index 000000000..b5f06075b Binary files /dev/null and b/content/page/farm/productData/product3/earn.png differ diff --git a/content/page/farm/productData/product3/product3.md b/content/page/farm/productData/product3/product3.md new file mode 100644 index 000000000..da388809e --- /dev/null +++ b/content/page/farm/productData/product3/product3.md @@ -0,0 +1,9 @@ +--- +id: farm_product3 +title: '' +image: ./earn.png +button: '' +link: '' +--- + +Earn ThreeFold Tokens for connecting and offering planet positive capacity. diff --git a/content/page/tft/cta/cta.md b/content/page/tft/cta/cta.md index 716a60017..9597e1965 100644 --- a/content/page/tft/cta/cta.md +++ b/content/page/tft/cta/cta.md @@ -4,7 +4,7 @@ title: THE POTENTIAL IS ENDLESS image: ./potental.png button: How ThreeFold Compares With The Industry link: https://forum.threefold.io/t/threefold-is-the-substrate-for-decloud/1295 -button2: -link2: +button2: '' +link2: '' --- Many projects created bits and pieces of what a decentralized cloud would look like, each with their own protocol and tools, making the industry more complicated than ever. With TFT, people can access the most comprehensive digital network ever created. diff --git a/src/assets/images/brandPanel/farm_future.jpg b/src/assets/images/brandPanel/farm_future.jpg new file mode 100644 index 000000000..ddcb20711 Binary files /dev/null and b/src/assets/images/brandPanel/farm_future.jpg differ diff --git a/src/assets/images/brandPanel/farm_titan.jpg b/src/assets/images/brandPanel/farm_titan.jpg new file mode 100644 index 000000000..fac5a49f0 Binary files /dev/null and b/src/assets/images/brandPanel/farm_titan.jpg differ diff --git a/src/assets/images/brandPanel/setup_nodes .png b/src/assets/images/brandPanel/setup_nodes .png new file mode 100644 index 000000000..f98756744 Binary files /dev/null and b/src/assets/images/brandPanel/setup_nodes .png differ diff --git a/src/components/custom/sections/CallToAction.vue b/src/components/custom/sections/CallToAction.vue index 1bd43d85a..20c7767b3 100644 --- a/src/components/custom/sections/CallToAction.vue +++ b/src/components/custom/sections/CallToAction.vue @@ -191,6 +191,144 @@ > + +
+

+ {{ cta.title }} +

+
+ + +
+ +
+

+ {{ cta.title }} + {{ cta.subtitle }} +

+ +
+ + +
+
-
+
@@ -36,12 +42,9 @@ pt-10 pb-10 px-6 - sm:pt-16 - sm:px-10 - lg:py-16 - lg:pr-0 - xl:py-20 - xl:px-15 + sm:pt-16 sm:px-10 + lg:py-16 lg:pr-0 + xl:py-20 xl:px-15 " >
@@ -91,8 +94,7 @@ rounded-lg shadow-xl overflow-hidden - lg:grid lg:grid-cols-2 - lg:gap-4 + lg:grid lg:grid-cols-2 lg:gap-4 " >
@@ -399,7 +398,154 @@
- + +
+
+
+

+ {{ brand.title }} + {{ + brand.subtitle + }} +

+
+ {{ brand.btnTxt }} +
+
+
+ +
+
+ +
+
+ +
+
+
+

+ {{ brand.title }} + {{ + brand.subtitle + }} +

+
+ {{ brand.btnTxt }} +
+
+
+ +
+
+ +
+
+
+

+ {{ brand.title }} + {{ + brand.subtitle + }} +

+
+ {{ brand.btnTxt }} +
+
+
+ +
-
+

{{ brand.title }} @@ -443,7 +597,14 @@
@@ -537,8 +698,7 @@ >
@@ -925,8 +1082,7 @@ rounded-lg shadow-xl overflow-hidden - lg:grid lg:grid-cols-2 - lg:gap-4 + lg:grid lg:grid-cols-2 lg:gap-4 " >
@@ -997,9 +1150,13 @@ export default { \ No newline at end of file diff --git a/src/components/marketing/sections/cta-sections/Header.vue b/src/components/marketing/sections/cta-sections/Header.vue index b718f53f6..dcbd8c4ff 100644 --- a/src/components/marketing/sections/cta-sections/Header.vue +++ b/src/components/marketing/sections/cta-sections/Header.vue @@ -78,7 +78,6 @@ :href="link" >{{ button }} -
@@ -88,16 +87,13 @@ flex flex-wrap text-center items-center - lg:text-left - lg:mb-10 - lg:mt-4 + lg:text-left lg:mb-10 lg:mt-4 -mx-2 " v-if="id == 'mission'" >

Learn more -->

+
+ +
+
+ + +
+
+

+ {{ title }} +
+ {{ title2 }} +

+
+ +
{{ product.title }}
-
+
diff --git a/src/templates/MarkdownPage.vue b/src/templates/MarkdownPage.vue index 483332151..9e3c2d5f4 100644 --- a/src/templates/MarkdownPage.vue +++ b/src/templates/MarkdownPage.vue @@ -9,6 +9,7 @@ " :id="$page.markdownPage.id" :title="$page.markdownPage.header_title" + :title2="$page.markdownPage.header_title2" :slogan="$page.markdownPage.header_slogan" :image="$page.markdownPage.header_image" :altImg="$page.markdownPage.header_altImg" @@ -16,11 +17,14 @@ :button="$page.markdownPage.button" :link="$page.markdownPage.link" /> - + @@ -29,7 +33,10 @@ :id="$page.markdownPage.id" :brand="$page.markdownPage.brandPanel2" v-if=" - $page.markdownPage.brandPanel2 && $page.markdownPage.id !== 'tft' + $page.markdownPage.brandPanel2 && + $page.markdownPage.id !== 'tft' && + $page.markdownPage.brandPanel2 && + $page.markdownPage.id !== 'farm' " :brandPanel2="true" /> @@ -38,7 +45,10 @@ :id="$page.markdownPage.id" :brand="$page.markdownPage.brandPanel3" v-if=" - $page.markdownPage.brandPanel3 && $page.markdownPage.id !== 'tft' + $page.markdownPage.brandPanel3 && + $page.markdownPage.id !== 'tft' && + $page.markdownPage.brandPanel3 && + $page.markdownPage.id !== 'farm' " :brandPanel3="true" /> @@ -56,6 +66,7 @@ $page.markdownPage.header_title && $page.markdownPage.header_title != '' && $page.markdownPage.id !== 'mission' && + $page.markdownPage.id !== 'farm' && $page.markdownPage.id !== 'grid' && $page.markdownPage.id !== 'tft' " @@ -73,13 +84,18 @@ v-if=" $page.markdownPage.cta && $page.markdownPage.id !== 'grid' && - $page.markdownPage.id !== 'tft' + $page.markdownPage.id !== 'tft' && + $page.markdownPage.id !== 'farm' " :cta="$page.markdownPage.cta" /> @@ -113,7 +129,7 @@ :main="$page.markdownPage.comparisonMain" :sections="$page.markdownPage.comparisonSecs" /> --> - + - + - + - - @@ -173,7 +184,7 @@ v-if="$page.markdownPage.roadmap" :roadmap="$page.markdownPage.roadmap" /> - + + + + + + + + + + + + - @@ -318,6 +364,7 @@ header_excerpt header_altImg header_title + header_title2 header_image header_slogan button @@ -408,6 +455,7 @@ } cta2{ title + subtitle image button link @@ -440,6 +488,7 @@ brandPanel2{ id title + subtitle btnTxt sourceUrl content @@ -449,6 +498,7 @@ id title btnTxt + subtitle sourceUrl sourceUrl2 content