15 Commits

Author SHA1 Message Date
191ee3f98b ok 2025-09-02 13:50:50 +02:00
f2fa57e7bb Implement branch-aware deployment: auto-detect environment to prevent merge conflicts
- Auto-detects git branch (master/development/other)
- Sets correct base_url for each environment:
  * master -> https://www.mycelium.threefold.io/ (production)
  * development -> https://www2.mycelium.threefold.io/ (staging)
  * other -> /mycelium/ (local development)
- Eliminates merge conflicts between staging and production
- Enables seamless branch merging workflow
2025-09-02 13:24:15 +02:00
767e4a2eea add config.toml 2025-09-02 13:08:41 +02:00
2055eb2956 del 2025-09-02 13:06:27 +02:00
bca4094ab3 replace docs 2025-09-01 17:24:31 +02:00
45aaf87d60 remove repeating docs 2025-09-01 14:51:04 +02:00
2c0a49ffcc replace docs 2025-09-01 14:35:29 +02:00
e78fedfc6c replace docs 2025-09-01 14:34:06 +02:00
24a3131656 update with markdown 2025-06-22 12:40:49 +03:00
f3239c3c42 update matomo
Some checks failed
www.threefold_io / Deploy (push) Has been cancelled
www.threefold_io / Wait for Website Update (push) Has been cancelled
www.threefold_io / Check for Broken Links (push) Has been cancelled
2025-03-19 16:33:47 +02:00
b2ecdaacfe Merge branch 'development'
Some checks failed
www.threefold_io / Deploy (push) Has been cancelled
www.threefold_io / Wait for Website Update (push) Has been cancelled
www.threefold_io / Check for Broken Links (push) Has been cancelled
2025-02-28 18:44:38 +08:00
50dcd945b8 Merge branch 'development'
Some checks are pending
www.threefold_io / Deploy (push) Waiting to run
www.threefold_io / Wait for Website Update (push) Blocked by required conditions
www.threefold_io / Check for Broken Links (push) Blocked by required conditions
2025-02-28 18:39:18 +08:00
bddaa0b4f2 Merge pull request 'development to master' (#13) from development into master
Some checks failed
www.threefold_io / Deploy (push) Has been cancelled
www.threefold_io / Wait for Website Update (push) Has been cancelled
www.threefold_io / Check for Broken Links (push) Has been cancelled
Reviewed-on: #13
2025-02-25 16:45:31 +00:00
d2dec763df Merge pull request 'development to master' (#11) from development into master
Some checks are pending
www.threefold_io / Deploy (push) Waiting to run
www.threefold_io / Wait for Website Update (push) Blocked by required conditions
www.threefold_io / Check for Broken Links (push) Blocked by required conditions
Reviewed-on: #11
2025-02-25 16:17:34 +00:00
5f3557594c update cong
Some checks are pending
www.threefold_io / Deploy (push) Waiting to run
www.threefold_io / Wait for Website Update (push) Blocked by required conditions
www.threefold_io / Check for Broken Links (push) Blocked by required conditions
2025-02-25 17:10:57 +02:00
10 changed files with 32 additions and 24 deletions

1
.gitignore vendored
View File

@@ -33,3 +33,4 @@ install*
public public
static/css static/css
tailwindcss tailwindcss
config.toml

View File

@@ -43,14 +43,28 @@ echo "Compiling tailwindcss and building zola project..."
rm -rf public static/css 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
# Auto-detect deployment environment based on git branch
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "Detected git branch: $CURRENT_BRANCH"
# echo "Building without prefix..." if [ "$CURRENT_BRANCH" = "master" ]; then
# sed 's|base_url = "BASEURL"|base_url = "https://www.mycelium.threefold.io/"|' config.templ.toml > config.toml # Production deployment (www.mycelium.threefold.io)
# zola --root $ABS_DIR_OF_SCRIPT build echo "Building for PRODUCTION environment..."
# rsync -avz --delete public/ "root@threefold.info:/root/hero/www/info/$PREFIX/" BASE_URL="https://www.mycelium.threefold.io/"
DEPLOY_PATH="root@threefold.info:/root/hero/www/info/$PREFIX/"
elif [ "$CURRENT_BRANCH" = "development" ]; then
# Staging deployment (www2.mycelium.threefold.io)
echo "Building for STAGING environment..."
BASE_URL="https://www2.mycelium.threefold.io/"
DEPLOY_PATH="root@threefold.info:/root/hero/www/info/$PREFIX/"
else
# Fallback for other branches (local development mode)
echo "Building for LOCAL/OTHER branch environment..."
BASE_URL="/mycelium/"
DEPLOY_PATH="${HOME}/hero/var/www/$PREFIX/"
fi
echo "Building with prefix: /$PREFIX/" echo "Using base_url: $BASE_URL"
sed 's|base_url = "BASEURL"|base_url = "/mycelium/"|' config.templ.toml > config.toml sed "s|base_url = \"BASEURL\"|base_url = \"$BASE_URL\"|" config.templ.toml > config.toml
zola --root $ABS_DIR_OF_SCRIPT build zola --root $ABS_DIR_OF_SCRIPT build
rsync -rav --delete public/ "${HOME}/hero/var/www/$PREFIX/" echo "Build completed successfully! Static files generated in public/ directory."
rsync -avz --delete public/ "root@threefold.info:/root/hero/www/info/$PREFIX/"

View File

@@ -1,5 +1,5 @@
# The URL the site will be built for # The URL the site will be built for
base_url = "/mycelium/" base_url = "https://www.mycelium.threefold.io/"
title = "Mycelium" title = "Mycelium"
description = "Our global digital backbone" description = "Our global digital backbone"

View File

@@ -105,7 +105,7 @@ True digital sovereignty for open-source builders. The ThreeFold Grid provides l
||| |||
<button>[The Manual](https://threefold.info/mycelium/docs/)</button> <button>[The Manual](https://docs.ourworld.tf/mycelium_cloud/docs/)</button>
||| |||

View File

@@ -102,7 +102,7 @@ extra:
button_text="Download Now", button_text="Download Now",
button_link="/download", button_link="/download",
button_text2="Read More", button_text2="Read More",
button_link2="https://threefold.info/mycelium/docs/" button_link2="https://docs.ourworld.tf/mycelium_cloud/docs/"
) }} ) }}

