From fe42393fc4af2a79c82fe2bbe2149b8c699fb9cb Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime.quandalle@gmail.com>
Date: Thu, 10 Aug 2023 20:26:51 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20page=20de=20contr=C3=B4le=20des?=
 =?UTF-8?q?=20miniatures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/aides.yaml                                |   4 +-
 .../{ => (front)}/(about)/+layout.svelte      |   0
 .../{ => (front)}/(about)/a-propos/+page.svx  |   0
 .../(about)/integrer-sur-mon-site/+page.svx   |   0
 .../(about)/liste-aides/+page.server.js       |   0
 .../(about)/liste-aides/+page.svelte          |   0
 .../(about)/liste-aides/AideSummary.svelte    |   0
 .../(about)/mentions-legales/+page.svx        |   0
 .../(about)/statistiques/+page.svelte         |   0
 .../{ => (front)}/(search)/+layout.svelte     |   0
 .../{ => (front)}/(search)/+page.svelte       |   0
 .../forfait-mobilite-durable/+page.js         |   0
 .../forfait-mobilite-durable/+page.svelte     |   0
 .../prime-a-la-conversion/+page.svelte        |   0
 .../(search)/ville/[slug]/+page.server.js     |   0
 .../(search)/ville/[slug]/+page.svelte        |   0
 .../(search)/ville/[slug]/CategoryLine.svelte |   0
 .../ville/[slug]/ExplanationsText.svelte      |   0
 .../(search)/ville/[slug]/Results.svelte      |   0
 .../ville/[slug]/cover-sharing.png/+server.js |   0
 .../[slug]/cover-sharing.png/template.html    |   0
 src/routes/(front)/+layout.svelte             | 123 ++++++++++++++++++
 .../departement/[slug]/+page.server.js        |   0
 .../departement/[slug]/+page.svelte           |   0
 .../{ => (front)}/sitemap.txt/+server.js      |   0
 src/routes/+layout.svelte                     | 121 +----------------
 src/routes/dev/+layout.svelte                 |   4 +
 .../dev/controle-miniatures/+page.svelte      |  49 +++++++
 28 files changed, 179 insertions(+), 122 deletions(-)
 rename src/routes/{ => (front)}/(about)/+layout.svelte (100%)
 rename src/routes/{ => (front)}/(about)/a-propos/+page.svx (100%)
 rename src/routes/{ => (front)}/(about)/integrer-sur-mon-site/+page.svx (100%)
 rename src/routes/{ => (front)}/(about)/liste-aides/+page.server.js (100%)
 rename src/routes/{ => (front)}/(about)/liste-aides/+page.svelte (100%)
 rename src/routes/{ => (front)}/(about)/liste-aides/AideSummary.svelte (100%)
 rename src/routes/{ => (front)}/(about)/mentions-legales/+page.svx (100%)
 rename src/routes/{ => (front)}/(about)/statistiques/+page.svelte (100%)
 rename src/routes/{ => (front)}/(search)/+layout.svelte (100%)
 rename src/routes/{ => (front)}/(search)/+page.svelte (100%)
 rename src/routes/{ => (front)}/(search)/forfait-mobilite-durable/+page.js (100%)
 rename src/routes/{ => (front)}/(search)/forfait-mobilite-durable/+page.svelte (100%)
 rename src/routes/{ => (front)}/(search)/prime-a-la-conversion/+page.svelte (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/+page.server.js (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/+page.svelte (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/CategoryLine.svelte (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/ExplanationsText.svelte (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/Results.svelte (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/cover-sharing.png/+server.js (100%)
 rename src/routes/{ => (front)}/(search)/ville/[slug]/cover-sharing.png/template.html (100%)
 create mode 100644 src/routes/(front)/+layout.svelte
 rename src/routes/{ => (front)}/departement/[slug]/+page.server.js (100%)
 rename src/routes/{ => (front)}/departement/[slug]/+page.svelte (100%)
 rename src/routes/{ => (front)}/sitemap.txt/+server.js (100%)
 create mode 100644 src/routes/dev/+layout.svelte
 create mode 100644 src/routes/dev/controle-miniatures/+page.svelte

diff --git a/src/aides.yaml b/src/aides.yaml
index 1fe94b8..efac19e 100644
--- a/src/aides.yaml
+++ b/src/aides.yaml
@@ -1759,7 +1759,7 @@ aides . vallée de l'homme:
 
 aides . sablé sur sarthe:
   remplace: commune
-  titre: Communauté de communes des Sablé sur Sarthe
+  titre: Communauté de communes de Sablé sur Sarthe
   applicable si:
     toutes ces conditions:
       - localisation . code insee = '72264'
@@ -3327,7 +3327,7 @@ aides . marignier:
 
 aides . combloux:
   remplace: commune
-  titre: Commune de Combloux
+  titre: Ville de Combloux
   applicable si:
     toutes ces conditions:
       - localisation . code insee = '74083'
diff --git a/src/routes/(about)/+layout.svelte b/src/routes/(front)/(about)/+layout.svelte
similarity index 100%
rename from src/routes/(about)/+layout.svelte
rename to src/routes/(front)/(about)/+layout.svelte
diff --git a/src/routes/(about)/a-propos/+page.svx b/src/routes/(front)/(about)/a-propos/+page.svx
similarity index 100%
rename from src/routes/(about)/a-propos/+page.svx
rename to src/routes/(front)/(about)/a-propos/+page.svx
diff --git a/src/routes/(about)/integrer-sur-mon-site/+page.svx b/src/routes/(front)/(about)/integrer-sur-mon-site/+page.svx
similarity index 100%
rename from src/routes/(about)/integrer-sur-mon-site/+page.svx
rename to src/routes/(front)/(about)/integrer-sur-mon-site/+page.svx
diff --git a/src/routes/(about)/liste-aides/+page.server.js b/src/routes/(front)/(about)/liste-aides/+page.server.js
similarity index 100%
rename from src/routes/(about)/liste-aides/+page.server.js
rename to src/routes/(front)/(about)/liste-aides/+page.server.js
diff --git a/src/routes/(about)/liste-aides/+page.svelte b/src/routes/(front)/(about)/liste-aides/+page.svelte
similarity index 100%
rename from src/routes/(about)/liste-aides/+page.svelte
rename to src/routes/(front)/(about)/liste-aides/+page.svelte
diff --git a/src/routes/(about)/liste-aides/AideSummary.svelte b/src/routes/(front)/(about)/liste-aides/AideSummary.svelte
similarity index 100%
rename from src/routes/(about)/liste-aides/AideSummary.svelte
rename to src/routes/(front)/(about)/liste-aides/AideSummary.svelte
diff --git a/src/routes/(about)/mentions-legales/+page.svx b/src/routes/(front)/(about)/mentions-legales/+page.svx
similarity index 100%
rename from src/routes/(about)/mentions-legales/+page.svx
rename to src/routes/(front)/(about)/mentions-legales/+page.svx
diff --git a/src/routes/(about)/statistiques/+page.svelte b/src/routes/(front)/(about)/statistiques/+page.svelte
similarity index 100%
rename from src/routes/(about)/statistiques/+page.svelte
rename to src/routes/(front)/(about)/statistiques/+page.svelte
diff --git a/src/routes/(search)/+layout.svelte b/src/routes/(front)/(search)/+layout.svelte
similarity index 100%
rename from src/routes/(search)/+layout.svelte
rename to src/routes/(front)/(search)/+layout.svelte
diff --git a/src/routes/(search)/+page.svelte b/src/routes/(front)/(search)/+page.svelte
similarity index 100%
rename from src/routes/(search)/+page.svelte
rename to src/routes/(front)/(search)/+page.svelte
diff --git a/src/routes/(search)/forfait-mobilite-durable/+page.js b/src/routes/(front)/(search)/forfait-mobilite-durable/+page.js
similarity index 100%
rename from src/routes/(search)/forfait-mobilite-durable/+page.js
rename to src/routes/(front)/(search)/forfait-mobilite-durable/+page.js
diff --git a/src/routes/(search)/forfait-mobilite-durable/+page.svelte b/src/routes/(front)/(search)/forfait-mobilite-durable/+page.svelte
similarity index 100%
rename from src/routes/(search)/forfait-mobilite-durable/+page.svelte
rename to src/routes/(front)/(search)/forfait-mobilite-durable/+page.svelte
diff --git a/src/routes/(search)/prime-a-la-conversion/+page.svelte b/src/routes/(front)/(search)/prime-a-la-conversion/+page.svelte
similarity index 100%
rename from src/routes/(search)/prime-a-la-conversion/+page.svelte
rename to src/routes/(front)/(search)/prime-a-la-conversion/+page.svelte
diff --git a/src/routes/(search)/ville/[slug]/+page.server.js b/src/routes/(front)/(search)/ville/[slug]/+page.server.js
similarity index 100%
rename from src/routes/(search)/ville/[slug]/+page.server.js
rename to src/routes/(front)/(search)/ville/[slug]/+page.server.js
diff --git a/src/routes/(search)/ville/[slug]/+page.svelte b/src/routes/(front)/(search)/ville/[slug]/+page.svelte
similarity index 100%
rename from src/routes/(search)/ville/[slug]/+page.svelte
rename to src/routes/(front)/(search)/ville/[slug]/+page.svelte
diff --git a/src/routes/(search)/ville/[slug]/CategoryLine.svelte b/src/routes/(front)/(search)/ville/[slug]/CategoryLine.svelte
similarity index 100%
rename from src/routes/(search)/ville/[slug]/CategoryLine.svelte
rename to src/routes/(front)/(search)/ville/[slug]/CategoryLine.svelte
diff --git a/src/routes/(search)/ville/[slug]/ExplanationsText.svelte b/src/routes/(front)/(search)/ville/[slug]/ExplanationsText.svelte
similarity index 100%
rename from src/routes/(search)/ville/[slug]/ExplanationsText.svelte
rename to src/routes/(front)/(search)/ville/[slug]/ExplanationsText.svelte
diff --git a/src/routes/(search)/ville/[slug]/Results.svelte b/src/routes/(front)/(search)/ville/[slug]/Results.svelte
similarity index 100%
rename from src/routes/(search)/ville/[slug]/Results.svelte
rename to src/routes/(front)/(search)/ville/[slug]/Results.svelte
diff --git a/src/routes/(search)/ville/[slug]/cover-sharing.png/+server.js b/src/routes/(front)/(search)/ville/[slug]/cover-sharing.png/+server.js
similarity index 100%
rename from src/routes/(search)/ville/[slug]/cover-sharing.png/+server.js
rename to src/routes/(front)/(search)/ville/[slug]/cover-sharing.png/+server.js
diff --git a/src/routes/(search)/ville/[slug]/cover-sharing.png/template.html b/src/routes/(front)/(search)/ville/[slug]/cover-sharing.png/template.html
similarity index 100%
rename from src/routes/(search)/ville/[slug]/cover-sharing.png/template.html
rename to src/routes/(front)/(search)/ville/[slug]/cover-sharing.png/template.html
diff --git a/src/routes/(front)/+layout.svelte b/src/routes/(front)/+layout.svelte
new file mode 100644
index 0000000..528b063
--- /dev/null
+++ b/src/routes/(front)/+layout.svelte
@@ -0,0 +1,123 @@
+<script>
+	import { preloadCode } from '$app/navigation';
+	import { page } from '$app/stores';
+	import { localisation } from '$lib/stores';
+	import Emoji from '$lib/components/Emoji.svelte';
+	import Footer from '$lib/components/Footer.svelte';
+	import { onMount, setContext } from 'svelte';
+	import { building, dev } from '$app/environment';
+
+	onMount(() => {
+		preloadCode('/', '/ville/*');
+
+		// This is a work-around a cold-start issue with the search
+		// autocompletion. By calling this endpoint as soon as possible we
+		// asynchrounsly warm up the server code, and reduce the latency in case
+		// of a cold start.
+		if (!dev) {
+			fetch('/api/collectivites');
+		}
+	});
+
+	const isEmbeded = Boolean(building ? false : $page.url.searchParams.get('iframe'));
+	const embedSource = isEmbeded && $page.url.searchParams.get('utm_source');
+	setContext('embed', { isEmbeded, embedSource });
+
+	let pageElement;
+
+	onMount(() => {
+		if (!isEmbeded) {
+			return;
+		}
+		// The code below communicate with the iframe.js script on a host site
+		// to automatically resize the iframe when its inner content height
+		// change.
+		const minHeight = 500; // Also used in iframe.js
+		const observer = new ResizeObserver(([entry]) => {
+			const value = Math.max(minHeight, entry.contentRect.height);
+			window.parent?.postMessage({ kind: 'resize-height', value }, '*');
+		});
+
+		observer.observe(pageElement);
+	});
+
+	// When the site is embeded in an iframe, we don't want to track a “visit”
+	// every time the page is loaded, as the iframe is oftentimes low on the
+	// page and the user might not interact with it or even see it. We disable
+	// tracking up until the first click interaction;
+	let enableTracking = import.meta.env.PROD && !isEmbeded;
+
+	// The city can be provided from the URL, for instance /ville/paris. The
+	// `data` output of a load function provides a mechanism for pages to pass
+	// data 'upward' to layouts, which is useful in our case since the selected
+	// city is a "global state".
+	localisation.set($page.data?.ville ?? null);
+	$: if ($page.data?.ville) {
+		localisation.set($page.data.ville);
+	}
+</script>
+
+<svelte:window on:click={() => (enableTracking = true)} />
+
+{#if isEmbeded}
+	<div class="embeded-too-small text-xl text-center items-center justify-center h-[100vh]">
+		<p>
+			Retrouvez toutes les aides à l’achat d’un vélo sur le site<br />
+			<a
+				href="https://mesaidesvelo.fr"
+				target="_blank"
+				class="inline-block mt-2 font-bold underline hover:text-green-800"
+				>Mes<span class="text-green-800">aides</span>velo.fr</a
+			>
+		</p>
+	</div>
+{/if}
+
+<div class="app px-3 sm:px-8 {!isEmbeded ? 'h-screen' : ''} flex flex-col" bind:this={pageElement}>
+	<header
+		class="{!isEmbeded
+			? 'mt-8'
+			: ''} w-full max-w-screen-md m-auto flex flex-row justify-between items-end"
+	>
+		{#if !isEmbeded}
+			<a href="/" class="text-3xl font-bold cursor-pointer">
+				Mes<span class="text-green-800">Aides</span>Vélo
+				<Emoji emoji="🚲" className="-mt-2" />
+			</a>
+			<a
+				href="https://aideretrofit.fr"
+				rel="external"
+				class="underline underline-green-400 underline-offset-4 text-green-600 hover:text-green-400 <sm:hidden"
+				>Aide Retrofit</a
+			>
+		{/if}
+	</header>
+	<div class="pb-6 {!isEmbeded ? 'flex-1' : ''}">
+		<slot />
+	</div>
+	<Footer />
+
+	{#if !dev && enableTracking}
+		<script defer data-domain="mesaidesvelo.fr" src="/js/script.js"></script>
+	{/if}
+</div>
+
+<style>
+	:global(body) {
+		min-height: 100vh;
+	}
+
+	.embeded-too-small {
+		display: none;
+	}
+
+	@media (max-height: 300px) {
+		.embeded-too-small + .app {
+			display: none;
+		}
+
+		.embeded-too-small {
+			display: flex;
+		}
+	}
+</style>
diff --git a/src/routes/departement/[slug]/+page.server.js b/src/routes/(front)/departement/[slug]/+page.server.js
similarity index 100%
rename from src/routes/departement/[slug]/+page.server.js
rename to src/routes/(front)/departement/[slug]/+page.server.js
diff --git a/src/routes/departement/[slug]/+page.svelte b/src/routes/(front)/departement/[slug]/+page.svelte
similarity index 100%
rename from src/routes/departement/[slug]/+page.svelte
rename to src/routes/(front)/departement/[slug]/+page.svelte
diff --git a/src/routes/sitemap.txt/+server.js b/src/routes/(front)/sitemap.txt/+server.js
similarity index 100%
rename from src/routes/sitemap.txt/+server.js
rename to src/routes/(front)/sitemap.txt/+server.js
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3d24a78..299adc5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,124 +1,5 @@
 <script>
-	import { preloadCode } from '$app/navigation';
-	import { page } from '$app/stores';
-	import { localisation } from '$lib/stores';
-	import Emoji from '$lib/components/Emoji.svelte';
-	import Footer from '$lib/components/Footer.svelte';
-	import { onMount, setContext } from 'svelte';
 	import 'virtual:windi.css';
-	import { building, dev } from '$app/environment';
-
-	onMount(() => {
-		preloadCode('/', '/ville/*');
-
-		// This is a work-around a cold-start issue with the search
-		// autocompletion. By calling this endpoint as soon as possible we
-		// asynchrounsly warm up the server code, and reduce the latency in case
-		// of a cold start.
-		if (!dev) {
-			fetch('/api/collectivites');
-		}
-	});
-
-	const isEmbeded = Boolean(building ? false : $page.url.searchParams.get('iframe'));
-	const embedSource = isEmbeded && $page.url.searchParams.get('utm_source');
-	setContext('embed', { isEmbeded, embedSource });
-
-	let pageElement;
-
-	onMount(() => {
-		if (!isEmbeded) {
-			return;
-		}
-		// The code below communicate with the iframe.js script on a host site
-		// to automatically resize the iframe when its inner content height
-		// change.
-		const minHeight = 500; // Also used in iframe.js
-		const observer = new ResizeObserver(([entry]) => {
-			const value = Math.max(minHeight, entry.contentRect.height);
-			window.parent?.postMessage({ kind: 'resize-height', value }, '*');
-		});
-
-		observer.observe(pageElement);
-	});
-
-	// When the site is embeded in an iframe, we don't want to track a “visit”
-	// every time the page is loaded, as the iframe is oftentimes low on the
-	// page and the user might not interact with it or even see it. We disable
-	// tracking up until the first click interaction;
-	let enableTracking = import.meta.env.PROD && !isEmbeded;
-
-	// The city can be provided from the URL, for instance /ville/paris. The
-	// `data` output of a load function provides a mechanism for pages to pass
-	// data 'upward' to layouts, which is useful in our case since the selected
-	// city is a "global state".
-	localisation.set($page.data?.ville ?? null);
-	$: if ($page.data?.ville) {
-		localisation.set($page.data.ville);
-	}
 </script>
 
-<svelte:window on:click={() => (enableTracking = true)} />
-
-{#if isEmbeded}
-	<div class="embeded-too-small text-xl text-center items-center justify-center h-[100vh]">
-		<p>
-			Retrouvez toutes les aides à l’achat d’un vélo sur le site<br />
-			<a
-				href="https://mesaidesvelo.fr"
-				target="_blank"
-				class="inline-block mt-2 font-bold underline hover:text-green-800"
-				>Mes<span class="text-green-800">aides</span>velo.fr</a
-			>
-		</p>
-	</div>
-{/if}
-
-<div class="app px-3 sm:px-8 {!isEmbeded ? 'h-screen' : ''} flex flex-col" bind:this={pageElement}>
-	<header
-		class="{!isEmbeded
-			? 'mt-8'
-			: ''} w-full max-w-screen-md m-auto flex flex-row justify-between items-end"
-	>
-		{#if !isEmbeded}
-			<a href="/" class="text-3xl font-bold cursor-pointer">
-				Mes<span class="text-green-800">Aides</span>Vélo
-				<Emoji emoji="🚲" className="-mt-2" />
-			</a>
-			<a
-				href="https://aideretrofit.fr"
-				rel="external"
-				class="underline underline-green-400 underline-offset-4 text-green-600 hover:text-green-400 <sm:hidden"
-				>Aide Retrofit</a
-			>
-		{/if}
-	</header>
-	<div class="pb-6 {!isEmbeded ? 'flex-1' : ''}">
-		<slot />
-	</div>
-	<Footer />
-
-	{#if !dev && enableTracking}
-		<script defer data-domain="mesaidesvelo.fr" src="/js/script.js"></script>
-	{/if}
-</div>
-
-<style>
-	:global(body) {
-		min-height: 100vh;
-	}
-
-	.embeded-too-small {
-		display: none;
-	}
-
-	@media (max-height: 300px) {
-		.embeded-too-small + .app {
-			display: none;
-		}
-
-		.embeded-too-small {
-			display: flex;
-		}
-	}
-</style>
+<slot />
diff --git a/src/routes/dev/+layout.svelte b/src/routes/dev/+layout.svelte
new file mode 100644
index 0000000..74368d8
--- /dev/null
+++ b/src/routes/dev/+layout.svelte
@@ -0,0 +1,4 @@
+<svelte:head>
+	<meta name="robots" content="noindex" />
+</svelte:head>
+<slot />
diff --git a/src/routes/dev/controle-miniatures/+page.svelte b/src/routes/dev/controle-miniatures/+page.svelte
new file mode 100644
index 0000000..00c39b6
--- /dev/null
+++ b/src/routes/dev/controle-miniatures/+page.svelte
@@ -0,0 +1,49 @@
+<script>
+	import miniaturesManifest from '$lib/data/miniatures.json';
+	import { engine } from '$lib/engine';
+
+	const aidesRuleNames = Object.keys(engine.getParsedRules()).filter(
+		(ruleName) => ruleName.startsWith('aides .') && engine.getRule(ruleName).rawNode.titre
+	);
+
+	function simplifyTitle(title) {
+		return title
+			.trim()
+			.replace(/ville (d'|d’|de)/i, '')
+			.replace(/communauté des? communes ?(du|de la|des|de)?/i, '')
+			.replace(/communauté( urbaine| d'agglomération( de)?)?/i, '')
+			.replace(/département (du|de la|de l'|de)/i, '')
+			.trim();
+	}
+</script>
+
+<h1 class="mx-4 my-2 font-bold font-serif">
+	<span
+		class="mr-4 no-underline bg-gray-800 text-light-100 rounded-full px-2 py-1 uppercase text-xs font-bold tracking-widest self-center"
+		>DEV</span
+	>
+	Contrôle des miniatures
+</h1>
+
+<div
+	class="grid gap-2 items-stretch mx-4 mb-10"
+	style="grid-template-columns: repeat(auto-fill,minmax(min(100%,120px),1fr));"
+>
+	{#each aidesRuleNames as aideRuleName}
+		{@const title = engine.getRule(aideRuleName).rawNode.titre}
+		<article class="flex flex-col justify-between items-center border shadow-sm p-2">
+			<div>
+				{#if miniaturesManifest[aideRuleName]}
+					<img
+						src="/miniatures/{miniaturesManifest[aideRuleName]}"
+						class="object-fill max-h-20"
+						alt="Logo {title.toLowerCase()}"
+					/>
+				{:else}
+					<div class="bg-gray-200 text-gray-800 italic text-center">Pas de miniature</div>
+				{/if}
+			</div>
+			<h3 class="text-xs text-center mt-4">{simplifyTitle(title)}</h3>
+		</article>
+	{/each}
+</div>