Complete merge: resolve conflicts with branch-aware deployment solution

- 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

.github/workflows/tf_update_dev.yml

@@ -1,46 +0,0 @@
-name: www2.threefold_io
-on: 
-  push:
-    branches: [ development ]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-    - name: pushing latest change on www2.threefold.io
-      uses: appleboy/ssh-action@master
-      with:
-        host: dev.threefold.io
-        username: webuser
-        key: ${{ secrets.TF_SECRET }}
-        port: 34022
-        script: |
-          cd websites/www2/www_threefold_io/
-          git log -1
-          git fetch
-          git reset --hard origin/development
-          sed -i "s/https:\/\/www.threefold.io/https:\/\/dev.threefold.io/g" config.toml
-          ./build.sh
-          
-  wait:
-    needs: deploy
-    name: Wait for Website Update
-    runs-on: ubuntu-latest
-    steps:
-    - name: Wait Period
-      id: wait-deploy
-      run: |
-        echo "Sleeping for 30"
-        sleep 30
-        
-  checklinks:
-    needs: wait
-    name: Check for Broken Links
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for Broken Links
-        id: link-report
-        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
-        with:
-          args: 'https://www2.threefold.io -w 404'

.github/workflows/tf_update_prod.yml

@@ -1,46 +0,0 @@
-name: www.threefold_io
-on: 
-  push:
-    branches: [ master ]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-    - name: pushing latest change on www.threefold.io
-      uses: appleboy/ssh-action@master
-      with:
-        host: www.threefold.io
-        username: root
-        key: ${{ secrets.TF_SECRET }}
-        port: 22
-        script: |
-          cd /opt/www_threefold_io/
-          git log -1
-          git fetch
-          git reset --hard origin/master
-          sed -i "s/https:\/\/dev.threefold.io/https:\/\/www.threefold.io/g" config.toml
-          ./build.sh
-          
-  wait:
-    needs: deploy
-    name: Wait for Website Update
-    runs-on: ubuntu-latest
-    steps:
-    - name: Wait Period
-      id: wait-deploy
-      run: |
-        echo "Sleeping for 30"
-        sleep 30
-        
-  checklinks:
-    needs: wait
-    name: Check for Broken Links
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for Broken Links
-        id: link-report
-        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
-        with:
-          args: 'https://www.threefold.io -w 404'

.github/workflows/update_dev2.yml

@@ -1,46 +0,0 @@
-name: www3.threefold_io
-on: 
-  push:
-    branches: [ development_sasha ]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-    - name: pushing latest change on www3.threefold.io
-      uses: appleboy/ssh-action@master
-      with:
-        host: www3.threefold.io
-        username: webuser
-        key: ${{ secrets.TF_SECRET }}
-        port: 34022
-        script: |
-          cd websites/tmp/www_threefold_io/
-          git log -1
-          git restore .
-          git pull
-          sed -i "s/https:\/\/dev.threefold.io/https:\/\/dev2.threefold.io/g" config.toml
-          bash build.sh
-          
-  wait:
-    needs: deploy
-    name: Wait for Website Update
-    runs-on: ubuntu-latest
-    steps:
-    - name: Wait Period
-      id: wait-deploy
-      run: |
-        echo "Sleeping for 30"
-        sleep 30
-        
-  checklinks:
-    needs: wait
-    name: Check for Broken Links
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for Broken Links
-        id: link-report
-        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
-        with:
-          args: 'https://www3.threefold.io -w 404'

.github/workflows/update_www3.yml

@@ -1,46 +0,0 @@
-name: www3.threefold_io
-on: 
-  push:
-    branches: [ 3.10.0 ]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-    - name: pushing latest change on www3.threefold.io
-      uses: appleboy/ssh-action@master
-      with:
-        host: www3.threefold.io
-        username: webuser
-        key: ${{ secrets.TF_SECRET }}
-        port: 34022
-        script: |
-          cd websites/www3/www_threefold_io/
-          git log -1
-          git restore .
-          git pull
-          sed -i "s/https:\/\/www.threefold.io/https:\/\/www3.threefold.io/g" config.toml
-          bash build.sh
-          
-  wait:
-    needs: deploy
-    name: Wait for Website Update
-    runs-on: ubuntu-latest
-    steps:
-    - name: Wait Period
-      id: wait-deploy
-      run: |
-        echo "Sleeping for 30"
-        sleep 30
-        
-  checklinks:
-    needs: wait
-    name: Check for Broken Links
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for Broken Links
-        id: link-report
-        uses: docker://ghcr.io/threefoldfoundation/website-link-checker:latest
-        with:
-          args: 'https://www3.threefold.io -w 404'

