diff --git a/README.md b/README.md index 07e2c68..60c167f 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,48 @@ The official website of **your website*** -Production(master branch) [your website domain) +## Getting Started -Staging(developmentr branch) [your website domain) +### Fork the Repository +On the top right corner of the repository page, you will see a button labeled "Fork." Click on it. This action will create a copy of the template repository in your GitHub account. -Last updated: insert date +### Clone the Forked Repository -## Contribution +After forking, go to your GitHub profile, and you should see the forked repository listed there. Click on it. On the right side, you will find a green button labeled "Code." Click on it, and you can either download the repository as a ZIP file or use Git to clone it to your local machine. + +## Replace Template Images + +USE IMAGE TEMPLATE ON: [FIGMA](https://www.figma.com/file/ZOf117YaHS3Gg3IJOvSIZ4/photo-templates?type=design&node-id=0%3A1&mode=design&t=WeavsHLNVCNYNoJg-1) + +Access the provided image template by clicking on the link provided. The template is designed with a fixed format for images, and its layout includes predefined image frames with clear instructions for each section. Familiarize yourself with the template's structure and layout before proceeding. + +Replace the existing image frames in the figma template with your own images, ensuring that they match the specified dimensions and aspect ratios to maintain responsiveness. + +### Customizing Your Website + Export the images from figma files on the new repository. Detailed instructions are provided within the figma file. + + Customize the content as needed to align with your website's theme and purpose, following the instructions within the file. After making these changes, export the images as image files. Be sure to follow any additional guidelines provided in the template file for optimization. + +### Reviewing New Website Changes Locally + +#### Access the Terminal +Within your code editor, open the terminal or command line interface. Make sure you are in the root directory of your website project in the terminal. + +#### Run the Build Script: +Type **./build.sh** in the terminal and press Enter. This script is responsible for building or compiling your website code and assets. + +#### Run the Start Script: +After the build process is complete, type **./start.sh** in the terminal and press Enter. This script typically starts a local development server. + +Wait for the Localhost URL: The start script will initiate a local development server, and it will display a localhost URL, such as **http://localhost:xxxx**, where xxxx is a port number. Wait for this URL to be generated. + +### Open the URL in Your Browser +Once the localhost URL is generated, open your web browser and enter the provided URL (e.g., http://localhost:xxxx). This will display your website locally, allowing you to review the changes you made. + +### Publishing New Website + +To publish your website with [ThreeFold's Operations team](https://github.com/threefoldtech/tf_operations/issues), create a new issue in their GitHub repository here, specifying your preferred domains. They will guide you through the process of domain allocation and setting up your site. Once it's live, test it thoroughly, and feel free to reach out for further support or updates. Feel free to [create a new issue](your repo) to report an error on the website, or if you have any suggestions on website improvements. @@ -31,30 +65,9 @@ Create an issue on: repo ## Administrators [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) -## Contribution Procedure +## Website Maintenance ![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.
-__WARNING__: DO NOT commit straight into __master__ / __development__ branch. - -1. Create an Issue -Feel free to [create a new issue](repo) 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). - - - - - +__WARNING__: DO NOT commit straight into __master__ / __development__ branch. \ No newline at end of file diff --git a/content/.DS_Store b/content/.DS_Store index 339c1ff..773e31b 100644 Binary files a/content/.DS_Store and b/content/.DS_Store differ diff --git a/content/blog/blogtemplate/blog_header.png b/content/blog/blogtemplate/blog_header.png new file mode 100644 index 0000000..e0abf2f Binary files /dev/null and b/content/blog/blogtemplate/blog_header.png differ diff --git a/content/blog/blogtemplate/blogtemplate.webp b/content/blog/blogtemplate/blogtemplate.webp deleted file mode 100644 index b18b4a2..0000000 Binary files a/content/blog/blogtemplate/blogtemplate.webp and /dev/null differ diff --git a/content/blog/blogtemplate/index.md b/content/blog/blogtemplate/index.md index 0e851fc..c87ad95 100644 --- a/content/blog/blogtemplate/index.md +++ b/content/blog/blogtemplate/index.md @@ -8,7 +8,7 @@ taxonomies: tags: [threefold_grid, technology, peer_to_peer, threefold_cloud] categories: [foundation] extra: - imgPath: blogtemplate.webp + imgPath: blog_header.png --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam diff --git a/content/header/_index.md b/content/header/_index.md index ae920c6..fbfd578 100644 --- a/content/header/_index.md +++ b/content/header/_index.md @@ -4,7 +4,7 @@ description: "this is a header." insert_anchor_links: "left" template: "partials/header.html" extra: - logoPath: "/images/logo.svg" + logoPath: "/images/logo.png" imgPath: "" --- diff --git a/content/home/img/block1.webp b/content/home/img/block1.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block1.webp and /dev/null differ diff --git a/content/home/img/block2.webp b/content/home/img/block2.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block2.webp and /dev/null differ diff --git a/content/home/img/block3.webp b/content/home/img/block3.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block3.webp and /dev/null differ diff --git a/content/home/img/block4.webp b/content/home/img/block4.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block4.webp and /dev/null differ diff --git a/content/home/img/block5.webp b/content/home/img/block5.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block5.webp and /dev/null differ diff --git a/content/home/img/block6.webp b/content/home/img/block6.webp deleted file mode 100644 index f27da69..0000000 Binary files a/content/home/img/block6.webp and /dev/null differ diff --git a/content/home/img/bottom.webp b/content/home/img/bottom.webp deleted file mode 100644 index 01619c9..0000000 Binary files a/content/home/img/bottom.webp and /dev/null differ diff --git a/content/home/img/header.webp b/content/home/img/header.webp deleted file mode 100644 index 455847a..0000000 Binary files a/content/home/img/header.webp and /dev/null differ diff --git a/content/home/img/img_column.png b/content/home/img/img_column.png new file mode 100644 index 0000000..33fddfd Binary files /dev/null and b/content/home/img/img_column.png differ diff --git a/content/home/img/img_column_item.png b/content/home/img/img_column_item.png new file mode 100644 index 0000000..031841a Binary files /dev/null and b/content/home/img/img_column_item.png differ diff --git a/content/home/img/img_header.png b/content/home/img/img_header.png new file mode 100644 index 0000000..45b1e7a Binary files /dev/null and b/content/home/img/img_header.png differ diff --git a/content/home/img/img_portrait.png b/content/home/img/img_portrait.png new file mode 100644 index 0000000..f78e048 Binary files /dev/null and b/content/home/img/img_portrait.png differ diff --git a/content/home/img/img_section.png b/content/home/img/img_section.png new file mode 100644 index 0000000..19be1b8 Binary files /dev/null and b/content/home/img/img_section.png differ diff --git a/content/home/img/item1.webp b/content/home/img/item1.webp deleted file mode 100644 index 13b85d8..0000000 Binary files a/content/home/img/item1.webp and /dev/null differ diff --git a/content/home/img/item2.webp b/content/home/img/item2.webp deleted file mode 100644 index 13b85d8..0000000 Binary files a/content/home/img/item2.webp and /dev/null differ diff --git a/content/home/img/item3.webp b/content/home/img/item3.webp deleted file mode 100644 index 13b85d8..0000000 Binary files a/content/home/img/item3.webp and /dev/null differ diff --git a/content/home/img/leftimg.webp b/content/home/img/leftimg.webp deleted file mode 100644 index f6d11c3..0000000 Binary files a/content/home/img/leftimg.webp and /dev/null differ diff --git a/content/home/img/logo1.webp b/content/home/img/logo1.webp deleted file mode 100644 index 4a750cd..0000000 Binary files a/content/home/img/logo1.webp and /dev/null differ diff --git a/content/home/img/logo2.webp b/content/home/img/logo2.webp deleted file mode 100644 index 4a750cd..0000000 Binary files a/content/home/img/logo2.webp and /dev/null differ diff --git a/content/home/img/logo3.webp b/content/home/img/logo3.webp deleted file mode 100644 index 4a750cd..0000000 Binary files a/content/home/img/logo3.webp and /dev/null differ diff --git a/content/home/img/logo4.webp b/content/home/img/logo4.webp deleted file mode 100644 index 4a750cd..0000000 Binary files a/content/home/img/logo4.webp and /dev/null differ diff --git a/content/home/img/logo_bottom.png b/content/home/img/logo_bottom.png new file mode 100644 index 0000000..a8684a2 Binary files /dev/null and b/content/home/img/logo_bottom.png differ diff --git a/content/home/img/rightimg.webp b/content/home/img/rightimg.webp deleted file mode 100644 index f6d11c3..0000000 Binary files a/content/home/img/rightimg.webp and /dev/null differ diff --git a/content/home/index.md b/content/home/index.md index e2a152c..fa03e86 100644 --- a/content/home/index.md +++ b/content/home/index.md @@ -31,7 +31,7 @@ weight: 1 ||| -![placeholder](./img/header.webp#mx-auto) +![placeholder](./img/img_header.png#mx-auto) {% end %} @@ -51,7 +51,7 @@ weight: 1
-![Image](./img/item1.webp#md#mx-auto) +![Image](./img/img_column_item.png#md#mx-auto) #### item 1 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam @@ -62,7 +62,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/item2.webp#md#mx-auto) +![Image](./img/img_column_item.png#md#mx-auto) #### item 2 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam @@ -72,7 +72,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/item3.webp#md#mx-auto) +![Image](./img/img_column_item.png#md#mx-auto) #### item 3 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam @@ -85,7 +85,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i {% row(style="left" margin="withContainer" padding="bottom") %} -![placeholder](./img/leftimg.webp#mx-auto) +![placeholder](./img/img_section.png#mx-auto) ||| @@ -119,7 +119,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i ||| -![placeholder](./img/rightimg.webp#mx-auto) +![placeholder](./img/img_section.png#mx-auto) @@ -142,7 +142,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block1.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -153,7 +153,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block2.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -164,7 +164,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block3.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -179,7 +179,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block4.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -190,7 +190,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block5.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -201,7 +201,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
-![Image](./img/block6.webp#sm#mx-auto) +![Image](./img/img_column.png#sm#mx-auto) #### Lorem ipsum Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. @@ -214,7 +214,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i {% row(style="left" margin="withContainer" padding="both") %} -![](./img/bottom.webp#mx-auto) +![](./img/img_portrait.png#mx-auto) ||| @@ -235,18 +235,18 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i {% row(style="center" padding="bottom") %} -[![logo1](img/logo1.webp#small)](yourlink) +[![logo1](img/logo_bottom.png#small)](yourlink) ||| -[![logo2](img/logo2.webp#small)](yourlink) +[![logo2](img/logo_bottom.png#small)](yourlink) ||| -[![logo3](img/logo3.webp#small)](yourlink) +[![logo3](img/logo_bottom.png#small)](yourlink) ||| -[![logo4](img/logo4.webp#small)](yourlink) +[![logo4](img/logo_bottom.png#small)](yourlink) {% end %} \ No newline at end of file diff --git a/content/newsroom/newstemplate/index.md b/content/newsroom/newstemplate/index.md index 5049f5b..39b0d91 100644 --- a/content/newsroom/newstemplate/index.md +++ b/content/newsroom/newstemplate/index.md @@ -8,7 +8,7 @@ taxonomies: tags: [community,technology,update,event] news-category: [foundation] extra: - imgPath: newstemplate.webp + imgPath: news_header.png --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. diff --git a/content/newsroom/newstemplate/news_header.png b/content/newsroom/newstemplate/news_header.png new file mode 100644 index 0000000..e0abf2f Binary files /dev/null and b/content/newsroom/newstemplate/news_header.png differ diff --git a/content/newsroom/newstemplate/newstemplate.webp b/content/newsroom/newstemplate/newstemplate.webp deleted file mode 100644 index b18b4a2..0000000 Binary files a/content/newsroom/newstemplate/newstemplate.webp and /dev/null differ diff --git a/static/images/logo.png b/static/images/logo.png new file mode 100644 index 0000000..9fff0ff Binary files /dev/null and b/static/images/logo.png differ diff --git a/static/images/logo.svg b/static/images/logo.svg deleted file mode 100644 index f58e210..0000000 --- a/static/images/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -