Adjust fees to Astrolabe context

Reviewed-on: #31
Reviewed-by: Déborah Jean <deborah.jean@astrolabe.coop>

.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

README.md

@@ -20,10 +20,7 @@ If you need to get the latest commits of the SiteWebAstrolabe_private repo, you
 
 ### Deploy
 
-1. Copy paste deploy.js file in two new files `deploy-preprod.js`and `deploy-prod.js`
-2. Make sure to fill in correct platform information in the two files
-3. Run `npm run deploy-preprod` to deploy to the pre-production platform
-4. Run `npm run deploy-prod` to deploy to the production platform
+1. deploy.js is not used anymore
 
 ## Terminal commands
 

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"
   },

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
     }

src/_includes/layouts/member.njk

@@ -40,6 +40,22 @@
               {% if socialBehance %}
                 <li><a href="{{ socialBehance }}" title="behance"><svg width="29" height="29" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M22 7h-7v-2h7v2zm1.726 10c-.442 1.297-2.029 3-5.101 3-3.074 0-5.564-1.729-5.564-5.675 0-3.91 2.325-5.92 5.466-5.92 3.082 0 4.964 1.782 5.375 4.426.078.506.109 1.188.095 2.14h-8.027c.13 3.211 3.483 3.312 4.588 2.029h3.168zm-7.686-4h4.965c-.105-1.547-1.136-2.219-2.477-2.219-1.466 0-2.277.768-2.488 2.219zm-9.574 6.988h-6.466v-14.967h6.953c5.476.081 5.58 5.444 2.72 6.906 3.461 1.26 3.577 8.061-3.207 8.061zm-3.466-8.988h3.584c2.508 0 2.906-3-.312-3h-3.272v3zm3.391 3h-3.391v3.016h3.341c3.055 0 2.868-3.016.05-3.016z"/></svg></a></li>
               {% endif %}
+              {% if socialMalt %}
+                <li><a href="{{ socialMalt }}" title="malt"><svg width="26" height="26" viewBox="0 0 43 43" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M32.1993 10.5357C29.3591 7.69551 26.3252 9.53378 24.4265 11.4325L6.49014 29.3694C4.59144 31.2679 2.60411 34.1526 5.59336 37.1414C8.58262 40.1313 11.4673 38.1436 13.3656 36.2449L31.3023 18.3084C33.201 16.4095 35.0393 13.3755 32.1993 10.5357Z" fill="none"/>
+                  <path d="M15.0631 9.80108L18.8611 13.5989L22.727 9.73299C22.9894 9.46992 23.2559 9.22579 23.524 8.99555C23.1192 6.95303 21.9537 5.1065 18.8593 5.1065C15.759 5.1065 14.595 6.96028 14.1923 9.00723C14.4818 9.25761 14.7706 9.5086 15.0631 9.80108Z" fill="none"/>
+                  <path d="M22.7248 38.0122L18.8613 34.1486L15.0653 37.9442C14.7771 38.2326 14.4902 38.4961 14.2046 38.7436C14.6399 40.8258 15.8718 42.733 18.8597 42.733C21.8554 42.733 23.0857 40.8156 23.5182 38.7267C23.2525 38.4981 22.9866 38.2739 22.7248 38.0122Z" fill="none"/>
+                  <path d="M13.4522 19.0079H6.13018C3.44549 19.0079 0 19.8537 0 23.8699C0 26.8666 1.91804 28.0971 4.00729 28.5294C4.25465 28.2438 13.4522 19.0079 13.4522 19.0079Z" fill="none"/>
+                  <path d="M33.7268 19.2029C33.4951 19.4724 24.2782 28.7317 24.2782 28.7317H31.4963C34.1812 28.7317 37.6265 28.0973 37.6265 23.8699C37.6265 20.7701 35.7733 19.6054 33.7268 19.2029Z" fill="none"/>
+                  <path d="M15.8513 16.6044L17.1594 15.2963L13.3638 11.5002C11.4649 9.60166 8.5806 7.61413 5.59135 10.6034C3.39937 12.7954 3.88623 14.9287 5.04889 16.6606C5.40301 16.6345 15.8513 16.6044 15.8513 16.6044Z" fill="none"/>
+                  <path d="M21.8697 31.1351L20.5582 32.4467L24.4244 36.3126C26.3231 38.2115 29.3571 40.0493 32.1969 37.2095C34.316 35.0903 33.8297 32.8644 32.6582 31.0814C32.2811 31.1086 21.8697 31.1351 21.8697 31.1351Z" fill="none"/>
+                  </svg></a></li>
+              {% endif %}
+              {% if socialPinterest %}
+                <li><a href="{{ socialPinterest }}" title="pinterest"><svg fill="none" width="24" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path d="M16.021 0c-8.828 0-15.984 7.156-15.984 15.984 0 6.771 4.214 12.552 10.161 14.88-0.141-1.266-0.266-3.203 0.052-4.583 0.292-1.25 1.875-7.943 1.875-7.943s-0.479-0.964-0.479-2.375c0-2.219 1.292-3.88 2.891-3.88 1.365 0 2.026 1.021 2.026 2.25 0 1.37-0.87 3.422-1.323 5.323-0.38 1.589 0.797 2.885 2.365 2.885 2.839 0 5.026-2.995 5.026-7.318 0-3.813-2.75-6.49-6.677-6.49-4.547 0-7.214 3.417-7.214 6.932 0 1.375 0.526 2.854 1.188 3.651 0.13 0.161 0.146 0.302 0.109 0.464-0.12 0.5-0.391 1.599-0.443 1.818-0.073 0.297-0.229 0.359-0.536 0.219-1.99-0.922-3.245-3.839-3.245-6.193 0-5.036 3.667-9.672 10.563-9.672 5.542 0 9.854 3.958 9.854 9.229 0 5.516-3.474 9.953-8.307 9.953-1.62 0-3.141-0.839-3.677-1.839l-1 3.797c-0.359 1.391-1.339 3.135-2 4.193 1.5 0.458 3.078 0.714 4.734 0.714 8.813 0 15.979-7.151 15.979-15.984 0-8.828-7.167-15.979-15.979-15.979z"/>
+</svg></a></li>
+              {% endif %}
             </ul>
           </div>
           <div class="member__bio">

