diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml deleted file mode 100644 index f0b34c176..000000000 --- a/.github/workflows/action.yml +++ /dev/null @@ -1,17 +0,0 @@ -# On every push this script is executed -on: push -name: Build and deploy GH Pages -jobs: - build: - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/development' - steps: - - name: checkout - uses: actions/checkout@v2 - - name: build_and_deploy - uses: shalzz/zola-deploy-action@v0.14.1 - env: - # Target branch - PAGES_BRANCH: gh-pages - # Provide personal access token - TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file diff --git a/content/build/index.md b/content/build/index.md index ea5db9219..4fd713a9c 100644 --- a/content/build/index.md +++ b/content/build/index.md @@ -8,15 +8,14 @@ insert_anchor_links: "left" {% row(style="center margin narrow") %} -## The Next Generation of
**Cloud Computing** +## **Build** the Future -Deploy any workload with unprecedented security, scalability, and efficiency, on a fully comprehensive peer-to-peer digital infrastructure. Discover a cloud like no other. +Deploy and administer on a decentralized autonomous edge infrastructure. Experience true ownership of your deployments with a decentralized framework. Evolve the way you create and deploy innovative solutions, with greater scalability, efficiency, privacy, and security.
- - - + {% end %} @@ -31,8 +30,6 @@ Deploy any workload with unprecedented security, scalability, and efficiency, on Plug in standard tools and protocols to the most resilient and versatile storage system ever created, or access raw disk on the location of your choice. - - ||| ![compute](compute.jpg#medium) @@ -41,8 +38,6 @@ Plug in standard tools and protocols to the most resilient and versatile storage Native support for containers and virtual machines. Migrate existing applications effortlessly or build from scratch in a cutting-edge computing environment. - - ||| ![network](network.jpg#medium) @@ -51,47 +46,6 @@ Native support for containers and virtual machines. Migrate existing application Private overlay networks and global end-to-end encryption minimize attack surface. Handle inbound traffic with uniquely secure web gateways. - - - -{% end %} - - - -{% row(style="center mtop narrow") %} - -## Explore **What's Possible** - -Build in a truly decentralized environment on the ThreeFold Grid. A sandbox of limitless possibilities awaits for the open source builders of a decentralized tomorrow. - -{% end %} - -{% row(style="center mtop between") %} - -[![virtual machine](virtual_machine.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_vm) - -||| - -[![kubernetes](kubernetes.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_k8s) - -||| - -[![terraform](terraform.png#medium)](https://library.threefold.me/info/manual/#/manual__manual3_iac_home) - -{% end %} - -{% row(style="center mbottom between") %} - -[![weblets](weblets.png#medium)](https://library.threefold.me/info/manual/#/manual__weblets_home) - -||| - -[![quantum safe storage](qss.png#medium)](https://library.threefold.me/info/manual/#/technology/qsss/threefold__qsss_home) - -||| - -[![planetary network](planetary_network.png#medium)](https://library.threefold.me/info/manual/#/cloud/threefold__planetary_network) - {% end %} @@ -112,8 +66,8 @@ Dive into more resources and join the open-source movement building a better dig
- - + + {% end %} \ No newline at end of file diff --git a/content/community/index.md b/content/community/index.md index 6518abe7d..3b681d292 100644 --- a/content/community/index.md +++ b/content/community/index.md @@ -35,7 +35,7 @@ We're a 100% open-source and community-driven project that builds the critical i ||| -[![yahoo_news](documentation.png)](https://library.threefold.me/info/threefold#/) +[![yahoo_news](documentation.png)](https://manual.grid.tf) {% end %} @@ -81,38 +81,6 @@ We're a 100% open-source and community-driven project that builds the critical i {% end %} -
- - - - -{% row(style="margin" bgColor="#f2f2f2") %} - -![Image](community_developers.png#medium) - -||| - -## Join the ThreeFold
**Developer Community** - -From testing our latest releases to joining our development teams or applying for a ThreeFold Foundation grant – there are many ways to engage with ThreeFold’s technology. - - - -{% end %} - - - -{% row(style="center between margin") %} - -## Frequently Asked
**Questions** - -Check out the FAQs or ask a question on the ThreeFold Forum. - - - - -{% end %} - {% community_banner() %} diff --git a/content/farm/index.md b/content/farm/index.md index 784e4ddc1..c96861d68 100644 --- a/content/farm/index.md +++ b/content/farm/index.md @@ -10,13 +10,13 @@ insert_anchor_links: "left" ## Be the **Internet** -Become a ThreeFold Farmer. Provide Internet capacity to the people around you, and earn for it. +By connecting a modern computer at your home or office to the ThreeFold Grid, you can provide Internet capacity to communities and builders, and be rewarded for doing this. Support a decentralized future. Take part in shaping a new Internet era governed by all of us.
- - + + {% end %} @@ -138,7 +138,7 @@ The ThreeFold Grid is the only Internet infrastructure that can scale to the far
- + {% end %} diff --git a/content/footer/_index.md b/content/footer/_index.md index 9da09766c..4f9d86185 100644 --- a/content/footer/_index.md +++ b/content/footer/_index.md @@ -10,21 +10,17 @@ extra: {% row(style="lean") %} -##### PARTICIPATE +##### TAKE ACTION
-###### [Talk to ThreeFolders](https://t.me/threefold) +###### [Manuals](https://manual.grid.tf/) -###### [Buy the Token](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy) +###### [Buy the Token](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) -
Start Farming
+###### [Start Farming](https://manual.grid.tf/farmers/farmers.html) -###### [Farming Community](https://t.me/threefoldfarmers) - -###### [Use the Grid](https://dashboard.grid.tf/) - -###### [Testing Community](https://t.me/threefoldtesting) +###### [Use the Dashboard](https://dashboard.grid.tf/) ###### [ThreeFold Connect: iOS](https://apps.apple.com/us/app/3bot-login/id1459845885) @@ -32,21 +28,19 @@ extra: ||| -##### KNOWLEDGEBASE +##### TALK TO HUMANS
-###### [ThreeFold Grid](https://library.threefold.me/info/threefold#/tfgrid/threefold__tfgrid_home) +###### [Main Community](https://t.me/threefold) -###### [ThreeFold Technology](https://library.threefold.me/info/threefold/#/technology/threefold__zos) +###### [Farming Community](https://t.me/threefoldfarmers) -###### [ThreeFold Farming](https://library.threefold.me/info/threefold/#/tfgrid/farming/threefold__farming_home) +###### [Grid User Community](https://t.me/threefoldtesting) -###### [ThreeFold Token](https://library.threefold.me/info/threefold/#/tokens/threefold__tokens_home) +###### [Forum](https://forum.threefold.io/) -###### [Manuals](https://manual.grid.tf/) - -###### [ThreeFold Glossary](https://library.threefold.me/info/threefold/#/threefold__definitions_concepts) +
Support
||| @@ -58,12 +52,10 @@ extra:
Partners
+
People
+
Blog
NewsRoom
-###### [Forum](https://forum.threefold.io/) - -
Support
- -{% end %} +{% end %} \ No newline at end of file diff --git a/content/grid/index.md b/content/grid/index.md index 83884366a..d6b72430d 100644 --- a/content/grid/index.md +++ b/content/grid/index.md @@ -15,8 +15,7 @@ The Internet was meant to be a peer-to-peer infrastructure with us in the center
- - + {% end %} @@ -32,8 +31,8 @@ The Internet was meant to be a peer-to-peer infrastructure with us in the center Any current or future technology, including blockchain, metaverses and web 3.0, can be hosted natively on the ThreeFold Grid via smart contracts with minimum migration. The grid is compatible with most open source tools and protocols. - - + + {% end %} @@ -45,7 +44,7 @@ Any current or future technology, including blockchain, metaverses and web 3.0, The ThreeFold Grid is formed by Farmers, independent people who connect 3Nodes (decentralized Internet capacity) anywhere electricity and network are present. Together, they form a globally distributed Internet infrastructure and earn income in the form of TFT. - + ||| @@ -80,7 +79,7 @@ All our code is made open source to energize open collaboration and promote univ A decentralized autonomous operating system designed to dedicate hardware capacity to the People’s Internet via the ThreeFold Blockchain. Zero-OS can be booted on most modern computers to host anything that runs on Linux in a decentralized way. - + {% end %} @@ -93,7 +92,6 @@ A decentralized autonomous operating system designed to dedicate hardware capaci TFT is the official medium of exchange for Internet capacity on the ThreeFold Grid. The utility token allows users to reserve Internet capacity via the ThreeFold Blockchain and rewards farmers for their contribution to the network. - ||| diff --git a/content/header/index.md b/content/header/index.md index da38a41a9..1bc4e186f 100644 --- a/content/header/index.md +++ b/content/header/index.md @@ -43,16 +43,6 @@ extra: -||| - - - {% end %} - More @@ -62,9 +52,9 @@ extra: #### Tools - +#### Resources + + + ||| #### Dive Deeper @@ -130,9 +122,9 @@ extra: - - - + + {% end %} diff --git a/content/people/ali_mohsen/ali_mohsen.jpg b/content/people/ali_mohsen/ali_mohsen.jpg deleted file mode 100644 index 9a8470914..000000000 Binary files a/content/people/ali_mohsen/ali_mohsen.jpg and /dev/null differ diff --git a/content/people/ali_mohsen/index.md b/content/people/ali_mohsen/index.md deleted file mode 100644 index cda4093ea..000000000 --- a/content/people/ali_mohsen/index.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Ali Mohsen -weight: 4 -description: Fortunated to have worked in different disciplines for the past 20 years and in complex environments.. -taxonomies: - people: [ali_mohsen] - memberships: [aci_members] - categories: [foundation, farming, cloud, aci] -extra: - imgPath: ali_mohsen.jpg - organizations: [threefold_foundation] - countries: [UAE] - cities: [Dubai] - private: 0 - socialLinks: { - } ---- - -It is only natural to seek a world of justice and equality with consciousness and awareness. Being part of this wonderful community sets the path forward. Fortunated to have worked in different disciplines for the past 20 years and in complex environments focusing on diplomacy and conflict Management Resolution, Anti Corruption and Geopolitical Strategies in the MENA region and West Africa with an extensive network in the private and public sector, we are dedicated to help expand the Threefold activities across those regions in a sustainable and progressive momentum. diff --git a/content/tft/index.md b/content/tft/index.md index f27d45878..e73a0e56f 100644 --- a/content/tft/index.md +++ b/content/tft/index.md @@ -9,15 +9,14 @@ insert_anchor_links: "left" {% row(style="center mtop narrow") %} -## Decentralizing
**the Internet Economy** +## TFT **Powers** the Decentralized Internet -ThreeFold creates an entirely new decentralized Internet economy that allows anyone to join the world’s fastest growing market – the Internet. +Join the Internet revolution with the ThreeFold Token (TFT), an innovative utility token used to build, store and exchange on the ThreeFold Grid. Through many of its unique properties, TFT opens a whole new world of possibilities that was previously unimaginable with centralized infrastructures.
- - - + + {% end %} @@ -80,8 +79,6 @@ While many projects have created bits and pieces of what a decentralized Interne ![Image](tft_table.png#mx-auto) - - {% end %} @@ -98,7 +95,7 @@ While many projects have created bits and pieces of what a decentralized Interne TFT is a utility token that allows people to hold current and future Internet capacity on the ThreeFold Grid. It incentivizes an open ecosystem where anyone can connect and utilize Internet capacity without any intermediaries. - + {% end %} diff --git a/content/tftfaq/q3/index.md b/content/tftfaq/q3/index.md index fe704c8df..86ef62bd7 100644 --- a/content/tftfaq/q3/index.md +++ b/content/tftfaq/q3/index.md @@ -11,8 +11,6 @@ The most used platforms are: 1. [Pancake Swap](https://library.threefold.me/info/threefold#/tokens/threefold__tft_binance_defi) to exchange any Binance Smart Chain token to TFT. -2. [Liquid Exchange](https://library.threefold.me/info/threefold#/tokens/threefold__tft_liquid) and [Liquid Quick Exchange](https://library.threefold.me/info/threefold#/tokens/threefold__tft_liquid_quick_exchange) support bank deposits, visa credit cards and most used cryptocurrencies. - -3. [Stellar DEX](https://library.threefold.me/info/threefold#/tokens/threefold__tft_stellar_dex) to exchange XLM or other stellar based tokens to TFT (multiple wallets and DEX UI supported). +3. [Stellar DEX](https://manual.grid.tf/threefold_token/buy_sell_tft/tft_lobstr/tft_lobstr.html) to exchange XLM or other stellar based tokens to TFT (multiple wallets and DEX UI supported). Learn more about the other buying options [here](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy) diff --git a/templates/shortcodes/tft_links.html b/templates/shortcodes/tft_links.html index 05d79da88..20c17fb28 100644 --- a/templates/shortcodes/tft_links.html +++ b/templates/shortcodes/tft_links.html @@ -6,7 +6,7 @@ gettft {% set link = page.permalink ~ "stellar_logo.png"%} stellar