From 4af06f9ccd53fc1aac6ce998f070314822c9503e Mon Sep 17 00:00:00 2001 From: samaradel Date: Wed, 20 Apr 2022 14:20:16 +0200 Subject: [PATCH 01/13] Update farm links --- content/page/farm/brandPanel/index.md | 2 +- content/page/farm/farm.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/page/farm/brandPanel/index.md b/content/page/farm/brandPanel/index.md index ef26adba5..e7b25696c 100644 --- a/content/page/farm/brandPanel/index.md +++ b/content/page/farm/brandPanel/index.md @@ -3,6 +3,6 @@ id: farm_brandPanel title: Hello Titan image: farm_titan.jpg # src/assets/brandPanel/.. btnTxt : Get Titan -sourceUrl : https://shop.threefold.tech +sourceUrl : https://marketplace.3node.global/ --- The Titan was designed to fit in any home or office. It's compact, optimized for performance, and comes plug-and-farm. Just connect the Titan to electricity and network to start earning. Yes, it's that simple! diff --git a/content/page/farm/farm.md b/content/page/farm/farm.md index 37a8797b2..54f04510f 100644 --- a/content/page/farm/farm.md +++ b/content/page/farm/farm.md @@ -8,7 +8,7 @@ header_title: BE THE header_title2: internet header_image: ./farm_header.jpg button: Get a 3Node -link: https://shop.threefold.tech/ +link: https://marketplace.3node.global/ header_altImg: threefold header_excerpt: The People’s Internet is powered by an entirely new incentive model made possible by the ThreeFold Blockchain. productsMain: product_farm From 29ced8852763e57026af1e933c7ce1021d00069f Mon Sep 17 00:00:00 2001 From: samaradel Date: Wed, 27 Apr 2022 12:46:02 +0200 Subject: [PATCH 02/13] Update footer --- src/components/marketing/sections/cta-sections/Footer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/marketing/sections/cta-sections/Footer.vue b/src/components/marketing/sections/cta-sections/Footer.vue index 545e57fc2..7151707ff 100644 --- a/src/components/marketing/sections/cta-sections/Footer.vue +++ b/src/components/marketing/sections/cta-sections/Footer.vue @@ -255,8 +255,8 @@
-

- © 2021 ThreeFold, All rights reserved. +

+ ThreeFold S.A. , B265333 © 2021 ThreeFold, All rights reserved. Date: Wed, 27 Apr 2022 13:47:06 +0200 Subject: [PATCH 03/13] update footer --- src/components/marketing/sections/cta-sections/Footer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/marketing/sections/cta-sections/Footer.vue b/src/components/marketing/sections/cta-sections/Footer.vue index 7151707ff..86d1b6265 100644 --- a/src/components/marketing/sections/cta-sections/Footer.vue +++ b/src/components/marketing/sections/cta-sections/Footer.vue @@ -256,7 +256,7 @@

