From 191330ba57c7f615f2380d925e35500c4ad3f819 Mon Sep 17 00:00:00 2001 From: despiegk Date: Sat, 30 Oct 2021 11:17:06 +0200 Subject: [PATCH] navigation fixes --- content/footer/footer.md | 51 +++--- content/navigation/navigation.md | 161 ------------------ .../careers/job/tech_community_manager.md | 4 +- content/page/faq/faq/q1/q1.md | 2 +- content/page/faq/faq/q4/q4.md | 2 +- content/page/faq/faq/q7/q7.md | 8 +- content/page/home/brandPanel/brandPanel.md | 2 +- content/page/home/comparison/main/main.md | 2 +- content/page/home/cta5/cta5.md | 2 +- content/page/home/features2/main/main.md | 7 +- content/page/home/map/index.md | 4 +- content/page/home/videoPanel/index.md | 2 +- .../page/oldtoken/brandPanel/brandPanel.md | 2 +- content/page/oldtoken/cta2/cta2.md | 2 +- content/page/oldtoken/oldtoken.md | 2 +- .../page/oldtoken/productData/main/main.md | 2 +- content/page/support/header4/header4.md | 2 +- content/page/universe/comparison/main/main.md | 2 +- content/page/why/partenerships/main/main.md | 2 +- readme.md | 2 +- src/index.html | 2 +- 21 files changed, 50 insertions(+), 215 deletions(-) diff --git a/content/footer/footer.md b/content/footer/footer.md index 3749e7bf8..8b1dfca01 100644 --- a/content/footer/footer.md +++ b/content/footer/footer.md @@ -1,27 +1,24 @@ --- id: footer description: THREEFOLD +telegram: 'https://t.me/threefoldnews' linkedin: 'https://www.linkedin.com/company/threefold-foundation/' facebook: 'https://www.facebook.com/threefold.io' twitter: 'https://twitter.com/threefold_io' -dribbble: '#' -instagram: '#' youtube: 'https://www.youtube.com/threefoldfoundation' -github: 'https://github.com/threefoldfoundation' -telegram: 'https://t.me/threefoldnews' +github foundation: 'https://github.com/threefoldfoundation' +github tech: 'https://github.com/threefoldtech' items: - title: Threefold Universe links: - name: ThreeFold Token - link: /tft + link: https://www.threefold.io/tft - name: ThreeFold Cloud - link: https://cloud.threefold.io/ + link: https://library.threefold.me/info/threefold/#/cloud/threefold__cloud_home - name: Grid Explorer link: https://explorer.threefold.io/ - - name: ThreeFold Marketplace + - name: ThreeFold Marketplace 2.0 link: https://threefold.io/marketplace - - name: Digital Twin - link: https://mydigitaltwin.io - name: Alliance link: https://consciousinternet.org @@ -29,50 +26,48 @@ items: - title: Participate links: - name: Start Farming - link: /farm + link: https://farming.threefold.io/farm - name: Buy the Token - link: https://library.threefold.me/info/tfgrid/#/tokens/how_to_buy - - name: Test the Cloud - link: https://cloud.threefold.io/ - - name: Deploy with SDK - link: https://threefold.io/info/sdk + link: https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy + - name: Use the Cloud + link: https://library.threefold.me/info/threefold/#/cloud/threefold__cloud_home - name: Testing Community link: https://t.me/joinchat/BwOvOxxgK59GmRoZ2_sM0w - title: Knowledgebase links: - name: ThreeFold Grid - link: /grid + link: https://www.threefold.io/grid - name: ThreeFold Technology - link: https://library.threefold.me/info/cloud/#/cloud_home + link: https://library.threefold.me/info/threefold/#/cloud/threefold__cloud_home - name: ThreeFold Farming - link: https://library.threefold.me/info/tfgrid/#/farming/farming_home.md + link: https://library.threefold.me/info/threefold/#/tfgrid/farming/threefold__farming_home - name: ThreeFold Token - link: https://library.threefold.me/info/tfgrid/#/tokens/tokens_home.md + link: https://library.threefold.me/info/threefold/#/tokens/threefold__tokens_home - name: Manuals - link: https://threefold.io/info/threefold#/threefold__wiki_overview + link: https://library.threefold.me/info/threefold/#/manual_tfgrid3/threefold__manual3_home - name: ThreeFold Glossary - link: https://threefold.io/info/threefold#/threefold__defs + link: https://library.threefold.me/info/threefold/#/threefold__definitions_concepts - title: About Us links: - name: ThreeFold - link: /mission + link: https://www.threefold.io/mission - name: Partners - link: /partners + link: https://www.threefold.io/partners - name: People - link: /people + link: https://www.threefold.io/people - name: Blog - link: /blog + link: https://www.threefold.io/blog - name: NewsRoom - link: /news + link: https://www.threefold.io/news - name: Forum link: https://forum.threefold.io/ - name: Support - link: /support + link: https://www.threefold.io/support --- -[Terms & Conditions](https://threefold.io/info/legal#/legal__terms_conditions_websites) | [Privacy Policy](https://threefold.io/info/legal#/legal__privacypolicy) | [Impressum]() +[Terms & Conditions](https://library.threefold.me/info/legal/#/legal__terms_conditions_websites) | [Privacy Policy](https://library.threefold.me/info/legal/#/legal__privacypolicy) | [Impressum]()
© 2021 ThreeFold, All rights reserved. \ No newline at end of file diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md index 24f4bf6ec..27b6c40fb 100644 --- a/content/navigation/navigation.md +++ b/content/navigation/navigation.md @@ -78,164 +78,3 @@ social: --- - - - - - - - diff --git a/content/page/careers/job/tech_community_manager.md b/content/page/careers/job/tech_community_manager.md index aa502dcf9..08157c0e3 100644 --- a/content/page/careers/job/tech_community_manager.md +++ b/content/page/careers/job/tech_community_manager.md @@ -12,7 +12,7 @@ link: https://06gdrqp39yz.typeform.com/to/FffDv61M **Values & Passion:** - Understand what it means to work in a successfully growing project and endorse this way of working. - - Resonate with [a blog once written about values & collaboration (2017)](https://threefold.io/info/threefold#/threefold__kristof_build_a_better_world_values_collaboration?id=change-is-good). + - Resonate with [values & collaboration](https://library.threefold.me/info/freeflow/#/collaboration/freeflow__goals_values). - Be passionate and willing to bring a positive change to the world. - Understand it won't be a 9-5 job. We are changing the world, it takes courage and perseverance. - Be willing to travel and stay at other locations for some time to work directly with the team. @@ -46,7 +46,7 @@ We are looking for a **Technical Community Manager & Team Lead** to help our com - Understand and follow Pareto 20/80 rule - A good teacher - Understand what it means to be a team_lead - - Be at least level 'wolf' in [the skill levels](https://threefold.io/info/threefold#/threefold__p2p_awareness_level) we use + - Be at least level 'wolf' in [the skill levels](https://library.threefold.me/info/freeflow/#/collaboration/freeflow__p2p_awareness_level) we use ## What we offer diff --git a/content/page/faq/faq/q1/q1.md b/content/page/faq/faq/q1/q1.md index d4640daf6..cc7c729ed 100644 --- a/content/page/faq/faq/q1/q1.md +++ b/content/page/faq/faq/q1/q1.md @@ -16,4 +16,4 @@ ThreeFold is committed to making all it's peer-to-peer technologies open-source

