Merge branch 'development'

new repo link

.github/workflows/tf_update.yml

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

.github/workflows/tf_update_dev.yml

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

.github/workflows/tf_update_prod.yml

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

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright Incubaid NV Belgium
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,5 +1,46 @@
-# OURWORLD NOMAD Website
+# Welcome to OurNomads Website Repository
+
+## About
+
+The official website of OurNomads- A Digital Nomads Experience Powered by Ourworld.
+
+production [https://ournomads.ourworld.tf/](https://ournomads.ourworld.tf/)
+
+staging    [https://www2.ournomads.ourworld.tf/](https://www2.ournomads.ourworld.tf/)
+
+Last Updated: March 2023
+
+## Contribution
+
+Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ournomads/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. <br>
+__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).
+
+
+
 
-https://nomads.ourworld.tf/
 
-Digital Nomads Experience by Ourworld.

content/co-Own/index.md

@@ -4,11 +4,19 @@ description: ""
 date: 2018-09-14
 updated: 2021-02-20
 draft: false
-weight: 2
+weight: 3
 ---
 
+
+<div class="container mx-auto"> 
+
 <!-- section 1 (co-found) -->
 
+<br>
+
+<br>
+
+
 {% row(style="center" margin="narrow" padding="top") %}
 
 ## BECOME A CO-FOUNDER IN OURWORLD NOMADS {#text-4xl}
@@ -22,15 +30,15 @@ Unique co-ownership structure of a diverse real-estate portfolio
 
 {% row(style="center" margin="narrow" padding="none") %}
 
-![](img/world.png#small#mx-auto)  
+![](img/world.png#iconsize#mx-auto)  
 
 |||
 
-![](img/nomad.png#small#mx-auto)  
+![](img/nomad.png#iconsize#mx-auto)  
 
 |||
 
-![](img/farm.png#small#mx-auto)  
+![](img/farm.png#iconsize#mx-auto)  
 
 
 {% end %}
@@ -65,3 +73,5 @@ To power OurWorld Digital Nomad DAO, we will create a Digital Nomad Token (DNT)
 - Ability to reserve premises/locations for private events
 
 {% end %}
+
+</div>

content/header/index.md

@@ -1,165 +0,0 @@
----
-title: "Header"
-insert_anchor_links: "left"
-template: "partials/header.html"
-extra:
-  logoPath: "images/black_threefold.png"
-  button_Path: "/images/gettft_white.png"
----
-
-
-- [Mission]("/mission")
-- [Grid]("/grid")
-- [Build]("/build")
-- [Farm]("/farm")
-- [TFT]("/tft")
-- Ecosystem
-
-{% row() %}
-
-<button onclick="window.location.href='/people'">
-
-[Our People](/people)
-<br>
-<p class="text-sm">Team, stories, & more</p>
-
-</button>
-
-|||
-
-<button onclick="window.location.href='/partners'">
-
-[Our Partners](/partners)
-<br>
-<p class="text-sm">Explore Our Partners</p>
-
-|||
-
-<button onclick="window.location.href='/community'">
-
-[ThreeFold Community](/community)
-<br>
-<p class="text-sm">Welcome To The Fold</p>
-
-</button>
-
-|||
-
-<button onclick="window.location.href='/developer'">
-
-[Developer Resources](/developer)
-<br>
-<p class="text-sm">Join The Developer Community</p>
-
-</button>
-
-{% end %}
-
-- MoreInfo
-
-{% row(style="wide") %}
-
-
-#### Tools
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/tokens/threefold__threefold_connect')">
-
-[ThreeFold Connect](https://library.threefold.me/info/threefold#/tokens/threefold__threefold_connect)
-<br>
-<p class="text-sm">TFT Wallet, 2FA, & More</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//dashboard.grid.tf/')">
-
-[Dashboard](https://dashboard.grid.tf/)
-<br>
-<p class="text-sm">Portal & Capacity Explorer</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//play.grid.tf')">
-
-[Weblet Playground](https://play.grid.tf)
-<br>
-<p class="text-sm">Deploy a VM & More</p>
-
-|||
-
-#### Resources 
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/threefold#/')">
-
-[Library](https://library.threefold.me/info/threefold#/)
-<br>
-<p class="text-sm">Explore the Documentation</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//library.threefold.me/info/manual/#/manual__manual3_home_new')">
-
-[Manual](https://library.threefold.me/info/manual/#/manual__manual3_home_new)
-<br>
-<p class="text-sm">Get Started on the Grid</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//github.com/')">
-
-[GitHub](https://github.com/)
-<br>
-<p class="text-sm">Code Library & Documentation</p>
-
-|||
-
-#### Dive Deeper
-
-<button onclick="window.location.href='/blog'">
-
-[Blog](/blog)
-<br>
-<p class="text-sm">Explore the Blogs</p>
-
-</button>
-
-<button onclick="window.location.href='/newsroom'">
-
-[Newsroom](/newsroom)
-<br>
-<p class="text-sm">Check the Latest Updates</p>
-
-</button>
-
-<button onclick="openInNewTab('https&#58;//intro.threefold.me')">
-
-[Intro Docs](https://intro.threefold.me)
-<br>
-<p class="text-sm">Perfect for Newcomers</p>
-
-|||
-
-#### Support & Help
-
-<button onclick="openInNewTab('https&#58;//forum.threefold.io')">
-
-[Forum](https://forum.threefold.io)
-<br>
-<p class="text-sm">Questions & Feedback</p>
-
-<button onclick="window.location.href='/support'">
-
-[Support](/support)
-<br>
-<p class="text-sm">Speak Live with a Human</p>
-
-</button>
-
-<button onclick="window.location.href='/careers'">
-
-[Careers](/careers)
-<br>
-<p class="text-sm">Join the Team</p>
-
-</button>
-
-{% end %}

content/home/index.md

@@ -7,26 +7,35 @@ draft: false
 weight: 1
 ---
 
+
 <!-- section 1 (header) -->
 
-{% row(margin="header" bgPath="home_header.jpg" bgStyle="full") %}
+{% row(style="center" margin="tight" bgPath="homeheader.jpg" bgStyle="full") %}
 
-# WORK, <br> LIVE & PLAY
+<br>
 
-Our world offers Digital Nomads <br /> truly amazing experiences in some <br /> of the world’s best locations.
+<br>
+
+<div class="bg-gray-200/50 py-4 px-4 rounded-md">
+
+# WORK, LIVE & PLAY
+
+Our world offers Digital Nomads truly amazing experiences in some of the world’s best locations.
 
 <button>[KNOW MORE](/locations)</button>
 
+</div>
+
+
 {% end %}
 
-<br>
-<br>
+<div class="container mx-auto"> 
 
 <!-- section 2  -->
 
-{% row(style="center" margin="narrow" padding="bottom") %}
+{% row(style="center" margin="moderate" padding="both") %}
 
-![REGENERATION](RGAsset10.png#medium)
+![REGENERATION](RGAsset10.png#medium#mx-auto)
 
 ### **REGENERATION**
 
@@ -34,7 +43,7 @@ We offer endless services to heal the body, mind and soul
 
 |||
 
-![CONNECTIONS](RGAsset11.png#medium)
+![CONNECTIONS](RGAsset11.png#medium#mx-auto)
 
 ### **CONNECTIONS**
 
@@ -42,7 +51,7 @@ Our locations are designed to provide intimacy and bring people together
 
 |||
 
-![EXPERIENCE](RGAsset12.png#medium)
+![EXPERIENCE](RGAsset12.png#medium#mx-auto)
 
 ### **EXPERIENCE**
 
@@ -52,7 +61,7 @@ An enviroment that meets people’s personal and professional needs
 
 <!-- section 3 -->
 
-{% row(style="center" margin="narrow" padding="none") %}
+{% row(margin="moderate" padding="none") %}
 
 ![Image](location.jpg)
 
@@ -68,7 +77,7 @@ Carefully chosen locations that offer an array of services and activities ready
 
 <!-- section 4 -->
 
-{% row(style="" margin="narrow" padding="top") %}
+{% row(style="" margin="moderate" padding="top") %}
 
 ![Image](RGAsset14.png#sm#mx-auto)
 
@@ -80,7 +89,7 @@ Live in sustainable and planet-conscious structures built to support the planet
 
 |||
 
-![Image](RGAsset15.png#sm#mx-auto)
+![Image](RGAsset15.png#small#mx-auto)
 
 |||
 
@@ -92,9 +101,9 @@ Take advantage of a high-speed, sovereign and decentralized internet connection!
 
 <!-- section 4-2-->
 
-{% row(style="" margin="narrow" padding="none") %}
+{% row(style="" margin="moderate" padding="none") %}
 
-![Image](RGAsset16.png#sm#mx-auto)
+![Image](RGAsset16.png#small#mx-auto)
 
 |||
 
@@ -104,7 +113,7 @@ Tackle ESG concerns by working with local communities to empower them
 
 |||
 
-![Image](RGAsset17.png#sm#mx-auto)
+![Image](RGAsset17.png#small#mx-auto)
 
 |||
 
@@ -116,9 +125,9 @@ We created an environment which allows everyone to work together easily and effe
 
 <!-- section 4-3-->
 
-{% row(style="" margin="narrow" padding="bottom") %}
+{% row(style="" margin="moderate" padding="bottom") %}
 
-![Image](RGAsset18.png#sm#mx-auto)
+![Image](RGAsset18.png#small#mx-auto)
 
 |||
 
@@ -128,7 +137,7 @@ Enjoy the benefits of community-building sessions and tools built specifically f
 
 |||
 
-![Image](RGAsset19.png#sm#mx-auto)
+![Image](RGAsset19.png#small#mx-auto)
 
 |||
 
@@ -140,7 +149,7 @@ Enjoy all the cultural, natural, sports and networking evnts of the locations!
 
 <!-- section 5 -->
 
-{% row(style="center" margin="narrow" padding="none") %}
+{% row(style="right" reverse="rightreserve" reserve="rightreserve" margin="moderate" padding="both") %}
 
 ## REGENERATE <br /> YOURSELF
 
@@ -151,10 +160,12 @@ empowers the local community!
 
 |||
 
-![Image](RGAsset20.png)
+![Image](RGAsset20.png#medium#mx-auto)
 
 {% end %}
 
+</div> 
+
 <!-- section 6 -->
 
 {% row(style="center" margin="narrow" padding="top") %}
@@ -172,3 +183,4 @@ Begin your nomadic journey with us.
     <div class="img"></div>
 
 {% end %}
+

content/invest/index.md

@@ -4,172 +4,29 @@ description: ""
 date: 2018-09-14
 updated: 2021-02-20
 draft: false
-weight: 2
+weight: 4
 ---
 
+<div class="container mx-auto"> 
+
 <!-- section 1 (JP) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="Invest") %}
+<br>
 
-### BECOME AN INVESTOR 
+<br>
 
-RESORT IN ZANZIBAR, TANZANIA
+{% row(style="center" bgColor="#FFFFFF" margin="moderate" padding="both") %}
 
-Jungle Paradise is based at Mbweni in Zanzibar and is home to a boutique hotel, botanical gardens and ruins with a rich history. The location was instrumental in abolishing slavery and had a school where mainly slave children had a chance to get educated and become free. The ruins are surrounded by a beautiful botanic garden which supports over 600 different kinds of tree species. It has a mature rainforest atmosphere, only found in a few other places in Zanzibar and Pemba. It has many areas of native plants, including the coral rag forest on the cliff and mangroves on the shoreline.
+# BECOME AN INVESTOR 
 
-This location in the capital is ideal for digital nomads as they have quick access to Zanzibar's business district and airport, while being in a remote and peaceful neighbourhood.
+<BR>
 
+![invest](img/invest.png#mx-auto)
 
+<BR>
 
-46 ROOMS
-
-|||
-
-![bed](img/bed.png#icon)
+<button><a href="mailto:info@ourworld.tf">Contact Us</a></button>
 
 {% end %}
 
-<!-- section 2 (Fun beach) -->
-
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
-
-### FUN BEACH
-HOTEL IN ZANZIBAR, TANZANIA
-
-<p style='font-size: 15px'>
-Fun Beach is a beachfront property in the south-east of Zanzibar which provides a far more relaxed, holiday vibe. It is located between Jambiani and Paje in Zanzibar, an ideal location in close proximity to the Zanzibar nightlife but sufficiently far from the busy tourist hot spots, therefore a perfect fit for digital nomads.
-</p>
-
-<p style='font-size: 15px'>
-The top class restaurant offers breakfast, lunch and dinner in a range of cuisines - international, Indian, Arabian and more.There are two pools, sized 26m and 27m, on the beach front of the property flowing into each other. They provide a full view of the Indian Ocean. There is also a pool in the centre with small islands and sitting areas. The game room features billiards, ping pong, and a football table in addition to a TV and library area. Throughout Fun Beach there is ultra-fast wifi connectivity.
-</p>
-
-![bed](img/bed.png#icon)
-
-<p style='font-size: 15px'>
-40 ROOMS
-</p>
-
-|||
-
-![fun](img/fun2.png#large)
-
-{% end %}
-
-<!-- section 3 (Veda boats) -->
-
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
-
-### NILE VEDA
-BOATS IN LUXOR, EGYPT
-
-<p style='font-size: 15px'>
-Dahabiyas are traditional sailing boats used on the Nile river. This location includes four dahabiyas that offer peaceful and organic platforms for its visitors. The boats are located on the Nile River in Luxor, Egypt. They are originally designed for private trips along the Nile offering a unique and authentic experience with organic food, green energy, and a warm-hearted crew. The four dahabiyas total have 29 rooms and 10 suites that can host up to 78 people. Each room has a private bathroom. All boats have clean, modern and authentic communal areas for relaxation and co-working. There are many meeting spaces including an upper deck meeting room with a 360 degree panoramic view of the Nile. 
-<p>
-
-![bed](img/bed.png#icon)
-
-<p style='font-size: 15px'>
-39 ROOMS
-<p>
-
-|||
-
-![veda](img/nile2.png#large)
-
-{% end %}
-
-
-<!-- section 4 (Yenice valley) -->
-
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
-
-### YENICE VALLEY
-RESORT IN MUGLA, TURKEY
-
-<p style='font-size: 15px'>
-The concept of Yenice Valle grew from a love of traditional Turkish village life and the desire to sustain our natural environment. Yenice Valley has come to reality in a secluded valley, surrounded by tree-covered mountains, with accommodation built using traditional local materials, to include a treehouse, stone cottages, and a log cabin, each in plenty of space, well-furnished and fully equipped. The focal point is a stunning stone-built boutique hotel, which fits perfectly with the surrounding countryside.
-<p>
-
-![bed](img/bed.png#icon)
-
-<p style='font-size: 15px'>
-55 ROOMS
-<p>
-
-|||
-
-![tr](img/turkey2.png#large)
-
-<!-- section 5 (Paradise hills) -->
-
-{% end %}
-
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
-
-### PARADISE HILLS
-TOWNHOUSES IN DUBAI, UAE
-
-<p style='font-size: 15px'>
-Paradise Hills is located right within the heart of Dubai and offers a unique luxurious experience. It is an ultra-modern gated community housing 170 pent suites and townhouses, accompanied with stellar amenities and remarkable landscaping in the extensive estate grounds. There are three suites and townhouses, containing 15 rooms, available for digital nomads. Paradise Hills' state-of-the-art amenities include, but are not limited to; community center with retail shops and services, 24-hour security, kids play areas, spacious green areas with water features, jogging tracks, and a dedicated multi-purpose building hall for various occasions and functions such as weddings, international conferences, and events.
-<p>
-
-![bed](img/bed.png#icon)
-
-<p style='font-size: 15px'>
-15 ROOMS
-<p>
-
-|||
-
-![p_hills](img/dubai2.png#large)
-
-{% end %}
-
-<!-- section 5 (Dar) -->
-
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
-
-### CITY OF PEACE
-RESORT IN DAR ES SALAAM, TANZANIA
-
-<p style='font-size: 15px'>
-We have a unique opportunity to acquire 2 million square metres of beachfront land just south of Dar-es-Salaam and turn it into a new home for digital nomads. The plot is 30km south-east of Dar-es-Salaam. It provides a refuge for digital nomads who wish to be away from city life and a staging point for those who want to visit the famous Serengeti National Park or Ngorongoro Crater, Lake Manyara, Sealous Game Reserve and Zanzibar. However, it is not unreasonably far from the business hub of Dar-es-Salaam and the airport.
-<p>
-
-<p style='font-size: 15px'>
-There are 32 hectares of built-up land in the plot, consisting of 10 bungalows with thatched roofs. These bungalows have Wi-Fi, TVs, living areas, safes, tea & coffeemaking facilities and they all have terraces with ocean views.
-<p>
-
-![bed](img/bed.png#icon)
-
-<p style='font-size: 15px'>
-60 ROOMS
-<p>
-
-|||
-
-![tr](img/dar2.png#large)
-
-{% end %}
-
-<!-- section 5 (FARMS) -->
-
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
-
-### FARMS
-MULTIPLE LANDS IN TANZANIA
-
-<p style='font-size: 15px'>
-Located in the middle of Lake Victoria, Lake Malawi and Lake Tanganyika, Tanzania has one of Africa's most fertile lands. The farm lands in Tanzania are significantly cheaper than lands in Zanzibar. We aim to acquire up to 500 hectares of land in mainland Tanzania. This acquisition will be done in phases based on the priorities of the project at the time.
-<p>
-
-<p style='font-size: 15px'>
-Up to 50 hectares of land is planned to be acquired. Our team is still scouting for more farmlands across the Zanzibar archipelago. Many pieces of land are identified and we are in contact with the relevant authorities for further steps. Even though the identified farming lands are in many locations in Zanzibar, we plan to acquire a majority of the land from Bambi in Unguja Island and Pemba Island. The first land in Bambi has already been purchased.
-<p>
-
-|||
-
-![tr](img/bambi2.png#large)
-
-{% end %}
+</div> 

content/locations/index.md

@@ -4,12 +4,20 @@ description: ""
 date: 2018-09-14
 updated: 2021-02-20
 draft: false
-weight: 1
+weight: 2
 ---
 
+<br>
+
+<br>
+
 <!-- section 1 (JP) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="fflow_grid") %}
+
+![jp](img/jp2.jpg#mx-auto)
+
+|||
 
 ### JUNGLE PARADISE 
 
@@ -23,21 +31,21 @@ Jungle Paradise is based at Mbweni in Zanzibar and is home to a boutique hotel,
 This location in the capital is ideal for digital nomads as they have quick access to Zanzibar's business district and airport, while being in a remote and peaceful neighbourhood.
 </p>
 
+
+
 ![bed](img/bed.png#icon)
 
+
+
 <p style='font-size: 15px'>
 46 ROOMS
 </p>
 
-|||
-
-![jp](img/jp2.png#large)
-
 {% end %}
 
 <!-- section 2 (Fun beach) -->
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(reverse="rightreserve" style="right" bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
 
 ### FUN BEACH
 HOTEL IN ZANZIBAR, TANZANIA
@@ -50,21 +58,29 @@ Fun Beach is a beachfront property in the south-east of Zanzibar which provides
 The top class restaurant offers breakfast, lunch and dinner in a range of cuisines - international, Indian, Arabian and more.There are two pools, sized 26m and 27m, on the beach front of the property flowing into each other. They provide a full view of the Indian Ocean. There is also a pool in the centre with small islands and sitting areas. The game room features billiards, ping pong, and a football table in addition to a TV and library area. Throughout Fun Beach there is ultra-fast wifi connectivity.
 </p>
 
+<div class="rightImg">
+
 ![bed](img/bed.png#icon)
 
+</div>
+
 <p style='font-size: 15px'>
 40 ROOMS
 </p>
 
 |||
 
-![fun](img/fun2.png#large)
+![fun](img/fun2.png#mx-auto)
 
 {% end %}
 
 <!-- section 3 (Veda boats) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(bgColor="#FFFFFF" margin="moderate" padding="both" id="fflow_grid") %}
+
+![veda](img/nile2.jpg#mx-auto)
+
+|||
 
 ### NILE VEDA
 BOATS IN LUXOR, EGYPT
@@ -79,16 +95,12 @@ Dahabiyas are traditional sailing boats used on the Nile river. This location in
 39 ROOMS
 <p>
 
-|||
-
-![veda](img/nile2.png#large)
-
 {% end %}
 
 
 <!-- section 4 (Yenice valley) -->
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(reverse="rightreserve" style="right" bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
 
 ### YENICE VALLEY
 RESORT IN MUGLA, TURKEY
@@ -97,22 +109,30 @@ RESORT IN MUGLA, TURKEY
 The concept of Yenice Valle grew from a love of traditional Turkish village life and the desire to sustain our natural environment. Yenice Valley has come to reality in a secluded valley, surrounded by tree-covered mountains, with accommodation built using traditional local materials, to include a treehouse, stone cottages, and a log cabin, each in plenty of space, well-furnished and fully equipped. The focal point is a stunning stone-built boutique hotel, which fits perfectly with the surrounding countryside.
 <p>
 
+<div class="rightImg">
+
 ![bed](img/bed.png#icon)
 
+</div>
+
 <p style='font-size: 15px'>
 55 ROOMS
 <p>
 
 |||
 
-![tr](img/turkey2.png#large)
+![tr](img/turkey2.png#mx-auto)
 
 
 {% end %}
 
 <!-- section 5 (Dar) -->
 
-{% row(bgColor="#F2F2F2" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(bgColor="#F2F2F2" reserve="rightreserve" margin="moderate" padding="top" id="fflow_grid") %}
+
+![tr](img/dar2.jpg#mx-auto)
+
+|||
 
 ### CITY OF PEACE
 RESORT IN DAR ES SALAAM, TANZANIA
@@ -131,15 +151,11 @@ There are 32 hectares of built-up land in the plot, consisting of 10 bungalows w
 60 ROOMS
 <p>
 
-|||
-
-![tr](img/dar2.png#large)
-
 {% end %}
 
 <!-- section 5 (FARMS) -->
 
-{% row(bgColor="#FFFFFF" margin="moderate" padding="top" id="fflow_grid") %}
+{% row(reverse="rightreserve" style="right" bgColor="#FFFFFF" reserve="rightreserve" margin="moderate" padding="top" id="fflow_grid") %}
 
 ### FARMS
 MULTIPLE LANDS IN TANZANIA
@@ -154,6 +170,13 @@ Up to 50 hectares of land is planned to be acquired. Our team is still scouting
 
 |||
 
-![tr](img/bambi2.png#large)
+![tr](img/bambi2.jpg#mx-auto)
 
 {% end %}
+
+<style>
+    .rightImg{
+     display: flex;
+     justify-content: right;
+    }
+</style>

css/index.css

@@ -37,6 +37,10 @@ img[src*="#sm"] {
   width: 200px;
 }
 
+img[src*="#iconsize"] {
+  width: 200px;
+}
+
 img[src*="#md"] {
     width: 300px;
 }
@@ -83,9 +87,12 @@ img[src*="#fig"] {
   font-family: "lato";
 }
 
+a:hover {
+  color: #5a5a5a;
+}
 @layer components {
   h1 {
-    @apply text-3xl lg:text-5xl xl:text-7xl font-bold leading-none my-4;
+    @apply text-3xl md:text-4xl lg:text-6xl font-bold leading-none my-4;
     font-family: "lato", sans-serif;
     line-height: 0.9;
     
@@ -94,7 +101,7 @@ img[src*="#fig"] {
     @apply font-medium;
   }
   h2 {
-    @apply text-3xl md:text-4xl lg:text-5xl xl:text-7xl font-bold leading-none my-4;
+    @apply text-3xl md:text-4xl lg:text-5xl font-bold leading-none my-4;
     font-family: "lato", sans-serif;
     line-height: 0.9;
     
@@ -179,12 +186,12 @@ header .freeflow {
 }
 
 footer .freeflow {
-    width: 100vw;
     background-color: #FFFFFF;
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 40px;
+    padding-top: 40px;
+    padding-bottom: 40px;
 }
 
 footer .freeflow img {
@@ -380,6 +387,12 @@ header {
     padding: 80px 0;
   }
 
+  img[src*="#medium"] {
+    width: 300px;
+}
+img[src*="#iconsize"] {
+  width: 130px;
+}
   h2 {
     font-size: 3rem;
   }

templates/partials/head.html

@@ -5,6 +5,7 @@
 {% set zolaVer = '0.13.0' %}
 
 <head>
+  <link rel="icon" type="image/x-icon" href="/images/favicon.png">
   <meta name="generator" content="Zola v.{{ zolaVer }} - getzola.org" />
 
   {% block title %}

templates/partials/header.html

@@ -12,7 +12,7 @@
 
     function toggleMenu(button) {
         if (displayedMenu === button.id.split("-")[0]) { 
-            button.className = button.className.replace(" text-blue-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
+            button.className = button.className.replace(" text-green-500 bg-stone-200 sm:bg-transparent", " text-gray-900");
             hideMenu(button.id.split("-")[0]);
             button.lastElementChild.className = button.lastElementChild.className.replace("rotate-0", "-rotate-90")
             displayedMenu = "";
@@ -20,7 +20,7 @@
         else { 
             showMenu(button.id.split("-")[0]);
             button.lastElementChild.className = button.lastElementChild.className.replace("-rotate-90", "rotate-0")
-            button.className = button.className.replace(" text-gray-900", " text-blue-500 bg-stone-200 sm:bg-transparent");
+            button.className = button.className.replace(" text-gray-900", " text-green-500 bg-stone-200 sm:bg-transparent");
             displayedMenu = button.id.split("-")[0]
         }
     }
@@ -79,7 +79,7 @@
         buttons.forEach((button) => {
             button.addEventListener( 'click', function() { handleClick(button) });
         })
-        document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
+        //document.getElementById("mobile-learn-btn").addEventListener( 'click', toggleMenu);
     }
 
 </script>
@@ -97,7 +97,7 @@
 {% else %}
     <header id="header-container">
         {% set header_class = config.extra.header_class | default(value='') %}
-        <div class="{{'z-10 bg-white fixed w-screen ' ~ header_class}}">
+        <div class="{{'z-10 header_BG fixed w-screen max-w-full ' ~ header_class}}">
             <div class="relative z-50 shadow">
             <div class="mx-auto flex z-50 shadow justify-between items-center pl-6 pr-2 md:pr-0 lg:py-5  md:px-12 py-2 lg:px-20 lg:justify-start lg:space-x-20">
                 <div>
@@ -108,22 +108,22 @@
                 <div class="-mr-2 -my-2 lg:hidden">
                     <button id="hamburger-btn" type="button" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
                         <!-- Heroicon name: menu -->
-                        <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <svg class="h-6 w-6 text-black" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
                         </svg>
                     </button>
                 <button id="close-hamburger-btn" type="button" class="hidden lg:hidden inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out my-2">
                     <!-- Heroicon name: x -->
-                    <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <svg class="h-6 w-6 text-black" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
                     </svg>
                     </button>
                 </div>
                 <div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-end lg:space-x-12">
-                    <nav class="flex space-x-10">    
+                    <nav class="flex space-x-6">    
                     {% for page in section.pages %}
                     {% if page.extra.menu %} {% continue %} {% endif %}
-                        <a href="{{page.permalink}}" class="text-lg leading-6 text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                        <a href="{{page.permalink}}" class="text-lg uppercase font-semibold leading-6 text-black focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                             {{page.title}}
                         </a>
                         <div class="relative">
@@ -133,7 +133,7 @@
                         {% if subsection == "footer/_index.md" %} {% continue %} {% endif %}                        
                         {% set button_id = subsection ~ "-menu-btn" | slugify %}
                         <div class="relative">
-                        <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-blue-300 focus:outline-none transition ease-in-out duration-150">
+                        <button type="button" id="{{button_id}}" class="nav_btn text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 hover:text-green-300 focus:outline-none transition ease-in-out duration-150">
                             <span>{{ subsection }}</span>
                             <div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
                         </button>
@@ -173,7 +173,7 @@
         <div id="hamburger" class="hidden fixed mt-16 z-20 top-0 inset-x-0 transition transform origin-top-right lg:hidden">
             <div>
                 <div class="shadow-xs h-screen bg-white divide-y-2 divide-gray-50">
-                    <div class="pb-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
+                    <div class="pt-6 sm:px-12 md:px-16 lg:px-20 space-y-6 sm:space-y-8 sm:pb-8 max-h-screen overflow-y-auto">
     
                         <nav class="flex flex-col justify-around pb-12">
                         {% for page in section.pages %}
@@ -223,4 +223,7 @@
     
 {% endif %}
 
-
+<style>
+    .logo{
+    width: 200px;}
+</style>

templates/shortcodes/row.html

@@ -54,6 +54,17 @@ Parameters:
 
 {% endif %}
 
+ <!-- reverse col at mobile -->
+
+{% if reverse %}
+ {% if "rightreserve" in reverse %}
+ {% set row_class = "flex flex-col-reverse md:flex-row items-center mx-8" %}
+ {% elif "leftreserve" in reverse %}
+ {% set row_class = "flex flex-col md:flex-row items-center mx-8" %}
+     
+ {% endif %}
+ {% endif %}
+
 <!-- Padding -->
 
 {% set padding_class = " py-8 md:py-8 lg:py-28" %}
@@ -74,24 +85,23 @@ Parameters:
 
 {% set row_class =  row_class ~ padding_class %}
 
-
 <!-- Margins -->
 
-{% set margin_class = " mx-4 md:mx-16 lg:mx-24" %}
+{% set margin_class = " mx-8 md:mx-16 lg:mx-24" %}
 
 {% if margin %}
     {% if "none" in margin %}
         {% set margin_class = " mx-0" %}
     {% elif "wide" in margin %}
-        {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %}
+        {% set margin_class = " mx-8 md:mx-12 lg:mx-16 xl:mx-20" %}
     {% elif "moderate" in margin %}
-        {% set margin_class = " mx-8 sm:mx-16 md:mx-20 lg:mx-28" %}
+        {% set margin_class = " mx-8 md:mx-20 lg:mx-28" %}
     {% elif "narrow" in margin %}
-        {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40" %}
+        {% set margin_class = " mx-8 md:mx-28 lg:mx-40" %}
     {% elif "tight" in margin %}
-        {% set margin_class = " mx-20 sm:mx-32 md:mx-40 lg:mx-80 xl:mx-96" %}
+        {% set margin_class = " mx-8 md:mx-40 lg:mx-80 xl:mx-96" %}
     {% elif "header" in margin %}
-        {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40 my-10" %}
+        {% set margin_class = " mx-8 md:mx-28 lg:mx-40 my-10" %}
     {% endif %}
     {% if "lean-left" in margin %}
         {% set margin = margin_class | replace(from=" ", to=" first:")%}
@@ -117,10 +127,14 @@ Parameters:
 {% if style %}
 
     {% if "center" in style %}
-        {% set row_class = row_class ~ " text-center items-center mx-auto " %}
+        {% set row_class = row_class ~ " text-center items-center lg:mx-auto " %}
         {% set col_class = col_class ~ " flex-1 " %}
     {% endif %}
 
+    {% if "right" in style %}
+    {% set row_class = row_class ~ " text-right justify-center " %}
+    {% endif %}
+
     {% if "items-end" in style %}
     {% set row_class = row_class ~ " lg:items-end" %}
     {% set col_class = col_class ~ " flex-1 " %}
@@ -195,7 +209,7 @@ Parameters:
 {% set no_margins = " -mx-8 md:-mx-12 lg:-mx-16 xl:-mx-20" %}
 
 
-        <div id="{{anchor_link}}" class="{{'relative justify-center flex overflow-hidden ' ~ div_class }}" style="{{styles}}">
+        <div id="{{anchor_link}}" class="{{'relative justify-center items-start flex overflow-hidden ' ~ div_class }}" style="{{styles}}">
             <div id="{{row_id}}" class="{{row_class}}" style="min-width: -webkit-fill-available; min-width: -moz-available"> 
         
         {% for column in columns%}