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..3fe15e4 --- /dev/null +++ b/simulateur @@ -0,0 +1 @@ +Subproject commit 3fe15e4ae7ebdcf245377cfc9f264b4e466799d9 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/_includes/layouts/simulateur.njk b/src/_includes/layouts/simulateur.njk new file mode 100644 index 0000000..afe4b10 --- /dev/null +++ b/src/_includes/layouts/simulateur.njk @@ -0,0 +1,32 @@ +{% extends 'layouts/base.njk' %} + +{% block content %} +
+
+
+ {{ content | safe }} +
+
+ {% include "partials/components/contact-form.njk" %} +
+ + +{% endblock %} \ No newline at end of file diff --git a/src/pages/simulateur.md b/src/pages/simulateur.md new file mode 100644 index 0000000..553b017 --- /dev/null +++ b/src/pages/simulateur.md @@ -0,0 +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 new file mode 100644 index 0000000..30ef784 --- /dev/null +++ b/src/scss/components/_iframe.scss @@ -0,0 +1,21 @@ +.iframe-container { + width: 100%; + height: 100%; + position: relative; + padding-top: 100%; + + iframe { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + width: 100%; + height: 100%; + border: 0; + } +} + +.simulateur { + padding: 0; +} 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; } } 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';