View File

@@ -15,7 +15,7 @@ extra:
title="Download Mycelium", title="Download Mycelium",
description="Get Mycelium for Android, Windows, macOS, and iOS to securely connect, store, and interact with the decentralized network—seamlessly and efficiently.", description="Get Mycelium for Android, Windows, macOS, and iOS to securely connect, store, and interact with the decentralized network—seamlessly and efficiently.",
description3="Not sure how it works?", description3="Not sure how it works?",
button_link="https://threefold.info/mycelium/docs/", button_link="https://docs.ourworld.tf/mycelium_cloud/docs/",
button_text="Read the manual." button_text="Read the manual."
) }} ) }}
@@ -142,5 +142,5 @@ extra:
button_text="Download Now", button_text="Download Now",
button_link="/download", button_link="/download",
button_text2="Read More", button_text2="Read More",
button_link2="https://threefold.info/mycelium/docs/" button_link2="https://docs.ourworld.tf/mycelium_cloud/docs/"
) }} ) }}

View File

@@ -14,7 +14,7 @@ extra:
<br> <br>
###### [Manual](https://threefold.info/mycelium/docs/) ###### [Manual](https://docs.ourworld.tf/mycelium_cloud/docs/)
###### [Dashboard](https://dashboard.grid.tf/) ###### [Dashboard](https://dashboard.grid.tf/)

View File

@@ -9,6 +9,6 @@ extra:
--- ---
- [About]("/about") - [About]("/about")
- [Docs]("https://threefold.info/mycelium/docs/") - [Docs]("https://docs.ourworld.tf/mycelium_cloud/docs/")

View File

@@ -314,7 +314,7 @@ extra:
button_text="Download Now", button_text="Download Now",
button_link="/download", button_link="/download",
button_text2="Read More", button_text2="Read More",
button_link2="https://threefold.info/mycelium/docs/" button_link2="https://docs.ourworld.tf/mycelium_cloud/docs/"
) }} ) }}

View File

@@ -74,10 +74,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<a href="https://threefold.info/mycelium/docs/"
class="text-lg py-3 leading-6 font-light text-pretty tracking-wide focus:outline-none focus:text-gray-200 transition ease-in-out duration-150" target="_blank">
Docs
</a>
</nav> </nav>
<div class="hidden md:inline-block md:order-last"> <div class="hidden md:inline-block md:order-last">
@@ -225,10 +222,6 @@
</p> </p>
{% include "partials/socialLinks.html" %} {% include "partials/socialLinks.html" %}
</div> #} </div> #}
<a href="https://threefold.info/mycelium/docs/"
class="text-lg px-8 py-3 leading-6 font-normal hover:text-gray-600 focus:outline-none focus:text-gray-50 transition ease-in-out duration-150" target="_blank">
Docs
</a>
<div class="rounded-full border-2 my-4 border-gray-400 py-2 mx-4"> <div class="rounded-full border-2 my-4 border-gray-400 py-2 mx-4">
<a href="/download" class="mt-2 rounded-md px-4 py-2.5 text-lg font-semibold shadow-sm hover:text-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white">Get Mycelium</a> <a href="/download" class="mt-2 rounded-md px-4 py-2.5 text-lg font-semibold shadow-sm hover:text-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white">Get Mycelium</a>
</div> </div>