Merge pull request #12 from ourworld-tsc/development

merge to master

.github/workflows/tf_update.yml

@@ -1,23 +0,0 @@
-name: zanzibar.ourworld.tf
-on:
-  push:
-    branch: [main]
-
-jobs:
-  job_one:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: pushing latest change on zanzibar.ourworld.tf
-        uses: appleboy/ssh-action@master
-        with:
-          host: zanzibar.ourworld.tf
-          username: webuser
-          key: ${{ secrets.TF_SECRET }}
-          port: 34022
-          script: |
-            cd websites/www_ourparadise_new/
-            git log -1
-            git restore .
-            git pull
-            bash build.sh

.github/workflows/tf_update_dev.yml

@@ -0,0 +1,24 @@
+name: www2.zanzibar.ourworld.tf
+on:
+  push:
+    branches: [ development ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www2.zanzibar.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www2.zanzibar.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www2/www_eden/
+          git log -1
+          git restore .
+          git pull
+          sed -i "s/https:\/\/zanzibar.ourworld.tf/https:\/\/www2.zanzibar.ourworld.tf/g" config.toml
+          ./build.sh

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,24 @@
+name: zanzibar.ourworld.tf
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on zanzibar.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: zanzibar.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www_eden/
+          git log -1
+          git restore .
+          git pull
+          sed -i "s/https:\/\/www2.zanzibar.ourworld.tf/https:\/\/zanzibar.ourworld.tf/g" config.toml
+          ./build.sh

README.md

@@ -1,6 +1,8 @@
-# Welcome to Eden Website Repository
+# EDEN Website (Updated)
 
-## About
+Production (master branch) [www.zanzibar.ourworld.tf](https://www.zanzibar.ourworld.tf/) 
+
+Staging (development branch) [www2.zanzibar.ourworld.tf](https://www2.zanzibar.ourworld.tf/)
 
 The official website of Eden: A Co-Living Community for Change-Makers & Digital Nomads
 

content/activities/chumbe/index.md

@@ -13,7 +13,7 @@ weight: 6
  
 ### Activities
 
-Friends of OurParadise, Chumbe Island is one of the world's most successful ecotourism projects. In 1994 the reef surrounding Chumbe island was created as Tanzania's first Marine National Park. The island itself, covered with lush mangrove forest, is a designated forest reserve. Trips to Chumbe leave from our property each day.
+Friends of Eden, Chumbe Island is one of the world's most successful ecotourism projects. In 1994 the reef surrounding Chumbe island was created as Tanzania's first Marine National Park. The island itself, covered with lush mangrove forest, is a designated forest reserve. Trips to Chumbe leave from our property each day.
 
 <button>[<<< On the Water](/activities/boats)</button>
 <button>[Spa Experience >>>](/activities/spa)</button>

content/location/chumbe/index.md

@@ -8,7 +8,7 @@ weight: 3
 ---
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/chumbe2.png" bgStyle="full") %}
+{% row(style="center narrow" margin="header" bgPath="img/chumbe_header.png" bgStyle="full") %}
 
 # Chumbe Island
 

content/location/history/index.md

@@ -7,7 +7,7 @@ draft: false
 weight: 3
 ---
 
-{% row(style="center narrow" margin="header" bgPath="img/history_header.jpg" bgStyle="full") %}
+{% row(style="center narrow" margin="header" bgPath="img/history_header.png" bgStyle="full") %}
 
 ## Take a Look Back
 

content/location/index.md

@@ -76,7 +76,7 @@ We share space with historic ruins of a school for freed slaves (1874) with asso
 
 The Gardens here are beautiful and mature, with more than 280 tree and plant species, many of which are very old and even endemic to the island.
 
-<button>[Programs to Protect](/protect)</button>
+<button>[Programs to Protect](/protection)</button>
 
 {% end %}
 

content/location/mbweni/index.md

@@ -8,7 +8,7 @@ weight: 3
 ---
 <!-- section 1 (JP) -->
 
-{% row(style="center narrow" margin="header" bgPath="img/jungle1.png" bgStyle="full") %}
+{% row(style="center narrow" margin="header" bgPath="img/mbweni_header.png" bgStyle="full") %}
 
 ## Jungle Paradise