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 @@ + + + (enableTracking = true)} /> + +{#if isEmbeded} +
+

+ Retrouvez toutes les aides à l’achat d’un vélo sur le site
+ Mesaidesvelo.fr +

+
+{/if} + +
+
+ {#if !isEmbeded} + + MesAidesVélo + + + Aide Retrofit + {/if} +
+
+ +
+
+ + {#if !dev && enableTracking} + + {/if} +
+ + 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 @@ - (enableTracking = true)} /> - -{#if isEmbeded} -
-

- Retrouvez toutes les aides à l’achat d’un vélo sur le site
- Mesaidesvelo.fr -

-
-{/if} - -
-
- {#if !isEmbeded} - - MesAidesVélo - - - Aide Retrofit - {/if} -
-
- -
-
- - {#if !dev && enableTracking} - - {/if} -
- - + 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 @@ + + + + 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 @@ + + +

+ DEV + Contrôle des miniatures +

+ +
+ {#each aidesRuleNames as aideRuleName} + {@const title = engine.getRule(aideRuleName).rawNode.titre} +
+
+ {#if miniaturesManifest[aideRuleName]} + Logo {title.toLowerCase()} + {:else} +
Pas de miniature
+ {/if} +
+

{simplifyTitle(title)}

+
+ {/each} +