Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d698e9b
refactor(UI): corrige l'espacement des liens CTA (page de détails d'…
Shamzic Oct 1, 2025
85d5d6b
Répare la génération du fichier de stats en l'absence de données Mato…
guillett Oct 1, 2025
3e37ae5
Ajout des pages d'aides par ville (#4990)
jenovateurs Oct 1, 2025
ceff4a2
Chore(deps): Bump brace-expansion in /contribuer (#4984)
dependabot[bot] Oct 1, 2025
2c330a0
fix: mise en pause de l'aide covoiturage du quotidien (#5008)
jenovateurs Oct 23, 2025
25475e0
met à jour l'AILE de Paris (#5005)
yasmine-glitch Oct 23, 2025
68d4ae5
Crée "Résidences Etudiantes à Loyer Modéré" (#5009)
yasmine-glitch Oct 23, 2025
124ed0b
Chore(deps): Bump @betagouv/aides-velo from 3.2.0 to 3.3.0 (#4999)
dependabot[bot] Oct 23, 2025
39079c4
Maj aides 231025 (#5011)
yasmine-glitch Oct 30, 2025
b851202
Mise à jour d'Openfisca local, paris, france et core (#5001)
jenovateurs Oct 30, 2025
6e3926d
Met à jour ville_lille (#5017)
aides-jeunes-bot Oct 30, 2025
a8a7f03
Ajoute une case à cocher pour accepter la réception du sondage (#5014)
Shamzic Nov 6, 2025
f61eb8d
Met à jour la demande de logement social. (#5013)
yasmine-glitch Nov 6, 2025
582332f
Intègre des liens trackés dans l'aide. Reformule le titre pour inclur…
yasmine-glitch Nov 6, 2025
877786d
Met à jour ville-lille-aide-au-financement-du-permis-de-conduire (#5015)
aides-jeunes-bot Nov 13, 2025
1fcfa4c
fix: test untaire - profil inexistant PR #5015 (#5025)
Shamzic Nov 13, 2025
a75d28b
Chore(deps): Bump openfisca-core[web-api] in /openfisca (#5024)
dependabot[bot] Nov 13, 2025
7bfcb38
Chore(deps): Bump openfisca-france in /openfisca (#5026)
dependabot[bot] Nov 20, 2025
538cd3d
Chore(deps): Bump openfisca-france in /openfisca (#5030)
dependabot[bot] Nov 27, 2025
3ebd03b
Ajout d'un script pour appliquer des milestones aux PRs terminées (#5…
Shamzic Nov 27, 2025
9e93622
Chore(deps): Bump next from 15.4.7 to 15.4.8 in /contribuer (#5033)
dependabot[bot] Dec 4, 2025
2128a23
Chore(deps): Bump openfisca-core[web-api] in /openfisca (#5032)
dependabot[bot] Dec 4, 2025
23be5a8
fix: mettre à jour le label du bouton d'envoi de récapitulatif par em…
Shamzic Dec 4, 2025
6563d3a
Crée ville_lille-dispositif-d-aide-financiere-au-bafa-1 (#5018)
aides-jeunes-bot Dec 8, 2025
4bf6441
Chore(deps): Bump js-yaml from 4.1.0 to 4.1.1 in /contribuer (#5027)
dependabot[bot] Dec 8, 2025
d222606
Extrait le styling des emails (#4910)
guillett Dec 8, 2025
c7bd0b0
Crée ccas-de-redon (#5038)
aides-jeunes-bot Dec 17, 2025
cde1206
Secure supply chain attack (#5034)
Shamzic Dec 18, 2025
16e7848
MAJ Eslint et nextjs (#5036)
jenovateurs Dec 18, 2025
aa97aca
Chore(deps): Bump openfisca-france in /openfisca (#5035)
dependabot[bot] Dec 18, 2025
6d96a50
Chore(deps): Bump openfisca-france in /openfisca (#5041)
dependabot[bot] Dec 26, 2025
364ef78
Chore(deps): Bump openfisca-core[web-api] in /openfisca (#5042)
dependabot[bot] Jan 3, 2026
fe612c5
Ajoute le bouton des lieux proches de chez soi à la fin du sondage (#…
Shamzic Jan 14, 2026
7456ae2
Mise à jour de la page de contribution (#5006)
jenovateurs Jan 14, 2026
c93f64c
Merge remote-tracking branch 'aj/main' into update_20260119
guillett Jan 19, 2026
7cf2526
Linte vite.config.ts
guillett Jan 19, 2026
4558df6
Linte src/styles/themes/mes-aides-org.css
guillett Jan 19, 2026
3553805
Corrige l'affichage des mails dans l'outil local (#5045)
Shamzic Jan 20, 2026
a5f1355
Explicite une étape d'installation seulement
guillett Jan 19, 2026
bfaeab1
Utilise une couleur plus constrastée pour passer les tests d'accessib…
guillett Jan 20, 2026
3279a18
Tente de logguer les erreurs d'accessibilité en CI
guillett Jan 20, 2026
3940db6
Corrige les problèmes d'accessibilité
guillett Jan 20, 2026
8e747a9
Merge remote-tracking branch 'aj/main' into update_20260119
guillett Jan 20, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/check-links-validity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- cron: "30 8 * * *"
jobs:
run:
if: github.repository == 'betagouv/aides-jeunes'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
Expand Down
69 changes: 44 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:
health-check:
runs-on: ubuntu-latest
if: github.event.pull_request.head.repo.full_name == github.repository
if: github.event.pull_request.head.repo.full_name == github.repository && github.repository == 'betagouv/aides-jeunes'
steps:
- name: Check Sentry Status
id: sentry-check
Expand All @@ -35,7 +35,11 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 24
- name: Cache NPM install files
uses: actions/cache@v4
id: restore-npm-install-packages
Expand All @@ -58,7 +62,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Cache Virtual Environment
uses: actions/cache@v4
id: python-dependencies
Expand All @@ -85,7 +89,11 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 24
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand All @@ -102,7 +110,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand All @@ -117,7 +125,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand Down Expand Up @@ -161,7 +169,11 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 24
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand All @@ -188,7 +200,11 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 24
- name: Restore contribuer/node_modules
uses: actions/cache@v4
id: restore-contribuer-dependencies
Expand All @@ -215,7 +231,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
Expand All @@ -242,7 +258,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand Down Expand Up @@ -271,7 +287,11 @@ jobs:
test: [base, family, handicap, patrimoine, student]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 24
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
Expand All @@ -287,6 +307,12 @@ jobs:
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cache-cypress-${{ hashFiles('**/package-lock.json') }}
- name: Cypress install
if: steps.restore-cypress.outputs.cache-hit != 'true'
run: |
node_modules/.bin/cypress install
node_modules/.bin/cypress cache list
node_modules/.bin/cypress verify
- name: Cache Virtual Environment
uses: actions/cache@v4
id: python-dependencies
Expand All @@ -311,13 +337,6 @@ jobs:
source .venv/bin/activate
nohup gunicorn api --chdir openfisca/ --config openfisca/config.py --preload --log-level debug --log-file=- &
deactivate
- name: Cypress install
uses: cypress-io/github-action@v6
if: steps.restore-cypress.outputs.cache-hit != 'true'
with:
browser: chrome
config-file: cypress.config.ts
runTests: false
- name: Copy cypress env file
run: cp .env.e2e .env
- name: Cypress run
Expand Down Expand Up @@ -351,7 +370,7 @@ jobs:
status: ${{ steps.stop-early.outputs.status }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- id: stop-early
Expand All @@ -370,11 +389,11 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
Expand Down Expand Up @@ -416,7 +435,7 @@ jobs:
status: ${{ steps.has-changes.outputs.status }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Restore node modules
Expand All @@ -433,16 +452,16 @@ jobs:
check_benefit_link_improvements:
name: Check benefit link improvements and update link table if necessary
needs: [test_benefit_file_changes]
if: needs.test_benefit_file_changes.outputs.status == 'success' && github.event.pull_request.head.repo.full_name == github.repository
if: needs.test_benefit_file_changes.outputs.status == 'success' && github.event.pull_request.head.repo.full_name == github.repository && github.repository == 'betagouv/aides-jeunes'
runs-on: ubuntu-24.04
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
- name: Restore node modules
uses: actions/cache@v4
id: restore-dependencies
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
engine-strict=true
ignore-scripts=true
4 changes: 2 additions & 2 deletions backend/lib/mes-aides/emails/email-render.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from "fs"
import yaml from "js-yaml"
import { load } from "js-yaml"
import path from "path"
import consolidate from "consolidate"
import { fileURLToPath } from "url"
Expand All @@ -22,7 +22,7 @@ function readFile(filePath) {
const emailTemplate = readFile("templates/email.mjml")
const footerTemplate = readFile("templates/footer.mjml")
const headerTemplate = readFile(`templates/${config.contextName}/header.mjml`)
const style = yaml.load(readFile(`templates/${config.contextName}/style.yaml`))
const style = load(readFile(`templates/${config.contextName}/style.yaml`))
const simulationResultsTemplate = readFile("templates/simulation-results.mjml")
const simulationUsefulnessTemplate = readFile(
"templates/simulation-usefulness.mjml",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ctaBackgroundColor: "#2aa28bff"
ctaBackgroundColor: "#5770be"
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ctaBackgroundColor: "#2aa28bff"
ctaBackgroundColor: "#228572ff"
1 change: 1 addition & 0 deletions contribuer/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
3 changes: 3 additions & 0 deletions contribuer/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
const nextConfig = {
output: "export",
reactStrictMode: true,
images: {
unoptimized: true,
},
}

module.exports = nextConfig
Loading
Loading