Skip to content

Commit

Permalink
Change all QGIS Hugo occurrences to QGIS Website
Browse files Browse the repository at this point in the history
  • Loading branch information
Xpirix committed Jul 30, 2024
1 parent f239e02 commit ce40314
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/update-feeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
scrape:
runs-on: ubuntu-latest
steps:
- name: '🛒 Checkout QGIS Hugo'
- name: '🛒 Checkout QGIS Website'
uses: actions/checkout@v3
with:
ref: main
path: ./qgis-hugo
path: ./qgis-website

- name: '🐍 Setup Python'
uses: actions/setup-python@v3
Expand All @@ -26,19 +26,19 @@ jobs:

- name: '🚸Install Python deps'
run: |
cd ./qgis-hugo
cd ./qgis-website
pip install pipenv && pipenv install -r REQUIREMENTS.txt && pipenv sync --bare
pipenv run pip freeze
- name: '🗞️ Fetch Feed Content'
run: |
cd ./qgis-hugo
cd ./qgis-website
pipenv run pip freeze
pipenv run ./fetch_feeds.py
- name: '✉️ Commit'
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: 'Funders scraped and committed via a GitHub Action.'
repository: ./qgis-hugo
repository: ./qgis-website
# push_options: --force
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
help:
@echo "QGIS Hugo"
@echo "QGIS Website"
@echo
@echo "Brought to you by Kartoza (Pty) Ltd."
@echo
@echo "Help for using this Makefile"
@echo
@echo "For detailed help please visit:"
@echo "https://github.com/QGIS/QGIS-Hugo"
@echo "https://github.com/QGIS/QGIS-Website"
@echo
@echo "------------------------------------------------------------------"
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m - %s\n", $$1, $$2}'
Expand Down
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# QGIS Hugo Website
# QGIS Website

![Screenshot](./img/hugo-preview.png)

By Tim Sutton and QGIS Contributors.

## Project Status