- ThreeFold S.A. , B265333 © 2021 ThreeFold, All rights reserved. + © 2021 ThreeFold, All rights reserved. Date: Wed, 4 May 2022 10:17:05 +0200 Subject: [PATCH 04/13] Fix broken links #153 --- content/page/developer/footers/footers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/page/developer/footers/footers.md b/content/page/developer/footers/footers.md index dca9ac8e0..0418e12be 100644 --- a/content/page/developer/footers/footers.md +++ b/content/page/developer/footers/footers.md @@ -39,11 +39,11 @@ items: - name: Quantum Safe Storage link: https://library.threefold.me/info/threefold#/qss/threefold__qsss_home - name: Virtual Machines - link: https://library.threefold.me/info/threefold#/manual_tfgrid3/manual3_iac/grid3_terraform/threefold__terraform_get_started?id=getting-started + link: https://library.threefold.me/info/manual/#/manual__weblets_vm - name: Kubernetes - link: https://library.threefold.me/info/threefold#/manual_tfgrid3/manual3_iac/grid3_terraform/threefold__terraform_get_started?id=kubernetes + link: https://library.threefold.me/info/manual/#/manual__weblets_k8s - name: Planetary Network - link: https://library.threefold.me/info/threefold#/manual_tfgrid3/threefold__grid3_planetary_network + link: https://library.threefold.me/info/manual/#/technology/threefold__planetary_network --- From c95878ac0c3546d9a63685b3807fe5bd874b66a1 Mon Sep 17 00:00:00 2001 From: samaradel Date: Mon, 6 Jun 2022 17:40:14 +0200 Subject: [PATCH 05/13] Add tflabs page --- content/page/tfLabs/contacts/contacts.md | 14 +++++ content/page/tfLabs/map/map.md | 4 ++ content/page/tfLabs/tfLabs.md | 8 +++ gridsome.config.js | 9 +++ .../contact-sections/split_two_tone.vue | 63 +++++++++++++++++++ .../sections/cta-sections/Footer.vue | 14 +++-- src/templates/MarkdownPage.vue | 34 +++++++--- 7 files changed, 132 insertions(+), 14 deletions(-) create mode 100644 content/page/tfLabs/contacts/contacts.md create mode 100644 content/page/tfLabs/map/map.md create mode 100644 content/page/tfLabs/tfLabs.md create mode 100644 src/components/marketing/sections/contact-sections/split_two_tone.vue diff --git a/content/page/tfLabs/contacts/contacts.md b/content/page/tfLabs/contacts/contacts.md new file mode 100644 index 000000000..1ed715da5 --- /dev/null +++ b/content/page/tfLabs/contacts/contacts.md @@ -0,0 +1,14 @@ +--- +id: contacts +title: ThreeFold Labs IT +subtitle: A company organized and existing under the laws of the United Arab Emirates with license number 934955 +emailTxt: Please get in touch at +email: info@threefold.io +--- +Warehouse 88:89 + +Al Jaddaf Dry Docks + +P.O Box 283182 + +Dubai, United Arab Emirates diff --git a/content/page/tfLabs/map/map.md b/content/page/tfLabs/map/map.md new file mode 100644 index 000000000..669cafab7 --- /dev/null +++ b/content/page/tfLabs/map/map.md @@ -0,0 +1,4 @@ +--- +id: tfmap +map: "https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3609.732111513173!2d55.32868122377514!3d25.2122551323585!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3e5f5d5f7da0de2b%3A0x5aed461f937f54ff!2sAl%20Jaddaf%20-%20Dubai%20-%20United%20Arab%20Emirates!5e0!3m2!1sen!2str!4v1654516740830!5m2!1sen!2str" +--- diff --git a/content/page/tfLabs/tfLabs.md b/content/page/tfLabs/tfLabs.md new file mode 100644 index 000000000..196b3d800 --- /dev/null +++ b/content/page/tfLabs/tfLabs.md @@ -0,0 +1,8 @@ +--- +id: tfLabs +metaTitle: ThreeFold | ThreeFold Labs IT +metaDesc: A company organized and existing under the laws of the United Arab Emirates with license number 934955 +metaImg: ./token_header.png +contacts: contacts +map: tfmap +--- diff --git a/gridsome.config.js b/gridsome.config.js index 70855b3da..ae1ab0ed3 100644 --- a/gridsome.config.js +++ b/gridsome.config.js @@ -504,6 +504,14 @@ module.exports = { } }, + { + use: '@gridsome/source-filesystem', + options: { + typeName: 'Contacts', + path: './content/page/**/contacts/*.md', + } + }, + { use: '@gridsome/source-filesystem', options: { @@ -572,6 +580,7 @@ module.exports = { conversations: 'Conversations', workloadsMain: 'WorkloadsMain', workloads: 'Workloads', + contacts: "Contacts" } } }, diff --git a/src/components/marketing/sections/contact-sections/split_two_tone.vue b/src/components/marketing/sections/contact-sections/split_two_tone.vue new file mode 100644 index 000000000..f43fc802f --- /dev/null +++ b/src/components/marketing/sections/contact-sections/split_two_tone.vue @@ -0,0 +1,63 @@ + + + diff --git a/src/components/marketing/sections/cta-sections/Footer.vue b/src/components/marketing/sections/cta-sections/Footer.vue index 86d1b6265..15eac2013 100644 --- a/src/components/marketing/sections/cta-sections/Footer.vue +++ b/src/components/marketing/sections/cta-sections/Footer.vue @@ -256,7 +256,7 @@

- © 2021 ThreeFold, All rights reserved. + © {{ currentYear }} ThreeFold, All rights reserved. Privacy Policy | - ImpressumThreeFold Labs IT

@@ -284,6 +281,11 @@ diff --git a/src/templates/MarkdownPage.vue b/src/templates/MarkdownPage.vue index 10c8ed8ec..b9d0b4da8 100644 --- a/src/templates/MarkdownPage.vue +++ b/src/templates/MarkdownPage.vue @@ -190,14 +190,13 @@ /> - +
+
Date: Mon, 6 Jun 2022 18:20:10 +0200 Subject: [PATCH 06/13] mv map --- .../contact-sections/split_two_tone.vue | 50 +++++++------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/src/components/marketing/sections/contact-sections/split_two_tone.vue b/src/components/marketing/sections/contact-sections/split_two_tone.vue index f43fc802f..d4029f314 100644 --- a/src/components/marketing/sections/contact-sections/split_two_tone.vue +++ b/src/components/marketing/sections/contact-sections/split_two_tone.vue @@ -1,37 +1,8 @@ From 07b70f0842b651028f7c235d5cc46c2215dca8aa Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 6 Jun 2022 23:02:21 +0200 Subject: [PATCH 07/13] update padding --- .../marketing/sections/contact-sections/split_two_tone.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/marketing/sections/contact-sections/split_two_tone.vue b/src/components/marketing/sections/contact-sections/split_two_tone.vue index d4029f314..8352248d1 100644 --- a/src/components/marketing/sections/contact-sections/split_two_tone.vue +++ b/src/components/marketing/sections/contact-sections/split_two_tone.vue @@ -1,6 +1,6 @@