From 6eaaf873e4f35472501ecf6bccf4e6241b7c21ee Mon Sep 17 00:00:00 2001 From: despiegk Date: Sat, 22 Feb 2025 18:14:28 +0300 Subject: [PATCH 01/14] ... --- env.sh | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/env.sh b/env.sh index 770564b..2100975 100644 --- a/env.sh +++ b/env.sh @@ -1,3 +1,4 @@ + export NAME='threefoldio' SOURCE=${BASH_SOURCE[0]} @@ -42,7 +43,7 @@ if [[ ! -f "$HOME/hero/bin/tailwindcss" ]]; then pushd /tmp rm -f $ASSET rm -f tailwindcss - curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}" + curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/${ASSET}" FILE_SIZE=$(get_file_size "$ASSET") if [[ $FILE_SIZE -lt 20000000 ]]; then @@ -59,6 +60,8 @@ if [[ ! -f "$HOME/hero/bin/tailwindcss" ]]; then popd fi + +# Zola version and platform-specific binaries are handled in the install functions below check_zola() { if command -v zola &> /dev/null; then echo "Zola is already installed." @@ -88,12 +91,37 @@ install_zola_arch() { # Function to install Zola on macOS install_zola_macos() { echo "Installing Zola on macOS..." - if command -v brew &> /dev/null; then - brew install zola + ZOLA_VERSION="v0.18.0" + + # Determine architecture + if [[ "$(uname -m)" == "arm64" ]]; then + ZOLA_ARCH="aarch64" else - echo "Homebrew is not installed. Please install Homebrew first." + ZOLA_ARCH="x86_64" + fi + + ZOLA_FILE="zola-${ZOLA_VERSION}-${ZOLA_ARCH}-apple-darwin.tar.gz" + ZOLA_URL="https://github.com/getzola/zola/releases/download/${ZOLA_VERSION}/${ZOLA_FILE}" + + echo "Downloading Zola ${ZOLA_VERSION} for ${ZOLA_ARCH}..." + pushd /tmp + curl -sLO "${ZOLA_URL}" + + # Check file size (should be around 8-9MB) + FILE_SIZE=$(get_file_size "$ZOLA_FILE") + if [[ $FILE_SIZE -lt 7000000 ]]; then + echo "Error: Downloaded file size is less than 7MB, download may be incomplete." + rm "$ZOLA_FILE" + popd exit 1 fi + + # Extract and install + tar -xzf "$ZOLA_FILE" + chmod +x zola + mv zola "$HOME/hero/bin/" + rm "$ZOLA_FILE" + popd } if ! check_zola; then @@ -131,6 +159,6 @@ fi # Compile tailwindcss for prod & build project echo "Compiling tailwindcss and building zola project..." rm -rf public static/css + +set +e tailwindcss -i css/index.css -o ./static/css/index.css --minify - - From 854ed04995ca257e36d0b3342593528dd6963c11 Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Sun, 23 Feb 2025 11:08:05 +0200 Subject: [PATCH 02/14] update download --- templates/partials/download/download1.html | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/templates/partials/download/download1.html b/templates/partials/download/download1.html index 10ded6d..cfc5b9d 100644 --- a/templates/partials/download/download1.html +++ b/templates/partials/download/download1.html @@ -13,9 +13,9 @@
-
+
-
+
Apple
@@ -53,19 +53,20 @@

+
+ Android +
+ Download for Linux +
+
+

+ Download the Mycelium binary for Linux directly from its Github repository.

+

+ Download Now +

-
- Android -
- Download for Linux -
-
-

- Download the Mycelium binary for Linux directly from its Github repository.

-

- Download Now - -

+
+
From 3d39921416fadaaa1ffdaf1934cee2632bdb07ff Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Sun, 23 Feb 2025 11:26:01 +0200 Subject: [PATCH 03/14] fix links and header --- templates/partials/header.html | 8 ++++---- templates/partials/hero/myhero2.html | 6 +++--- templates/partials/hero/myhero7.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/partials/header.html b/templates/partials/header.html index 0d3f8a7..4b112b2 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -61,7 +61,7 @@ {% endif %} {% endif %} {% endfor %} - Docs @@ -111,7 +111,7 @@ #} - Get Mycelium + Get Mycelium @@ -199,12 +199,12 @@

