Merge branch 'development' of https://github.com/threefoldfoundation/www_threefold_io into development
This commit is contained in:
6
.github/workflows/tf_update_dev.yml
vendored
6
.github/workflows/tf_update_dev.yml
vendored
@@ -12,11 +12,11 @@ jobs:
|
|||||||
uses: appleboy/ssh-action@master
|
uses: appleboy/ssh-action@master
|
||||||
with:
|
with:
|
||||||
host: www2.threefold.io
|
host: www2.threefold.io
|
||||||
username: root
|
username: webuser
|
||||||
key: ${{ secrets.TF_SECRET }}
|
key: ${{ secrets.TF_SECRET }}
|
||||||
port: 22
|
port: 34022
|
||||||
script: |
|
script: |
|
||||||
cd /opt/www_threefold_io/
|
cd websites/www2/www_threefold_io/
|
||||||
git log -1
|
git log -1
|
||||||
git fetch
|
git fetch
|
||||||
git reset --hard origin/development
|
git reset --hard origin/development
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
id: dunia_yetu
|
id: dunia_yetu
|
||||||
title: Dunia Yetu Formally Announced in Dar Es Salaam
|
title: "Dunia Yetu Formally Announced in Dar Es Salaam"
|
||||||
image_caption: Dunia Yetu
|
image_caption: "Dunia Yetu"
|
||||||
description: Dunia Yetu (Our World) is a collaborative and co-owned movement to redefine the digital landscape in Tanzania and East Africa, empower coders, spur economic development, and build a self-reliant sovereign digital ecosystem for a better digital future.
|
description: Dunia Yetu (Our World) is a collaborative and co-owned movement to redefine the digital landscape in Tanzania and East Africa, empower coders spur economic development, and build a self-reliant sovereign digital ecosystem for a better digital future.
|
||||||
date: 2024-01-26
|
date: 2024-01-26
|
||||||
taxonomies:
|
taxonomies:
|
||||||
people: [sam_taggart]
|
people: [sam_taggart]
|
||||||
|
|||||||
13
start.sh
13
start.sh
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
set +ex
|
set +ex
|
||||||
# Check if tailwindcss is already installed
|
# Check if tailwindcss is already installed
|
||||||
if command -v tailwindcss &> /dev/null; then
|
if command -v tailwindcss &> /dev/null; then
|
||||||
@@ -25,10 +24,7 @@ else
|
|||||||
mv $ASSET /usr/local/bin/tailwindcss
|
mv $ASSET /usr/local/bin/tailwindcss
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
source ./env.sh
|
||||||
|
|
||||||
source env.sh
|
|
||||||
|
|
||||||
# initialized and configures tailwind if not configured
|
# initialized and configures tailwind if not configured
|
||||||
if [ ! -f "tailwind.config.js" ]
|
if [ ! -f "tailwind.config.js" ]
|
||||||
then
|
then
|
||||||
@@ -39,21 +35,14 @@ fi
|
|||||||
# compiles tailwind css & launches locally
|
# compiles tailwind css & launches locally
|
||||||
# rm -rf public static/css
|
# rm -rf public static/css
|
||||||
# ./tailwindcss -i css/index.css -o ./static/css/index.css --watch
|
# ./tailwindcss -i css/index.css -o ./static/css/index.css --watch
|
||||||
|
|
||||||
# zola serve &
|
# zola serve &
|
||||||
|
|
||||||
# compiles tailwind css for prod & builds project
|
# compiles tailwind css for prod & builds project
|
||||||
# ./tailwindcss -i css/index.css -o ./static/css/index.css --minify
|
# ./tailwindcss -i css/index.css -o ./static/css/index.css --minify
|
||||||
# zola build
|
# zola build
|
||||||
|
|
||||||
# # kills zola and tw bg processes on interrupt
|
# # kills zola and tw bg processes on interrupt
|
||||||
# trap 'kill $(jobs -p); exit 1' INT
|
# trap 'kill $(jobs -p); exit 1' INT
|
||||||
# wait
|
# wait
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
zola build -o ~/Documents/web/$NAME/
|
zola build -o ~/Documents/web/$NAME/
|
||||||
|
|
||||||
open ~/Documents/web/$NAME/index.html
|
open ~/Documents/web/$NAME/index.html
|
||||||
Reference in New Issue
Block a user