feat: homepage projects custom priority

apps/nuxt-e2e/src/form/formResultsData.ts

@@ -40,7 +40,7 @@ export const tests: FormResultDataType[] = [
     id: 2,
     valid: true,
     type: 'program',
-    url: 'questionnaire/resultat/projet/isolation-thermique/renovation-petit-tertiaire-prive?choix-du-parcours=j-ai-un-projet&siret=83014132100034&effectif=TPE&objectifs=building',
+    url: 'questionnaire/resultat/projet/isolation-thermique/pret-vert?choix-du-parcours=j-ai-un-projet&siret=83014132100034&effectif=TPE&objectifs=building',
     values: {
       name: { value: 'test', type: 'text' },
       surname: { value: 'test', type: 'text' },
@@ -55,7 +55,7 @@ export const tests: FormResultDataType[] = [
     id: 3,
     valid: true,
     type: 'program',
-    url: 'aides-entreprise/act-pas-a-pas?siret=83014132100034&effectif=TPE',
+    url: 'aides-entreprise/baisse-les-watts?siret=83014132100034&effectif=TPE',
     values: {
       name: { value: 'test', type: 'text' },
       surname: { value: 'test', type: 'text' },
@@ -178,7 +178,7 @@ export const tests: FormResultDataType[] = [
     valid: true,
     manual: true,
     type: 'program',
-    url: 'aides-entreprise/act-pas-a-pas',
+    url: 'aides-entreprise/baisse-les-watts',
     values: {
       name: { value: 'test', type: 'text' },
       surname: { value: 'test', type: 'text' },

apps/nuxt/src/assets/scss/footer.scss

@@ -1,6 +1,8 @@
 @use 'tool';
 
 .fr-footer {
+  box-shadow: none !important;
+
   &__content {
     flex-basis: fit-content;
     margin-left: 0;

apps/nuxt/src/assets/scss/grid.scss

@@ -56,3 +56,11 @@
   top: 0;
   z-index: 1000;
 }
+
+.fr-position--relative { 
+  position: relative;
+}
+
+.fr-position--absolute {
+  position: absolute;
+} 

apps/nuxt/src/components/TeeFooter.vue

@@ -1,9 +1,9 @@
 <template>
   <!-- FOOTER -->
-  <div :class="`fr-footer ${stickToBottom ? 'tee-footer-bottom' : ''}`">
+  <div :class="`fr-footer fr-pt-md-0 ${stickToBottom ? 'tee-footer-bottom' : ''}`">
     <div class="fr-container--fluid fr-mx-md-20v fr-mx-8v">
       <!-- FOOTER BODY -->
-      <div class="fr-footer__body fr-grid-row">
+      <div class="fr-footer__body fr-hidden-sm fr-grid-row">
         <div class="fr-footer__brand fr-col-lg-3">
           <p class="fr-logo">
             République
@@ -30,7 +30,7 @@
       </div>
 
       <!-- FOOTER PARTNERS -->
-      <div class="fr-footer__partners">
+      <div class="fr-footer__partners fr-hidden-sm">
         <h4 class="fr-footer__partners-title">Nos partenaires</h4>
         <div class="fr-footer__partners-logos fr-grid-row">
           <div class="fr-footer__partners-main">

apps/nuxt/src/components/catalog/CatalogPrograms.vue

@@ -1,14 +1,17 @@
 <template>
   <TeeDsfrBreadcrumb v-if="!hasSpinner" />
-  <CatalogBanner>
-    <template #title> {{ title }} </template>
-    <template #description>
-      {{ description }}
-    </template>
-  </CatalogBanner>
   <div class="fr-container--fluid fr-container--fluid--no-overflow fr-mt-6v">
     <div class="fr-grid-row fr-grid-row--center">
       <div class="fr-container fr-m-0 fr-p-0 fr-pl-md-2v">
+        <div
+          class="fr-col-12 fr-mt-3v"
+          :class="{
+            'fr-col-offset-md-2 fr-col-md-10 fr-col-justify--left': !hasError,
+            'fr-col-md-12 fr-col-justify--center': hasError
+          }"
+        >
+          <h1 class="fr-text--blue-france">{{ title }}</h1>
+        </div>
         <div
           class="fr-col-12 fr-mt-3v"
           :class="{
@@ -96,7 +99,7 @@ onNuxtReady(async () => {
   await new ProgramManager().getDependentCompanyData(false)
 })
 
-const title = 'Le catalogue des aides publiques à la transition écologique'
+const title = 'Les aides à la transition écologique'
 const description =
   'Réalisez une recherche parmi les aides à la transition écologique des entreprises, proposées par l’ensemble des partenaires publics :' +
   'ADEME, Bpifrance, CCI, CMA, etc.'

apps/nuxt/src/components/catalog/CatalogProjects.vue

@@ -1,11 +1,12 @@
 <template>
-  <TeeDsfrBreadcrumb />
-  <CatalogBanner>
-    <template #title> {{ title }} </template>
-    <template #description> {{ description }} </template>
-  </CatalogBanner>
-
+  <TeeDsfrBreadcrumb v-if="showBreadcrumbs" />
   <div class="fr-container fr-mt-6v">
+    <div
+      v-if="showTitle"
+      class="fr-col-10 fr-col-lg-8"
+    >
+      <h1 class="fr-text--blue-france">{{ title }}</h1>
+    </div>
     <div class="fr-grid-row fr-grid-row--center">
       <div>
         <div class="fr-col-12 fr-col-justify--left fr-mt-3v">
@@ -19,12 +20,15 @@
           radius-size="2-5v"
         />
         <div v-if="hasFilteredProjects">
-          <div class="fr-col-12 fr-text--blue-france tee-font-style--italic fr-mt-3v">
+          <div
+            v-if="showCounter"
+            class="fr-col-12 fr-text--blue-france tee-font-style--italic fr-mt-3v"
+          >
             <TeeCounterResult :to-count="filteredProjects" />
           </div>
           <div class="fr-grid-row fr-grid-row--gutters fr-grid-row--left fr-mt-0">
             <div
-              v-for="project in sortedProjects"
+              v-for="project in projectList"
               :key="project.id"
               class="fr-col-12 fr-col-sm-6 fr-col-md-6 fr-col-lg-4 no-outline"
             >
@@ -59,32 +63,54 @@ import { useProjectStore } from '@/stores/project'
 import { ProjectManager } from '@/tools/project/projectManager'
 import ProjectFilter from '@/tools/project/projectFilter'
 import ProjectSorter from '@/tools/project/projectSorter'
-import { ThemeId } from '@/types'
+import { RouteName, ThemeId } from '@/types'
 import { MetaSeo } from '@/tools/metaSeo'
 import { computed } from 'vue'
 import { Theme } from '@/tools/theme'
+import Navigation from '@/tools/navigation'
 
 const programStore = useProgramStore()
 const navigationStore = useNavigationStore()
-
+const navigation = new Navigation()
+interface Props {
+  showTitle?: boolean
+  showLimit?: number
+  showCounter?: boolean
+  showBreadcrumbs?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+  showTitle: true,
+  showLimit: -1,
+  showCounter: true,
+  showBreadcrumbs: true
+})
 const { projects, hasError } = storeToRefs(useProjectStore())
 
 await new ProjectManager().getProjects()
 
-const title = 'Le catalogue des projets de transition écologique'
+const title = 'Les projets de transition écologique'
 const description = 'Accédez à la liste des projets de transition écologique destinées aux entreprises.'
 
 useSeoMeta(MetaSeo.get(title, description))
 
 const theme = Theme.getThemeFromSelectedTheme()
 
 const filteredProjects = ProjectFilter.filter(projects, theme)
-const sortedProjects = ProjectSorter.sort(filteredProjects)
+
+const sortedProjects = computed(() => {
+  if (navigation.isByRouteName(RouteName.Homepage) && (!theme.value || theme.value.length === 0)) {
+    return ProjectSorter.homepageSort(filteredProjects).value
+  }
+  return ProjectSorter.sort(filteredProjects).value
+})
 
 const hasSpinner = computed(() => {
   return navigationStore.hasSpinner
 })
 
+const projectList = computed(() => {
+  return props.showLimit !== -1 ? sortedProjects.value.slice(0, props.showLimit) : sortedProjects.value
+})
 const hasThemeCard = computed(() => {
   return programStore.hasThemeTypeSelected() && !hasSpinner.value
 })

apps/nuxt/src/components/element/vueDsfr/dsfrHeader/TeeDsfrHeader.vue

@@ -2,6 +2,7 @@
   <header
     role="banner"
     class="fr-header"
+    :class="navigation.isByRouteName(RouteName.Homepage) ? 'fr-sticky' : ''"
   >
     <div class="fr-header__body">
       <div class="fr-container width-inherit">
@@ -216,6 +217,10 @@ import { DsfrLanguageSelector, DsfrLogo, DsfrSearchBar, registerNavigationLinkKe
 
 import type { DsfrLanguageSelectorElement } from '@gouvminint/vue-dsfr/types/components/DsfrLanguageSelector/DsfrLanguageSelector.vue'
 import type { DsfrHeaderProps } from '@gouvminint/vue-dsfr/types/components/DsfrHeader/DsfrHeader.vue'
+import Navigation from '@/tools/navigation'
+import { RouteName } from '@/types'
+
+const navigation = new Navigation()
 
 const props = withDefaults(defineProps<DsfrHeaderProps>(), {
   searchbarId: 'searchbar-header',

apps/nuxt/src/components/project/list/ProjectCard.vue

@@ -53,10 +53,10 @@ const priorityTag: string = 'A FAIRE EN PRIORITÉ'
 const navigationStore = useNavigationStore()
 const navigation = new Navigation()
 const isCatalog = navigation.isCatalogProjects()
-
+const isHomePage = navigation.isByRouteName(RouteName.Homepage)
 const getRouteToProjectDetail = (project: ProjectType): RouteLocationRaw => {
   return {
-    name: isCatalog ? RouteName.CatalogProjectDetail : RouteName.ProjectResultDetail,
+    name: isCatalog || isHomePage ? RouteName.CatalogProjectDetail : RouteName.ProjectResultDetail,
     params: { projectSlug: project.slug },
     query: navigationStore.query
   }

apps/nuxt/src/middleware/resetProgramFilters.ts

@@ -1,3 +1,7 @@
-export default defineNuxtRouteMiddleware(() => {
-  useProgramStore().resetFilters()
+import { RouteName } from '@/types'
+
+export default defineNuxtRouteMiddleware((to, from) => {
+  if (from.name !== RouteName.Homepage) {
+    useProgramStore().resetFilters()
+  }
 })