{% include "partials/socialLinks.html" %} #} - Docs
- Get Mycelium + Get Mycelium
diff --git a/templates/partials/hero/myhero2.html b/templates/partials/hero/myhero2.html index d311afc..030b69e 100644 --- a/templates/partials/hero/myhero2.html +++ b/templates/partials/hero/myhero2.html @@ -22,7 +22,7 @@

Designed to operate in a decentralized manner, it connects nodes and enables efficient data transfer and communication without relying on a single central authority.

- Learn more + Learn more

@@ -34,7 +34,7 @@

Mycelium provides an efficient digital communication network where data travels along the most efficient paths, reducing latency and optimizing resource utilization.

- Learn more + Learn more

@@ -47,7 +47,7 @@

Inspired by nature's resilience, it creates a network that can adapt and continue to function even in the presence of challenges, ensuring uninterrupted communication.

- Learn more + Learn more

diff --git a/templates/partials/hero/myhero7.html b/templates/partials/hero/myhero7.html index 67c1f8c..9e9875a 100644 --- a/templates/partials/hero/myhero7.html +++ b/templates/partials/hero/myhero7.html @@ -6,7 +6,7 @@

Join the Mycelium network and be a part of the decentralized movement.

Download Now - Read Manual + Read Manual
From 8095f7bc611c339fe5b926a78793a250727bd57f Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Sun, 23 Feb 2025 12:05:30 +0200 Subject: [PATCH 04/14] update footer --- content/footer/_index.md | 30 ++++-------------------------- templates/partials/footer.html | 10 +++++----- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/content/footer/_index.md b/content/footer/_index.md index 149022c..1991e20 100644 --- a/content/footer/_index.md +++ b/content/footer/_index.md @@ -14,31 +14,13 @@ extra:
-###### [Learn](https://docs.threefold.io/docs/introduction) - -###### [Host (Farm)](https://docs.threefold.io/docs/category/become-a-farmer) +###### [Manual](https://manual.grid.tf/) ###### [Dashboard](https://dashboard.grid.tf/) -###### [Download TF Connect: iOS](https://apps.apple.com/us/app/3bot-login/id1459845885) +
Download Mycelium
-###### [Download TF Connect: Android](https://play.google.com/store/apps/details?id=org.jimber.threebotlogin&hl=en_US) -||| - -##### COMMUNITY - -
- -###### [Main Chat](https://t.me/threefold) - -###### [Hosting / Farming Chat](https://t.me/threefoldfarmers) - -###### [Grid User Chat](https://t.me/threefoldtesting) - -###### [Forum](https://forum.threefold.io/) - -###### [Support](https://threefoldfaq.crisp.help/en/) ||| @@ -48,13 +30,9 @@ extra:
About
-
Blog
+###### [ThreeFold](https://threefold.io/) -
NewsRoom
- -
Newsletter
- -
Community
+###### [Support](https://threefoldfaq.crisp.help/en/) diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 03cdfb4..5241a95 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -6,17 +6,17 @@
-
-
-
+
+
+
ThreeFold Logo

{{section.description}}

