ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development_zola' of github.com:threefoldfoundation/www_threefold_io into development_zola

Browse Source
This commit is contained in:
kristof de spiegeleer
2024-04-04 06:26:58 +02:00
parent 77b52355f2 459629ddaf
commit 264c47ed58
7 changed files with 62 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,18 @@
![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 the __master__ / __development__ branches.
1. 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 the __development__ branch. By creating a new branch from __development__ you will be provided with the latest copy of the live website content at the staging site, www2.threefold.io.
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 www.threefold.io (master branch).

67
README.md
View File

@@ -1,68 +1,41 @@
# Welcome to Welcome to ThreeFold Website RepositoryWebsite Repository # Threefold Website
Official website for Threefold.
![](./static/images/tf_logo.png) **Administration & Access**
## About This website is administered by [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin). Publishing changes directly to `development` and `master` branches requires access for repository admins. Please see [contribution procedures](CONTRIBUTING.md) for more information.
The official website of ThreeFold Foundation. <br> **Deployment**
- Production: [www.threefold.io](https://www.threefold.io) (`master` branch)
- Staging: [www2.threefold.io](https://www2.threefold.io) (`development` branch)
Production: [www.threefold.io](https://www.threefold.io) (master branch) ## Getting started
Staging: www2.threefold.io (development branch) 1. Install `hero` if you don't have it
```bash
curl https://raw.githubusercontent.com/freeflowuniverse/crystallib/development/scripts/installer_hero.sh > /tmp/hero_install.sh
bash /tmp/hero_install.sh
```
Last Updated: May 2023 1. Clone repository
## Administrators 2. edit content or playbook
[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin)
## Contribution Procedure 3. run playbook to preview website in browser
![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) `hero zola -u https://github.com/threefoldfoundation/www_threefold_io/tree/development_zola/playbook` or `bash start.sh`
It is highly important to follow this procedure to contribute to the website content. <br> 4. save and publish changes
__WARNING__: DO NOT commit straight into the __master__ / __development__ branches.
1. 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 the __development__ branch. By creating a new branch from __development__ you will be provided with the latest copy of the live website content at the staging site, www2.threefold.io.
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 www.threefold.io (master branch).
## Development ## Development
While contributing content to this site doesn't strictly require setting up a development environment, it will allow you to preview your changes and that's super handy. This website is built with `hero`, using `zola` under the hood.
To do that, the following prerequisites are needed: Please see
* macOS or Linux
* [Zola](https://www.getzola.org/documentation/getting-started/installation/)
Then clone the repository recursively to also pull in contents of `threefold_data`:
```
git clone --recursive https://github.com/threefoldfoundation/www_threefold_io.git
```
Now run `build.sh` to download Tailwind, build the CSS, and also build the site with Zola:
```
cd www_threefold_io
bash build.sh
```
Finally, start a browsable local copy of the site that will respond to changes in the source files like this: Finally, start a browsable local copy of the site that will respond to changes in the source files like this:
```
zola serve
```
Zola will display a local address such as `http://127.0.0.1:1111` which you can click or copy and paste into your browser to view the site on your own machine. Zola will display a local address such as `http://127.0.0.1:1111` which you can click or copy and paste into your browser to view the site on your own machine.

10
content/_index.md
View File

@@ -1,10 +0,0 @@
---
title: "Home"
description: "ThreeFold is the world’s first system enabling anyone to become a cloud and internet service provider." # quotation marks to allow colons where used
date: 2018-09-14T21:00:00-05:00
updated: 2021-02-20T14:40:00-06:00
draft: false
extra:
author: Your name here
imgPath: home/header_new.jpeg
---

15
playbook/1_define.md
View File

@@ -6,8 +6,11 @@ We first define our website and add our zola template to it.
!!website.define !!website.define
name:'www2_threefold' name:'www2_threefold'
title:'Threefold Development' title:'Threefold Development'
description: "ThreeFold is the world’s first system enabling anyone to become a cloud and internet service provider."
!!website.template_add url:'https://github.com/freeflowuniverse/webcomponents/tree/main/zola' !!website.template_add
url:'https://github.com/freeflowuniverse/webcomponents/tree/main/zola'
pull: true
``` ```
Then we add the [doctrees]() we will use for the website. When we add a doctree, all [collections]() from the doctree are imported and available to be used in building our website. Then we add the [doctrees]() we will use for the website. When we add a doctree, all [collections]() from the doctree are imported and available to be used in building our website.
@@ -17,9 +20,15 @@ We use the following doctrees in our website:
- `threefoldfoundation/www_threefold_io` for site content for pages. - `threefoldfoundation/www_threefold_io` for site content for pages.
```js ```js
// add collections to the website using their github url // add collections to the website using their github url
!!website.doctree_add url:'https://github.com/threefoldfoundation/www_threefold_io/tree/development_zola/content' !!website.doctree_add
url:'https://github.com/threefoldfoundation/www_threefold_io/tree/development_zola/content'
branch: development_zola
pull: true
!!website.doctree_add url:'https://github.com/threefoldfoundation/threefold_data/tree/development_zola/content'
!!website.doctree_add
url:'https://github.com/threefoldfoundation/threefold_data/tree/development_zola/content'
pull: true
``` ```
_Note that you can also use a specific branch for your doctrees_ _Note that you can also use a specific branch for your doctrees_

6
playbook/2_people.md
View File

@@ -1,9 +1,8 @@
## People ## People
Here, we add the people we want to display in the people page. The people we want to add are defined in the `people` collection, so we need to add the file from the `people` collection which defines the person. In this page, we add the people we want to display in the people section. The people we want to add are defined in the `people` collection of `threefold_data`, so we need to add the file from the `people` collection which defines the person.
First we define the title and description of our people section.
Note that the order we add the people determines the order in which they are listed in.
```js ```js
!!website.people_add !!website.people_add
@@ -13,6 +12,7 @@ Note that the order we add the people determines the order in which they are lis
``` ```
Note that above we chose to sort by the order we add the people. As such, the order below determines the order in which they are listed in.
```js ```js
!!website.person_add pointer:'people:kristof_de_spiegeleer.md' !!website.person_add pointer:'people:kristof_de_spiegeleer.md'

2
playbook/3_news.md
View File

@@ -1,5 +1,7 @@
## News ## News
we add the news articles we want to display in the news section section. The people we want to add are defined in the `people` collection of `threefold_data`, so we need to add the file from the `people` collection which defines the person.
```js ```js
!!website.news_add pointer:'newsroom:2020_rewind_grid_24.md' !!website.news_add pointer:'newsroom:2020_rewind_grid_24.md'
!!website.news_add pointer:'newsroom:2021_review_2022_preview.md' !!website.news_add pointer:'newsroom:2021_review_2022_preview.md'

28
start.sh
View File

@@ -1,25 +1,9 @@
# builds if executable isn't foound # install hero if not installed
if [ ! -f "tailwindcss" ] if [ ! -f "hero" ]
then then
sh build.sh curl https://raw.githubusercontent.com/freeflowuniverse/crystallib/development/scripts/installer_hero.sh > /tmp/hero_install.sh
bash /tmp/hero_install.sh
fi fi
# initialized and configures tailwind if not configured # run playbook
if [ ! -f "tailwind.config.js" ] hero zola -u https://github.com/threefoldfoundation/www_threefold_io/tree/development_zola/playbook
then
./tailwindcss init
sed -i '' "s| content: \\[\\],| content: \\['./templates/**/*.html'\\],|g" tailwind.config.js
fi
# compiles tailwind css & launches locally
rm -rf public static/css
./tailwindcss -i css/index.css -o ./static/css/index.css --watch & zola serve &
# compiles tailwind css for prod & builds project
./tailwindcss -i css/index.css -o ./static/css/index.css --minify
zola build
# kills zola and tw bg processes on interrupt
trap 'kill $(jobs -p); exit 1' INT
wait