diff --git a/README.md b/README.md index 68d7c43..5a20028 100644 --- a/README.md +++ b/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]. diff --git a/build.sh b/build.sh index 2910b18..e13c72e 100755 --- a/build.sh +++ b/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 -if [[ -f "tailwindcss" ]] -then - rm tailwindcss -fi +# Check if tailwindcss executable exists, if not, download and install it +if [[ ! -f "tailwindcss" ]]; then + echo "Installing & building tailwind..." + ASSET="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 -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - ASSET="$ASSET-linux" -elif [[ "$OSTYPE" == "darwin"* ]]; then - ASSET="$ASSET-macos" + curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/${ASSET}" + chmod +x $ASSET + mv $ASSET tailwindcss +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,15 @@ fi echo "Compiling tailwindcss and building zola project..." rm -rf public static/css ./tailwindcss -i css/index.css -o ./static/css/index.css --minify -zola --root $ABS_DIR_OF_SCRIPT build \ No newline at end of file + + +# echo "Building without prefix..." +# sed 's|base_url = "BASEURL"|base_url = "https://www.mycelium.threefold.io/"|' config.templ.toml > config.toml +# zola --root $ABS_DIR_OF_SCRIPT build +# rsync -avz --delete public/ "root@threefold.info:/root/hero/www/info/$PREFIX/" + +echo "Building with prefix: /$PREFIX/" +sed 's|base_url = "BASEURL"|base_url = "/mycelium/"|' config.templ.toml > config.toml +zola --root $ABS_DIR_OF_SCRIPT build +rsync -rav --delete public/ "${HOME}/hero/var/www/$PREFIX/" +rsync -avz --delete public/ "root@threefold.info:/root/hero/www/info/$PREFIX/" diff --git a/config.templ.toml b/config.templ.toml new file mode 100644 index 0000000..0cc2756 --- /dev/null +++ b/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 diff --git a/content/_index.md b/content/_index.md index 7bae84b..d2d4f7e 100644 --- a/content/_index.md +++ b/content/_index.md @@ -105,7 +105,7 @@ True digital sovereignty for open-source builders. The ThreeFold Grid provides l ||| - + ||| diff --git a/content/about/index.md b/content/about/index.md index 92c3924..9021b12 100644 --- a/content/about/index.md +++ b/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://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/" ) }} diff --git a/content/download/index.md b/content/download/index.md index 3caa200..022027f 100644 --- a/content/download/index.md +++ b/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://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/", 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://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/" ) }} diff --git a/content/footer/_index.md b/content/footer/_index.md index 2b77400..d81930e 100644 --- a/content/footer/_index.md +++ b/content/footer/_index.md @@ -14,7 +14,7 @@ extra:
-###### [Manual](https://threefold.info/mycelium/docs/) +###### [Manual](https://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/) ###### [Dashboard](https://dashboard.grid.tf/) diff --git a/content/header/index.md b/content/header/index.md index fb57915..f554d92 100644 --- a/content/header/index.md +++ b/content/header/index.md @@ -9,6 +9,6 @@ extra: --- - [About]("/about") -- [Docs]("https://threefold.info/mycelium/docs/") +- [Docs]("https://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/") diff --git a/content/home/index.md b/content/home/index.md index ac5bae9..babe502 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -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://manual.grid.tf/labs/documentation/system_administrators/mycelium_toc/" ) }} diff --git a/templates/partials/footer.html b/templates/partials/footer.html index cdee99c..e736e39 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -12,8 +12,8 @@ {# MYCELIUM Logo #} - - + + diff --git a/templates/partials/header.html b/templates/partials/header.html index dd9dfd3..7a5cef3 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -74,7 +74,7 @@ {% endif %} {% endif %} {% endfor %} - Docs @@ -225,7 +225,7 @@

{% include "partials/socialLinks.html" %} #} - Docs diff --git a/templates/shortcodes/cta.html b/templates/shortcodes/cta.html index 9e7dfba..ba7a5e7 100644 --- a/templates/shortcodes/cta.html +++ b/templates/shortcodes/cta.html @@ -20,7 +20,7 @@
- {{ image_alt }} + {{ image_alt }}
diff --git a/templates/shortcodes/feature_card.html b/templates/shortcodes/feature_card.html index 7a8b30e..e342786 100644 --- a/templates/shortcodes/feature_card.html +++ b/templates/shortcodes/feature_card.html @@ -9,7 +9,7 @@
{% if icon %}
- +
{% endif %}

{{ title }}

diff --git a/templates/shortcodes/hero.html b/templates/shortcodes/hero.html index daea42a..090567f 100644 --- a/templates/shortcodes/hero.html +++ b/templates/shortcodes/hero.html @@ -28,7 +28,7 @@
- {{ image_alt }} + {{ image_alt }}
diff --git a/templates/shortcodes/hero_bottom_img.html b/templates/shortcodes/hero_bottom_img.html index b225fe7..d47b13a 100644 --- a/templates/shortcodes/hero_bottom_img.html +++ b/templates/shortcodes/hero_bottom_img.html @@ -8,7 +8,7 @@
- {{ image_alt }} + {{ image_alt }}
diff --git a/templates/shortcodes/hero_features.html b/templates/shortcodes/hero_features.html index 1057ac8..01124cd 100644 --- a/templates/shortcodes/hero_features.html +++ b/templates/shortcodes/hero_features.html @@ -9,7 +9,7 @@
- {{ image_alt }}
diff --git a/templates/shortcodes/text_right_img.html b/templates/shortcodes/text_right_img.html index dd59f30..3651348 100644 --- a/templates/shortcodes/text_right_img.html +++ b/templates/shortcodes/text_right_img.html @@ -13,7 +13,7 @@
- {{ image_alt }}