Merge pull request #280 from threefoldfoundation/development

update master

build.sh

@@ -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

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 %}
+{% end %}

content/tfLabs/_index.md

@@ -1,47 +0,0 @@
----
-title: "TF Labs"
-template: "section.html"
-insert_anchor_links: "left"
----
-
-<!-- section 1 (header) -->
-
-<br>
-
-<br>
-
-{% row(style="") %}
-
-### **ThreeFold Labs IT**
-
-<br>
-
-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.)
-
-|||
-
-<div class="relative" style="width: 100%; height: 450px;"><div class="absolute inset-0 bg-gray-300"><iframe width="100%" height="100%" frameborder="0" marginheight="0" marginwidth="0" title="map" scrolling="no" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3609.732111513173!2d55.32868122377514!3d25.2122551323585!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3e5f5d5f7da0de2b%3A0x5aed461f937f54ff!2sAl%20Jaddaf%20-%20Dubai%20-%20United%20Arab%20Emirates!5e0!3m2!1sen!2str!4v1654516740830!5m2!1sen!2str"></iframe></div></div>
-
-
-
-{% end %}
-
-
-
-
-
-
-
-

env.sh

@@ -0,0 +1 @@
+export NAME='threefoldio'

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

templates/partials/footer.html

@@ -28,9 +28,8 @@
               <div  class="mt-12 mx-auto border-t border-gray-200 pt-8">
                 <p data-v-14efe4a7="" class="text-base leading-6 text-gray-400 text-center">
                 © 2022 ThreeFold, All rights reserved.
-                <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms &amp; Conditions |
-                </a><a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy |
-                </a><a href="/tfLabs" class="leading-6 text-gray-500 hover:text-gray-900">ThreeFold Labs IT</a></p>
+                <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms &amp; Conditions |</a>
+                <a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy</a>
               </div>
     
             </div>