.gitignore

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

README.md

@@ -17,7 +17,7 @@ Mycelium is a decentralized networking and storage solution designed to integrat
 
 ### **Clone the Repository**  
 ```sh
-git clone https://git.ourworld.tf/ourworld_web/www_mycelium.git
+git clone https://git.threefold.info/ourworld_web/www_mycelium.git
 cd www_mycelium
 ```
 
@@ -36,7 +36,7 @@ This will generate and serve the website for preview.
 
 ## 📌 **Issues & Contributions**  
 Report bugs or suggest improvements in the issue tracker:  
-🔗 [Issue Tracker](https://git.ourworld.tf/tfgrid/circle_web_presence/issues)  
+🔗 [Issue Tracker](https://git.threefold.info/tfgrid/circle_web_presence/issues)  
 
 ## 📜 **License**  
 This project is open-source and licensed under [insert applicable license].  

build.sh

@@ -1,34 +1,33 @@
+PREFIX="mycelium"
+
 echo "Starting build..."
 
 SOURCE=${BASH_SOURCE[0]}
 DIR_OF_THIS_SCRIPT="$( dirname "$SOURCE" )"
 ABS_DIR_OF_SCRIPT="$( realpath $DIR_OF_THIS_SCRIPT )"
 
-# TODO: Check if current version is latest to avoid redundant installation
+# Check if tailwindcss executable exists, if not, download and install it
-if [[ -f "tailwindcss" ]]
+if [[ ! -f "tailwindcss" ]]; then
-then
+    echo "Installing & building tailwind..."
-    rm tailwindcss
+    ASSET="tailwindcss"
-fi
 
-# checks os and architecture for correct release
+    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-# https://stackoverflow.com/a/8597411 
+        ASSET="$ASSET-linux"
-echo "Installing & building tailwind..."
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
-ASSET="tailwindcss"
+        ASSET="$ASSET-macos"
+    fi
+    if [[ "$(uname -m)" == "x86_64"* ]]; then
+        ASSET="$ASSET-x64"
+    elif [[ "$(uname -m)" == "arm64"* ]]; then
+        ASSET="$ASSET-arm64"
+    fi
 
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/${ASSET}"
-    ASSET="$ASSET-linux"
+    chmod +x $ASSET
-elif [[ "$OSTYPE" == "darwin"* ]]; then
+    mv $ASSET tailwindcss
-    ASSET="$ASSET-macos"
+else
+    echo "tailwindcss already exists, skipping installation."
 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/download/v3.4.17/${ASSET}"
-chmod +x $ASSET
-mv $ASSET tailwindcss
 
 
 # initialized and configures tailwind if not configured
@@ -43,4 +42,29 @@ fi
 echo "Compiling tailwindcss and building zola project..."
 rm -rf public static/css
 ./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"
+
+if [ "$CURRENT_BRANCH" = "master" ]; then
+    # Production deployment (www.mycelium.threefold.io)
+    echo "Building for PRODUCTION environment..."
+    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 "Using base_url: $BASE_URL"
+sed "s|base_url = \"BASEURL\"|base_url = \"$BASE_URL\"|" config.templ.toml > config.toml
 zola --root $ABS_DIR_OF_SCRIPT build
+rsync -avz --delete public/ "$DEPLOY_PATH"

config.templ.toml

@@ -0,0 +1,99 @@
+# The URL the site will be built for
+base_url = "BASEURL"
+
+title = "Mycelium"
+description = "Our global digital backbone"
+
+# When set to "true", a feed is automatically generated.
+# generate_feed = true
+
+# The filename to use for the feed. Used as the template filename, too.
+# Defaults to "atom.xml", which has a built-in template that renders an Atom 1.0 feed.
+# There is also a built-in template "rss.xml" that renders an RSS 2.0 feed.
+# feed_filename = "atom.xml"
+
+# The number of articles to include in the feed. All items are included if
+# this limit is not set (the default).
+# feed_limit = 10
+
+# Whether to automatically compile all Sass files in the sass directory
+compile_sass = false
+
+# When set to "true", the generated HTML files are minified.
+# minify_html = true
+# I'm keeping off for now -- buggy -- 2021-02-05 (@keats says it'll be fixed 0.14.0)
+
+# Whether to build a search index to be used later on by a JavaScript library
+build_search_index = false
+
+[markdown]
+# Whether to do syntax highlighting
+# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
+highlight_code = true
+highlight_theme = "visual-studio-dark"
+
+# When set to "true", emoji aliases translated to their corresponding
+# Unicode emoji equivalent in the rendered Markdown files. (e.g.: :smile: => 😄)
+render_emoji = false
+
+# Whether external links are to be opened in a new tab
+# If this is true, a `rel="noopener"` will always automatically be added for security reasons
+# external_links_target_blank = false
+
+# Whether to set rel="nofollow" for all external links
+external_links_no_follow = true
+
+# Whether to set rel="noreferrer" for all external links
+external_links_no_referrer = true
+
+# Whether smart punctuation is enabled (changing quotes, dashes, dots in their typographic form)
+# For example, `...` into `…`, `"quote"` into `“curly”` etc
+smart_punctuation = true
+
+#[build]
+#not_found = "404.md"
+
+[[taxonomies]]
+name = "categories"
+feed = true
+paginate_by = 6
+paginate_path = "blog-posts"
+
+[[taxonomies]]
+name = "partners-category"
+feed = true
+paginate_by = 6
+paginate_path = "partner-card"
+
+[[taxonomies]]
+name = "news-category"
+feed = true
+paginate_by = 6
+paginate_path = "news-card"
+
+[[taxonomies]]
+name = "roles"
+feed = true
+paginate_by = 2
+paginate_path = "join-us"
+
+[[taxonomies]]
+name = "tags"
+feed = true
+paginate_by = 9
+paginate_path = "tags"
+
+[[taxonomies]]
+name = "people"
+feed = false
+paginate_by = 9
+paginate_path = "people"
+
+[[taxonomies]]
+name = "memberships"
+feed = false
+paginate_by = 8
+paginate_path = "people/memberships"
+
+[extra]
+# Put all your custom variables here

config.toml

@@ -1,6 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www3.mycelium.threefold.io/"
+base_url = "https://www2.mycelium.threefold.io/"
-# Change this to your own URL! Please note this variable **must** be uncommented .
 
 title = "Mycelium"
 description = "Our global digital backbone"

content/_index.md

@@ -5,8 +5,8 @@ description: "Mycelium is a decentralized networking and storage solution design
 #updated: 2021-02-20T14:40:00-06:00
 draft: false
 extra:
-  author: ThreeFold
+  author: Mycelium
-  imgPath: home/tf.png
+  imgPath: home/mycel2.png
 ---
 
 
@@ -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>
 
 |||
 

content/about/index.md

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

content/download/index.md

@@ -15,7 +15,7 @@ extra:
     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.",
     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." 
 ) }}
 
