Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #101

Merged
merged 8 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
hugo: circleci/hugo@0.3.1
hugo: circleci/hugo@1.3.0

jobs:
test:
Expand All @@ -23,6 +23,20 @@ jobs:
name: Run tests
command: npm test

html_validate:
docker:
- image: cimg/ruby:2.7.3-browsers
steps:
- checkout
- run:
name: Install html-proofer
command: gem install html-proofer --version 4.4.3
- attach_workspace:
at: .
- run:
name: Check HTML common mistakes
command: exec htmlproofer ./public --assume-extension .html --check-sri true --disable-external true --ignore-empty-alt true --allow-missing-href true

deploy:
docker:
- image: circleci/node:lts
Expand All @@ -48,12 +62,16 @@ workflows:
jobs:
- test
- hugo/build:
version: '0.37'
html-proofer: true
version: '0.106'
html-proofer: false
- html_validate:
requires:
- hugo/build
- deploy:
requires:
- test
- hugo/build
- html_validate
filters:
branches:
only: master
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thank you for wanting to contribute to OpenFisca! :smiley:

Feel free to contact us or send us pull requests over GitHub.
For more information on how to do so, please see our [contribution guidelines](http://openfisca.org/doc/contribute/index.html).
For more information on how to do so, please see our [contribution guidelines](https://openfisca.org/doc/contribute/index.html).
2 changes: 1 addition & 1 deletion config.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
baseURL = "http://openfisca.org/"
baseURL = "https://openfisca.org/"
title = "OpenFisca"
theme = "ananke" # alternatives: https://themes.gohugo.io/github-project-landing-page/ https://themes.gohugo.io/hugo-universal-theme/

Expand Down
6 changes: 3 additions & 3 deletions layouts/_default/packages.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h3>{{ $.Param "nz" }}</h3>
{{ $.Param "sources_introduction" }} <a href="https://github.com/ServiceInnovationLab/openfisca-aotearoa">GitHub</a>.
</p> 
</div>
<a href="http://nz.openfisca.org" class="cta">{{ $.Param "explore" }}</a>
<a href="https://nz.openfisca.org" class="cta">{{ $.Param "explore" }}</a>
</section>

<section class="row">
Expand Down Expand Up @@ -127,12 +127,12 @@ <h3>{{ $.Param "nsw" }}</h3>
{{ $.Param "sources_introduction" }} <a href="https://github.com/digitalnsw/openfisca-nsw">GitHub</a>.
</p> 
</div>
<a href="http://nsw-rules.herokuapp.com/" class="cta">{{ $.Param "explore" }}</a>
<a href="https://nsw-rules.herokuapp.com/" class="cta">{{ $.Param "explore" }}</a>
</section>

<section class="row">
<h3 class="left-col">{{ $.Param "others" }}</h3>
<a href="http://openfisca.org/doc/coding-the-legislation/bootstrapping_a_new_country_package.html" class="cta">{{ $.Param "modelize" }}</a>
<a href="https://openfisca.org/doc/coding-the-legislation/bootstrapping_a_new_country_package.html" class="cta">{{ $.Param "modelize" }}</a>
</section>
</div>
{{ end }}
2 changes: 1 addition & 1 deletion layouts/_default/tracking.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3>{{ $.Param "consent.title" }}</h3>
</p>
<h3>{{ $.Param "data.title" }}</h3>
<p>
{{ $.Param "data.description" }} <a href="http://stats.data.gouv.fr/index.php?module=CoreHome&action=index&idSite=4&period=range&date=previous30#?module=Dashboard&action=embeddedIndex&idSite=4&period=range&date=previous30&idDashboard=1">stats.data.gouv.fr</a>
{{ $.Param "data.description" }} <a href="https://stats.data.gouv.fr/index.php?module=CoreHome&action=index&idSite=4&period=range&date=previous30#?module=Dashboard&action=embeddedIndex&idSite=4&period=range&date=previous30&idDashboard=1">stats.data.gouv.fr</a>
</p>
</section>
</div>
Expand Down
10 changes: 5 additions & 5 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<h1>{{ .Title}}</h1>

<a href="{{ "countries" | relLangURL }}" class="cta get-started">{{ $.Param "get_started" }}  🙌</a>
<a href="{{ "packages" | relLangURL }}" class="cta get-started">{{ $.Param "get_started" }}  🙌</a>
</div>
</header>

Expand Down Expand Up @@ -68,7 +68,7 @@ <h3>{{ $.Param "usecases.reforms.title" }}</h3>

<figure>
<img class="screenshot" src="/img/revenu-de-base.jpg" alt="Comment appréhender le coût d’un revenu de base ?">
<figcaption><a href="http://www.revenudebase.info/2017/04/07/apprehender-cout-dun-revenu-de-base/">Publication</a> {{ $.Param "usecases.reforms.caption_1" }} <a href="https://openfisca.org/doc/openfisca-python-api/index.html">Python API</a> {{ $.Param "usecases.reforms.caption_2" }}</figcaption>
<figcaption><a href="https://www.revenudebase.info/2017/04/07/apprehender-cout-dun-revenu-de-base/">Publication</a> {{ $.Param "usecases.reforms.caption_1" }} <a href="https://openfisca.org/doc/openfisca-python-api/index.html">Python API</a> {{ $.Param "usecases.reforms.caption_2" }}</figcaption>
</figure>
</section>

Expand All @@ -80,7 +80,7 @@ <h3>{{ $.Param "usecases.rapu_ture.title" }}</h3>

<figure>
<img class="screenshot" src="/img/rapu-ture.png" alt="Rapu Ture - Exploring the Rules">
<figcaption><a href="http://nz.openfisca.org/">Rapu Ture</a> {{ $.Param "usecases.rapu_ture.caption" }}</figcaption>
<figcaption><a href="https://nz.openfisca.org/">Rapu Ture</a> {{ $.Param "usecases.rapu_ture.caption" }}</figcaption>
</figure>
</section>

Expand All @@ -89,11 +89,11 @@ <h3>{{ $.Param "usecases.rapu_ture.title" }}</h3>

<figure>
<img class="screenshot" src="/img/legexp-nsw.png" alt="New South Wales's Legislation Explorer">
<figcaption><a href="http://nsw-rules.herokuapp.com/">New South Wales</a> {{ $.Param "usecases.legexp_nsw.caption_1" }} <a href="https://github.com/openfisca/legislation-explorer">Legislation Explorer</a> {{ $.Param "usecases.legexp_nsw.caption_2" }}</figcaption>
<figcaption><a href="https://nsw-rules.herokuapp.com/">New South Wales</a> {{ $.Param "usecases.legexp_nsw.caption_1" }} <a href="https://github.com/openfisca/legislation-explorer">Legislation Explorer</a> {{ $.Param "usecases.legexp_nsw.caption_2" }}</figcaption>
</figure>
</section>

<a href="{{ "countries" | relLangURL }}" class="cta get-started">{{ $.Param "get_started" }} 🙌</a>
<a href="{{ "packages" | relLangURL }}" class="cta get-started">{{ $.Param "get_started" }} 🙌</a>

{{ partial "footer.html" . }}
</body>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
<script type="text/javascript" src="/scripts/track-page.js"></script>
<noscript>
openfisca.org needs JavaScript to work properly.
Please follow <a href="http://www.enable-javascript.com">instructions to activate JavaScript in your browser</a>.
Please follow <a href="https://www.enable-javascript.com">instructions to activate JavaScript in your browser</a>.
</noscript>
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"devDependencies": {
"eslint": "^4.4.1",
"eslint-config-google": "^0.9.1",
"gh-pages": "^1.0.0"
"gh-pages": "^4.0.0"
},
"engines": {
"node": ">10"
},
"repository": {
"type": "git",
Expand Down