- {% include "partials/socialLinks.html" %} + {# {% include "partials/socialLinks.html" %} #}
-
+
{{ section.content | safe }}
From 2993e52f50da9ba5edd78671c8d0cde06c19c081 Mon Sep 17 00:00:00 2001 From: despiegk Date: Sun, 23 Feb 2025 11:18:10 +0000 Subject: [PATCH 05/14] ... --- templates/partials/hero/myhero5.html | 8 +++---- templates/partials/hero/myhero6.html | 31 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/templates/partials/hero/myhero5.html b/templates/partials/hero/myhero5.html index ea97a1f..16c161f 100644 --- a/templates/partials/hero/myhero5.html +++ b/templates/partials/hero/myhero5.html @@ -16,9 +16,9 @@
- ✓ QSFS Storage Functionality + ✓ Quantum Safe Storage Functionality
-
Mycelium’s QSFS storage enables flexible, scalable, and efficient data distribution across a decentralized network, ensuring redundancy and security.
+
Mycelium’s quantum safe storage enables flexible, scalable, and efficient data distribution across a decentralized network, ensuring redundancy and security.
@@ -37,9 +37,9 @@
- ✓ Ability to Store Data on Behalf of Other Users + ✓ Integrated Name Services (DNS)
-
Mycelium enables users to securely store and manage data for others, facilitating shared access while maintaining ownership and permissions.
+
The Integrated DNS system efficiently finds the shortest path between users and websites, automatically balancing loads and identifying alternative routes in case of internet issues.
diff --git a/templates/partials/hero/myhero6.html b/templates/partials/hero/myhero6.html index e06d096..b8a2352 100644 --- a/templates/partials/hero/myhero6.html +++ b/templates/partials/hero/myhero6.html @@ -52,6 +52,37 @@
+
+

+ +

+
+
+

+ No, Mycelium is not yet fully scalable to a global level. Currently, each network can support around 100,000 users, but multiple networks can be deployed to expand capacity. We anticipate resolving these scalability challenges by 2025. +

+
+
+

From a2decef6ec071c7ff8e9ca88d75ce5000698a14b Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 24 Feb 2025 12:15:31 +0200 Subject: [PATCH 06/14] fix hero img --- templates/partials/hero/myhero.html | 2 +- templates/partials/hero/myhero1.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/partials/hero/myhero.html b/templates/partials/hero/myhero.html index 6538807..4b832e4 100644 --- a/templates/partials/hero/myhero.html +++ b/templates/partials/hero/myhero.html @@ -18,7 +18,7 @@

- +
diff --git a/templates/partials/hero/myhero1.html b/templates/partials/hero/myhero1.html index aa471f5..9d8d5d1 100644 --- a/templates/partials/hero/myhero1.html +++ b/templates/partials/hero/myhero1.html @@ -1,7 +1,7 @@
-
+

ABOUT

Discover Mycelium

From 8e2ccc259d34542c855e6924903300c1c5efa0f2 Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 24 Feb 2025 12:50:44 +0200 Subject: [PATCH 07/14] update absolute img --- templates/partials/hero/myhero7.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/hero/myhero7.html b/templates/partials/hero/myhero7.html index 9e9875a..725b587 100644 --- a/templates/partials/hero/myhero7.html +++ b/templates/partials/hero/myhero7.html @@ -10,7 +10,7 @@
- App screenshot + App screenshot
From 2b404132d236c46b129d083e4499b8402e12b28f Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 24 Feb 2025 12:53:30 +0200 Subject: [PATCH 08/14] update absolute img --- templates/partials/hero/myhero7.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/hero/myhero7.html b/templates/partials/hero/myhero7.html index 725b587..faefa3a 100644 --- a/templates/partials/hero/myhero7.html +++ b/templates/partials/hero/myhero7.html @@ -10,7 +10,7 @@
- App screenshot + App screenshot
From 8632ed4a97012a18ebedd5acaeb4bb54934a325e Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 24 Feb 2025 13:23:37 +0200 Subject: [PATCH 09/14] fix about response --- templates/partials/about/about1.html | 14 +++++++------- templates/partials/about/about3.html | 17 +++++++++-------- templates/partials/about/about4.html | 4 ++-- templates/partials/about/about5.html | 16 +++++++--------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/templates/partials/about/about1.html b/templates/partials/about/about1.html index 45c6c53..4360ebb 100644 --- a/templates/partials/about/about1.html +++ b/templates/partials/about/about1.html @@ -1,8 +1,11 @@
-
-
- +
+
+ Mobile App Screenshot +
+

About Mycelium

@@ -13,10 +16,7 @@ We aim to build a system that adapts to our growing digital needs while promoting sustainability and security.

-
- Mobile App Screenshot -
+
diff --git a/templates/partials/about/about3.html b/templates/partials/about/about3.html index 708077e..b78d1a6 100644 --- a/templates/partials/about/about3.html +++ b/templates/partials/about/about3.html @@ -1,7 +1,12 @@
-
-
+
+
+ + Mobile App Screenshot +
+

BENEFITS

Highly Efficient

@@ -11,12 +16,8 @@ Mycelium's routing algorithms prioritize minimizing latency in data transfer. This ensures that data takes the most direct and efficient route, reducing the time it takes to travel from the source node to the destination node.

-
- {# Mobile App Screenshot #} - Mobile App Screenshot -
+ +
diff --git a/templates/partials/about/about4.html b/templates/partials/about/about4.html index 5c68365..643aa5e 100644 --- a/templates/partials/about/about4.html +++ b/templates/partials/about/about4.html @@ -1,7 +1,7 @@
-
-
+
+
{# Mobile App Screenshot #}
-
-
+
+
+ Mobile App Screenshot +
+

BENEFITS

Enhances Scalability

@@ -13,13 +17,7 @@

The system is designed to efficiently distribute network traffic. During periods of high demand or increased data transfer, Mycelium balances the load by routing data through multiple paths or nodes. This ensures the network can handle greater traffic and more users without becoming overloaded.

-

-
- {# Mobile App Screenshot #} - Mobile App Screenshot -
+
From f7553f6214afc7171eba100c0896fef9dc3fc4d0 Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Mon, 24 Feb 2025 16:58:19 +0200 Subject: [PATCH 10/14] fix spacing --- templates/partials/about/about1.html | 2 +- templates/partials/about/about6.html | 2 +- templates/partials/hero/myhero.html | 2 +- templates/partials/hero/myhero1.html | 4 ++-- templates/partials/hero/myhero2.html | 21 ++++++++++----------- templates/partials/hero/myhero3.html | 19 ++++++++++--------- templates/partials/hero/myhero5.html | 22 +++++++++++----------- templates/partials/hero/myhero8.html | 6 +++--- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/templates/partials/about/about1.html b/templates/partials/about/about1.html index 4360ebb..6217bed 100644 --- a/templates/partials/about/about1.html +++ b/templates/partials/about/about1.html @@ -1,6 +1,6 @@
-
+
Mobile App Screenshot diff --git a/templates/partials/about/about6.html b/templates/partials/about/about6.html index bc4659a..b3eff41 100644 --- a/templates/partials/about/about6.html +++ b/templates/partials/about/about6.html @@ -1,6 +1,6 @@
-
+

A Part of ThreeFold Ecosystem

An Integral Component of Sustainable Decentralization

diff --git a/templates/partials/hero/myhero.html b/templates/partials/hero/myhero.html index 4b832e4..9648d6d 100644 --- a/templates/partials/hero/myhero.html +++ b/templates/partials/hero/myhero.html @@ -1,4 +1,4 @@ -
+
diff --git a/templates/partials/hero/myhero1.html b/templates/partials/hero/myhero1.html index 9d8d5d1..e32d364 100644 --- a/templates/partials/hero/myhero1.html +++ b/templates/partials/hero/myhero1.html @@ -1,4 +1,4 @@ -
+
@@ -13,7 +13,7 @@
-
+
Mobile App Screenshot
diff --git a/templates/partials/hero/myhero2.html b/templates/partials/hero/myhero2.html index 030b69e..4e36cb8 100644 --- a/templates/partials/hero/myhero2.html +++ b/templates/partials/hero/myhero2.html @@ -1,6 +1,6 @@ -
-
-
+
+
+

BENEFITS

Nature's Blueprint for Digital Connectivity

@@ -9,12 +9,11 @@

-
-
-
+
+
-
-
+
+
Decentralization @@ -26,7 +25,7 @@

-
+
Efficiency @@ -38,7 +37,7 @@

-
+
Resilience @@ -55,7 +54,7 @@
- +