diff --git a/config.toml b/config.toml index 5facafe95..175403f39 100644 --- a/config.toml +++ b/config.toml @@ -51,6 +51,9 @@ external_links_no_referrer = true # For example, `...` into `…`, `"quote"` into `“curly”` etc smart_punctuation = true +[build] +not_found = "404.md" + [[taxonomies]] name = "categories" feed = true diff --git a/content/404.md b/content/404.md new file mode 100644 index 000000000..fcb925338 --- /dev/null +++ b/content/404.md @@ -0,0 +1,8 @@ +--- +title: "404" +description: "" +insert_anchor_links: "left" +template: "404.html" + +--- + diff --git a/content/blog/introducing_project_inca/index.md b/content/blog/introducing_project_inca/index.md index d4bc7e46e..587f1505f 100644 --- a/content/blog/introducing_project_inca/index.md +++ b/content/blog/introducing_project_inca/index.md @@ -13,6 +13,10 @@ extra: isFeatured: true --- +*Please note the information below is subject to change as the project evolves and will be updated as is appropriate.* + +
+ ThreeFold’s journey over the past years has been one of deep, collaborative commitment, marked by significant technological advancements and milestones in building a new cloud infrastructure from the ground up, as well as the global expansion of the grid to its current state. Throughout this journey, we have learned, adapted, and evolved, leading us to a strong strategy for the next chapter and achieving our collective vision. ### **Meet Project Internet Capacity** diff --git a/content/community/discourse.png b/content/community/discourse.png new file mode 100644 index 000000000..f4c41cf5b Binary files /dev/null and b/content/community/discourse.png differ diff --git a/content/community/gh.png b/content/community/gh.png new file mode 100644 index 000000000..4d27771b4 Binary files /dev/null and b/content/community/gh.png differ diff --git a/content/community/index.md b/content/community/index.md new file mode 100644 index 000000000..97c268755 --- /dev/null +++ b/content/community/index.md @@ -0,0 +1,205 @@ +--- +title: "community" +description: "community a decade ago, a group of passionate Internet & Cloud veterans came together to build a system." # quotation marks to allow colons where used +template: "page.html" +insert_anchor_links: "left" +extra: + author: Your name here + imgPath: about/deploy_hero.png +--- + + + +
+ + +{% row( style="center mtop semiNarrow") %} + + +## **Join the Community** + +{% end %} + +{% row( style="center semiNarrow") %} + +
+ +[![Image](discourse.png#social)](https://forum.threefold.io/) + +
+ +###### **Forum** + +

Ask Questions

+ +||| + +

+ +[![Image](gh.png#social)](https://github.com/threefoldfoundation) + +
+ +###### **GitHub | Tech** + +

Open-Source Collaboration for Tech Development

+ +||| + +

+ +[![Image](gh.png#social)](https://github.com/threefoldtech) + +
+ +###### **GitHub | Foundation** + +

Open-source Collaboration for Websites and Online Info

+ +||| + +

+ +[![Image](x.png#social)](https://x.com/threefold_io) + +
+ +###### **X | Twitter** + +

"Tweet" With Us

+ +{% end %} + +{% row( style="center semiNarrow") %} + +

+ +[![Image](telegram.png#social)](https://t.me/threefoldnews) + +
+ +###### **Telegram News** + +

Stay Updated

+ +||| + +

+ +[![Image](telegram.png#social)](https://t.me/threefold) + +
+ +###### **Telegram Main Chat** + +

Community Conversation

+ +||| + +

+ +[![Image](telegram.png#social)](https://t.me/threefoldfarmers) + +
+ +###### **Telegram Farmers Chat** + +

Farming Community

+ +||| + +

+ +[![Image](telegram.png#social)](https://t.me/threefoldtesting) + +
+ +###### **Telegram Grid User Chat** + +

Grid User Community

+ +{% end %} + + + +{% row( style="center mbottom semiNarrow") %} + +

+ +[![Image](reddit.png#social)](https://www.reddit.com/r/threefold/) + +
+ +###### **Reddit** + +

Join In

+ +||| + +

+ +[![Image](youtube.png#social)](https://www.youtube.com/@ThreeFoldFoundation) + +
+ +###### **YouTube** + +

Watch Things Unfold

+ +||| + +

+ + + +![Image](mail.png#social) + + + +
+ +###### **E-mail Newsletter** + +

Updates in Your Inbox

+ + +||| + +

+ +[![Image](linkedin.png#social)](https://www.linkedin.com/company/threefold-foundatiooon/) + +
+ +###### **LinkedIn** + +

Lets Network

+ +{% end %} + + +{% row( style="center mtop semiNarrow") %} + + +## **Keep up with ThreeFold Events** + +{% end %} + +
+ + + + +

+ + + \ No newline at end of file diff --git a/content/community/linkedin.png b/content/community/linkedin.png new file mode 100644 index 000000000..bf1f5208f Binary files /dev/null and b/content/community/linkedin.png differ diff --git a/content/community/mail.png b/content/community/mail.png new file mode 100644 index 000000000..427f56364 Binary files /dev/null and b/content/community/mail.png differ diff --git a/content/community/manual.png b/content/community/manual.png new file mode 100644 index 000000000..59bbb1d39 Binary files /dev/null and b/content/community/manual.png differ diff --git a/content/community/reddit.png b/content/community/reddit.png new file mode 100644 index 000000000..c54661505 Binary files /dev/null and b/content/community/reddit.png differ diff --git a/content/community/telegram.png b/content/community/telegram.png new file mode 100644 index 000000000..92bc82277 Binary files /dev/null and b/content/community/telegram.png differ diff --git a/content/community/x.png b/content/community/x.png new file mode 100644 index 000000000..7ca1293de Binary files /dev/null and b/content/community/x.png differ diff --git a/content/community/youtube.png b/content/community/youtube.png new file mode 100644 index 000000000..aefff096d Binary files /dev/null and b/content/community/youtube.png differ diff --git a/content/footer/_index.md b/content/footer/_index.md index 3634143e6..b4cb8f4ff 100644 --- a/content/footer/_index.md +++ b/content/footer/_index.md @@ -48,12 +48,14 @@ extra:
About
-
NewsRoom
- -
People
- -
Partners
-
Blog
+
NewsRoom
+ +
Newsletter
+ +
Community
+ + + {% end %} \ No newline at end of file diff --git a/content/home/index.md b/content/home/index.md index 23f4a2baf..159d0a9ad 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -457,7 +457,7 @@ Get assistance from our support team
-[![](join1.png#icon)](https://t.me/threefold) +[![](join1.png#icon)](/community)
diff --git a/content/newsroom/july_community_calls/index.md b/content/newsroom/july_community_calls/index.md new file mode 100644 index 000000000..a30615cde --- /dev/null +++ b/content/newsroom/july_community_calls/index.md @@ -0,0 +1,58 @@ +--- +id: july_community_calls +title: "🗓 Announcing: July Community Calls" +image_caption: July Community calls +description: Check out the schedule for our July community calls and see what's on the agenda. Save the date! +date: 2024-06-28 +taxonomies: + people: [bernadette_amanda_caster] + tags: [technology,update,threefold_grid,community,news] + news-category: [foundation] +extra: + imgPath: july_community_calls.png + +--- + +Friends, take a look at the line-up of calls for the month of July (plus the first of August). + +
+ +**Project Update**
+Wednesday July 03 @ 17:00 CEST | 11:00 EDT (*Rescheduled from June 27*)
+ +The team will update the community on their latest updates on strategy, tech development, partners, on-the-ground activities, and other such topics. + +
+ +**Discussion & Demo: Nextcloud**
+Tuesday July 09 @ 19:00 CEST | 13:00 EDT
+ +[Nextcloud](https://nextcloud.com/) is an open-source content collaboration platform with a mission to develop software for decentralized and federated clouds, and over 400,000 deployments. During this session, the team will show how to deploy Nextcloud on the ThreeFold Grid. + +
+ +**Community Discussion**
+Thursday July 18 @ 17:00 CEST | 11:00 EDT (*Pending enough interest from the community*)
+ +Pending enough interest from the community, we will hold a Q&A / two-way discussion. We will check in ahead of this date to pre-seed questions and discussion topics. + +
+ +**Discussion & Demo: TFROBOT**
+Tuesday July 23 @ 19:00 CEST | 13:00 EDT
+ +During this session, the team will discuss and demo [TFROBOT](https://manual.grid.tf/documentation/developers/tfrobot/tfrobot.html), a command line interface tool that offers simultaneous mass deployment of groups of VMs on the grid. + +
+ +**Project Update**
+Thursday August 01 @ 17:00 CEST | 11:00 EDT
+ +The team will update the community on their latest updates on strategy, tech development, partners, on-the-ground activities, and other such topics. + +
+ +Find the full details [here](https://forum.threefold.io/t/july-2024-threefold-community-call-schedule/4380). We look forward to seeing you there! + + + diff --git a/content/newsroom/july_community_calls/july_community_calls.png b/content/newsroom/july_community_calls/july_community_calls.png new file mode 100644 index 000000000..031c1990d Binary files /dev/null and b/content/newsroom/july_community_calls/july_community_calls.png differ diff --git a/content/newsroom/june_project_update/index.md b/content/newsroom/june_project_update/index.md new file mode 100644 index 000000000..68554ffe6 --- /dev/null +++ b/content/newsroom/june_project_update/index.md @@ -0,0 +1,39 @@ +--- +id: june_project_call +title: ☕️ Watch June's Project Update +image_caption: June Project call +description: This month's update covered highlights of Grid v3.14, a preview of v3.15, Internet Capacity updates, demos, and more. +date: 2024-07-05 +taxonomies: + people: [bernadette_amanda_caster] + tags: [technology,update,threefold_grid,community,news] + news-category: [foundation] +extra: + imgPath: june_project_update.png + +--- + +We hosted a general project update this Wednesday covering a range of topics. Kristof started off with a general state of things to set the stage for the coming summer (northern hemisphere) months. Then, Sam reviewed ThreeFold positioning and TF Grid vs TF Grid 4, and Scott detailed the highlights of TF Grid v3.14 (heading to mainnet thanks to a successful DAO vote this week). + +
+ +Next, Theo from Project Internet Capacity / Zonaris spoke briefly, and Kristof showed the investor-focused presentation being prepared by the team. Kristof continued with some behind the scenes info about conversations we are having with partners and potential partners and showed some demos, and then covered what’s coming with the next grid release (v3.15). + +
+ +Finally, Mik discussed recent documentation updates, and Sam covered on the ground highlights from the past month, before answering a question from the community, and signing off. + +
+ +Dig into the latest from the team [here](https://youtu.be/Cgak5Zy52vI?si=js1STSiaJNGPk3lA). + +
+ +Take note of [calls coming up this july](https://forum.threefold.io/t/july-2024-threefold-community-call-schedule/4380). + +
+ +*Please note the content of this call is for information purposes only and is subject to change as the project evolves.* + + + diff --git a/content/newsroom/june_project_update/june_project_update.png b/content/newsroom/june_project_update/june_project_update.png new file mode 100644 index 000000000..a613f0d37 Binary files /dev/null and b/content/newsroom/june_project_update/june_project_update.png differ diff --git a/content/newsroom/mainnet_upgrade_314/index.md b/content/newsroom/mainnet_upgrade_314/index.md new file mode 100644 index 000000000..69fdfaac6 --- /dev/null +++ b/content/newsroom/mainnet_upgrade_314/index.md @@ -0,0 +1,24 @@ +--- +id: mainnet_upgrade_314 +title: "🗳 Vote: Bring v3.14 to Mainnet" +image_caption: mainnet_upgrade_314 +description: Calling all farmers to vote on the GEP to bring grid version 3.14 to mainnet! +date: 2024-06-24 +taxonomies: + people: [bernadette_amanda_caster] + tags: [technology,update,threefold_grid,community,news] + news-category: [foundation] +extra: + imgPath: mainnet_upgrade_314.png + +--- + +Calling ThreeFold Farmers to vote on the Grid Enhancement Proposal to bring TF Grid v3.14 to mainnet. The vote ends tomorrow Tuesday June 25 at 10am CEST. This release is focused on stability and reliability and includes improvements and upgrades to Zero OS, TF Chain, Grid-Proxy, Farmerbot, Pulumi, and SDK-Go. Find the details [here](https://forum.threefold.io/t/gep-tf-grid-mainnet-release-3-14/4372). + +
+ +To vote, visit the [Dashboard](https://dashboard.grid.tf/) >>> DAO Section >>> Vote. + +
+ +Have a great week ahead, ThreeFold community! diff --git a/content/newsroom/mainnet_upgrade_314/mainnet_upgrade_314.png b/content/newsroom/mainnet_upgrade_314/mainnet_upgrade_314.png new file mode 100644 index 000000000..bd5a6a432 Binary files /dev/null and b/content/newsroom/mainnet_upgrade_314/mainnet_upgrade_314.png differ diff --git a/content/partners/_index.md b/content/partners/_index.md index 83a287e9a..45894bf3f 100644 --- a/content/partners/_index.md +++ b/content/partners/_index.md @@ -1,6 +1,6 @@ --- title: "Our Partners" -paginate_by: 6 +paginate_by: 9 # paginate_reversed: false diff --git a/content/partners/holochain/holochain2.png b/content/partners/holochain/holochain2.png new file mode 100644 index 000000000..c3fb9acc6 Binary files /dev/null and b/content/partners/holochain/holochain2.png differ diff --git a/content/partners/holochain/holochain3.png b/content/partners/holochain/holochain3.png new file mode 100644 index 000000000..d97c104fe Binary files /dev/null and b/content/partners/holochain/holochain3.png differ diff --git a/content/partners/holochain/index.md b/content/partners/holochain/index.md new file mode 100644 index 000000000..b3f88bc2d --- /dev/null +++ b/content/partners/holochain/index.md @@ -0,0 +1,71 @@ +--- +id: holochain +title: Holochain +description: Holochain is a P2P alternative to the blockchain, giving developers a framework for creating decentralized applications +template: partnerPage.html +taxonomies: + partners-category: [foundation] + tags: [] +date: 2024-07-05 +extra: + countries: [Global] + cities: [] + rank: 1 + imgPath: holochain3.png + image_caption: holochain + partner_logo: holochain.png + websites: https://www.holochain.org/ + private: 0 +--- + +
+ +### **An end-to-end open source P2P app framework** + +[Holochain](https://www.holochain.org) is a framework for developing and running decentralized applications (dApps) designed to be scalable, efficient and adaptable, featuring a peer-to-peer content distribution protocol, cryptography and hash tables. Unlike traditional blockchain architectures, Holochain uses a distributed hash table (DHT) to enable peer-to-peer communication and data storage, offering greater flexibility and performance for decentralized applications. It addresses effectively scalability challenges and is highly environmentally friendly. + +
+ +![holochain](holochain3.png) + +
+ +A significant change enabling Holochain's innovation is its shift from a data-dependent blockchain to an agent-centric system. Unlike blockchain's need for global consensus, Holochain employs an agent system where each agent maintains a private fork, managed on the blockchain in a limited manner using a distributed hash table. This approach eliminates the scalability issues common to blockchain solutions, allowing decentralized applications (dApps) on Holochain to achieve more with fewer resources. + +
+ +![holochain](holochain2.png) + +
+ +ThreeFold and Holochain will together go to market, Holochain as application layer being hosted on the ThreeFold Grid. + +### **Partnership with ThreeFold** + +The partnership between ThreeFold and Holochain merges decentralized infrastructure with advanced application development frameworks. By combining the strengths of both platforms, this collaboration seeks to drive innovation and expedite the adoption of decentralized technologies. + +
+ +#### **How the Partnership Works** + +
+ +**Integration of Services:** ThreeFold's TF Grid will integrate with Holochain's framework, providing decentralized hosting and storage solutions for Holochain-based applications. This integration will enable developers to deploy their dApps on a scalable and resilient infrastructure, enhancing performance and reliability for end-users. + +
+ +**Benefits for Users:** + +- **Enhanced Performance:** Users of Holochain-based applications hosted on the TF Grid will experience improved performance and responsiveness, thanks to the scalable and distributed nature of ThreeFold's infrastructure. + +- **Increased Reliability:** By leveraging ThreeFold's decentralized hosting solutions, users will benefit from enhanced reliability and uptime for Holochain applications, reducing the risk of downtime and service interruptions. + +- **Data Sovereignty:** Users will have greater control over their data and digital assets, as Holochain applications hosted on the TF Grid will adhere to principles of data sovereignty and privacy. + +
+ +**Conclusion:** The partnership between ThreeFold and Holochain represents a strategic alignment of decentralized infrastructure and application development frameworks, aimed at empowering developers and users to build and deploy scalable, efficient, and resilient decentralized applications. By leveraging each other's strengths and capabilities, the partnership holds the promise of driving innovation and accelerating the adoption of decentralized technologies across various industries and use cases. + +
+ +For more information about Holochain, visit [Holochain](holochain.org). diff --git a/content/support/index.md b/content/support/index.md index d8072a93c..6c6f810db 100644 --- a/content/support/index.md +++ b/content/support/index.md @@ -19,7 +19,7 @@ insert_anchor_links: "left" Need help? We've got you covered. The support team is available Monday through Friday 08:00am - 12:00am CET. Click on the blue chat icon at the bottom of this page or follow the button below to talk to one of our support team members. - + {% end %} diff --git a/css/index.css b/css/index.css index 34d528d8f..3a9eab37b 100644 --- a/css/index.css +++ b/css/index.css @@ -48,7 +48,7 @@ img[src*="#icon"] { } img[src*="#social"] { - width: 100px; + width: 80px; margin: auto; } diff --git a/static/images/404_text.png b/static/images/404_text.png new file mode 100644 index 000000000..f6e35e952 Binary files /dev/null and b/static/images/404_text.png differ diff --git a/templates/404.html b/templates/404.html new file mode 100644 index 000000000..ae33f1300 --- /dev/null +++ b/templates/404.html @@ -0,0 +1,20 @@ +{% extends "_default/base.html" %} + +{% block content %} + +
+ +
+
+ 404_image +
+
+

You seem to have ended up on a missing page!

+

This could mean that you’ve entered the wrong URL or you’ve clicked on content which has moved locations or is no longer live. If you need assistance, click on the blue chat icon at the bottom of the screen to speak with real humans on our support team. Or go back to home.

+
+ +
+ +
+ +{% endblock content %} diff --git a/templates/partials/header.html b/templates/partials/header.html index 4916da9db..91bfef91c 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -40,7 +40,7 @@ {{link_label}} {% endif %} - {% elif current == current_url %} + {% elif current_url and current == current_url %} {{link_label}} @@ -83,7 +83,7 @@ -
  • + {#
  • -
  • + #}
    diff --git a/templates/people/single.html b/templates/people/single.html index 6ae30fc2c..180d0e47e 100644 --- a/templates/people/single.html +++ b/templates/people/single.html @@ -1,58 +1,54 @@ -{% extends "_default/base.html" %} -{% block content %} +{% extends "_default/base.html" %} {% block content %} {% set page_path = +term.path ~ 'index.md' | replace(from='-', to='_') | trim_start_matches(pat="/") +%} {% set people = get_section(path="people/_index.md") %} {% set pages_str = +people.pages | json_encode() | as_str %} {% if pages_str is +containing(term.name) %} {% set page = get_page(path=page_path) %} -{% set page_path = term.path ~ 'index.md' | replace(from='-', to='_') | trim_start_matches(pat="/") %} -{% set people = get_section(path="people/_index.md") %} -{% set pages_str = people.pages | json_encode() | as_str %} -{% if pages_str is containing(term.name) %} - {% set page = get_page(path=page_path) %} - - -
    -
    -
    - -
    -
    -
    -

    - {{page.title}} -

    -
    - {% include "partials/socialLinks.html" %} -
    -
    -
    - {{page.content | safe }} -
    -
    - {% if page.taxonomies.memberships %} - {% for tag in page.taxonomies.memberships %} - - {{tag}} - +
    +
    +
    + +
    +
    +
    +

    + {{page.title}} +

    +
    {% include "partials/socialLinks.html" %}
    +
    +
    {{page.content | safe }}
    +
    +
    +
      + {% for org in page.extra.organizations %} +
    • + + + +
    • {% endfor %} - {% endif %} +
    +
    + {% if page.taxonomies.memberships %} {% for tag in + page.taxonomies.memberships %} + + {{tag}} + + {% endfor %} {% endif %}
    -
    -
    -
    -
    -
    +
    +
    +
    +
    -{% endif %} - -{% endblock content %} \ No newline at end of file +{% endif %} {% endblock content %} diff --git a/templates/shortcodes/grid_stats.html b/templates/shortcodes/grid_stats.html index bb5845041..b92a37aa6 100644 --- a/templates/shortcodes/grid_stats.html +++ b/templates/shortcodes/grid_stats.html @@ -5,7 +5,8 @@ {{body | markdown | safe }}
    -
    +
    + The total amount of storage (SSD, HDD, & RAM) on the grid. 1 petabyte equals roughly 1 million gigabytes. capacity
    -
    +
    + The total number of Central Processing Unit cores (compute power) available on the grid. cores
    -
    +
    + The total number of nodes on the grid. A node is a computer server 100% dedicated to the network. nodes
    -
    +
    + The total number of countries where at least one node is connected and operational. countries
    -
    +
    + The total number of farms on the grid. A farm is one or more nodes operated by the same entity / entities.