diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b3163cc..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index b2e602e..fa17097 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -12,11 +12,11 @@ jobs: uses: appleboy/ssh-action@master with: host: www2.freezone.ourworld.tf - username: webuser + username: ${{ secrets.TF_USER }} key: ${{ secrets.TF_SECRET }} - port: 34022 + port: ${{ secrets.TF_PORT }} script: | - cd websites/www2/www_ourzone/ + cd websites/www2/www_ourworld_freezone/ git log -1 git fetch git reset --hard origin/development diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 8353d74..7cebb4b 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -12,11 +12,11 @@ jobs: uses: appleboy/ssh-action@master with: host: freezone.ourworld.tf - username: webuser + username: ${{ secrets.TF_USER }} key: ${{ secrets.TF_SECRET }} - port: 34022 + port: ${{ secrets.TF_PORT }} script: | - cd websites/www_ourzone/ + cd websites/www_ourworld_freezone/ git log -1 git fetch git reset --hard origin/master diff --git a/README.md b/README.md index 2cf2c32..2248618 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,32 @@ -# OurPhone™ +# OurWorld Freezone -## - -![](./public/images/logo_placeholder1.png) +![](../static/images/logo_placeholder2.png) ## About -The official website of OurZone™ +The official website of **OurWorld Freezone** -Production(master branch) [www.ourphone.ourworld.tf](https://www.ourzone.ourworld.tf/) +Production(master branch) [www.ourworld.freezone.tf](https://www.ourzone.ourworld.tf/) -Staging(developmentr branch) [www2.ourphone.ourworld.tf](https://www2.ourzone.ourworld.tf/) +Staging(developmentr branch) [www2.ourworld.freezone.tf](https://www2.ourzone.ourworld.tf/) Last updated: March 2023 ## Contribution -Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ourphone/issues) to report an error on the website, or if you have any suggestions on website improvements. +Feel free to [create a new issue](https://github.com/ourworldfreezone/www_ourworld_freezone/issues/) to report an error on the website, or if you have any suggestions on website improvements. -# Welcome to Ourworld Website Repository +# Welcome to Ourworld Free Zone Website Repository -- Website Name: Ourworld -- Brief Description: This is the official website of Ourworld. +- Website Name: Ourworld Free Zone +- Brief Description: This is the official website of Ourworld Free Zone. Last Updated: March 2023 -- Website URL: https://ourworld.tf/ +- Website URL: https://ourworld.freezone.tf/ - For any suggestions or improvement ideas please -Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues +Create an issue on: https://github.com/ourworldfreezone/www_ourworld_freezone/issues/ ## Administrators [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) diff --git a/config.toml b/config.toml index 87d82ef..57a885f 100644 --- a/config.toml +++ b/config.toml @@ -2,7 +2,7 @@ base_url = "https://www2.freezone.ourworld.tf/" # Change this to your own URL! Please note this variable **must** be uncommented. -title = "OurWorld Digital Free Zone" +title = "OurWorld Free Zone" description="Accessible and affordable for all" # When set to "true", a feed is automatically generated. @@ -78,6 +78,24 @@ feed = true paginate_by = 2 paginate_path = "blog-posts" +[[taxonomies]] +name = "partners-category" +feed = true +paginate_by = 6 +paginate_path = "partner-card" + +[[taxonomies]] +name = "news-category" +feed = true +paginate_by = 6 +paginate_path = "news-card" + +[[taxonomies]] +name = "memberships" +feed = true +paginate_by = 8 +paginate_path = "people/memberships" + [extra] header_class = "customize" footer_class = "customize" @@ -86,25 +104,25 @@ footer_class = "customize" [extra.taxonomies."roles".Create] icon_path = "images/icons/paint-brush-art-svgrepo-com.svg" banner_path = "images/marius-masalar-unsplash.jpg" - title = "Create Ourworld" + title = "Create OurWorld" description = "Become a part of a team of creators looking to shape our digital world" [extra.taxonomies."roles".Develop] icon_path = "images/icons/code-svgrepo-com.svg" banner_path = "images/marius-masalar-unsplash.jpg" - title = "Develop Ourworld" + title = "Develop OurWorld" description = "Become a part of a team of developers building our digital world" [extra.taxonomies."roles".Inspire] icon_path = "images/icons/bar-svgrepo-com.svg" banner_path = "images/marius-masalar-unsplash.jpg" - title = "Share Ourworld" + title = "Share OurWorld" description = "Create communities and involve people in ourworld" [extra.taxonomies."roles".Organize] icon_path = "images/icons/form-svgrepo-com.svg" banner_path = "images/marius-masalar-unsplash.jpg" - title = "Run Ourworld" + title = "Run OurWorld" description = "Become a part of the organizational team at ourworld" diff --git a/content/.DS_Store b/content/.DS_Store index 4b13418..339c1ff 100644 Binary files a/content/.DS_Store and b/content/.DS_Store differ diff --git a/content/footer/_index.md b/content/footer/_index.md new file mode 100644 index 0000000..d4eed5f --- /dev/null +++ b/content/footer/_index.md @@ -0,0 +1,58 @@ +--- +title: "Footer" +description: "" +insert_anchor_links: "left" +template: "partials/footer.html" +extra: + logoPath: "images/logo_placeholder2sm.png" + socialLinks: { Github: "https://github.com/ourworldfreezone", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews" } +--- + +{% row(style="lean") %} + +##### Affiliate Projects + +
+ +###### [ThreeFold](https://incubaid.com) + +###### [Incubaid](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html) + +###### [Mazraa](https://dashboard.grid.tf/) + +###### [Freeflow Nation](https://manual.grid.tf/farmers/farmers.html) + +||| + +##### OurWorld + +
+ +###### [OurWorld](https://ourworld.tf) + +###### [Freezone](https://freezone.ourworld.tf) + +###### [OurPhone](https://ourphone.ourworld.tf/) + +###### [OurParadise](https://ourparadise.ourworld.tf/) + +###### [OurNomads](https://ournomads.ourworld.tf/) + +||| + +##### About Us + +
+ +###### [Knowledgebase](https://ourworldfreezone.github.io/info_freezone/) + +
Blog
+ +###### [Telegram](https://t.me/threefoldnews) + +###### [Support](https://threefoldfaq.crisp.help/en/) + +###### [Github](https://github.com/ourworldfreezone) + + +{% end %} \ No newline at end of file diff --git a/content/header/_index.md b/content/header/_index.md index 763a530..dfcd65e 100644 --- a/content/header/_index.md +++ b/content/header/_index.md @@ -8,4 +8,7 @@ extra: imgPath: "" --- +- [Info]("https://ourworldfreezone.github.io/info_freezone/intro/intro_readme.html") +- [News]("/newsroom") - [Blog]("/blog") +- [Contact]("mailto:info@ourworld.tf") diff --git a/content/home/index.md b/content/home/index.md index 92442c0..cc86fb3 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -1,5 +1,5 @@ --- -title: "OurWorld" +title: "Ourworld Free Zone" description: "" date: 2018-09-14 updated: 2021-02-20 @@ -16,7 +16,8 @@ weight: 1

