From b42f05d4d68c32b755a084439e8c897bca91d0d0 Mon Sep 17 00:00:00 2001 From: despiegk Date: Thu, 19 Sep 2024 12:57:43 +0400 Subject: [PATCH] ... --- README.md | 20 ++-- build.sh | 40 ++----- config.toml | 3 +- content/about/index.md | 232 +++++++++++++++++++++-------------------- content/home/index.md | 14 ++- start.sh | 29 +++--- 6 files changed, 173 insertions(+), 165 deletions(-) diff --git a/README.md b/README.md index 0e0bf30b1..3880ef8a6 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Staging: www2.threefold.io (development branch) Last Updated: May 2023 ## Administrators + [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) ## Contribution Procedure @@ -47,15 +48,22 @@ To do that, the following prerequisites are needed: Then clone the repository recursively to also pull in contents of `threefold_data`: -``` -git clone --recursive https://github.com/threefoldfoundation/www_threefold_io.git -``` +```bash +#if you don't have hero installed yet, run the following commands +curl https://raw.githubusercontent.com/freeflowuniverse/crystallib/development/scripts/install_hero.sh > /tmp/hero_install.sh +bash /tmp/hero_install.sh -Now run `build.sh` to download Tailwind, build the CSS, and also build the site with Zola: +#install zola & tailwind +hero installers -n zola + +#get this repo be careful --pr will remove all local changes (pull reset), -b development means we are on the development branch +hero git pull -u https://github.com/threefoldfoundation/www_threefold_io -b development -pr + +#cd to the directory +eval $(hero git cd -u https://github.com/threefoldfoundation/www_threefold_io) -``` -cd www_threefold_io bash build.sh + ``` Finally, start a browsable local copy of the site that will respond to changes in the source files like this: diff --git a/build.sh b/build.sh index d4e42ff48..ce2bbbe51 100755 --- a/build.sh +++ b/build.sh @@ -1,46 +1,26 @@ +#/bin/bash +set -ex + +BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${BASE_DIR} + + echo "Starting build..." -# TODO: Check if current version is latest to avoid redundant installation -if [[ -f "tailwindcss" ]] -then - echo "Tailwind installed" -else - # rm tailwindcss - # checks os and architecture for correct release - # https://stackoverflow.com/a/8597411 - echo "Installing & building tailwind..." - ASSET="tailwindcss" - - if [[ "$OSTYPE" == "linux-gnu"* ]]; then - ASSET="$ASSET-linux" - elif [[ "$OSTYPE" == "darwin"* ]]; then - ASSET="$ASSET-macos" - fi - if [[ "$(uname -m)" == "x86_64"* ]]; then - ASSET="$ASSET-x64" - elif [[ "$(uname -m)" == "arm64"* ]]; then - ASSET="$ASSET-arm64" - fi - - curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}" - chmod +x $ASSET - mv $ASSET tailwindcss -fi - - +hero installers -n zola # initialized and configures tailwind if not configured echo "Initializing tailwind..." if [[ ! -f "tailwind.config.js" ]] then - ./tailwindcss init + tailwindcss init sed -i '' "s| content: \\[\\],| content: \\['./templates/**/*.html'\\],|g" tailwind.config.js fi # compiles tailwind css for prod & builds project echo "Compiling tailwindcss and building zola project..." rm -rf public static/css -./tailwindcss -i css/index.css -o ./static/css/index.css --minify +tailwindcss -i css/index.css -o ./static/css/index.css --minify zola build diff --git a/config.toml b/config.toml index 175403f39..858833dd4 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,6 @@ # The URL the site will be built for -base_url = "https://dev.threefold.io" +# base_url = "https://dev.threefold.io" +base_url = "http://localhost:1111" # Change this to your own URL! Please note this variable **must** be uncommented . title = "ThreeFold" diff --git a/content/about/index.md b/content/about/index.md index cb69689c6..851062fd1 100644 --- a/content/about/index.md +++ b/content/about/index.md @@ -27,10 +27,14 @@ extra: #### A STRONG VISION FOR THE FUTURE -## **The Internet as Hope for Humanity** +## **The Internet as
Hope for Humanity** -The project was started by some Internet & Cloud veterans who believe that the Internet represents an amazing opportunity. We are a group of passionate people building a new foundational layer for a better Internet, more like how the Internet was originally intended to be. +ThreeFold was started by a group of passionate Internet & Cloud veterans who wants to restore the Internet to its original glory. +

+*The Internet is a network of computers which are typically hosted in large datacenters. These datacenters are owned by a few large corporations. This is not how the Internet was designed. The Internet was designed to be decentralized, open and available to everyone.* +

+**We have invented a new Data, Cloud and Network system
as an engine for an upgraded Internet.**
@@ -46,40 +50,31 @@ The project was started by some Internet & Cloud veterans who believe that the I - +
-{% row( style="center between margin") %} +{% row( style="mtop") %} -#### OUR MISSION & VISION +#### ROADMAP -## **Empowering Human Potential** +## **Expanding ThreeFold** -
+{% end %} -Our mission is to empower individuals and organizations with secure, private, and
autonomous access to computing resources, ensuring fair cloud access for everyone. +{% roadmap() %} -
- - -We envision a global, community-driven network of interconnected servers and nodes—the grid—that democratizes
computing power and storage. This decentralized infrastructure fosters innovation, digital sovereignty, and an equitable internet, where users fully control their data and interactions. - - -
- - -Through our token, we support an open ecosystem that facilitates the seamless exchange of internet capacity,
fostering a new digital era of sovereignty, security, privacy, and inclusivity. +## **roadmap** {% end %} @@ -89,6 +84,8 @@ Through our token, we support an open ecosystem that facilitates the seamless ex
+ + @@ -142,110 +139,19 @@ In response, we came together with a shared mission- to design a revolutionary d
-As we embark on the expansion and commercialization phase, the ThreeFold Grid is in it’s third generation and live ±60 countries, significant milestones in our ongoing commitment to redefine the future of the digital landscape. - +The ThreeFold Grid is in it’s third generation and live in +50 countries.
-We are at the start of a journey to millions of nodes and will launch soon the fourth generation of the Grid- Project Internet Capacity. - +We are at the start of a journey to millions of nodes and will launch soon the fourth generation the ThreeFold grid. +For this a new token called INCA has been created. {% end %} - - - - -{% row( style="center semiNarrow") %} - - -#### KEY ACHIEVEMENTS TO DATE - - -## **Milestones in Our Journey** - - -{% end %} - - -{% row( style="semiNarrow mbottom") %} - - -

