diff --git a/.github/workflows/tf_update.yml b/.github/workflows/tf_update.yml deleted file mode 100644 index d5c6728..0000000 --- a/.github/workflows/tf_update.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml new file mode 100644 index 0000000..1196713 --- /dev/null +++ b/.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 diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml new file mode 100644 index 0000000..8734a88 --- /dev/null +++ b/.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 diff --git a/README.md b/README.md index 685e5fe..c7bf8d5 100644 --- a/README.md +++ b/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 diff --git a/content/about/img/about_header.jpg b/content/about/img/about_header.jpg new file mode 100644 index 0000000..104c9b1 Binary files /dev/null and b/content/about/img/about_header.jpg differ diff --git a/content/about/img/about_header.png b/content/about/img/about_header.png new file mode 100644 index 0000000..f5a7638 Binary files /dev/null and b/content/about/img/about_header.png differ diff --git a/content/action/img/action_header.HEIC b/content/action/img/action_header.HEIC new file mode 100644 index 0000000..063ab0b Binary files /dev/null and b/content/action/img/action_header.HEIC differ diff --git a/content/action/img/action_header.png b/content/action/img/action_header.png new file mode 100644 index 0000000..ed2552d Binary files /dev/null and b/content/action/img/action_header.png differ diff --git a/content/activities/chumbe/index.md b/content/activities/chumbe/index.md index e2d5df2..c464946 100644 --- a/content/activities/chumbe/index.md +++ b/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. diff --git a/content/activities/img/activities_header.HEIC b/content/activities/img/activities_header.HEIC new file mode 100644 index 0000000..f5b65c7 Binary files /dev/null and b/content/activities/img/activities_header.HEIC differ diff --git a/content/activities/img/activities_header.png b/content/activities/img/activities_header.png index 431b037..70aa255 100644 Binary files a/content/activities/img/activities_header.png and b/content/activities/img/activities_header.png differ diff --git a/content/home/img/home_about.jpg b/content/home/img/home_about.jpg new file mode 100644 index 0000000..4464e93 Binary files /dev/null and b/content/home/img/home_about.jpg differ diff --git a/content/home/img/home_about.png b/content/home/img/home_about.png new file mode 100644 index 0000000..69c3c71 Binary files /dev/null and b/content/home/img/home_about.png differ diff --git a/content/home/img/home_action.jpg b/content/home/img/home_action.jpg new file mode 100644 index 0000000..c41590e Binary files /dev/null and b/content/home/img/home_action.jpg differ diff --git a/content/home/img/home_action.png b/content/home/img/home_action.png new file mode 100644 index 0000000..11095e3 Binary files /dev/null and b/content/home/img/home_action.png differ diff --git a/content/home/img/home_activities.jpg b/content/home/img/home_activities.jpg new file mode 100644 index 0000000..c6b6bee Binary files /dev/null and b/content/home/img/home_activities.jpg differ diff --git a/content/home/img/home_activities.png b/content/home/img/home_activities.png new file mode 100644 index 0000000..80aee63 Binary files /dev/null and b/content/home/img/home_activities.png differ diff --git a/content/home/img/home_header.jpg b/content/home/img/home_header.jpg new file mode 100644 index 0000000..67903d1 Binary files /dev/null and b/content/home/img/home_header.jpg differ diff --git a/content/home/img/home_header.png b/content/home/img/home_header.png new file mode 100644 index 0000000..898ed25 Binary files /dev/null and b/content/home/img/home_header.png differ diff --git a/content/home/img/home_location.jpg b/content/home/img/home_location.jpg new file mode 100644 index 0000000..51f6203 Binary files /dev/null and b/content/home/img/home_location.jpg differ diff --git a/content/home/img/home_location.png b/content/home/img/home_location.png new file mode 100644 index 0000000..99dd98e Binary files /dev/null and b/content/home/img/home_location.png differ diff --git a/content/home/img/home_protection.jpg b/content/home/img/home_protection.jpg new file mode 100644 index 0000000..fed6592 Binary files /dev/null and b/content/home/img/home_protection.jpg differ diff --git a/content/home/img/home_protection.png b/content/home/img/home_protection.png new file mode 100644 index 0000000..4cb0618 Binary files /dev/null and b/content/home/img/home_protection.png differ diff --git a/content/location/chumbe/img/chumbe_header.png b/content/location/chumbe/img/chumbe_header.png new file mode 100644 index 0000000..bfe8fe6 Binary files /dev/null and b/content/location/chumbe/img/chumbe_header.png differ diff --git a/content/location/chumbe/index.md b/content/location/chumbe/index.md index 34219aa..df40115 100644 --- a/content/location/chumbe/index.md +++ b/content/location/chumbe/index.md @@ -8,7 +8,7 @@ weight: 3 --- -{% 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 diff --git a/content/location/history/img/history_header.png b/content/location/history/img/history_header.png new file mode 100644 index 0000000..15822f5 Binary files /dev/null and b/content/location/history/img/history_header.png differ diff --git a/content/location/history/index.md b/content/location/history/index.md index 1909813..14e6b3b 100644 --- a/content/location/history/index.md +++ b/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 diff --git a/content/location/img/location_header.jpg b/content/location/img/location_header.jpg new file mode 100644 index 0000000..c2153c4 Binary files /dev/null and b/content/location/img/location_header.jpg differ diff --git a/content/location/img/location_header.png b/content/location/img/location_header.png new file mode 100644 index 0000000..5395026 Binary files /dev/null and b/content/location/img/location_header.png differ diff --git a/content/location/index.md b/content/location/index.md index af9425d..77e273c 100644 --- a/content/location/index.md +++ b/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. - + {% end %} diff --git a/content/location/mbweni/img/mbweni_header.png b/content/location/mbweni/img/mbweni_header.png new file mode 100644 index 0000000..fc77f59 Binary files /dev/null and b/content/location/mbweni/img/mbweni_header.png differ diff --git a/content/location/mbweni/index.md b/content/location/mbweni/index.md index 6990a54..ffbf302 100644 --- a/content/location/mbweni/index.md +++ b/content/location/mbweni/index.md @@ -8,7 +8,7 @@ weight: 3 --- -{% 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 diff --git a/content/protection/img/protection_header.jpg b/content/protection/img/protection_header.jpg new file mode 100644 index 0000000..bab85e2 Binary files /dev/null and b/content/protection/img/protection_header.jpg differ diff --git a/content/protection/img/protection_header.png b/content/protection/img/protection_header.png new file mode 100644 index 0000000..86347c9 Binary files /dev/null and b/content/protection/img/protection_header.png differ