[![E2E Tests](https://github.com/qgis/QGIS-Hugo/actions/workflows/e2e.yml/badge.svg)](https://github.com/qgis/QGIS-Hugo/actions/workflows/e2e.yml)
[![Deploy Hugo site to Pages](https://github.com/qgis/QGIS-Hugo/actions/workflows/hugo.yml/badge.svg)](https://github.com/qgis/QGIS-Hugo/actions/workflows/hugo.yml)
![Website Status](https://img.shields.io/website-up-down-green-red/http/qgis.github.io/QGIS-Hugo.svg)
![License](https://img.shields.io/github/license/qgis/QGIS-Hugo.svg)
[![E2E Tests](https://github.com/qgis/QGIS-Website/actions/workflows/e2e.yml/badge.svg)](https://github.com/qgis/QGIS-Website/actions/workflows/e2e.yml)
[![Deploy Hugo site to Pages](https://github.com/qgis/QGIS-Website/actions/workflows/hugo.yml/badge.svg)](https://github.com/qgis/QGIS-Website/actions/workflows/hugo.yml)
![Website Status](https://img.shields.io/website-up-down-green-red/http/qgis.github.io/QGIS-Website.svg)
![License](https://img.shields.io/github/license/qgis/QGIS-Website.svg)

![](https://img.shields.io/github/issues/qgis/QGIS-Hugo.svg)
![](https://img.shields.io/github/issues-closed/qgis/QGIS-Hugo.svg)
![](https://img.shields.io/github/issues-pr/qgis/QGIS-Hugo.svg)
![](https://img.shields.io/github/issues-pr-closed/qgis/QGIS-Hugo.svg)
![](https://img.shields.io/github/issues/qgis/QGIS-Website.svg)
![](https://img.shields.io/github/issues-closed/qgis/QGIS-Website.svg)
![](https://img.shields.io/github/issues-pr/qgis/QGIS-Website.svg)
![](https://img.shields.io/github/issues-pr-closed/qgis/QGIS-Website.svg)


Project stars:
![Stars](https://starchart.cc/qgis/QGIS-Hugo.svg)
![Stars](https://starchart.cc/qgis/QGIS-Website.svg)

## 🏃Before you start

Expand All @@ -30,8 +30,8 @@ This web site is a static site built using [Hugo](https://gohugo.io/).

development
```
git clone https://github.com/qgis/QGIS-Hugo.git
cd QGIS-Hugo
git clone https://github.com/qgis/QGIS-Website.git
cd QGIS-Website
```


Expand Down Expand Up @@ -78,7 +78,7 @@ If you are using VSCode, I recommend the following extensions:
Clone the repo:

```
git clone https://github.com/qgis/qgis-hugo.git
git clone https://github.com/qgis/QGIS-Website.git
```

Run the site:
Expand Down Expand Up @@ -155,7 +155,7 @@ $PLAYWRIGHT \
--project chromium
```

Read more on testing [here](https://github.com/qgis/QGIS-Hugo/blob/main/playwright/ci-test/README.md).
Read more on testing [here](https://github.com/qgis/QGIS-Website/blob/main/playwright/ci-test/README.md).

### Running as github action

Expand Down Expand Up @@ -213,7 +213,7 @@ Also some bulma theme overrides are placed in themes/hugo-bulma-blocks-theme/ass

We welcome your contributions! All contributors are expected to sign a contributor license agreement (CLA) which you can see [here](https://gist.github.com/timlinux/cc20c0b8860648da977a261d46b170d4). This process is automatically enabled when you create your first pull request via https://cla-assistant.io/.

[![CLA assistant](https://cla-assistant.io/readme/badge/qgis/QGIS-Hugo)](https://cla-assistant.io/qgis/QGIS-Hugo)
[![CLA assistant](https://cla-assistant.io/readme/badge/qgis/QGIS-Website)](https://cla-assistant.io/qgis/QGIS-Website)

## 💮 Changing the templates

Expand All @@ -226,7 +226,7 @@ We welcome your contributions! All contributors are expected to sign a contribut

The layout of the landing page is themes/hugo-bulma-blocks-theme/layouts/index.html: the main page has many diverse blocks, that are not used anywhere else, hence its content is mostly in the partials.

The ``content/_index.md`` contains the front matter of the page and the contents for the `feature` shortcodes. Just edit whatever you like there. The blocks shortcodes are described [here](https://github.com/qgis/QGIS-Hugo/blob/main/docs/shortcodes.md)
The ``content/_index.md`` contains the front matter of the page and the contents for the `feature` shortcodes. Just edit whatever you like there. The blocks shortcodes are described [here](https://github.com/qgis/QGIS-Website/blob/main/docs/shortcodes.md)


## 📃 Adding a top level page
Expand All @@ -249,7 +249,7 @@ markdown as ```/img/foo.png```.

The site uses a number of shortcodes to create reusable blocks of content. These are defined in the ```themes/hugo-bulma-blocks-theme/layouts/shortcodes/``` folder.

The shortcodes with screenshots are described [here](https://github.com/qgis/QGIS-Hugo/blob/main/docs/shortcodes.md)
The shortcodes with screenshots are described [here](https://github.com/qgis/QGIS-Website/blob/main/docs/shortcodes.md)

<!-- 3rd level header with icon with title Reusable header web component -->
### Reusable header web component
Expand Down Expand Up @@ -356,11 +356,11 @@ See [nginx map tutorial](https://gauravswaroop.medium.com/nginx-bulk-url-redirec

## Stripe donations

main donation page: [https://qgis.github.io/QGIS-Hugo/funding/donate/](https://qgis.github.io/QGIS-Hugo/funding/donate/)
main donation page: [https://qgis.github.io/QGIS-Website/funding/donate/](https://qgis.github.io/QGIS-Website/funding/donate/)

Stripe widget can be included to any page with the shortcode `{{<stripe-widget>}}`

Payment options are implemented with [Payment Links](https://docs.stripe.com/no-code/payment-links). Values and links can be updated in [data/stripe_products.yml](https://github.com/qgis/QGIS-Hugo/blob/main/data/stripe_products.yml)
Payment options are implemented with [Payment Links](https://docs.stripe.com/no-code/payment-links). Values and links can be updated in [data/stripe_products.yml](https://github.com/qgis/QGIS-Website/blob/main/data/stripe_products.yml)

**Note**: payment links also support recurring donations (subscriptions) - products with recurrent payments should be created for that matter

Expand All @@ -371,7 +371,7 @@ Is not ported yet. Donors are stored in data/donors.json. [adddonor.pl](https://
## Auto-checking for broken links

```
docker run --rm dcycle/broken-link-checker:3 https://qgis.github.io/QGIS-Hugo > broken_links.csv
docker run --rm dcycle/broken-link-checker:3 https://qgis.github.io/QGIS-Website > broken_links.csv
```

Crawls the site and reports all 404. Full run takes apout 10 mins
2 changes: 1 addition & 1 deletion config/config.gh-pages.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
minify = true

[params]
uniNavHeaderLocationPrefix = "/QGIS-Hugo"
uniNavHeaderLocationPrefix = "/QGIS-Website"
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ showcase: "planet"



<li>Design for new web site landing page: <a href="https://qgis.github.io/QGIS-Hugo/" target="_blank" rel="noreferrer noopener">https://qgis.github.io/QGIS-Hugo/</a></li>
<li>Design for new web site landing page: <a href="https://qgis.github.io/QGIS-Website/" target="_blank" rel="noreferrer noopener">https://qgis.github.io/QGIS-Website/</a></li>



<li>Design for new web site (figma): <a href="https://www.figma.com/file/1jFYgq9R5nwHChf4HhhHpW/QGIS-(Copy)?type=design&amp;node-id=301-299&amp;mode=design&amp;t=rvdeAl4RSuzKJftu-0" target="_blank" rel="noreferrer noopener">https://www.figma.com/file/1jFYgq9R5nwHChf4HhhHpW/QGIS-(Copy)?type=design&amp;node-id=301-299&amp;mode=design&amp;t=rvdeAl4RSuzKJftu-0</a>&nbsp;</li>



<li>Code for new web site (what we have built so far): <a href="https://github.com/qgis/QGIS-Hugo" target="_blank" rel="noreferrer noopener">https://github.com/qgis/QGIS-Hugo</a></li>
<li>Code for new web site (what we have built so far): <a href="https://github.com/qgis/QGIS-Website" target="_blank" rel="noreferrer noopener">https://github.com/qgis/QGIS-Website</a></li>



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ showcase: "planet"



<p>Our approach also facilitated the creation of a very performant <span style="margin: 0px; padding: 0px;">website, as you can see&nbsp;<a href="https://github.com/qgis/QGIS-Hugo/pull/342" target="_blank">here</a>. We will try to adhere to these principles for the auxiliary site updates we do in the future,</span> too.</p>
<p>Our approach also facilitated the creation of a very performant <span style="margin: 0px; padding: 0px;">website, as you can see&nbsp;<a href="https://github.com/qgis/QGIS-Website/pull/342" target="_blank">here</a>. We will try to adhere to these principles for the auxiliary site updates we do in the future,</span> too.</p>



Expand Down Expand Up @@ -231,7 +231,7 @@ showcase: "planet"



<p>We hope our goals and process make sense for everybody and that we were able to lay out a clear, logical argument about why we don&#8217;t want to translate the new website quite yet. We want to focus on these overarching goals and then return to them later if they are still a priority for people. Everything we have built is Open Source and available at <a href="https://github.com/qgis/QGIS-Hugo/">this repo</a>, where you can also find an issue tracker to report issues and share ideas relating to the new website.</p>
<p>We hope our goals and process make sense for everybody and that we were able to lay out a clear, logical argument about why we don&#8217;t want to translate the new website quite yet. We want to focus on these overarching goals and then return to them later if they are still a priority for people. Everything we have built is Open Source and available at <a href="https://github.com/qgis/QGIS-Website/">this repo</a>, where you can also find an issue tracker to report issues and share ideas relating to the new website.</p>



Expand Down
2 changes: 1 addition & 1 deletion playwright/ci-test/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default defineConfig({
trace: "on-first-retry",
baseURL:
process.env.STAGING === "1"
? "https://qgis.github.io/QGIS-Hugo/"
? "https://qgis.github.io/QGIS-Website/"
: "http://127.0.0.1:1313",
},

Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mkShell {
export DIRENV_LOG_FORMAT=
echo "-----------------------"
echo "🌈 Your Hugo Dev Environment is ready."
echo "It provides hugo and vscode for use with the QGIS Hugo Project"
echo "It provides hugo and vscode for use with the QGIS Website Project"
echo ""
echo "🪛 VSCode:"
echo "--------------------------------"
Expand Down
4 changes: 2 additions & 2 deletions themes/hugo-bulma-blocks-theme/layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@

</div>
<div class="columns is-desktop issue-report-link is-justify-content-center">
<a href="https://github.com/qgis/QGIS-Hugo/issues" class="column is-narrow p-0 is-size-6" target="_blank">Problems with this website? Report an issue here 🐙</a>
<a href="https://github.com/qgis/QGIS-Website/issues" class="column is-narrow p-0 is-size-6" target="_blank">Problems with this website? Report an issue here 🐙</a>

</div>
</div>
<div class="commit-link is-size-7">
{{ $commit := readFile (print .Site.Params.commitFile)}}
<p>
Commit revision: <a href="https://github.com/qgis/QGIS-Hugo/commit/{{ $commit }}" target="_blank">{{ $commit }}</a>
Commit revision: <a href="https://github.com/qgis/QGIS-Website/commit/{{ $commit }}" target="_blank">{{ $commit }}</a>
</p>
</div>
</footer>
Expand Down

0 comments on commit ce40314

Please sign in to comment.