The ThreeFold Grid: connected across ±60 countries by independent people and organizations called ThreeFold farmers, live and usable in its third generation technology -

- - -
- - -

Partnerships with the governments of Tanzania, to deploy physical infrastructure and introducing coding academies and innovation hubs across the country, and Zanzibar, to deploy physical infrastructure locally and introduce a digital free zone -

- - -
- - -

An extensive community of 1000+ farmers and several thousand others – token holders, grid users, and supporters / advocates of the project -

- - -
- - -

Our strategic partnerships with key DePIN players: more will be announced soon

- - -{% end %} - - -
- - - - -
- - -
- - -{% row( style="mtop") %} - - -#### ROADMAP - - -## **Expanding ThreeFold** - - -{% end %} - - -{% roadmap() %} - - -## **roadmap** - - -{% end %} - - -
-
- - - - - - - - - - - +
@@ -437,8 +343,108 @@ We are a dedicated group committed to advancing a new digital era. Some of us ha {% end %} + +{% row( style="center semiNarrow") %} + + +#### KEY ACHIEVEMENTS TO DATE + + +## **Milestones in Our Journey** + + +{% end %} + + +{% row( style="semiNarrow mbottom") %} + + +

The ThreeFold Grid: connected across +50 countries by independent people and organizations called ThreeFold farmers, live and usable in its third generation opensource technology. +

+ + +
+ + +

Partnerships with governments, to deploy physical infrastructure and introducing coding academies and innovation hubs across the country, to deploy physical infrastructure locally. +

+ + +
+ + +

An extensive community of 1000+ farmers and several thousand others – token holders, grid users, and supporters / advocates of the project +

+ + +
+ + +

Our strategic partnerships with key DePIN players: more will be announced soon

+ +
+ + +

A new token launch called INCA. INCA is the fuel of our ThreeFold Grid.

+ + + + +{% end %} + + +
+ + + + + + + + + + + +
+ + +
+ + +{% row( style="center between margin") %} + + +#### OUR MISSION & VISION + + +## **Empowering Human Potential** + + +
+ + + +*We believe that the Internet should be affordable, accessible, and available to everyone on the planet.* + + +
+ + +We envision a global, community-driven network of interconnected computers that democratizes the deployment of the Internet. +
+Through a token we support an open ecosystem that facilitates the seamless exchange of internet network, data and cloud capacity. + +
+ +**This internet needs to be available in every region, reliable, secure, private, and sustainable.** + +{% end %} + + +
+
diff --git a/content/home/index.md b/content/home/index.md index 28c682790..442aba7b9 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -21,16 +21,24 @@ extra: {% row(style="reverse header margin") %} -#### HELLO THREEFOLD +#### THREEFOLD
-## **Evolving the Internet, Together** +## **"BE THE INTERNET"** +**We are not dreaming about a new Internet, we are building it.** -We envision the Internet as a free-flowing, global network of authentic information – connecting everyone, everywhere, and unlocking the unlimited potential of humanity. This vision is within reach and we are building it as we speak. All are welcomed to join. +
+The internet began as a free, open network for all. +
Now it's controlled by big tech, centralized, and only available to about half of the planet. +
+
**The Internet needs a new plumbing layer: free, private, and secure**.

+*ThreeFold has developed a decentralized self healing, secure cloude engine which has the potential to make the Internet available to everyone on this planet.*
+
+ diff --git a/start.sh b/start.sh index 4a8094af7..28c9b3350 100755 --- a/start.sh +++ b/start.sh @@ -1,25 +1,30 @@ -# builds if executable isn't foound -if [ ! -f "tailwindcss" ] -then - sh build.sh -fi +#/bin/bash +set -ex + +BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${BASE_DIR} + +hero installers -n zola # initialized and configures tailwind if not configured if [ ! -f "tailwind.config.js" ] then - ./tailwindcss init + tailwindcss init sed -i '' "s| content: \\[\\],| content: \\['./templates/**/*.html'\\],|g" tailwind.config.js fi # compiles tailwind css & launches locally rm -rf public static/css -./tailwindcss -i css/index.css -o ./static/css/index.css --watch & zola serve & +tailwindcss -i css/index.css -o ./static/css/index.css --watch & zola serve & # compiles tailwind css for prod & builds project -./tailwindcss -i css/index.css -o ./static/css/index.css --minify -zola build +tailwindcss -i css/index.css -o ./static/css/index.css --minify -# kills zola and tw bg processes on interrupt -trap 'kill $(jobs -p); exit 1' INT -wait +killall zola + +zola serve + +# # kills zola and tw bg processes on interrupt +# trap 'kill $(jobs -p); exit 1' INT +# wait