-## **Welcome to** OurWorld Digital Free Zone +## **Welcome to** +# OurWorld
Free Zone ### The world's first 100% digital free zone, accessible and affordable for all. Removing complexity from doing business. @@ -108,7 +109,7 @@ For the entrepreneur, the digital nomad, or any company, we provide a revolution ## Our Benefits ### Where freedom meets efficiency -With **OurWorld Digital Free Zone**, you can embark on your business journey with ease,
leveraging our innovative technology to streamline every step of the process. +With **OurWorld Free Zone**, you can embark on your business journey with ease,
leveraging our innovative technology to streamline every step of the process.
@@ -156,7 +157,7 @@ Seamlessly manage both fiat and digital currencies with our comprehensive bankin ![Image](./img/flexible.png#sm#mx-auto) #### Affordable & Flexible Company Licenses -OurWorld offers cost-effective and flexible company licenses, making it easier to kickstart your entrepreneurial journey. +Ourworld Free Zone offers cost-effective and flexible company licenses, making it easier to kickstart your entrepreneurial journey. @@ -166,7 +167,7 @@ OurWorld offers cost-effective and flexible company licenses, making it easier t ![Image](./img/sovereign.png#sm#mx-auto) #### Sovereign Economic Jurisdiction -OurWorld empowers businesses to operate within an independent economic environment, fostering growth and prosperity. +Ourworld Free Zone empowers businesses to operate within an independent economic environment, fostering growth and prosperity. @@ -193,7 +194,7 @@ Your Privacy, Your Data, Your Security. Our Quantum Safe Storage will empower yo ## Company License Presale ### Secure your spot with a Special Offer Price -Be among the first to secure your company license with our exclusive presale offer at a special price. Embrace the future of digital entrepreneurship with OurWorld Digital Free Zone and kickstart your business journey with unprecedented advantages. +Be among the first to secure your company license with our exclusive presale offer at a special price. Embrace the future of digital entrepreneurship with OurWorld Free Zone and kickstart your business journey with unprecedented advantages.
diff --git a/content/newsroom/_index.md b/content/newsroom/_index.md new file mode 100644 index 0000000..9eb8abc --- /dev/null +++ b/content/newsroom/_index.md @@ -0,0 +1,13 @@ +--- +title: "News" +paginate_by: 9 +# paginate_reversed: false +sort_by: "date" +insert_anchor_links: "left" +#base_url: "posts" +#first: "first" +#last: "last" +template: "layouts/newsroom.html" +page_template: "newsPage.html" +#transparent: true +--- diff --git a/content/newsroom/africanregensummit/africanregensummit.png b/content/newsroom/africanregensummit/africanregensummit.png new file mode 100644 index 0000000..200d983 Binary files /dev/null and b/content/newsroom/africanregensummit/africanregensummit.png differ diff --git a/content/newsroom/africanregensummit/index.md b/content/newsroom/africanregensummit/index.md new file mode 100644 index 0000000..22bade3 --- /dev/null +++ b/content/newsroom/africanregensummit/index.md @@ -0,0 +1,26 @@ +--- +id: africanregensummit +title: 🌍 African Regenerative Cities Summit +image_caption: African Regenerative Cities Summit +description: Learn about the summit we hosted this past weekend in Zanzibar to unite innovators and investors to support Africa's future. +date: 2023-07-23 +taxonomies: + tags: [community,technology,update,event] + news-category: [foundation] +extra: + imgPath: africanregensummit.png +--- + +Over the past four days, we have had the pleasure to host the African Regenerative Cities Summit in Zanzibar, Tanzania – uniting top innovators and investors supporting human flourishing, with a special focus on science and technology that will lay the foundation for Africa’s future. + +
+ +A lot has happened over the course of the summit, including a surprise visit today from an extremely special guest. + +
+ +Generally, we have been blown away by the participants and the projects they are working on, and we warmly welcome many of them now into the ThreeFold community. + +
+ +We'll be sharing more in the coming days. \ No newline at end of file diff --git a/content/newsroom/digitalfreezonezanzibar/digitalfreezonezanzibar.png b/content/newsroom/digitalfreezonezanzibar/digitalfreezonezanzibar.png new file mode 100644 index 0000000..83f49f4 Binary files /dev/null and b/content/newsroom/digitalfreezonezanzibar/digitalfreezonezanzibar.png differ diff --git a/content/newsroom/digitalfreezonezanzibar/index.md b/content/newsroom/digitalfreezonezanzibar/index.md new file mode 100644 index 0000000..c6efab1 --- /dev/null +++ b/content/newsroom/digitalfreezonezanzibar/index.md @@ -0,0 +1,26 @@ +--- +id: digitalfreezonezanzibar +title: 📣 A Digital Free Zone in Zanzibar – And More! +image_caption: A Digital Free Zone in Zanzibar – And More! +description: The President of Zanzibar, Dr. Hussein Mwinyi, visited us this weekend to publicly share our collaborations. +date: 2023-07-27 +taxonomies: + tags: [partnership,community,technology,update] + news-category: [foundation] +extra: + imgPath: digitalfreezonezanzibar.png +--- + +This past weekend, we were honored with a visit from Zanzibar's President Dr. Hussein Mwinyi at the African Regenerative Cities Summit. + +
+ +There, he formally and publicly expressed the government's commitment to the establishment of a digital free zone, a locally-owned Internet infrastructure, an incubator to support young local innovators – all in collaboration with ThreeFold – and their commitment to the ICT sector as a whole. + +
+ +Read [Zanzibar Seeks to Become a Digital FreeZone](https://www.thecitizen.co.tz/tanzania/zanzibar/zanzibar-seeks-to-become-digital-freezone--4316150) (via The Citizen) and [Mwinyi Commits to Improvement of Digital Spaces](https://dailynews.co.tz/mwinyi-commits-to-improvement-of-digital-spaces/) (via Daily News Tanzania) for further details. + +
+ +*We'll be sharing more developments on this front in the community call next week and as progress unfolds.* \ No newline at end of file diff --git a/content/newsroom/newchapter/index.md b/content/newsroom/newchapter/index.md new file mode 100644 index 0000000..3db0fcc --- /dev/null +++ b/content/newsroom/newchapter/index.md @@ -0,0 +1,20 @@ +--- +id: newchapter +title: 🌍 A New Chapter Unfolds - OurWorld Free Zone Joins Forces with Tanzania's Officials +image_caption: A New Chapter +description: OurWorld Free Zone Establishes Official Partnership with Zanzibar Government +date: 2023-08-23 +taxonomies: + tags: [community,technology,update,event] + news-category: [foundation] +extra: + imgPath: newchapter.png +--- + +OurWorld Free Zone is excited to announce a significant milestone in its journey towards global collaboration. On July 23 2023, a momentous contract was signed between OurWorld Free Zone and the government of Tanzania, solidifying their official partnership. +
+The signing ceremony, graced by the presence of OurWorld Free Zone's co-founder, Kristof De Spiegeleer, marked a pivotal moment in the organization's expansion efforts. The event was attended by a distinguished gathering, including members of the press, honored guests, and key government officials from both Zanzibar and Tanzania. +
+During the event, discussions were held to outline the next steps in this groundbreaking collaboration. The partnership between OurWorld Free Zone and the Zanzibar government aims to pave the way for new opportunities and mutual growth. The cooperative efforts are poised to foster economic development, innovation, and cooperation between different sectors. +
+Stay tuned for more detailed updates on this exciting partnership as OurWorld Free Zone and the government of Zanzibar work together to shape a promising future of collaboration and progress. Further announcements will shed light on the specific initiatives and projects that will emerge from this alliance. \ No newline at end of file diff --git a/content/newsroom/newchapter/newchapter.png b/content/newsroom/newchapter/newchapter.png new file mode 100644 index 0000000..1bd1e4d Binary files /dev/null and b/content/newsroom/newchapter/newchapter.png differ diff --git a/content/newsroom/our_world_financial_system/index.md b/content/newsroom/our_world_financial_system/index.md new file mode 100644 index 0000000..4fd23ce --- /dev/null +++ b/content/newsroom/our_world_financial_system/index.md @@ -0,0 +1,14 @@ +--- +id: our_world_financial_system +title: 📚 A New Financial System for “Our World” +image_caption: A new Financial System +description: ThreeFold co-founder Kristof wrote a Medium article about the problems of today’s financial systems and his thoughts on building better, more balanced systems... +date: 2022-11-29 +taxonomies: + tags: [update, technology, news] + news-category: [foundation] +extra: + imgPath: our_world_financial_system.png +--- + +ThreeFold co-founder Kristof wrote a Medium article about the problems of today’s financial systems and his thoughts on building better, more balanced systems for the benefit of our planet and all of us. Take a look at the summary and discuss it here or you can read [the full article](https://medium.com/@despiegk/a-new-financial-system-for-our-world-602605d1f6d7). diff --git a/content/newsroom/our_world_financial_system/our_world_financial_system.png b/content/newsroom/our_world_financial_system/our_world_financial_system.png new file mode 100644 index 0000000..35f6ae3 Binary files /dev/null and b/content/newsroom/our_world_financial_system/our_world_financial_system.png differ diff --git a/content/newsroom/ourworldfreezone/index.md b/content/newsroom/ourworldfreezone/index.md new file mode 100644 index 0000000..7a99ecc --- /dev/null +++ b/content/newsroom/ourworldfreezone/index.md @@ -0,0 +1,18 @@ +--- +id: ourworldfreezone +title: 🗞 In the News – OurWorld Digital Free Zone +image_caption: OurWorld Digital Free Zone +description: OurWorld Digital Free Zone received some coverage recently from IPPMEDIA. Take a look! +date: 2023-08-01 +taxonomies: + tags: [partner,news,community,technology,update] + news-category: [foundation] +extra: + imgPath: ourworldfreezone.png +--- + +"Our vision is to foster a digital ecosystem that harmoniously blends the tranquility of Zanzibar with the awe-inspiring power of the digital age. I am deeply appreciative of the dedication of the OurWorld Zanzibar team in turning this vision into a reality," Zanzibar President Dr. Hussein Mwinyi. + +
+ +Take a look at [this piece](https://www.ippmedia.com/en/features/mwinyi-keen-establish-digital-hub-isles) from IPPMEDIA, which goes into some detail about our collaboration with the Revolutionary Government of Zanzibar and the OurWorld Digital Free Zone. \ No newline at end of file diff --git a/content/newsroom/ourworldfreezone/ourworldfreezone.png b/content/newsroom/ourworldfreezone/ourworldfreezone.png new file mode 100644 index 0000000..d3262d8 Binary files /dev/null and b/content/newsroom/ourworldfreezone/ourworldfreezone.png differ diff --git a/content/newsroom/zuzalu/index.md b/content/newsroom/zuzalu/index.md new file mode 100644 index 0000000..297ecee --- /dev/null +++ b/content/newsroom/zuzalu/index.md @@ -0,0 +1,31 @@ +--- +id: zuzalu +title: 🗓 ThreeFold Team @ Zuzalu +image_caption: ThreeFold Team @ Zuzalu +description: Some of the team is at the New Cities & Network States event at Zuzalu, where Kristof will be speaking. +date: 2023-04-26 +taxonomies: + tags: [update, news, community] + news-category: [foundation] +extra: + imgPath: zuzalu.png +--- + +Some of the team has arrived to Zuzalu in Montenegro for this weekend's New Cities & Network States event. Kristof will be speaking on Sunday and we'll also be hosting several side events including a hackathon around the Web3 Gateway. + +
+ +Other speakers include Vitalik Buterin (founder of Ethereum), Balaji Srinivasan (author of The Network State), and Mark Lutter (founder & chairman of the Charter Cities Institute). + +
+ +Looking forward to a productive event with a like-minded community of people and sharing how ThreeFold provides the ideal underlying infrastructure for new cities and network states! + +
+ +We'll share more as we have it here and/or on other channels. + +
+ +- Zuzalu | [Site](https://zuzalu.city/) +- The Event | [Site](https://lu.ma/ae66qgco) \ No newline at end of file diff --git a/content/newsroom/zuzalu/zuzalu.png b/content/newsroom/zuzalu/zuzalu.png new file mode 100644 index 0000000..bea8423 Binary files /dev/null and b/content/newsroom/zuzalu/zuzalu.png differ diff --git a/static/images/OurZone.png b/static/images/OurZone.png new file mode 100644 index 0000000..8a0d50e Binary files /dev/null and b/static/images/OurZone.png differ diff --git a/static/images/logo_placeholder2 copy.png b/static/images/logo_placeholder2 copy.png new file mode 100644 index 0000000..93b8fa4 Binary files /dev/null and b/static/images/logo_placeholder2 copy.png differ diff --git a/static/images/logo_placeholder2.png b/static/images/logo_placeholder2.png index 93b8fa4..c58515d 100644 Binary files a/static/images/logo_placeholder2.png and b/static/images/logo_placeholder2.png differ diff --git a/static/images/logo_placeholder2.psd b/static/images/logo_placeholder2.psd new file mode 100644 index 0000000..55d78fb Binary files /dev/null and b/static/images/logo_placeholder2.psd differ diff --git a/static/images/logo_placeholder2sm.png b/static/images/logo_placeholder2sm.png new file mode 100644 index 0000000..be1e4dd Binary files /dev/null and b/static/images/logo_placeholder2sm.png differ diff --git a/static/images/logo_placeholder3.png b/static/images/logo_placeholder3.png new file mode 100644 index 0000000..93b8fa4 Binary files /dev/null and b/static/images/logo_placeholder3.png differ diff --git a/static/images/logo_placeholder4.png b/static/images/logo_placeholder4.png new file mode 100644 index 0000000..c290912 Binary files /dev/null and b/static/images/logo_placeholder4.png differ diff --git a/templates/layouts/newsroom.html b/templates/layouts/newsroom.html new file mode 100644 index 0000000..b243a29 --- /dev/null +++ b/templates/layouts/newsroom.html @@ -0,0 +1,33 @@ +{% extends "_default/base.html" %} + + +{% block content %} + +
+ + + {%- set section = get_section(path="newsroom/_index.md") %} + {% for page in section.pages %} + {% if page.extra.isFeatured %} + {%- set_global featured = page %} + {% break %} + {% endif %} + {% if not featured %} + {%- set_global featured = section.pages[0] %} + {% endif %} + {% endfor %} + + {% include "partials/featuredNews.html" %} + +
+ {% include "partials/newsPosts.html" %} + {% include "partials/newsSidebar.html" %} +
+
+ + {% endblock content %} diff --git a/templates/newsPage.html b/templates/newsPage.html new file mode 100644 index 0000000..69debfe --- /dev/null +++ b/templates/newsPage.html @@ -0,0 +1,143 @@ +{% extends "_default/base.html" %} +{% block content %} + +{% set split = page.content | split(pat="threefold.io") %} +{% if split | length < 2 %} + {% set content = page.content %} +{% else %} + {% set content = "" %} + {% for part in split %} + {% if part is starting_with("/blog") %} + {% set split_part = part | split(pat='/">') %} + {% set link = split_part[0] %} + {% set link = link | replace(from="/blog/post", to="/blog") %} + {% set link = link | replace(from="_", to="-") %} + {% set rest_part = split_part | slice(start=1) | join(sep='/">') %} + {% set part = link ~ '/">' ~ rest_part %} + {% endif %} + {% if part is starting_with("/people") %} + {% set split_part = part | split(pat='/">') %} + {% set link = split_part[0] %} + {% set link = link | replace(from="_", to="-") %} + {% set rest_part = split_part | slice(start=1) | join(sep='/">') %} + {% set part = link ~ '/">' ~ rest_part %} + {% endif %} + {% if loop.first %} + {% set_global content = part %} + {% else %} + {% set_global content = content ~ "threefold.io" ~ part %} + {% endif %} + {% endfor %} +{% endif %} + + + +
+ +
+ +
+
+

+ {{ page.title }} +

+
{{ page.description }}
+
+
+
+
+
    + {% if page.taxonomies.people %} + {% for person in page.taxonomies.people %} + {% set author_path = 'people/' ~ person ~ '/index.md' %} + {% set people = get_section(path="people/_index.md") %} + {% set pages_str = people.pages | json_encode() | as_str %} + {% if pages_str is containing(person) %} + {% set author = get_page(path=author_path) %} + {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %} +
  • + + {{ author.title }} + +
    • + {% endif %} + {% endfor %} + {% endif %} +
+
+ +
+

+ {% if page.taxonomies.people %} + {% for person in page.taxonomies.people %} + {% set author_path = 'people/' ~ person ~ '/index.md' %} + {% set people = get_section(path="people/_index.md") %} + {% set pages_str = people.pages | json_encode() | as_str %} + {% if pages_str is containing(person) %} + {% set author = get_page(path=author_path) %} + {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %} + + {{ author.title }} + + {% endif %} + {% endfor %} + {% endif %} +

+

+ + {#  ·  {{ page.news.timeToRead }} min read #} +

+
+
+
+
+
+
+ {% if page.extra.imgPath %} + {% set img_url = get_url(path='/' ~ page.relative_path | replace(from='_', to='-') | replace(from='index.md', to=page.extra.imgPath)) %} + + {%endif%} +
+ +
+
+
{{ content | safe }}
+
+ +
+ {% for tag in page.taxonomies.tags %} + {% set fullpath = "/tags/" ~ tag | replace(from='_', to='-' ) %} + {{ tag }} + {% endfor %} +
+
+
+
+{% endblock content %} \ No newline at end of file diff --git a/templates/partials/blogPosts.html b/templates/partials/blogPosts.html index b599eff..8e04924 100644 --- a/templates/partials/blogPosts.html +++ b/templates/partials/blogPosts.html @@ -7,7 +7,7 @@ {% set path_array = current_path | split(pat="/") %} {% set taxonomy = path_array[1] %} {% set category = path_array[2] %} - The Latest from OurWorld + The Latest from Ourworld Free Zone {% if taxonomy == "categories" %} - {{category | replace(from='-', to=' ' ) | title}} {% endif %} diff --git a/templates/partials/featuredNews.html b/templates/partials/featuredNews.html new file mode 100644 index 0000000..8c67ed4 --- /dev/null +++ b/templates/partials/featuredNews.html @@ -0,0 +1,28 @@ + + +
+
+

FEATURED NEWS

+ +

+ {{ featured.title }} +

+ + +

+ {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} - +

+ +
+ +
+ {% if featured.extra.imgPath %} + + {% endif %} +
+
+
+ + + \ No newline at end of file diff --git a/templates/partials/footer.html b/templates/partials/footer.html index d4154f5..ee3ce71 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -3,19 +3,43 @@ Read the documentation to get started: https://tailwindui.com/documentation --> -{%- set section = get_section(path="_index.md") %} +{%- set section = get_section(path="footer/_index.md") %} +{%- set logoPath = section.extra.logoPath %} -{% set subsections_str = section.subsections | join(sep=" ") %} + + +
+ + + + \ No newline at end of file diff --git a/templates/partials/icons/svgTelegram.html b/templates/partials/icons/svgTelegram.html new file mode 100644 index 0000000..d53dd94 --- /dev/null +++ b/templates/partials/icons/svgTelegram.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/partials/newsCard.html b/templates/partials/newsCard.html new file mode 100644 index 0000000..42bc17c --- /dev/null +++ b/templates/partials/newsCard.html @@ -0,0 +1,57 @@ +
+
+ +
+ {% if post.extra.imgPath %} + {% set img_url = get_url(path='/' ~ post.relative_path | replace(from='_', to='-') | replace(from='index.md', to=post.extra.imgPath)) %} + + {% endif %} +
+
+ +

+ {{ post.title }} +

+ {% if post.description %} +

+ {{ post.description }} +

+ {% endif %} + +
+
+
    + {% if post.taxonomies.people %} + {% for author in post.taxonomies.people %} + {% set author_path = 'people/' ~ author ~ '/index.md' %} + {% set people = get_section(path="people/_index.md") %} + {% set pages_str = people.pages | json_encode() | as_str %} + {% if pages_str is containing(author) %} + {% set author = get_page(path=author_path) %} + {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %} +
  • + + {{ author.title }} + +
    • + {% endif %} + {% endfor %} + {% endif %} +
+
+ +

+ +

+
+
+
+
\ No newline at end of file diff --git a/templates/partials/newsPosts.html b/templates/partials/newsPosts.html new file mode 100644 index 0000000..5c50e65 --- /dev/null +++ b/templates/partials/newsPosts.html @@ -0,0 +1,70 @@ +{% block content %} + +
+

+ {% set path_array = current_path | split(pat="/") %} + {% set taxonomy = path_array[1] %} + {% set category = path_array[2] %} + The Latest from OurWorld Free Zone + {% if taxonomy == "news-category" %} - + {{category | replace(from='-', to=' ' ) | title}} + {% endif %} +

+
+
+ {%- for post in paginator.pages %} + {% if "Engineering" == "Engineering"%} + {% include "partials/newsCard.html" %} + {%endif%} {%- endfor %} +
+
+

+ {% if paginator.previous %} + {% include "partials/icons/svgPrevPageIcon.html" %}{% include + "partials/icons/svgPrevPageIcon.html" %} +           + {% include "partials/icons/svgPrevPageIcon.html" %} +           +           {% else %} {% + include "partials/icons/svgFirstPageIcon.html" %}{% include + "partials/icons/svgFirstPageIcon.html" %} +           {% include + "partials/icons/svgFirstPageIcon.html" %} +           +           {% endif %} {% if + paginator.next %} + {% include "partials/icons/svgNextPageIcon.html" %} +           + {% include "partials/icons/svgNextPageIcon.html" %}{% include + "partials/icons/svgNextPageIcon.html" %} + {% else %} {% include "partials/icons/svgLastPageIcon.html" %} +           {% include + "partials/icons/svgLastPageIcon.html" %}{% include + "partials/icons/svgLastPageIcon.html" %} {% endif %} +

+
+
+ +{% endblock content %} diff --git a/templates/partials/newsSidebar.html b/templates/partials/newsSidebar.html new file mode 100644 index 0000000..1d3f625 --- /dev/null +++ b/templates/partials/newsSidebar.html @@ -0,0 +1,38 @@ + +
+
+

FILTER NEWS BY

+ All + {% set taxonomy = get_taxonomy(kind="news-category") %} + {% set categories = taxonomy.items %} + {% for category in categories %} + {% set path = category.name | slugify %} + {% set fullpath = "/news-category/" ~ path %} + {{category.name}} + {% endfor %} +
+ +{% set section = get_section(path="newsroom/_index.md")%} + +
+

FEATURED NEWS

+ + {% for page in section.pages %} + {% if page.extra.isFeatured %} + {{ page.title }} + {% endif %} + {% endfor %} + +
+
+ + \ No newline at end of file diff --git a/templates/partials/socialLinks.html b/templates/partials/socialLinks.html index 325f023..7bf4ba5 100644 --- a/templates/partials/socialLinks.html +++ b/templates/partials/socialLinks.html @@ -13,6 +13,8 @@ {% include "partials/icons/svgTwitterIcon.html" %} {% elif key == "Dribbble" %} {% include "partials/icons/svgDribbbleIcon.html" %} + {% elif key == "Telegram" %} + {% include "partials/icons/svgTelegram.html" %} {% endif %} diff --git a/templates/partnerPage.html b/templates/partnerPage.html new file mode 100644 index 0000000..705957a --- /dev/null +++ b/templates/partnerPage.html @@ -0,0 +1,57 @@ +{% extends "_default/base.html" %} +{% block content %} + +
+
+
+ +
+
+

+ {{ page.title }} +

+ +
+
+
    + {% if page.extra.websites %} +
  • + + +
    • + {% endif %} + {% if page.extra.linkedin %} +
  • + + +
    • + {% endif %} +
+ {% for tag in page.taxonomies.tags %} + + {{tag}} + + {% endfor %} +
+
+
+
+ +
+ +
+
{{ page.content | safe }}
+
+
+ +{% endblock content %} \ No newline at end of file diff --git a/templates/people_page.html b/templates/people_page.html new file mode 100644 index 0000000..8e94af9 --- /dev/null +++ b/templates/people_page.html @@ -0,0 +1,73 @@ +{% extends "_default/base.html" %} +{% block content %} + + +
+ {% include "partials/filter_bar.html" %} + +
+

+ {% set path_array = current_path | split(pat="/") %} + {% set taxonomy = path_array[1] %} + {% set category = path_array[2] %} + {{category | replace(from='-', to=' ' ) | title}} +

+
+
+ {%- for page in paginator.pages %} + {% if "Engineering" == "Engineering"%} + {% include "partials/person_card.html" %} + {%endif%} {%- endfor %} +
+
+

+ {% if paginator.previous %} + {% include "partials/icons/svgPrevPageIcon.html" %}{% include + "partials/icons/svgPrevPageIcon.html" %} +           + {% include "partials/icons/svgPrevPageIcon.html" %} +           +           {% else %} {% + include "partials/icons/svgFirstPageIcon.html" %}{% include + "partials/icons/svgFirstPageIcon.html" %} +           {% include + "partials/icons/svgFirstPageIcon.html" %} +           +           {% endif %} {% if + paginator.next %} + {% include "partials/icons/svgNextPageIcon.html" %} +           + {% include "partials/icons/svgNextPageIcon.html" %}{% include + "partials/icons/svgNextPageIcon.html" %} + {% else %} {% include "partials/icons/svgLastPageIcon.html" %} +           {% include + "partials/icons/svgLastPageIcon.html" %}{% include + "partials/icons/svgLastPageIcon.html" %} {% endif %} +

+
+
+
+ +{% endblock content %} diff --git a/templates/person_page.html b/templates/person_page.html new file mode 100644 index 0000000..36a81c3 --- /dev/null +++ b/templates/person_page.html @@ -0,0 +1,48 @@ +{% extends "_default/base.html" %} +{% block content %} + +
+
+
+ +
+
+
+

+ {{page.title}} +

+
+ {% include "partials/socialLinks.html" %} +
+
+
+ {{page.content | safe }} +
+
+
+
    + {% for org in page.extra.organizations %} +
  • + + + +
    • + {% endfor %} +
+
+
+ {% for tag in page.taxonomies.memberships %} + + {{tag}} + + {% endfor %} +
+
+
+
+
+
+
+
+ +{% endblock content %} \ No newline at end of file diff --git a/templates/resourcesPage.html b/templates/resourcesPage.html new file mode 100644 index 0000000..cc7f0aa --- /dev/null +++ b/templates/resourcesPage.html @@ -0,0 +1,36 @@ +{% extends "_default/base.html" %} +{% block content %} + +
+ +
+
+ +
{{ page.content | safe }}
+
+ + +
+
+{% endblock content %} \ No newline at end of file diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html new file mode 100644 index 0000000..f628a84 --- /dev/null +++ b/templates/taxonomy_list.html @@ -0,0 +1,4 @@ +{% extends "index.html" %} + +{% block content %} +{% endblock content %} \ No newline at end of file diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html new file mode 100644 index 0000000..d34cecd --- /dev/null +++ b/templates/taxonomy_single.html @@ -0,0 +1,25 @@ +{% extends "index.html" %} + +{% block content %} + +
+ +
+ {% if current_path is containing("partners") %} + {% include "partials/partnersCards.html" %} + {% include "partials/partnersSidebar.html" %} + {% elif current_path is containing("tags") %} + {% include "partials/tagsCards.html" %} + {% include "partials/tagsSidebar.html" %} + {% elif current_path is containing("memberships") %} + {% include "partials/memberships.html" %} + {% elif current_path is containing("people") %} + {% else %} + {% include "partials/newsPosts.html" %} + {% include "partials/newsSidebar.html" %} + {% endif %} +
+
+ + {% endblock content %} +