@@ -142,5 +142,5 @@ extra:
     button_text="Download Now",
     button_link="/download",
     button_text2="Read More",
-    button_link2="https://threefold.info/mycelium/docs/"
+    button_link2="https://docs.ourworld.tf/mycelium_cloud/docs/"
 ) }}

content/footer/_index.md

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

content/header/index.md

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

content/home/index.md

@@ -3,7 +3,7 @@ title: "Mycelium"
 description: "Mycelium is a decentralized networking and storage solution designed to integrate seamlessly with AI workloads, content delivery, and messaging." 
 insert_anchor_links: "left"
 extra:
- author: ThreeFold
+ author: Mycelium
  imgPath: home/mycel2.png
 ---
 
@@ -314,7 +314,7 @@ extra:
     button_text="Download Now",
     button_link="/download",
     button_text2="Read More",
-    button_link2="https://threefold.info/mycelium/docs/"
+    button_link2="https://docs.ourworld.tf/mycelium_cloud/docs/"
 ) }}
 
 

templates/partials/footer.html

@@ -12,8 +12,8 @@
                         {# <img class="w-36 h-auto" src="images/mycelium_white.png" alt="MYCELIUM Logo" /> #}
                         <a href="/" class="flex">
 
-                            <img id="lightLogo" src="/images/mycelium_white.png" alt="Light Logo" class="logo light w-36 h-auto" style="max-width: none;">
+                            <img id="lightLogo" src="{{ get_url(path='/images/mycelium_white.png') }}" alt="Light Logo" class="logo light w-36 h-auto" style="max-width: none;">
-                            <img id="darkLogo" src="/images/mycelium_dark.png" alt="Dark Logo" class="logo dark w-36 h-auto" style="max-width: none;">
+                            <img id="darkLogo" src="{{ get_url(path='/images/mycelium_dark.png') }}" alt="Dark Logo" class="logo dark w-36 h-auto" style="max-width: none;">
 
                             
                           </a>

templates/partials/header.html

@@ -74,10 +74,7 @@
                 {% endif %}  
             {% endif %}
             {% 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>
 
             <div class="hidden md:inline-block md:order-last">
@@ -225,10 +222,6 @@
                           </p>
                           {% include "partials/socialLinks.html" %}
                       </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">
                         <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>
@@ -259,7 +252,7 @@
 }
 
 .active{
-  color: rgb(100, 100, 100) !important;
+  color: rgb(144 143 143) !important
 }
 .nav_btn:hover {
   color: #c7c7c7 !important;

templates/shortcodes/cta.html

@@ -20,7 +20,7 @@
         </div>
       </div>
       <div class="relative mt-16 h-80 lg:mt-8">
-        <img class="absolute top-0 left-0 w-[25rem] lg:w-[45rem] max-w-none rounded-2xl ring-1 ring-white/10" src="{{ image_src }}" alt="{{ image_alt }}" width="1824" height="1080">
+        <img class="absolute top-0 left-0 w-[25rem] lg:w-[45rem] max-w-none rounded-2xl ring-1 ring-white/10" src="{{ get_url(path=image_src) }}" alt="{{ image_alt }}" width="1824" height="1080">
       </div>
     </div>
   </div>

templates/shortcodes/feature_card.html

@@ -9,7 +9,7 @@
 <div class="card relative shadow rounded-lg p-4 transition-all duration-300">
   {% if icon %}
   <div class="flex items-center justify-center h-12 w-12 rounded-md mb-4">
-    <img src="{{ icon | safe }}" class="">
+    <img src="{{ get_url(path=icon) }}" class="">
   </div>
   {% endif %}
   <h3 class="text-lg font-medium">{{ title }}</h3>

templates/shortcodes/hero.html

@@ -28,7 +28,7 @@
     </div>
     </div>
     <div class="relative lg:col-span-5 lg:-mr-8 xl:absolute xl:inset-0 xl:left-1/2 xl:mr-0 ">
-      <img class="lg:mt-10 aspect-1/1 mx-auto w-full sm:w-2/3 md:w-1/2 lg:w-full object-cover lg:absolute lg:inset-0 lg:aspect-auto" src="{{ image_src }}" alt="{{ image_alt }}">
+      <img class="lg:mt-10 aspect-1/1 mx-auto w-full sm:w-2/3 md:w-1/2 lg:w-full object-cover lg:absolute lg:inset-0 lg:aspect-auto" src="{{ get_url(path=image_src) }}" alt="{{ image_alt }}">
     </div>
   </div>
 </div>

templates/shortcodes/hero_bottom_img.html

@@ -8,7 +8,7 @@
     </div>
     <div class="relative overflow-hidden pt-2">
       <div class="mx-auto max-w-7xl px-4 lg:px-8 flex items-center justify-center">
-        <img src="{{ image_src }}" alt="{{ image_alt }}"  width="900">
+        <img src="{{ get_url(path=image_src) }}" alt="{{ image_alt }}"  width="900">
       </div>
     </div>
   

templates/shortcodes/hero_features.html

@@ -9,7 +9,7 @@
           </div>
         <div class="mx-auto max-w-7xl lg:flex lg:items-center lg:gap-x-15 lg:px-8">
           <div class="my-6 lg:my-0 lg:flex lg:justify-center lg:w-1/2">
-            <img class="w-full max-w-lg h-auto object-cover rounded-xl" src="{{ image_src }}" 
+            <img class="w-full max-w-lg h-auto object-cover rounded-xl" src="{{ get_url(path=image_src) }}"
                 alt="{{ image_alt }}">
         </div>
             <div class="mx-auto max-w-lg lg:mx-0 lg:flex-auto pt-4">

templates/shortcodes/text_right_img.html

@@ -13,7 +13,7 @@
 
         <div class="mx-auto mt-10 lg:mt-0  lg:flex lg:items-center lg:gap-x-15 ">
              <div class="mt-6 lg:mt-0 lg:flex lg:justify-center lg:w-1/2">
-                <img class="w-full max-w-md h-auto object-cover rounded-xl" src="{{ image_src }}" 
+                <img class="w-full max-w-md h-auto object-cover rounded-xl" src="{{ get_url(path=image_src) }}"
                     alt="{{ image_alt }}">
             </div>
             <div class="mx-auto max-w-xl lg:mx-6 lg:flex-auto">