diff --git a/build.sh b/build.sh deleted file mode 100755 index 8b00a2c60..000000000 --- a/build.sh +++ /dev/null @@ -1,38 +0,0 @@ -echo "Starting build..." - -# TODO: Check if current version is latest to avoid redundant installation - -# 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 - - -# initialized and configures tailwind if not configured -echo "Initializing tailwind..." -if [[ ! -f "tailwind.config.js" ]] -then - ./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 -zola build diff --git a/content/home/index.md b/content/home/index.md index 7667b56ea..fc94fdc80 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -38,7 +38,7 @@ ThreeFold is a globally-distributed grid of storage, compute, and network capaci {% grid_stats() %} -### The ThreeFold Grid v3.9 +### The ThreeFold Grid v3.11 ## **Live and Operational** @@ -272,4 +272,4 @@ We are truly proud to be trusted by some of the biggest names in the industry. [![grit_daily](grit_daily.png#mx-auto)](https://gritdaily.com/belarus-governments-control-internet/) -{% end %} \ No newline at end of file +{% end %} diff --git a/content/tfLabs/_index.md b/content/tfLabs/_index.md deleted file mode 100644 index aadf6c3c4..000000000 --- a/content/tfLabs/_index.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -title: "TF Labs" -template: "section.html" -insert_anchor_links: "left" ---- - - - -
- -
- -{% row(style="") %} - -### **ThreeFold Labs IT** - -
- -A company organized and existing under the laws of the United Arab Emirates - -with license number 934955 - -Warehouse 88:89 - -Al Jaddaf Dry Docks - -P.O Box 283182 - -Dubai, United Arab Emirates - -Please get in touch at [info@threefold.io](mailto:info@threefold.io.) - -||| - -
- - - -{% end %} - - - - - - - - diff --git a/env.sh b/env.sh new file mode 100644 index 000000000..11f292b71 --- /dev/null +++ b/env.sh @@ -0,0 +1 @@ +export NAME='threefoldio' diff --git a/start.sh b/start.sh index 4a8094af7..07243370a 100755 --- a/start.sh +++ b/start.sh @@ -1,9 +1,34 @@ -# builds if executable isn't foound -if [ ! -f "tailwindcss" ] -then - sh build.sh + +set +ex +# Check if tailwindcss is already installed +if command -v tailwindcss &> /dev/null; then + echo "tailwindcss is already installed." +else + # checks OS and architecture for correct release + 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 + pushd /tmp + curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}" + chmod +x $ASSET + mv $ASSET /usr/local/bin/tailwindcss + popd fi + +source env.sh + # initialized and configures tailwind if not configured if [ ! -f "tailwind.config.js" ] then @@ -12,14 +37,23 @@ then fi # compiles tailwind css & launches locally -rm -rf public static/css -./tailwindcss -i css/index.css -o ./static/css/index.css --watch & zola serve & +# rm -rf public static/css +# ./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 +# zola build -# kills zola and tw bg processes on interrupt -trap 'kill $(jobs -p); exit 1' INT -wait +# # kills zola and tw bg processes on interrupt +# trap 'kill $(jobs -p); exit 1' INT +# wait + +rm -rf public static/css +tailwindcss -i css/index.css -o ./static/css/index.css --minify + +zola build -o ~/Documents/web/$NAME/ + +open ~/Documents/web/$NAME/index.html diff --git a/tailwindcss-macos-x64 b/tailwindcss-macos-x64 deleted file mode 100644 index b36544a49..000000000 Binary files a/tailwindcss-macos-x64 and /dev/null differ diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 1b6625df2..5c9f09c30 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -28,9 +28,8 @@

© 2022 ThreeFold, All rights reserved. - Terms & Conditions | - Privacy Policy | - ThreeFold Labs IT

+ Terms & Conditions | + Privacy Policy