From f204281933db552aa1f3e482490706560a53847d Mon Sep 17 00:00:00 2001 From: PeterNashaat Date: Thu, 6 Apr 2023 07:03:30 +0000 Subject: [PATCH 1/4] adding workflow --- .github/workflows/tf_update_prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 17aef9e..7185e8b 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -10,10 +10,10 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - name: pushing latest change on www.jungleparadise.tf + - name: pushing latest change on www.beach-resort-zanzibar.com uses: appleboy/ssh-action@master with: - host: www.jungleparadise.tf + host: www.beach-resort-zanzibar.com username: ${{ secrets.TF_USER }} key: ${{ secrets.TF_SECRET }} port: ${{ secrets.TF_PORT }} -- 2.40.1 From f655bd39198552757afda74272a6897f7ccc82e6 Mon Sep 17 00:00:00 2001 From: PeterNashaat Date: Thu, 6 Apr 2023 07:05:29 +0000 Subject: [PATCH 2/4] fixing config.toml --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 623195f..2760723 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,5 @@ # The URL the site will be built for -base_url = "https://www2.jungleparadise.tf/" +base_url = "https://www.beach-resort-zanzibar.com/" # Change this to your own URL! Please note this variable **must** be uncommented. title = "Jungle Paradise" -- 2.40.1 From e6c344f5f87874ad3b7f7a8c5dbecdfc41a42456 Mon Sep 17 00:00:00 2001 From: sasha-astiadi <43240801+sasha-astiadi@users.noreply.github.com> Date: Fri, 12 May 2023 19:35:51 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README.md b/README.md index ae558cb..916a346 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,35 @@ Last Updated: March 2023 ## Contribution Feel free to [create a new issue](https://github.com/threefoldfoundation/www_jungle_paradise/issues) to report an error on the website, or if you have any suggestions on website improvements. + +## Administrators +[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) + +## Direct Contribution Procedure + +![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) + +It is highly important to follow this procedure to contribute to the website content.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch. + +1. Create an Issue +Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. + +2. Make your own branch from __'development'__ branch. +by creating a new branch from 'Master' you will be provided with the latest copy of the live website content. + +3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch. + +5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer. + +7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch) + +8. Admin will then create a PR to merge 'development' into into '**master**' (production branch) + +10. When PR is approved, you can see your changes live on production (master branch). + + + + + + -- 2.40.1 From 6354fc60420016de32a01c31295594967ea2c86a Mon Sep 17 00:00:00 2001 From: PeterNashaat Date: Sun, 28 May 2023 12:14:43 +0300 Subject: [PATCH 4/4] - Updating workflow with new prod branch name --- .github/workflows/tf_update_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 17aef9e..60f0494 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -2,7 +2,7 @@ name: Jungleparadise Production on: push: branches: - - main + - master jobs: -- 2.40.1