From a811cc85dc80525da0952734ac887840e0fdfba9 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Mon, 13 Jul 2026 14:36:59 +0200 Subject: [PATCH 01/10] Create simulator page --- src/pages/simulateur.md | 14 ++++++++++++++ src/scss/components/_iframe.scss | 17 +++++++++++++++++ src/scss/global.scss | 1 + 3 files changed, 32 insertions(+) create mode 100644 src/pages/simulateur.md create mode 100644 src/scss/components/_iframe.scss diff --git a/src/pages/simulateur.md b/src/pages/simulateur.md new file mode 100644 index 0000000..168cc78 --- /dev/null +++ b/src/pages/simulateur.md @@ -0,0 +1,14 @@ +--- +title: 'Simulateur de revenus' +permalink: '/simulateur/index.html' +eleventyExcludeFromCollections: true +--- + +
+ +
\ No newline at end of file diff --git a/src/scss/components/_iframe.scss b/src/scss/components/_iframe.scss new file mode 100644 index 0000000..7f26b64 --- /dev/null +++ b/src/scss/components/_iframe.scss @@ -0,0 +1,17 @@ +.iframe-container { + width: 100%; + height: 100%; + position: relative; + padding-top: 56.25%; + + iframe { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + width: 100%; + height: 100%; + border: 0; + } +} diff --git a/src/scss/global.scss b/src/scss/global.scss index f20dc24..280a767 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -17,6 +17,7 @@ @use 'components/gouvernance'; @use 'components/heading-permalink'; @use 'components/intro'; +@use 'components/iframe'; @use 'components/nav'; @use 'components/posts'; @use 'components/post'; -- 2.39.5 From a745b29126790acc9aa0d6ddc3d95c8ed26529f6 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Mon, 13 Jul 2026 14:38:15 +0200 Subject: [PATCH 02/10] Fix simulator height --- src/scss/components/_iframe.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/components/_iframe.scss b/src/scss/components/_iframe.scss index 7f26b64..b6302fb 100644 --- a/src/scss/components/_iframe.scss +++ b/src/scss/components/_iframe.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; position: relative; - padding-top: 56.25%; + padding-top: 90vh; iframe { position: absolute; -- 2.39.5 From a946fd4898e3b71e7363737a52da531890b6dfb8 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 16 Jul 2026 09:13:48 +0200 Subject: [PATCH 03/10] Remove padding from outside the iframe via specific layout --- src/_includes/layouts/simulateur.njk | 12 ++++++++++++ src/pages/simulateur.md | 7 ++++--- src/scss/components/_iframe.scss | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/_includes/layouts/simulateur.njk diff --git a/src/_includes/layouts/simulateur.njk b/src/_includes/layouts/simulateur.njk new file mode 100644 index 0000000..289a130 --- /dev/null +++ b/src/_includes/layouts/simulateur.njk @@ -0,0 +1,12 @@ +{% extends 'layouts/base.njk' %} + +{% block content %} +
+
+
+ {{ content | safe }} +
+
+ {% include "partials/components/contact-form.njk" %} +
+{% endblock %} diff --git a/src/pages/simulateur.md b/src/pages/simulateur.md index 168cc78..da5642c 100644 --- a/src/pages/simulateur.md +++ b/src/pages/simulateur.md @@ -1,14 +1,15 @@ --- title: 'Simulateur de revenus' permalink: '/simulateur/index.html' +layout: 'layouts/simulateur.njk' eleventyExcludeFromCollections: true ---
\ No newline at end of file diff --git a/src/scss/components/_iframe.scss b/src/scss/components/_iframe.scss index b6302fb..7aa88a4 100644 --- a/src/scss/components/_iframe.scss +++ b/src/scss/components/_iframe.scss @@ -15,3 +15,7 @@ border: 0; } } + +.simulateur { + padding: 0; +} -- 2.39.5 From 088cfde1909d286070f5ce1885c53f370f3cb066 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 16 Jul 2026 09:55:48 +0200 Subject: [PATCH 04/10] Fix iframe location --- src/pages/simulateur.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/simulateur.md b/src/pages/simulateur.md index da5642c..553b017 100644 --- a/src/pages/simulateur.md +++ b/src/pages/simulateur.md @@ -10,6 +10,6 @@ eleventyExcludeFromCollections: true id="simulateurFrame" class="responsive-iframe" title="Simulateur de revenus en CAE" - src="http://localhost:5173"> + src="./iframe"> \ No newline at end of file -- 2.39.5 From 7cbcb954b4b5061fb2be3a44e61e4c3bda220f2c Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Thu, 16 Jul 2026 13:48:51 +0200 Subject: [PATCH 05/10] Add simulator build workflow into prod script --- .gitmodules | 3 +++ package.json | 2 +- simulateur | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 simulateur diff --git a/.gitmodules b/.gitmodules index 1fd4295..0a07dc0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = members-data url = ssh://gitea@git.astrolabe.coop:2106/AstrolabeCAE/SiteWebAstrolabe_private.git branch = master +[submodule "simulateur"] + path = simulateur + url = https://framagit.org/deborahj/simulateur diff --git a/package.json b/package.json index 214bf2e..9794dca 100755 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "webp": "go-webp excludeFolders=\"src/fonts,members-data,src/images/profiles\" excludeFiles=\"images/*.svg,images/astrolabe/favicon.png\"", "start": "concurrently \"npm run vendor\" \"npm run sass:process -- --watch\" \"npm run serve\"", "serve": "cross-env ELEVENTY_ENV=development npx eleventy --serve", - "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run webp && npm run sass:process && npx eleventy", + "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run webp && npm run sass:process && npx eleventy && cd simulateur && npm run build && cd .. && mkdir -p dist/simulateur/iframe && [ -d \"simulateur/dist\" ] && cp -r simulateur/dist/* dist/simulateur/iframe", "deploy-preprod": "npm run prod && node deploy-preprod", "deploy-prod": "npm run prod && node deploy-prod" }, diff --git a/simulateur b/simulateur new file mode 160000 index 0000000..b2e2636 --- /dev/null +++ b/simulateur @@ -0,0 +1 @@ +Subproject commit b2e2636076fcf911850c0eb1582378e638f41e9d -- 2.39.5 From 73ccac49d71f60ee0accd38fc89a3ce985f1e2f5 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Fri, 17 Jul 2026 09:40:22 +0200 Subject: [PATCH 06/10] Adjust iframe height to avoid scrollbar --- src/_includes/layouts/simulateur.njk | 22 +++++++++++++++++++++- src/scss/components/_iframe.scss | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/_includes/layouts/simulateur.njk b/src/_includes/layouts/simulateur.njk index 289a130..afe4b10 100644 --- a/src/_includes/layouts/simulateur.njk +++ b/src/_includes/layouts/simulateur.njk @@ -9,4 +9,24 @@ {% include "partials/components/contact-form.njk" %} -{% endblock %} + + +{% endblock %} \ No newline at end of file diff --git a/src/scss/components/_iframe.scss b/src/scss/components/_iframe.scss index 7aa88a4..30ef784 100644 --- a/src/scss/components/_iframe.scss +++ b/src/scss/components/_iframe.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; position: relative; - padding-top: 90vh; + padding-top: 100%; iframe { position: absolute; -- 2.39.5 From f7b94dd55aa457585995bbadad9d09d930fdb3c9 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Fri, 17 Jul 2026 09:40:55 +0200 Subject: [PATCH 07/10] Adapt navigation to add simulator link --- src/_data/navigation.json | 10 +++++----- src/scss/components/_nav.scss | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/_data/navigation.json b/src/_data/navigation.json index 0d89de6..9143aac 100644 --- a/src/_data/navigation.json +++ b/src/_data/navigation.json @@ -1,13 +1,13 @@ { "items": [ { - "text": "Accueil", - "url": "/", + "text": "Comprendre la CAE", + "url": "/comprendre-la-cae/", "external": false }, { - "text": "Comprendre la CAE", - "url": "/comprendre-la-cae/", + "text": "Simuler mes revenus", + "url": "/simulateur/", "external": false }, { @@ -26,7 +26,7 @@ "external": false }, { - "text": "FAQ / Nous contacter", + "text": "FAQ / Contact", "url": "/faq+contact/", "external": false } diff --git a/src/scss/components/_nav.scss b/src/scss/components/_nav.scss index e1a6417..368ee29 100644 --- a/src/scss/components/_nav.scss +++ b/src/scss/components/_nav.scss @@ -16,7 +16,7 @@ } > * + * { - margin-left: 2rem; + margin-left: 1.4rem; } } -- 2.39.5 From e552e55ae94c8d2c2db02f3fe17d86f568622933 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Fri, 17 Jul 2026 09:44:44 +0200 Subject: [PATCH 08/10] Update simu to last version --- simulateur | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulateur b/simulateur index b2e2636..6148359 160000 --- a/simulateur +++ b/simulateur @@ -1 +1 @@ -Subproject commit b2e2636076fcf911850c0eb1582378e638f41e9d +Subproject commit 61483592ed8419c2198c659411a17632e73fe17b -- 2.39.5 From 1177ffbfda60bb6fd3ca70feb3a5e00236440b8b Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Fri, 17 Jul 2026 09:49:50 +0200 Subject: [PATCH 09/10] Hide unnecessary options --- simulateur | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulateur b/simulateur index 6148359..3777d6d 160000 --- a/simulateur +++ b/simulateur @@ -1 +1 @@ -Subproject commit 61483592ed8419c2198c659411a17632e73fe17b +Subproject commit 3777d6d2ce0fc875438b929532a7f5b97b1729fa -- 2.39.5 From d7afd99864655406945ca744f229415dda63bb90 Mon Sep 17 00:00:00 2001 From: Deborah Jean Date: Fri, 17 Jul 2026 09:59:30 +0200 Subject: [PATCH 10/10] Adjust fees to Astrolabe context --- simulateur | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulateur b/simulateur index 3777d6d..3fe15e4 160000 --- a/simulateur +++ b/simulateur @@ -1 +1 @@ -Subproject commit 3777d6d2ce0fc875438b929532a7f5b97b1729fa +Subproject commit 3fe15e4ae7ebdcf245377cfc9f264b4e466799d9 -- 2.39.5