From d474cd581e8260f28992fba97765338dfe3adbdd Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 11:32:27 +0000 Subject: [PATCH 01/20] dockerfile --- .gitpod.Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 323a0eee6..c0f108c22 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,10 +1,16 @@ -FROM threefolddev/publishtools:latest -ENV DEBIAN_FRONTEND=noninteractive + +FROM gitpod/workspace-full:latest + +USER root +RUN apt-get update && apt-get install -y mc + +ADD gitpod/install.sh /tmp/install.sh + +RUN bash /tmp/install.sh + +# RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* + USER gitpod -RUN cd /tmp && wget https://raw.githubusercontent.com/threefoldfoundation/www_threefold_io/development/sites.json && sudo publishtools update && sudo publishtools install || echo "try 1" -USER root -RUN cd /tmp && sudo publishtools install --reset - -ENTRYPOINT [ "entrypoint.sh" ] +# ENTRYPOINT [ "/usr/bin/bash" ] From 68db3084e099f839643fd53d4a9c37ebcb158ea0 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 15:34:32 +0400 Subject: [PATCH 02/20] Update .gitpod.Dockerfile --- .gitpod.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index c0f108c22..057591c5e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,9 +5,9 @@ FROM gitpod/workspace-full:latest USER root RUN apt-get update && apt-get install -y mc -ADD gitpod/install.sh /tmp/install.sh +# ADD gitpod/install.sh /tmp/install.sh -RUN bash /tmp/install.sh +# RUN bash /tmp/install.sh # RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* From b0cc502ab57c6a6015f069b2c17f853682e1f2f0 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 11:59:43 +0000 Subject: [PATCH 03/20] install --- .gitignore | 1 - .gitpod.Dockerfile | 8 +++++--- gitpod/install.sh | 24 ++++++++++++++++++++++++ gitpod/package.json | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 gitpod/install.sh create mode 100644 gitpod/package.json diff --git a/.gitignore b/.gitignore index 3c6d2cb6f..820687e20 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ node_modules .env.* yarn.lock .installed -install.sh run.sh build.sh package-lock.json diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 057591c5e..79f985b65 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -3,11 +3,13 @@ FROM gitpod/workspace-full:latest USER root -RUN apt-get update && apt-get install -y mc +RUN apt-get update && apt-get install -y mc rsync -# ADD gitpod/install.sh /tmp/install.sh +ADD gitpod/install.sh /tmp/install.sh +ADD gitpod/package.json /tmp/package.json + +RUN bash /tmp/install.sh -# RUN bash /tmp/install.sh # RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* diff --git a/gitpod/install.sh b/gitpod/install.sh new file mode 100644 index 000000000..0e22d1c34 --- /dev/null +++ b/gitpod/install.sh @@ -0,0 +1,24 @@ +set -ex +sudo chown gitpod:gitpod -R /tmp + +export base=/nodejs +export lts=14.17.3 + +echo $base +sudo mkdir -p $base +sudo chown gitpod:gitpod -R $base +cd $base + +rm -f $base/nvm.sh +curl -s -o nvm.sh https://raw.githubusercontent.com/nvm-sh/nvm/master/nvm.sh +bash nvm.sh + +export NVM_DIR=$base +source $base/nvm.sh +nvm install $lts +nvm use --lts + +cp /tmp/package.json . + +npm install --global @gridsome/cli +npm install diff --git a/gitpod/package.json b/gitpod/package.json new file mode 100644 index 000000000..e4b947184 --- /dev/null +++ b/gitpod/package.json @@ -0,0 +1,40 @@ +{ + "name": "my-blog", + "private": true, + "scripts": { + "build": "gridsome build", + "develop": "gridsome develop", + "explore": "gridsome explore" + }, + "dependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.30", + "@fortawesome/free-brands-svg-icons": "^5.14.0", + "@fortawesome/free-solid-svg-icons": "^5.14.0", + "@fortawesome/vue-fontawesome": "^2.0.0", + "@gridsome/source-filesystem": "^0.6.2", + "@gridsome/transformer-remark": "^0.6.2", + "@noxify/gridsome-remark-classes": "^1.0.0", + "@noxify/gridsome-remark-table-align": "^1.0.0", + "axios": "^0.21.1", + "babel-runtime": "^6.26.0", + "core-js": "^3.6.5", + "gridsome": "^0.7.3", + "gridsome-plugin-matomo": "^0.1.0", + "gridsome-plugin-remark-prismjs-all": "^0.3.5", + "gridsome-plugin-tailwindcss": "^3.0.1", + "gridsome-source-graphql": "^1.0.2", + "gridsome-source-static-meta": "github:noxify/gridsome-source-static-meta#master", + "lodash": "^4.17.20", + "node-sass": "^5.0.0", + "pluralize": "^8.0.0", + "sass-loader": "^10.0.2", + "tailwindcss": "^1.8.4", + "tailwindcss-gradients": "^3.0.0", + "tailwindcss-tables": "^0.4.0", + "v-tooltip": "^2.0.3", + "vue-markdown": "^2.1.2" + }, + "devDependencies": { + "@tailwindcss/aspect-ratio": "^0.2.0" + } +} From 84ccbd1ffa3afad92087de1c72bdc0cb2f3685b6 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:13:33 +0000 Subject: [PATCH 04/20] gitpod --- .gitignore | 2 -- .gitpod.yml | 2 +- gitpod/install.sh | 2 +- run.sh | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 run.sh diff --git a/.gitignore b/.gitignore index 820687e20..f97c17773 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,5 @@ node_modules .env.* yarn.lock .installed -run.sh -build.sh package-lock.json dist diff --git a/.gitpod.yml b/.gitpod.yml index 9c12bd536..c248f5027 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,7 @@ image: file: .gitpod.Dockerfile # # Commands to start on workspace startup tasks: - - command: sudo /etc/init.d/redis-server start && sudo publishtools develop --repo www_threefold_io + - command: run.sh ports: - port: 8080 onOpen: open-browser diff --git a/gitpod/install.sh b/gitpod/install.sh index 0e22d1c34..e8c1f3c64 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -15,7 +15,7 @@ bash nvm.sh export NVM_DIR=$base source $base/nvm.sh -nvm install $lts +nvm install --lts nvm use --lts cp /tmp/package.json . diff --git a/run.sh b/run.sh new file mode 100644 index 000000000..dc7aced36 --- /dev/null +++ b/run.sh @@ -0,0 +1,22 @@ +set -ex + +rm -f yarn.lock +rm -rf .cache + + +export base=/nodejs + +source $base/nvm.sh +nvm use --lts + +rsync -ra --delete $base/node_modules/ node_modules/ + +npm install + +export PATH=$base/bin:\$PATH + +if [ -f vue.config.js ]; then +npm run-script serve +else +gridsome develop +fi \ No newline at end of file From c5a1e41519919aaa48db75a5d383add479728c23 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:32:50 +0000 Subject: [PATCH 05/20] gitpod --- .gitignore | 2 ++ .gitpod.Dockerfile | 4 ++-- .gitpod.yml | 3 ++- gitpod/install.sh | 24 ++++++++++-------------- gitpod/install_docker.sh | 25 +++++++++++++++++++++++++ gitpod/run.sh | 29 +++++++++++++++++++++++++++++ run.sh | 22 ---------------------- 7 files changed, 70 insertions(+), 39 deletions(-) create mode 100644 gitpod/install_docker.sh create mode 100644 gitpod/run.sh delete mode 100644 run.sh diff --git a/.gitignore b/.gitignore index f97c17773..a366b4925 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ yarn.lock .installed package-lock.json dist +.temp + diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 79f985b65..3ba632d49 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,10 +5,10 @@ FROM gitpod/workspace-full:latest USER root RUN apt-get update && apt-get install -y mc rsync -ADD gitpod/install.sh /tmp/install.sh +ADD gitpod/install_docker.sh /tmp/install_docker.sh ADD gitpod/package.json /tmp/package.json -RUN bash /tmp/install.sh +RUN bash /tmp/install_docker.sh # RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* diff --git a/.gitpod.yml b/.gitpod.yml index c248f5027..c17335952 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,8 @@ image: file: .gitpod.Dockerfile # # Commands to start on workspace startup tasks: - - command: run.sh + - init: bash /workspace/www_threefold_io/gitpod/install.sh + - command: bash /workspace/www_threefold_io/gitpod/run.sh ports: - port: 8080 onOpen: open-browser diff --git a/gitpod/install.sh b/gitpod/install.sh index e8c1f3c64..e4c831230 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -1,24 +1,20 @@ -set -ex -sudo chown gitpod:gitpod -R /tmp +set -e + export base=/nodejs -export lts=14.17.3 -echo $base -sudo mkdir -p $base -sudo chown gitpod:gitpod -R $base +export PATH=$base/bin:$PATH + +source $base/nvm.sh + cd $base -rm -f $base/nvm.sh -curl -s -o nvm.sh https://raw.githubusercontent.com/nvm-sh/nvm/master/nvm.sh -bash nvm.sh +rm -f yarn.lock +rm -rf .cache -export NVM_DIR=$base -source $base/nvm.sh nvm install --lts nvm use --lts -cp /tmp/package.json . +cd /workspace +git clone https://github.com/threefoldfoundation/data_threefold -npm install --global @gridsome/cli -npm install diff --git a/gitpod/install_docker.sh b/gitpod/install_docker.sh new file mode 100644 index 000000000..46b59f767 --- /dev/null +++ b/gitpod/install_docker.sh @@ -0,0 +1,25 @@ +set -ex +sudo chown gitpod:gitpod -R /tmp + +export base=/nodejs +export lts=14.17.3 + +echo $base +sudo mkdir -p $base +sudo chown gitpod:gitpod -R $base +cd $base + +rm -f $base/nvm.sh +curl -s -o nvm.sh https://raw.githubusercontent.com/nvm-sh/nvm/master/nvm.sh +bash nvm.sh + +export NVM_DIR=$base +source $base/nvm.sh + +nvm install --lts +nvm use --lts + +cp /tmp/package.json . + +npm install --global @gridsome/cli +npm install diff --git a/gitpod/run.sh b/gitpod/run.sh new file mode 100644 index 000000000..42800a6ed --- /dev/null +++ b/gitpod/run.sh @@ -0,0 +1,29 @@ +set -e + + +export base=/nodejs + +export PATH=$base/bin:$PATH + +source $base/nvm.sh + +nvm install --lts +nvm use --lts + +#go to the website +cd .. + +rm -f yarn.lock +rm -rf .cache + +#copy from the docker image to speedup +rsync -rav --delete $base/node_modules/ node_modules/ + +#make sure all modules are there +npm install + +if [ -f vue.config.js ]; then +npm run-script serve +else +gridsome develop +fi \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100644 index dc7aced36..000000000 --- a/run.sh +++ /dev/null @@ -1,22 +0,0 @@ -set -ex - -rm -f yarn.lock -rm -rf .cache - - -export base=/nodejs - -source $base/nvm.sh -nvm use --lts - -rsync -ra --delete $base/node_modules/ node_modules/ - -npm install - -export PATH=$base/bin:\$PATH - -if [ -f vue.config.js ]; then -npm run-script serve -else -gridsome develop -fi \ No newline at end of file From 44081444a29e1dc0afe5a0310f9583f9c4df6713 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:42:38 +0000 Subject: [PATCH 06/20] git[od --- .gitpod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index c17335952..3e51fe687 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,8 +2,8 @@ image: file: .gitpod.Dockerfile # # Commands to start on workspace startup tasks: - - init: bash /workspace/www_threefold_io/gitpod/install.sh - - command: bash /workspace/www_threefold_io/gitpod/run.sh + # - init: bash /workspace/www_threefold_io/gitpod/install.sh + - command: bash /workspace/www_threefold_io/gitpod/install.sh && bash /workspace/www_threefold_io/gitpod/run.sh ports: - port: 8080 onOpen: open-browser From 9f492144a7a9ea9a549209cf9213e2a96a3d7c7c Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:46:58 +0000 Subject: [PATCH 07/20] gitpod --- gitpod/install.sh | 3 +++ gitpod/run.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/gitpod/install.sh b/gitpod/install.sh index e4c831230..2143d5b43 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -1,8 +1,11 @@ set -e + export base=/nodejs +sudo chown gitpod:gitpod -R $base + export PATH=$base/bin:$PATH source $base/nvm.sh diff --git a/gitpod/run.sh b/gitpod/run.sh index 42800a6ed..c3056346a 100644 --- a/gitpod/run.sh +++ b/gitpod/run.sh @@ -3,6 +3,8 @@ set -e export base=/nodejs + + export PATH=$base/bin:$PATH source $base/nvm.sh From 9c1492013789872d3df92ffc2bec3430d2b41000 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:49:54 +0000 Subject: [PATCH 08/20] gitpod --- gitpod/install.sh | 2 ++ gitpod/run.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gitpod/install.sh b/gitpod/install.sh index 2143d5b43..348a8dedb 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -18,6 +18,8 @@ rm -rf .cache nvm install --lts nvm use --lts +npm install --global @gridsome/cli + cd /workspace git clone https://github.com/threefoldfoundation/data_threefold diff --git a/gitpod/run.sh b/gitpod/run.sh index c3056346a..ac39bbc77 100644 --- a/gitpod/run.sh +++ b/gitpod/run.sh @@ -19,7 +19,9 @@ rm -f yarn.lock rm -rf .cache #copy from the docker image to speedup -rsync -rav --delete $base/node_modules/ node_modules/ +echo "sync node modules to website" +rsync -ra --delete $base/node_modules/ node_modules/ +echo "done" #make sure all modules are there npm install From b0d52fcfdcee5df7f50823625d3fd66d59d85df7 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 12:56:32 +0000 Subject: [PATCH 09/20] gitpod --- gitpod/install.sh | 13 +++++++++++++ gitpod/run.sh | 17 +---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gitpod/install.sh b/gitpod/install.sh index 348a8dedb..a03641f5a 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -23,3 +23,16 @@ npm install --global @gridsome/cli cd /workspace git clone https://github.com/threefoldfoundation/data_threefold +#go to the website +cd /workspace/www_threefold_io + +rm -f yarn.lock +rm -rf .cache + +#copy from the docker image to speedup +echo "sync node modules to website" +rsync -ra --delete $base/node_modules/ node_modules/ +echo "done" + +#make sure all modules are there +npm install diff --git a/gitpod/run.sh b/gitpod/run.sh index ac39bbc77..6bf7e4870 100644 --- a/gitpod/run.sh +++ b/gitpod/run.sh @@ -1,30 +1,15 @@ set -e - export base=/nodejs - - export PATH=$base/bin:$PATH source $base/nvm.sh -nvm install --lts nvm use --lts #go to the website -cd .. - -rm -f yarn.lock -rm -rf .cache - -#copy from the docker image to speedup -echo "sync node modules to website" -rsync -ra --delete $base/node_modules/ node_modules/ -echo "done" - -#make sure all modules are there -npm install +cd /workspace/www_threefold_io if [ -f vue.config.js ]; then npm run-script serve From fd290392713ab75a22c8589ebea1f740206c3937 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 13:06:07 +0000 Subject: [PATCH 10/20] gitpod --- gitpod/install.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gitpod/install.sh b/gitpod/install.sh index a03641f5a..2ab25113e 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -20,9 +20,6 @@ nvm use --lts npm install --global @gridsome/cli -cd /workspace -git clone https://github.com/threefoldfoundation/data_threefold - #go to the website cd /workspace/www_threefold_io @@ -36,3 +33,12 @@ echo "done" #make sure all modules are there npm install + +cd /workspace +if ! [ -d "/workspace/data_threefold" ] +then + git clone https://github.com/threefoldfoundation/data_threefold +fi + + + From a2756e17d3229f5b9a23de53edc98cc6a9544295 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 13:13:15 +0000 Subject: [PATCH 11/20] workspace --- workspace.code-workspace | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 workspace.code-workspace diff --git a/workspace.code-workspace b/workspace.code-workspace new file mode 100644 index 000000000..f5106b064 --- /dev/null +++ b/workspace.code-workspace @@ -0,0 +1,11 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "../data_threefold" + } + ], + "settings": {} +} \ No newline at end of file From c860ed15254f224b3aa312dee048ef2e037891d8 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 13:16:14 +0000 Subject: [PATCH 12/20] gitpod --- .gitpod.Dockerfile | 2 +- gitpod/package.json | 40 --------------------------------- sites.json | 55 --------------------------------------------- 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 gitpod/package.json delete mode 100644 sites.json diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 3ba632d49..9d61a6289 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -6,7 +6,7 @@ USER root RUN apt-get update && apt-get install -y mc rsync ADD gitpod/install_docker.sh /tmp/install_docker.sh -ADD gitpod/package.json /tmp/package.json +ADD package.json /tmp/package.json RUN bash /tmp/install_docker.sh diff --git a/gitpod/package.json b/gitpod/package.json deleted file mode 100644 index e4b947184..000000000 --- a/gitpod/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "my-blog", - "private": true, - "scripts": { - "build": "gridsome build", - "develop": "gridsome develop", - "explore": "gridsome explore" - }, - "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.30", - "@fortawesome/free-brands-svg-icons": "^5.14.0", - "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@fortawesome/vue-fontawesome": "^2.0.0", - "@gridsome/source-filesystem": "^0.6.2", - "@gridsome/transformer-remark": "^0.6.2", - "@noxify/gridsome-remark-classes": "^1.0.0", - "@noxify/gridsome-remark-table-align": "^1.0.0", - "axios": "^0.21.1", - "babel-runtime": "^6.26.0", - "core-js": "^3.6.5", - "gridsome": "^0.7.3", - "gridsome-plugin-matomo": "^0.1.0", - "gridsome-plugin-remark-prismjs-all": "^0.3.5", - "gridsome-plugin-tailwindcss": "^3.0.1", - "gridsome-source-graphql": "^1.0.2", - "gridsome-source-static-meta": "github:noxify/gridsome-source-static-meta#master", - "lodash": "^4.17.20", - "node-sass": "^5.0.0", - "pluralize": "^8.0.0", - "sass-loader": "^10.0.2", - "tailwindcss": "^1.8.4", - "tailwindcss-gradients": "^3.0.0", - "tailwindcss-tables": "^0.4.0", - "v-tooltip": "^2.0.3", - "vue-markdown": "^2.1.2" - }, - "devDependencies": { - "@tailwindcss/aspect-ratio": "^0.2.0" - } -} diff --git a/sites.json b/sites.json deleted file mode 100644 index b51e3b441..000000000 --- a/sites.json +++ /dev/null @@ -1,55 +0,0 @@ -[{ - "name": "www_threefold_io", - "url": "https://github.com/threefoldfoundation/www_threefold_io", - "branch": "", - "pull": false, - "reset": false, - "cat": 2, - "shortname": "threefold", - "path_code": "", - "domains": ["www.threefold.io", "www.threefold.me", "threefold.me", "new.threefold.io", "staging.threefold.io", "threefold.io"], - "descr": "is our entry point for everyone, redirect to the detailed websites underneith.", - "groups": [{ - "name": "tf1", - "members_users": ["kristof", "adnan", "rob"], - "members_groups": [] - }, { - "name": "tf2", - "members_users": ["polleke"], - "members_groups": ["tf1"] - }], - "acl": [], - "trackingid": "", - "opengraph": { - "title": "", - "description": "", - "url": "", - "type_": "article", - "image": "", - "image_width": "1200", - "image_height": "630" - } - }, { - "name": "data_threefold", - "url": "https://github.com/threefoldfoundation/data_threefold", - "branch": "", - "pull": false, - "reset": false, - "cat": 1, - "shortname": "data", - "path_code": "", - "domains": [], - "descr": "", - "groups": [], - "acl": [], - "trackingid": "", - "opengraph": { - "title": "", - "description": "", - "url": "", - "type_": "article", - "image": "", - "image_width": "1200", - "image_height": "630" - } - }] From bc2582c712f035e5085151c02316be7723ddb92d Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 13:33:01 +0000 Subject: [PATCH 13/20] gitpod --- gitpod/install.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gitpod/install.sh b/gitpod/install.sh index 2ab25113e..3f456eaa3 100644 --- a/gitpod/install.sh +++ b/gitpod/install.sh @@ -41,4 +41,13 @@ then fi +rm -f ../content/blog +ln -s /workspace/data_threefold/content/blog ../content/blog +rm -f ../content/news +ln -s /workspace/data_threefold/content/news ../content/news +rm -f ../content/person +ln -s /workspace/data_threefold/content/person ../content/person +rm -f ../content/project +ln -s /workspace/data_threefold/content/project ../content/project + From 4f2475634c838468cabecd9eeece2452aae286c4 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 13:56:57 +0000 Subject: [PATCH 14/20] gitpod --- .gitpod.Dockerfile | 7 ++----- .gitpod.yml | 6 +++++- run.sh | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 run.sh diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 9d61a6289..a7ddb0300 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,11 +5,8 @@ FROM gitpod/workspace-full:latest USER root RUN apt-get update && apt-get install -y mc rsync -ADD gitpod/install_docker.sh /tmp/install_docker.sh -ADD package.json /tmp/package.json - -RUN bash /tmp/install_docker.sh - +#prepare for gitpod nodejs env +RUN rm -f /tmp/install_docker.sh && curl -s -o /tmp/install_docker.sh https://raw.githubusercontent.com/threefoldfoundation/data_threefold/development/gitpod_scripts/install_docker.sh && bash /tmp/install_docker.sh # RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* diff --git a/.gitpod.yml b/.gitpod.yml index 3e51fe687..34e14adf1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,7 +3,11 @@ image: # # Commands to start on workspace startup tasks: # - init: bash /workspace/www_threefold_io/gitpod/install.sh - - command: bash /workspace/www_threefold_io/gitpod/install.sh && bash /workspace/www_threefold_io/gitpod/run.sh + - command: rm -f /tmp/install.sh \ + && curl -s -o /tmp/install.sh https://raw.githubusercontent.com/threefoldfoundation/data_threefold/development/install.sh \ + && bash /tmp/install.sh \ + && bash /workspace/data_threefold/gitpod_scripts/install.sh + && bash /workspace/data_threefold/gitpod_scripts/run.sh ports: - port: 8080 onOpen: open-browser diff --git a/run.sh b/run.sh new file mode 100644 index 000000000..1566c9721 --- /dev/null +++ b/run.sh @@ -0,0 +1,2 @@ +#!/bin/bash +bash /workspace/data_threefold/gitpod_scripts/run.sh From 4def2273b50a76c1d8b4bf09e46bef9883c9dc00 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 18:07:04 +0400 Subject: [PATCH 15/20] Delete package.json --- package.json | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 package.json diff --git a/package.json b/package.json deleted file mode 100644 index e4b947184..000000000 --- a/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "my-blog", - "private": true, - "scripts": { - "build": "gridsome build", - "develop": "gridsome develop", - "explore": "gridsome explore" - }, - "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.30", - "@fortawesome/free-brands-svg-icons": "^5.14.0", - "@fortawesome/free-solid-svg-icons": "^5.14.0", - "@fortawesome/vue-fontawesome": "^2.0.0", - "@gridsome/source-filesystem": "^0.6.2", - "@gridsome/transformer-remark": "^0.6.2", - "@noxify/gridsome-remark-classes": "^1.0.0", - "@noxify/gridsome-remark-table-align": "^1.0.0", - "axios": "^0.21.1", - "babel-runtime": "^6.26.0", - "core-js": "^3.6.5", - "gridsome": "^0.7.3", - "gridsome-plugin-matomo": "^0.1.0", - "gridsome-plugin-remark-prismjs-all": "^0.3.5", - "gridsome-plugin-tailwindcss": "^3.0.1", - "gridsome-source-graphql": "^1.0.2", - "gridsome-source-static-meta": "github:noxify/gridsome-source-static-meta#master", - "lodash": "^4.17.20", - "node-sass": "^5.0.0", - "pluralize": "^8.0.0", - "sass-loader": "^10.0.2", - "tailwindcss": "^1.8.4", - "tailwindcss-gradients": "^3.0.0", - "tailwindcss-tables": "^0.4.0", - "v-tooltip": "^2.0.3", - "vue-markdown": "^2.1.2" - }, - "devDependencies": { - "@tailwindcss/aspect-ratio": "^0.2.0" - } -} From 28eb81e12f698e8379343aff399285096956976b Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 14:11:39 +0000 Subject: [PATCH 16/20] gitpod --- .gitpod.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 34e14adf1..f5194bef4 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,11 +3,12 @@ image: # # Commands to start on workspace startup tasks: # - init: bash /workspace/www_threefold_io/gitpod/install.sh - - command: rm -f /tmp/install.sh \ - && curl -s -o /tmp/install.sh https://raw.githubusercontent.com/threefoldfoundation/data_threefold/development/install.sh \ - && bash /tmp/install.sh \ - && bash /workspace/data_threefold/gitpod_scripts/install.sh - && bash /workspace/data_threefold/gitpod_scripts/run.sh + - command: | + rm -f /tmp/install.sh + curl -s -o /tmp/install.sh https://raw.githubusercontent.com/threefoldfoundation/data_threefold/development/install.sh + bash /tmp/install.sh + bash /workspace/data_threefold/gitpod_scripts/install.sh + bash /workspace/data_threefold/gitpod_scripts/run.sh ports: - port: 8080 onOpen: open-browser From 7c2a5c07be1e374246ac8d41ee84a7c5ee2854c8 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 14:20:54 +0000 Subject: [PATCH 17/20] gitpod --- install_gitpod.sh | 7 +++++++ run.sh | 0 2 files changed, 7 insertions(+) create mode 100755 install_gitpod.sh mode change 100644 => 100755 run.sh diff --git a/install_gitpod.sh b/install_gitpod.sh new file mode 100755 index 000000000..e2a71b6bc --- /dev/null +++ b/install_gitpod.sh @@ -0,0 +1,7 @@ +#!/bin/bash +rm -f /tmp/install.sh +curl -s -o /tmp/install.sh https://raw.githubusercontent.com/threefoldfoundation/data_threefold/development/install.sh +bash /tmp/install.sh +bash /workspace/data_threefold/gitpod_scripts/install.sh +bash /workspace/data_threefold/gitpod_scripts/run.sh + diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 From b4a29c53d7ecba804154e301d84ee1440dac44f5 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 14:29:07 +0000 Subject: [PATCH 18/20] gitpod --- package.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 000000000..e4b947184 --- /dev/null +++ b/package.json @@ -0,0 +1,40 @@ +{ + "name": "my-blog", + "private": true, + "scripts": { + "build": "gridsome build", + "develop": "gridsome develop", + "explore": "gridsome explore" + }, + "dependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.30", + "@fortawesome/free-brands-svg-icons": "^5.14.0", + "@fortawesome/free-solid-svg-icons": "^5.14.0", + "@fortawesome/vue-fontawesome": "^2.0.0", + "@gridsome/source-filesystem": "^0.6.2", + "@gridsome/transformer-remark": "^0.6.2", + "@noxify/gridsome-remark-classes": "^1.0.0", + "@noxify/gridsome-remark-table-align": "^1.0.0", + "axios": "^0.21.1", + "babel-runtime": "^6.26.0", + "core-js": "^3.6.5", + "gridsome": "^0.7.3", + "gridsome-plugin-matomo": "^0.1.0", + "gridsome-plugin-remark-prismjs-all": "^0.3.5", + "gridsome-plugin-tailwindcss": "^3.0.1", + "gridsome-source-graphql": "^1.0.2", + "gridsome-source-static-meta": "github:noxify/gridsome-source-static-meta#master", + "lodash": "^4.17.20", + "node-sass": "^5.0.0", + "pluralize": "^8.0.0", + "sass-loader": "^10.0.2", + "tailwindcss": "^1.8.4", + "tailwindcss-gradients": "^3.0.0", + "tailwindcss-tables": "^0.4.0", + "v-tooltip": "^2.0.3", + "vue-markdown": "^2.1.2" + }, + "devDependencies": { + "@tailwindcss/aspect-ratio": "^0.2.0" + } +} From 11abc15939152f5e8db795afc61d14ec4358ea24 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 15:18:15 +0000 Subject: [PATCH 19/20] navigation --- content/navigation/navigation.md | 65 +++++++++++++++++++------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md index 397c1eda4..92e7831c0 100644 --- a/content/navigation/navigation.md +++ b/content/navigation/navigation.md @@ -6,24 +6,6 @@ navLinks: external: false expandable: false - - name: Grid - link: "" # /dropdown - external: false - expandable: true - submenu: - - title: Grid Introduction - path: https://threefold.io/farming/ - external: true - - title: Start Farming - path: https://threefold.io/farming/farming - external: true - - title: Get a 3Node - path: https://threefold.io/farming/get_3node - external: true - - title: FAQ - path: https://forum.threefold.io/c/farming/farming-faq/53 - external: true - - name: Token link: "" external: false @@ -44,23 +26,54 @@ navLinks: path: https://forum.threefold.io/c/threefold-token/tft-faq/57 external: true - - name: Use - link: "" + - name: Farming + link: "" # /dropdown external: false expandable: true submenu: - - title: Kubernetes Cloud - path: https://threefold.io/info/cloud#/cloud__evdc + - title: Grid Introduction + path: https://threefold.io/farming/ external: true - - title: Quantum-Safe Storage - path: https://threefold.io/info/cloud#/cloud__threefold_filesystem + - title: Start Farming + path: https://threefold.io/farming/farming external: true + - title: Get a 3Node + path: https://threefold.io/farming/get_3node + external: true + - title: FAQ + path: https://forum.threefold.io/c/farming/farming-faq/53 + external: true + + - name: Use + link: "https://cloud.threefold.io/" + external: true + expandable: true + submenu: + - title: Partners + path: /partners + - title: ThreeFold Cloud + path: https://cloud.threefold.io + external: true - title: ThreeFold Marketplace path: https://threefold.io/marketplace external: true - title: Digital Twin path: https://mydigitaltwin.io/ external: true + - title: Developers (SDK) + path: https://sdk.threefold.io/ + external: true + # - title: Kubernetes Cloud + # path: https://threefold.io/info/cloud#/cloud__evdc + # external: true + # - title: Quantum-Safe Storage + # path: https://threefold.io/info/cloud#/cloud__threefold_filesystem + # external: true + + # - name: Partners + # link: "/partners" # /dropdown + # external: false + # expandable: false - name: Technology link: "" # /dropdown @@ -68,7 +81,7 @@ navLinks: expandable: true submenu: - title: Grid Technology - path: https://threefold.io/info/threefold#/internet4__zos_3node_tfgrid_intro + path: https://threefold.io/info/threefold#/internet4__technology external: true - title: Zero-OS path: https://threefold.io/info/threefold#/internet4__tfgrid_primitives @@ -82,7 +95,7 @@ navLinks: - title: Web2 vs Web3 vs P2P path: https://threefold.io/info/threefold#/threefold__grid_compare external: true - - title: FAQ + - title: FAQ / Forum path: https://forum.threefold.io/c/technical-discussion/technical-faq/55 external: true From 273d0bf0b4f45966bd2c5d434a8915e04afcdba5 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Sun, 11 Jul 2021 15:23:18 +0000 Subject: [PATCH 20/20] navigation --- content/navigation/navigation.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md index 92e7831c0..96c01b0f0 100644 --- a/content/navigation/navigation.md +++ b/content/navigation/navigation.md @@ -13,19 +13,19 @@ navLinks: submenu: - title: Token Introduction path: /token - - title: How to buy TFT + - title: Buy TFT path: https://threefold.io/info/threefold#/threefold__how_to_buy_and_sell external: true - - title: ThreeFold Tokenomics + - title: Tokenomics path: https://threefold.io/info/threefold#/threefold__tokenomics external: true - - title: Token Distribution + - title: Distribution path: https://threefold.io/info/threefold#/threefold__token_overview external: true - title: FAQ path: https://forum.threefold.io/c/threefold-token/tft-faq/57 external: true - + - name: Farming link: "" # /dropdown external: false