-[Learn More](https://threefold.io/info/threefold#/threefold__why_grid_link) \ No newline at end of file +[Learn More](https://library.threefold.me/info/threefold#/tfgrid/grid/threefold__grid_home) \ No newline at end of file diff --git a/content/page/faq/faq/q4/q4.md b/content/page/faq/faq/q4/q4.md index bc417e56f..f64480bd2 100644 --- a/content/page/faq/faq/q4/q4.md +++ b/content/page/faq/faq/q4/q4.md @@ -10,4 +10,4 @@ It will protect your account with both your password and your phone. ThreeFold C

-[Learn More](https://info.threefold.io/#/threefold__threefold_connect) \ No newline at end of file +[Learn More](https://library.threefold.me/info/threefold/#/tokens/threefold__threefold_connect) \ No newline at end of file diff --git a/content/page/faq/faq/q7/q7.md b/content/page/faq/faq/q7/q7.md index 3f55bd0a7..c0442bd25 100644 --- a/content/page/faq/faq/q7/q7.md +++ b/content/page/faq/faq/q7/q7.md @@ -4,13 +4,13 @@ question: How can I get involved with ThreeFold if I'm not very technical? --- There are many ways for anyone to participate in the ThreeFold movement: -- Become a [Farmer](https://farming.threefold.io/farm) and connect sovereign and planet positive Internet capacity from your home or office. -- Buy [ThreeFold Tokens](https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell) to grow the new Internet economy and use it to reserve private and secure Internet capacity on the ThreeFold Grid. -- Join a collaborative ecosystem of partners that choose to take action, and together build the most efficient and secure technological infrastructures, equalitarian and sovereign applications and regenerate our planet. Join us - [the ThreeFold ecosystem](https://t.me/threefold) or [the Alliance for a Conscious Internet](https://threefold.io/aci). +- Become a [Farmer](https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro) and connect sovereign and planet positive Internet capacity from your home or office. +- Buy [ThreeFold Tokens](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy) to grow the new Internet economy and use it to reserve private and secure Internet capacity on the ThreeFold Grid. +- Join a collaborative ecosystem of partners that choose to take action, and together build the most efficient and secure technological infrastructures, equalitarian and sovereign applications and regenerate our planet. Join us - [the ThreeFold ecosystem](https://t.me/threefold) or [the Alliance for a Conscious Internet](https://www.consciousinternet.org/). - Become a ThreeFold Advocate by sharing about us within your networks. Wether one or thousands of people, with the butterfly effect, everyone counts! - Join our [community](https://t.me/threefold), [forum](https://forum.threefold.io/) and [github](https://github.com/threefoldfoundation) to support us in our growth by participating in our conversations and development. - And more.. we are very open to new ideas.

-Look for the Participate section on the navigation bar or check our [Collaboration section on wiki](https://threefold.io/info/threefold#/threefold__collaboration). \ No newline at end of file +Look for the Participate section on the navigation bar or check our [Collaboration section on wiki](https://library.threefold.me/info/freeflow/#/collaboration/freeflow__collaboration.md). \ No newline at end of file diff --git a/content/page/home/brandPanel/brandPanel.md b/content/page/home/brandPanel/brandPanel.md index 1945f2b77..ab5b72533 100644 --- a/content/page/home/brandPanel/brandPanel.md +++ b/content/page/home/brandPanel/brandPanel.md @@ -2,7 +2,7 @@ id: fix_internet title: ZERO OS subtitle: '' -sourceUrl: https://farming.threefold.io/get_3node +sourceUrl: https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__start_farming btnTxt: Get a Node button2: Learn More link2: /grid diff --git a/content/page/home/comparison/main/main.md b/content/page/home/comparison/main/main.md index f623ce27e..29f4f73f4 100644 --- a/content/page/home/comparison/main/main.md +++ b/content/page/home/comparison/main/main.md @@ -3,5 +3,5 @@ id: comparison title: GIVE THE WORLD A BETTER INTERNET description: The current Internet is centralized to tech giants that build power-hungry data centers and exploit user data. ThreeFold looks at updating the current $3.9 Billion IT with a new paradigm that serves people and our planet. button: Our Values -link: https://threefold.io/aci/about #add button link here +link: https://www.consciousinternet.org//about #add button link here --- diff --git a/content/page/home/cta5/cta5.md b/content/page/home/cta5/cta5.md index fe0daaa43..ed789d94a 100644 --- a/content/page/home/cta5/cta5.md +++ b/content/page/home/cta5/cta5.md @@ -2,7 +2,7 @@ id: home_cta5 title: '' button: Know More -link: 'https://threefold.io/info/threefold#/threefold__grid_why' +link: 'https://library.threefold.me/info/threefold#/threefold__why_intro' button2: Live Stats link2: 'https://explorer.threefold.io/' button3: '' diff --git a/content/page/home/features2/main/main.md b/content/page/home/features2/main/main.md index a4f34ae7a..db6d4b4e1 100644 --- a/content/page/home/features2/main/main.md +++ b/content/page/home/features2/main/main.md @@ -3,10 +3,11 @@ id: Features_home_2 title: Introducing 3Node subtitle: '' btn: How it works -link: https://farming.threefold.io/farm +link: https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro btn2: Order your 3Node -link2: https://farming.threefold.io/get_3node +link2: https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__start_farming btn3: Discover Zero-OS -link3: https://threefold.io/info/threefold#/internet4__zos +link3: https://library.threefold.me/info/threefold#/technology/threefold__zos --- Work with technology that can change the world. 3Nodes run Zero OS, a stateless and lightweight operating system that is setting new standards of security and efficiency to store humanity's data and run its workloads. + \ No newline at end of file diff --git a/content/page/home/map/index.md b/content/page/home/map/index.md index 1287d8b45..e4803264e 100644 --- a/content/page/home/map/index.md +++ b/content/page/home/map/index.md @@ -6,11 +6,11 @@ button: More Stats link: https://explorer.threefold.io image: ./map.png btn1: Become a Farmer -link1: https://farming.threefold.io/ +link1: https://library.threefold.me/info/threefold#/tfgrid/farming/threefold__farming_intro btn2: Explore Live Capacity link2: https://explorer.threefold.io/ btn3: Behind the New Internet -link3: https://threefold.io/info/threefold#/threefold__grid_concepts +link3: https://library.threefold.me/info/threefold#/tfgrid/grid/threefold__grid_home --- The ThreeFold Grid is formed by a global network of independent Farmers – people and organizations who expand Internet capacity to where it is needed the most. diff --git a/content/page/home/videoPanel/index.md b/content/page/home/videoPanel/index.md index 124a0b735..cebf43eb2 100644 --- a/content/page/home/videoPanel/index.md +++ b/content/page/home/videoPanel/index.md @@ -3,7 +3,7 @@ id: home_videoPanel video: https://www.youtube.com/embed/5DtVU66Z74s title: More than an Internet, a new paradigm btn: Learn More -link: https://threefold.io/info/threefold#/threefold__grid_concepts +link: https://library.threefold.me/info/threefold#/tfgrid/grid/threefold__grid_home --- ThreeFold started from the ground up to build secure and sustainable peer-to-peer Internet diff --git a/content/page/oldtoken/brandPanel/brandPanel.md b/content/page/oldtoken/brandPanel/brandPanel.md index 10919df7f..4e170c9e8 100644 --- a/content/page/oldtoken/brandPanel/brandPanel.md +++ b/content/page/oldtoken/brandPanel/brandPanel.md @@ -2,7 +2,7 @@ id: dive_TFT title: Dive Deeper into TFT subtitle: -sourceUrl: https://wiki.threefold.io/#/threefold__token_what +sourceUrl: https://library.threefold.me/info/threefold/#/tokens/threefold__tokens_home btnTxt: Learn More image: dive-into.png --- diff --git a/content/page/oldtoken/cta2/cta2.md b/content/page/oldtoken/cta2/cta2.md index ae6f48060..bda139ab0 100644 --- a/content/page/oldtoken/cta2/cta2.md +++ b/content/page/oldtoken/cta2/cta2.md @@ -3,7 +3,7 @@ id: oldtoken_cta2 title: Why does TFT have value? slogan: button: Get Tokens -link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell +link: https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy button2: link2: button3: diff --git a/content/page/oldtoken/oldtoken.md b/content/page/oldtoken/oldtoken.md index 5c7f5acfe..d4d2f2b4e 100644 --- a/content/page/oldtoken/oldtoken.md +++ b/content/page/oldtoken/oldtoken.md @@ -9,7 +9,7 @@ header_image: ./token_header.png header_altImg: ThreeFold Token header_excerpt: The Threefold Token is the official currency of ThreeFold – the engine for a planet positive and data sovereign Internet. Now is the perfect time to get involved. button: Get Tokens -link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell +link: https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy comparisonMain: token_comparison comparisonSecs: [expand_grid, invest_token] productsMain: token_product diff --git a/content/page/oldtoken/productData/main/main.md b/content/page/oldtoken/productData/main/main.md index 3da7177cd..f8928cfae 100644 --- a/content/page/oldtoken/productData/main/main.md +++ b/content/page/oldtoken/productData/main/main.md @@ -3,5 +3,5 @@ id: token_product title: The utility of TFT is growing subtitle: '' button: Get Tokens -link: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell +link: https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy --- diff --git a/content/page/support/header4/header4.md b/content/page/support/header4/header4.md index 813496a5e..d5eb8744f 100644 --- a/content/page/support/header4/header4.md +++ b/content/page/support/header4/header4.md @@ -11,4 +11,4 @@ link2: '' For questions and assistance, please use the chat function (blue chat bubble) on the bottom right corner of our website
-or 'Support' function in the [ThreeFold Connect app](https://threefold.io/info/threefold#/threefold__threefold_connect). \ No newline at end of file +or 'Support' function in the [ThreeFold Connect app](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect). \ No newline at end of file diff --git a/content/page/universe/comparison/main/main.md b/content/page/universe/comparison/main/main.md index 788a915fa..25bd8bea2 100644 --- a/content/page/universe/comparison/main/main.md +++ b/content/page/universe/comparison/main/main.md @@ -3,5 +3,5 @@ id: uni_comparison title: GIVE THE WORLD A BETTER INTERNET description: The current Internet is centralized to tech giants that build power-hungry data centers and exploit user data. ThreeFold looks at updating the current $3.9 Billion IT with a new paradigm that serves people and our planet. button: Our Values -link: https://threefold.io/aci/about #add button link here +link: https://www.consciousinternet.org//about #add button link here --- diff --git a/content/page/why/partenerships/main/main.md b/content/page/why/partenerships/main/main.md index 084b3a1bc..3cfbe0bef 100644 --- a/content/page/why/partenerships/main/main.md +++ b/content/page/why/partenerships/main/main.md @@ -5,7 +5,7 @@ slogan: PARTNERSHIPS button : Meet our Partners link : /partners button2 : Meet the Alliance -link2 : https://threefold.io/aci +link2 : https://www.consciousinternet.org/ --- We have carefully chosen the right partnerships to implement our vision. diff --git a/readme.md b/readme.md index 4863b9c7b..c9a98fe3e 100644 --- a/readme.md +++ b/readme.md @@ -5,6 +5,6 @@ If you have any input, a cool idea, or would like to see additions feel free to list an issue [HERE](https://github.com/threefoldfoundation/www_threefold_io/issues/new), or on Circles tool (**mandatory for internal team**) and we'll make sure to try and get it in there. -If you have questions or need any support please visit [our website](https://www.threefold.io) and use the chat function (blue chat bubble) on the bottom right corneror 'Support' function in the [ThreeFold Connect app](https://threefold.io/info/threefold#/threefold__threefold_connect). +If you have questions or need any support please visit [our website](https://www.threefold.io) and use the chat function (blue chat bubble) on the bottom right corneror 'Support' function in the [ThreeFold Connect app](https://library.threefold.me/info/threefold/#/tokens/threefold__threefold_connect). Enjoy exploring our websites! 🙂 diff --git a/src/index.html b/src/index.html index 275b01d2d..2fa001186 100644 --- a/src/index.html +++ b/src/index.html @@ -28,7 +28,7 @@ +type="text/javascript"> document.addEventListener('DOMContentLoaded', function () { cookieconsent.run({ "notice_banner_type": "headline", "consent_type": "express", "palette": "light", "language": "en", "website_name": "https://www.threefold.io", "website_privacy_policy_url":"https://library.threefold.me/info/legal/#/legal__privacypolicy" }); });