src/_includes/layouts/simulateur.njk

@@ -0,0 +1,32 @@
+{% extends 'layouts/base.njk' %}
+
+{% block content %}
+  <main id="main-content" tabindex="-1">
+    <article class="[ post ]">
+      <div class="[ post__body ] [ wrapper ] simulateur">
+        {{ content | safe }}
+      </div>
+    </article>
+    {% include "partials/components/contact-form.njk" %}
+  </main>
+
+<script>
+    const iframeContainer = document.querySelector('.simulateur .iframe-container');
+    const iframe = document.getElementById('simulateurFrame');
+    const iframeContent = document.getElementById('simulateurFrame').contentWindow;
+
+    function setIframeHeight() {
+      iframe.style.height = iframeContent.document.body.scrollHeight + 'px';
+      iframeContainer.style.minHeight = iframeContent.document.body.scrollHeight + 'px';
+      iframeContainer.style.paddingTop = '0';
+    }
+
+    iframe.addEventListener('load', () => {
+      setIframeHeight();
+        setTimeout(function() {
+          setIframeHeight(); // permet de reajuster apres chargement complet au besoin
+        }, 2000);
+    });
+
+</script>
+{% endblock %}

src/pages/simulateur.md

@@ -0,0 +1,15 @@
+---
+title: 'Simulateur de revenus'
+permalink: '/simulateur/index.html'
+layout: 'layouts/simulateur.njk'
+eleventyExcludeFromCollections: true
+---
+
+<div class="iframe-container">
+    <iframe
+    id="simulateurFrame"
+    class="responsive-iframe"
+    title="Simulateur de revenus en CAE"
+    src="./iframe">
+    </iframe>
+</div>

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;
+}

src/scss/components/_nav.scss

@@ -16,7 +16,7 @@
     }
 
     > * + * {
-      margin-left: 2rem;
+      margin-left: 1.4rem;
     }
   }
 

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';