From 3dd6934103626f60ee13bd7e9643752346c40c26 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Mon, 20 Nov 2023 10:17:50 +0100
Subject: [PATCH 01/18] search by subtheme

---
 src/components/TopicSearch.vue | 117 +++++++++++++++++++++++++++++++++
 src/model.ts                   |  40 ++++++++++-
 2 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 src/components/TopicSearch.vue

diff --git a/src/components/TopicSearch.vue b/src/components/TopicSearch.vue
new file mode 100644
index 000000000..76f45a0b8
--- /dev/null
+++ b/src/components/TopicSearch.vue
@@ -0,0 +1,117 @@
+<template>
+  <div className="filterForm">
+    <div class="fr-select-group">
+      <label class="fr-label" for="select_theme"> Thématiques </label>
+      <select class="fr-select" id="select_theme" @change="switchTheme($event)">
+        <option
+          :value="this.NoOptionSelected"
+          :selected="themeName == this.NoOptionSelected"
+        >
+          Choisir une thématique
+        </option>
+        <option
+          v-for="option in themeOptions"
+          :value="option.value"
+          :selected="option.value === themeName"
+        >
+          {{ option.text }}
+        </option>
+      </select>
+    </div>
+
+    <div class="fr-select-group">
+      <label class="fr-label" for="select_subtheme"> Chantiers </label>
+      <select
+        class="fr-select"
+        id="select_subtheme"
+        @change="switchSubtheme($event)"
+      >
+        <option
+          :value="this.NoOptionSelected"
+          :selected="subthemeName == this.NoOptionSelected"
+        >
+          Choisir un chantier
+        </option>
+        <option
+          v-for="option in subthemeOptions"
+          v-bind:value="option.value"
+          :selected="option.value === subthemeName"
+        >
+          {{ option.text }}
+        </option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+import config from '../config'
+import { NoOptionSelected, SelectOption } from '../model'
+import Tile from './Tile.vue'
+
+export default defineComponent({
+  name: 'TopicSearch',
+  components: {
+    Tile: Tile
+  },
+  created() {
+    this.NoOptionSelected = NoOptionSelected
+  },
+  props: {
+    themeName: {
+      type: String,
+      default: NoOptionSelected
+    },
+    subthemeName: {
+      type: String,
+      default: NoOptionSelected
+    }
+  },
+  computed: {
+    selectedTheme() {
+      for (const theme of this.themeList) {
+        if (theme.name === this.themeName) {
+          return theme
+        }
+      }
+      return null
+    },
+    themeList() {
+      return config.themes
+    },
+    themeOptions(): SelectOption[] {
+      const options: SelectOption[] = []
+      for (const theme of this.themeList) {
+        options.push({
+          value: theme.name,
+          text: theme.name
+        })
+      }
+      return options
+    },
+    subthemeOptions(): SelectOption[] {
+      const options: SelectOption[] = []
+      if (this.selectedTheme) {
+        for (const subtheme of this.selectedTheme.subthemes) {
+          options.push({
+            value: subtheme.name,
+            text: subtheme.name
+          })
+        }
+      }
+      return options
+    }
+  },
+  methods: {
+    switchTheme(event) {
+      this.$emit('update:subthemeName', NoOptionSelected)
+      this.$emit('update:themeName', event.target.value)
+    },
+    switchSubtheme(event) {
+      this.$emit('update:subthemeName', event.target.value)
+    }
+  }
+})
+</script>
diff --git a/src/model.ts b/src/model.ts
index 4a37fddf8..9f6e0b8e0 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -8,4 +8,42 @@ interface Subtheme {
   name: string
 }
 
-export type { Theme, Subtheme }
+interface SelectOption {
+  value: string
+  text: string
+  disabled?: boolean
+}
+
+interface BreadcrumbItem {
+  text: string
+  to?: string
+}
+
+interface Topic {
+  created_at: string
+  datasets: Dataset[]
+  description: string
+  extras: {
+    'ecospheres:datasets_properties': {}
+    'ecospheres:informations': { subtheme: string; theme: string }[]
+  }
+  featured: boolean
+  id: string
+  name: string
+  organisation: any
+  owner: any
+  page: string
+  private: boolean
+  reuses: []
+  slug: string
+  tags: string[]
+  uri: string
+}
+
+interface Dataset {
+  // to improve
+}
+
+export const NoOptionSelected = 'no_option_selected'
+
+export type { Theme, Subtheme, SelectOption, BreadcrumbItem, Topic }

From b7a6f941bf47b52a0fb2c742c4803f85a709d829 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Mon, 20 Nov 2023 10:18:07 +0100
Subject: [PATCH 02/18] list results

---
 src/components/TopicList.vue | 116 +++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 src/components/TopicList.vue

diff --git a/src/components/TopicList.vue b/src/components/TopicList.vue
new file mode 100644
index 000000000..b8172bbb8
--- /dev/null
+++ b/src/components/TopicList.vue
@@ -0,0 +1,116 @@
+<template>
+  <DsfrAlert
+    v-if="bouquets.length === 0"
+    type="info"
+    title="Pas de résultat"
+    description="Il n'y a pas encore de bouquets pour ces critères"
+  />
+  <p v-else>{{ numberOfResultMsg }}</p>
+  <div class="fr-container--fluid fr-mt-4w fr-mb-4w">
+    <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
+      <li class="fr-col-12 fr-col-lg-6">
+        <Tile
+          className="actionTile"
+          @click="goToCreate"
+          link=""
+          title="Ajouter un bouquet"
+        />
+      </li>
+      <li v-for="bouquet in bouquets" class="fr-col-12 fr-col-lg-6">
+        <Tile
+          :link="`/bouquets/${bouquet.slug}`"
+          :title="bouquet.name"
+          :description="bouquet.description"
+          :is-markdown="true"
+        />
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script lang="ts">
+import { onMounted } from 'vue'
+import { useLoading } from 'vue-loading-overlay'
+
+import type { Topic } from '../model'
+import { NoOptionSelected } from '../model'
+import { useTopicStore } from '../store/TopicStore'
+import Tile from './Tile.vue'
+
+export default {
+  name: 'TopicList',
+  components: {
+    Tile: Tile
+  },
+  setup() {
+    onMounted(() => {
+      const loader = useLoading().show()
+      useTopicStore()
+        .loadTopicsForUniverse()
+        .finally(() => {
+          loader.hide()
+        })
+    })
+  },
+  props: {
+    themeName: {
+      type: String,
+      default: NoOptionSelected
+    },
+    subthemeName: {
+      type: String,
+      default: NoOptionSelected
+    }
+  },
+  computed: {
+    bouquets(): Topic[] {
+      const allTopics = useTopicStore().$state.data
+      if (this.themeName === NoOptionSelected) {
+        return allTopics
+      }
+      const relevantTopics: Topic[] = []
+      if (this.subthemeName !== NoOptionSelected) {
+        for (const topic of allTopics) {
+          if (
+            this.isRelevant(topic, 'subtheme', this.subthemeName) &&
+            this.isRelevant(topic, 'theme', this.themeName)
+          ) {
+            relevantTopics.push(topic)
+          }
+        }
+      } else if (this.themeName !== NoOptionSelected) {
+        for (const topic of allTopics) {
+          if (this.isRelevant(topic, 'theme', this.themeName)) {
+            relevantTopics.push(topic)
+          }
+        }
+      }
+      return relevantTopics
+    },
+    numberOfResultMsg(): string {
+      if (this.bouquets.length === 1) {
+        return '1 bouquet disponible'
+      } else {
+        return this.bouquets.length + ' bouquets disponibles'
+      }
+    }
+  },
+  methods: {
+    isRelevant(topic: Topic, property: string, value): Boolean {
+      const topicInformations: { subtheme: string; theme: string }[] =
+        topic.extras['ecospheres:informations']
+      if (topicInformations) {
+        for (const information of topicInformations) {
+          if (information[property] === value) {
+            return true
+          }
+        }
+      }
+      return false
+    },
+    goToCreate() {
+      this.$router.push({ name: 'bouquet_add' })
+    }
+  }
+}
+</script>

From f7551a00c91b0892bd7b7cd4cd815263c470f946 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Mon, 20 Nov 2023 10:18:41 +0100
Subject: [PATCH 03/18] combine list and filter

---
 src/services/routerUtils.js             |   6 +-
 src/views/bouquets/BouquetsListView.vue | 100 ++++++++++++++----------
 2 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/services/routerUtils.js b/src/services/routerUtils.js
index 41741b9cc..7433d6cc6 100644
--- a/src/services/routerUtils.js
+++ b/src/services/routerUtils.js
@@ -42,7 +42,11 @@ export default class RouterFetch {
         items.push({
           path: item.linkPage,
           name: item.id,
-          component: BouquetsListView
+          component: BouquetsListView,
+          props: (route) => ({
+            initThemeName: route.query.theme,
+            initSubthemeName: route.query.subtheme
+          })
         })
         items.push({
           path: `${item.linkPage}/:bid`,
diff --git a/src/views/bouquets/BouquetsListView.vue b/src/views/bouquets/BouquetsListView.vue
index bcdcd34b7..2acee3270 100644
--- a/src/views/bouquets/BouquetsListView.vue
+++ b/src/views/bouquets/BouquetsListView.vue
@@ -1,46 +1,64 @@
-<script setup>
-import { onMounted, computed } from 'vue'
-import { useLoading } from 'vue-loading-overlay'
-import { useRouter } from 'vue-router'
-
-import Tile from '../../components/Tile.vue'
-import { useTopicStore } from '../../store/TopicStore'
-
-const store = useTopicStore()
-const $loading = useLoading()
-const router = useRouter()
-
-const bouquets = computed(() => store.$state.data)
-
-const goToCreate = () => {
-  router.push({ name: 'bouquet_add' })
-}
-
-onMounted(() => {
-  const loader = $loading.show()
-  store.loadTopicsForUniverse().finally(() => loader.hide())
-})
-</script>
-
 <template>
-  <div class="fr-container--fluid fr-mt-4w fr-mb-4w">
-    <div class="fr-grid-row fr-mb-1w">
-      <DsfrButton
-        class="fr-mb-1w"
-        label="Ajouter un bouquet"
-        icon="ri-add-circle-line"
-        @click="goToCreate"
+  <div className="fr-grid-row topicListView">
+    <nav className="fr-sidemenu fr-col-4" aria-labelledby="fr-sidemenu-title">
+      <div className="fr-sidemenu__inner">
+        <div className="fr-sidemenu__title" id="fr-sidemenu-title">Filtres</div>
+        <TopicSearch
+          v-model:themeName="themeName"
+          v-model:subthemeName="subthemeName"
+        />
+      </div>
+    </nav>
+    <div className="fr-col-8">
+      <DsfrBreadcrumb
+        class="home-selection-breadcrumb"
+        :links="breadcrumbList"
       />
+      <TopicList :themeName="themeName" :subthemeName="subthemeName" />
     </div>
-    <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
-      <li v-for="bouquet in bouquets" class="fr-col-12 fr-col-lg-4">
-        <Tile
-          :link="`/bouquets/${bouquet.slug}`"
-          :title="bouquet.name"
-          :description="bouquet.description"
-          :is-markdown="true"
-        />
-      </li>
-    </ul>
   </div>
 </template>
+
+<script lang="ts">
+import TopicList from '../../components/TopicList.vue'
+import TopicSearch from '../../components/TopicSearch.vue'
+import type { BreadcrumbItem } from '../../model'
+import { NoOptionSelected } from '../../model'
+
+export default {
+  name: 'BouquetsListView',
+  components: {
+    TopicSearch: TopicSearch,
+    TopicList: TopicList
+  },
+  props: {
+    initThemeName: {
+      type: String,
+      default: NoOptionSelected
+    },
+    initSubthemeName: {
+      type: String,
+      default: NoOptionSelected
+    }
+  },
+  data() {
+    return {
+      themeName: this.initThemeName,
+      subthemeName: this.initSubthemeName
+    }
+  },
+  computed: {
+    breadcrumbList() {
+      const links: BreadcrumbItem[] = []
+      if (this.themeName !== NoOptionSelected) {
+        links.push({ text: 'Accueil', to: '/' })
+        links.push({ text: this.themeName, to: `/?theme=${this.themeName}` })
+        if (this.subthemeName !== NoOptionSelected) {
+          links.push({ text: this.subthemeName })
+        }
+      }
+      return links
+    }
+  }
+}
+</script>

From 9a01015937f1583cb3b092f97a9423ca76f0aecf Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Mon, 20 Nov 2023 10:18:58 +0100
Subject: [PATCH 04/18] call from home

---
 src/assets/main.css           | 24 ++++++++++++++++++++++++
 src/components/HomeThemes.vue |  2 +-
 src/views/HomeView.vue        | 13 +++++++++----
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index 47d6bf015..01d8dd1a4 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -49,3 +49,27 @@
     text-align: left;
   }
 }
+
+.theme_without_breadcrumb {
+  margin: 128px 0 0;
+}
+
+.theme_with_breadcrumb {
+  margin: 60px 0 0;
+}
+
+.home-selection-breadcrumb {
+  text-align: left;
+}
+
+.topicListView {
+  margin-top: 128px;
+}
+
+.actionTile {
+  background: #000092;
+  a {
+    color: white;
+    
+  }
+}
\ No newline at end of file
diff --git a/src/components/HomeThemes.vue b/src/components/HomeThemes.vue
index 522cbdbf1..34438b68e 100644
--- a/src/components/HomeThemes.vue
+++ b/src/components/HomeThemes.vue
@@ -64,7 +64,7 @@ export default {
       return `box-shadow: rgb(221, 221, 221) 0px 0px 0px 1px inset, #${color} 0px -4px 0px 0px inset`
     },
     goToTopicList(subtheme: Subtheme): string {
-      return 'link to topic list' // TO DO redirect to search result once the page is created
+      return `/?theme=${this.selectedTheme.name}&subtheme=${subtheme.name}`
     },
     getThemeDescription(theme: Theme): string {
       const nbSubthemes = theme.subthemes.length
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 4a97741bf..4817efa82 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -9,6 +9,7 @@ import HomeButtons from '../components/HomeButtons.vue'
 import HomeCharts from '../components/HomeCharts.vue'
 import HomeThemes from '../components/HomeThemes.vue'
 import HomeTopics from '../components/HomeTopics.vue'
+import BouquetsListView from './bouquets/BouquetsListView.vue'
 
 const router = useRouter()
 const query = ref('')
@@ -43,10 +44,14 @@ const showTopicChart = config.website.show_topic_charts
       @search="doSearch"
       @update:modelValue="updateQuery"
     />
-    <HomeThemes
-      class-name="home-tile-list"
-      :selected-theme-name="$route.query.theme"
-    />
+    <div>
+      <BouquetsListView
+        v-if="$route.query.theme && $route.query.subtheme"
+        :init-theme-name="$route.query.theme"
+        :init-subtheme-name="$route.query.subtheme"
+      />
+      <HomeThemes v-else :selected-theme-name="$route.query.theme" />
+    </div>
     <HomeButtons v-if="buttons" :buttons="buttons" />
     <HomeTopics v-if="topics" :topics="topics" />
     <HomeCharts v-if="showTopicChart" />

From 6a7af23a8a4cc7a91b0debeaac3280aea781385d Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 09:56:44 +0100
Subject: [PATCH 05/18] fix details

---
 src/assets/main.css | 1 -
 src/model.ts        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index 01d8dd1a4..97ca84932 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -70,6 +70,5 @@
   background: #000092;
   a {
     color: white;
-    
   }
 }
\ No newline at end of file
diff --git a/src/model.ts b/src/model.ts
index 9f6e0b8e0..7bb02c667 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -41,7 +41,7 @@ interface Topic {
 }
 
 interface Dataset {
-  // to improve
+  // TODO --  add list of properties for Dataset
 }
 
 export const NoOptionSelected = 'no_option_selected'

From 851a520d32f8c6cf9fdd00ec1fe8e82c7682ed13 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 10:26:25 +0100
Subject: [PATCH 06/18] apply css

---
 src/assets/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index 97ca84932..df4680a2e 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -68,7 +68,7 @@
 
 .actionTile {
   background: #000092;
-  a {
+  .fr-tile__link {
     color: white;
   }
 }
\ No newline at end of file

From 45eb56c36a120ebafb11016860f2b6a6188e5dac Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 15:07:05 +0100
Subject: [PATCH 07/18] redirect to bouquet instead of home

---
 src/assets/main.css           |  2 +-
 src/components/HomeThemes.vue |  2 +-
 src/views/HomeView.vue        | 10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index df4680a2e..9b6497d0d 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -63,7 +63,7 @@
 }
 
 .topicListView {
-  margin-top: 128px;
+  margin-top: 50px;
 }
 
 .actionTile {
diff --git a/src/components/HomeThemes.vue b/src/components/HomeThemes.vue
index 34438b68e..6068c5d80 100644
--- a/src/components/HomeThemes.vue
+++ b/src/components/HomeThemes.vue
@@ -64,7 +64,7 @@ export default {
       return `box-shadow: rgb(221, 221, 221) 0px 0px 0px 1px inset, #${color} 0px -4px 0px 0px inset`
     },
     goToTopicList(subtheme: Subtheme): string {
-      return `/?theme=${this.selectedTheme.name}&subtheme=${subtheme.name}`
+      return `/bouquets/?theme=${this.selectedTheme.name}&subtheme=${subtheme.name}`
     },
     getThemeDescription(theme: Theme): string {
       const nbSubthemes = theme.subthemes.length
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 4817efa82..5793709e4 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -9,7 +9,6 @@ import HomeButtons from '../components/HomeButtons.vue'
 import HomeCharts from '../components/HomeCharts.vue'
 import HomeThemes from '../components/HomeThemes.vue'
 import HomeTopics from '../components/HomeTopics.vue'
-import BouquetsListView from './bouquets/BouquetsListView.vue'
 
 const router = useRouter()
 const query = ref('')
@@ -44,14 +43,7 @@ const showTopicChart = config.website.show_topic_charts
       @search="doSearch"
       @update:modelValue="updateQuery"
     />
-    <div>
-      <BouquetsListView
-        v-if="$route.query.theme && $route.query.subtheme"
-        :init-theme-name="$route.query.theme"
-        :init-subtheme-name="$route.query.subtheme"
-      />
-      <HomeThemes v-else :selected-theme-name="$route.query.theme" />
-    </div>
+    <HomeThemes :selected-theme-name="$route.query.theme" />
     <HomeButtons v-if="buttons" :buttons="buttons" />
     <HomeTopics v-if="topics" :topics="topics" />
     <HomeCharts v-if="showTopicChart" />

From 98589382f5a8cd83d10663208534d2cce69b5bff Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 15:22:33 +0100
Subject: [PATCH 08/18] change breadcrumb behavior

---
 src/components/TopicSearch.vue          | 11 ++++++++---
 src/views/bouquets/BouquetsListView.vue | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/components/TopicSearch.vue b/src/components/TopicSearch.vue
index 76f45a0b8..a6ab5e30e 100644
--- a/src/components/TopicSearch.vue
+++ b/src/components/TopicSearch.vue
@@ -106,11 +106,16 @@ export default defineComponent({
   },
   methods: {
     switchTheme(event) {
-      this.$emit('update:subthemeName', NoOptionSelected)
-      this.$emit('update:themeName', event.target.value)
+      this.$router.push({
+        path: '/bouquets',
+        query: { theme: event.target.value, subtheme: NoOptionSelected }
+      })
     },
     switchSubtheme(event) {
-      this.$emit('update:subthemeName', event.target.value)
+      this.$router.push({
+        path: '/bouquets',
+        query: { theme: this.themeName, subtheme: event.target.value }
+      })
     }
   }
 })
diff --git a/src/views/bouquets/BouquetsListView.vue b/src/views/bouquets/BouquetsListView.vue
index 2acee3270..414786c9e 100644
--- a/src/views/bouquets/BouquetsListView.vue
+++ b/src/views/bouquets/BouquetsListView.vue
@@ -1,4 +1,5 @@
 <template>
+  <DsfrBreadcrumb class="home-selection-breadcrumb" :links="breadcrumbList" />
   <div className="fr-grid-row topicListView">
     <nav className="fr-sidemenu fr-col-4" aria-labelledby="fr-sidemenu-title">
       <div className="fr-sidemenu__inner">
@@ -10,10 +11,6 @@
       </div>
     </nav>
     <div className="fr-col-8">
-      <DsfrBreadcrumb
-        class="home-selection-breadcrumb"
-        :links="breadcrumbList"
-      />
       <TopicList :themeName="themeName" :subthemeName="subthemeName" />
     </div>
   </div>
@@ -47,12 +44,23 @@ export default {
       subthemeName: this.initSubthemeName
     }
   },
+  watch: {
+    '$route.query.subtheme'(newVal) {
+      this.subthemeName = newVal
+    },
+    '$route.query.theme'(newVal) {
+      this.themeName = newVal
+    }
+  },
   computed: {
     breadcrumbList() {
       const links: BreadcrumbItem[] = []
       if (this.themeName !== NoOptionSelected) {
         links.push({ text: 'Accueil', to: '/' })
-        links.push({ text: this.themeName, to: `/?theme=${this.themeName}` })
+        links.push({
+          text: this.themeName,
+          to: `/bouquets?theme=${this.themeName}`
+        })
         if (this.subthemeName !== NoOptionSelected) {
           links.push({ text: this.subthemeName })
         }

From 7afc6e6ddf42237f14047e13850f75bf7b392c70 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 15:52:04 +0100
Subject: [PATCH 09/18] fix margin with/without breadcrumb

---
 src/assets/main.css                     | 22 +++-------------
 src/components/HomeThemes.vue           | 32 ++++++++++++-----------
 src/views/bouquets/BouquetsListView.vue | 34 ++++++++++++++++---------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index 9b6497d0d..a96168b93 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -39,33 +39,19 @@
   align-items: center;
 }
 
-.theme_without_breadcrumb {
+.without_breadcrumb {
   margin: 128px 0 0;
 }
 
-.theme_with_breadcrumb {
+.with_breadcrumb {
   margin: 60px 0 0;
-  .home-selection-breadcrumb {
-    text-align: left;
-  }
 }
 
-.theme_without_breadcrumb {
-  margin: 128px 0 0;
-}
-
-.theme_with_breadcrumb {
-  margin: 60px 0 0;
-}
-
-.home-selection-breadcrumb {
+.breadcrumb {
+  margin-top: 40px;
   text-align: left;
 }
 
-.topicListView {
-  margin-top: 50px;
-}
-
 .actionTile {
   background: #000092;
   .fr-tile__link {
diff --git a/src/components/HomeThemes.vue b/src/components/HomeThemes.vue
index 6068c5d80..ff5f6e4d2 100644
--- a/src/components/HomeThemes.vue
+++ b/src/components/HomeThemes.vue
@@ -1,5 +1,5 @@
 <template>
-  <div className="theme_without_breadcrumb" v-if="selectedTheme === null">
+  <div className="without_breadcrumb" v-if="selectedTheme === null">
     <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
       <li v-for="theme in themeList" class="fr-col-12 fr-col-lg-4">
         <Tile
@@ -11,20 +11,22 @@
       </li>
     </ul>
   </div>
-  <div className="theme_with_breadcrumb" v-else>
-    <DsfrBreadcrumb class="home-selection-breadcrumb" :links="breadcrumbList" />
-    <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
-      <li
-        v-for="subtheme in selectedTheme.subthemes"
-        class="fr-col-12 fr-col-lg-4"
-      >
-        <Tile
-          :style="getCustomBoxShadow(selectedTheme.color)"
-          :link="goToTopicList(subtheme)"
-          :title="subtheme.name"
-        />
-      </li>
-    </ul>
+  <div v-else>
+    <DsfrBreadcrumb class="breadcrumb" :links="breadcrumbList" />
+    <div class="with_breadcrumb">
+      <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
+        <li
+          v-for="subtheme in selectedTheme.subthemes"
+          class="fr-col-12 fr-col-lg-4"
+        >
+          <Tile
+            :style="getCustomBoxShadow(selectedTheme.color)"
+            :link="goToTopicList(subtheme)"
+            :title="subtheme.name"
+          />
+        </li>
+      </ul>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/bouquets/BouquetsListView.vue b/src/views/bouquets/BouquetsListView.vue
index 414786c9e..67ee84867 100644
--- a/src/views/bouquets/BouquetsListView.vue
+++ b/src/views/bouquets/BouquetsListView.vue
@@ -1,17 +1,21 @@
 <template>
-  <DsfrBreadcrumb class="home-selection-breadcrumb" :links="breadcrumbList" />
-  <div className="fr-grid-row topicListView">
-    <nav className="fr-sidemenu fr-col-4" aria-labelledby="fr-sidemenu-title">
-      <div className="fr-sidemenu__inner">
-        <div className="fr-sidemenu__title" id="fr-sidemenu-title">Filtres</div>
-        <TopicSearch
-          v-model:themeName="themeName"
-          v-model:subthemeName="subthemeName"
-        />
+  <DsfrBreadcrumb class="breadcrumb" :links="breadcrumbList" />
+  <div :class="classDependingOnBreadcrumb">
+    <div className="fr-grid-row topicListView">
+      <nav className="fr-sidemenu fr-col-4" aria-labelledby="fr-sidemenu-title">
+        <div className="fr-sidemenu__inner">
+          <div className="fr-sidemenu__title" id="fr-sidemenu-title">
+            Filtres
+          </div>
+          <TopicSearch
+            v-model:themeName="themeName"
+            v-model:subthemeName="subthemeName"
+          />
+        </div>
+      </nav>
+      <div className="fr-col-8">
+        <TopicList :themeName="themeName" :subthemeName="subthemeName" />
       </div>
-    </nav>
-    <div className="fr-col-8">
-      <TopicList :themeName="themeName" :subthemeName="subthemeName" />
     </div>
   </div>
 </template>
@@ -66,6 +70,12 @@ export default {
         }
       }
       return links
+    },
+    classDependingOnBreadcrumb() {
+      console.log(this.breadcrumbList.length)
+      return this.breadcrumbList.length > 0
+        ? 'with_breadcrumb'
+        : 'without_breadcrumb'
     }
   }
 }

From ae6c2ae80f08fa17f0565f0607c073281c524345 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 16:14:46 +0100
Subject: [PATCH 10/18] add topic btn

---
 src/assets/main.css          |  4 ++++
 src/components/TopicList.vue | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index a96168b93..b5c38ff54 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -57,4 +57,8 @@
   .fr-tile__link {
     color: white;
   }
+}
+
+.dsfr_alert {
+  margin: 20px 0;
 }
\ No newline at end of file
diff --git a/src/components/TopicList.vue b/src/components/TopicList.vue
index b8172bbb8..13816117e 100644
--- a/src/components/TopicList.vue
+++ b/src/components/TopicList.vue
@@ -1,21 +1,22 @@
 <template>
   <DsfrAlert
+    class="dsfr_alert"
     v-if="bouquets.length === 0"
     type="info"
     title="Pas de résultat"
     description="Il n'y a pas encore de bouquets pour ces critères"
   />
   <p v-else>{{ numberOfResultMsg }}</p>
+  <div class="fr-grid-row fr-mb-1w">
+    <DsfrButton
+      class="fr-mb-1w"
+      label="Ajouter un bouquet"
+      icon="ri-add-circle-line"
+      @click="goToCreate"
+    />
+  </div>
   <div class="fr-container--fluid fr-mt-4w fr-mb-4w">
     <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
-      <li class="fr-col-12 fr-col-lg-6">
-        <Tile
-          className="actionTile"
-          @click="goToCreate"
-          link=""
-          title="Ajouter un bouquet"
-        />
-      </li>
       <li v-for="bouquet in bouquets" class="fr-col-12 fr-col-lg-6">
         <Tile
           :link="`/bouquets/${bouquet.slug}`"

From 44bf259da44ae1994ae311954784a376c1b37cc4 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 22 Nov 2023 16:22:15 +0100
Subject: [PATCH 11/18] fix for tsconfig

---
 tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index f28bea414..1cb149b0d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "allowJs": true,
     "experimentalDecorators": true,
     "paths": {
       "@/*": ["./src/*"]

From 0c8ea9d36e5c892acbbc39d0088e135c17a9c538 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Fri, 24 Nov 2023 15:14:52 +0100
Subject: [PATCH 12/18] remove log

---
 src/views/bouquets/BouquetsListView.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/bouquets/BouquetsListView.vue b/src/views/bouquets/BouquetsListView.vue
index 67ee84867..4b23e58bf 100644
--- a/src/views/bouquets/BouquetsListView.vue
+++ b/src/views/bouquets/BouquetsListView.vue
@@ -72,7 +72,6 @@ export default {
       return links
     },
     classDependingOnBreadcrumb() {
-      console.log(this.breadcrumbList.length)
       return this.breadcrumbList.length > 0
         ? 'with_breadcrumb'
         : 'without_breadcrumb'

From 756c05c8d90e8ad314585dccf4e1baed7183640b Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 10:46:14 +0100
Subject: [PATCH 13/18] =?UTF-8?q?ajout=20n=C3=A9cessaire=20pour=20lancer?=
 =?UTF-8?q?=20le=20projet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 285 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   1 +
 2 files changed, 286 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 58a72b8c1..24bd453f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "ecospheres-front",
       "version": "0.3.0",
       "dependencies": {
+        "@esbuild/linux-x64": "^0.19.8",
         "@gouvminint/vue-dsfr": "^3.6.0",
         "@vueform/multiselect": "^2.6.2",
         "axios": "^1.6.2",
@@ -488,6 +489,275 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "cpu": [
+        "loong64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.19.8",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz",
+      "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==",
+      "cpu": [
+        "x64"
+      ],
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -3220,6 +3490,21 @@
         "node": ">=12"
       }
     },
+    "node_modules/esbuild/node_modules/@esbuild/linux-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
diff --git a/package.json b/package.json
index 5f5377df4..464b26948 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@esbuild/linux-x64": "^0.19.8",
     "@gouvminint/vue-dsfr": "^3.6.0",
     "@vueform/multiselect": "^2.6.2",
     "axios": "^1.6.2",

From 81e2724080c1f788c580865b688c5c04006d3de1 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 10:46:27 +0100
Subject: [PATCH 14/18] fix conditional theme

---
 src/views/HomeView.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 5793709e4..130083efc 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -43,7 +43,10 @@ const showTopicChart = config.website.show_topic_charts
       @search="doSearch"
       @update:modelValue="updateQuery"
     />
-    <HomeThemes :selected-theme-name="$route.query.theme" />
+    <HomeThemes
+      v-if="config.themes"
+      :selected-theme-name="$route.query.theme"
+    />
     <HomeButtons v-if="buttons" :buttons="buttons" />
     <HomeTopics v-if="topics" :topics="topics" />
     <HomeCharts v-if="showTopicChart" />

From a8a23de0ae739a5ba5a0b0fafd9c2946b59baa30 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 10:46:50 +0100
Subject: [PATCH 15/18] change message

---
 src/components/TopicList.vue   | 36 ++++++++++++++++++++--------------
 src/components/TopicSearch.vue |  4 +++-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/components/TopicList.vue b/src/components/TopicList.vue
index 13816117e..310f9eb57 100644
--- a/src/components/TopicList.vue
+++ b/src/components/TopicList.vue
@@ -1,22 +1,28 @@
 <template>
-  <DsfrAlert
-    class="dsfr_alert"
-    v-if="bouquets.length === 0"
-    type="info"
-    title="Pas de résultat"
-    description="Il n'y a pas encore de bouquets pour ces critères"
-  />
-  <p v-else>{{ numberOfResultMsg }}</p>
-  <div class="fr-grid-row fr-mb-1w">
-    <DsfrButton
-      class="fr-mb-1w"
-      label="Ajouter un bouquet"
-      icon="ri-add-circle-line"
-      @click="goToCreate"
-    />
+  <div v-if="bouquets.length > 0">
+    <p>{{ numberOfResultMsg }}</p>
+    <div class="fr-grid-row fr-mb-1w">
+      <DsfrButton
+        class="fr-mb-1w"
+        label="Ajouter un bouquet"
+        icon="ri-add-circle-line"
+        @click="goToCreate"
+      />
+    </div>
   </div>
   <div class="fr-container--fluid fr-mt-4w fr-mb-4w">
     <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
+      <li v-if="bouquets.length === 0" class="fr-col-12 fr-col-lg-6">
+        <div class="fr-alert fr-alert--info" data-fr-js-alert-actionee="true">
+          <h3 class="fr-alert__title">
+            Il n'y a pas encore de bouquet sur ce théme
+          </h3>
+          <p>
+            N'hésitez pas à contribuer en
+            <a href="/admin/bouquets/add" target="_blank">en créant un</a>
+          </p>
+        </div>
+      </li>
       <li v-for="bouquet in bouquets" class="fr-col-12 fr-col-lg-6">
         <Tile
           :link="`/bouquets/${bouquet.slug}`"
diff --git a/src/components/TopicSearch.vue b/src/components/TopicSearch.vue
index a6ab5e30e..9cb570280 100644
--- a/src/components/TopicSearch.vue
+++ b/src/components/TopicSearch.vue
@@ -47,8 +47,10 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 
+import type { SelectOption } from '@/model'
+
 import config from '../config'
-import { NoOptionSelected, SelectOption } from '../model'
+import { NoOptionSelected } from '../model'
 import Tile from './Tile.vue'
 
 export default defineComponent({

From 3347dabf4263349ccf62f31698da1bec3f62a250 Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 10:49:36 +0100
Subject: [PATCH 16/18] typo

---
 src/components/TopicList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TopicList.vue b/src/components/TopicList.vue
index 310f9eb57..62c3c982a 100644
--- a/src/components/TopicList.vue
+++ b/src/components/TopicList.vue
@@ -15,7 +15,7 @@
       <li v-if="bouquets.length === 0" class="fr-col-12 fr-col-lg-6">
         <div class="fr-alert fr-alert--info" data-fr-js-alert-actionee="true">
           <h3 class="fr-alert__title">
-            Il n'y a pas encore de bouquet sur ce théme
+            Il n'y a pas encore de bouquet sur ce thème
           </h3>
           <p>
             N'hésitez pas à contribuer en

From 223298124c4554f0c1bdc9c237de9bed419f40ea Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 11:11:37 +0100
Subject: [PATCH 17/18] no tile for error msg

---
 src/components/TopicList.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/TopicList.vue b/src/components/TopicList.vue
index 62c3c982a..c9abb3865 100644
--- a/src/components/TopicList.vue
+++ b/src/components/TopicList.vue
@@ -10,19 +10,19 @@
       />
     </div>
   </div>
+  <div
+    v-if="bouquets.length === 0"
+    class="fr-alert fr-alert--info"
+    data-fr-js-alert-actionee="true"
+  >
+    <h3 class="fr-alert__title">Il n'y a pas encore de bouquet sur ce thème</h3>
+    <p>
+      N'hésitez pas à contribuer en
+      <a href="/admin/bouquets/add" target="_blank">en créant un</a>
+    </p>
+  </div>
   <div class="fr-container--fluid fr-mt-4w fr-mb-4w">
     <ul class="fr-grid-row fr-grid-row--gutters es__tiles__list fr-mt-1w">
-      <li v-if="bouquets.length === 0" class="fr-col-12 fr-col-lg-6">
-        <div class="fr-alert fr-alert--info" data-fr-js-alert-actionee="true">
-          <h3 class="fr-alert__title">
-            Il n'y a pas encore de bouquet sur ce thème
-          </h3>
-          <p>
-            N'hésitez pas à contribuer en
-            <a href="/admin/bouquets/add" target="_blank">en créant un</a>
-          </p>
-        </div>
-      </li>
       <li v-for="bouquet in bouquets" class="fr-col-12 fr-col-lg-6">
         <Tile
           :link="`/bouquets/${bouquet.slug}`"

From 7d273c92da0b1d8d5877cbd192bf29795882ed4b Mon Sep 17 00:00:00 2001
From: Erica Delagnier <erica.delagnier@multi.coop>
Date: Wed, 29 Nov 2023 10:46:14 +0100
Subject: [PATCH 18/18] remove out of scope changes

This reverts commit 756c05c8d90e8ad314585dccf4e1baed7183640b.
---
 package-lock.json | 285 ----------------------------------------------
 package.json      |   1 -
 tsconfig.json     |   1 +
 3 files changed, 1 insertion(+), 286 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 24bd453f7..58a72b8c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,6 @@
       "name": "ecospheres-front",
       "version": "0.3.0",
       "dependencies": {
-        "@esbuild/linux-x64": "^0.19.8",
         "@gouvminint/vue-dsfr": "^3.6.0",
         "@vueform/multiselect": "^2.6.2",
         "axios": "^1.6.2",
@@ -489,275 +488,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
-      "cpu": [
-        "loong64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
-      "cpu": [
-        "riscv64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.19.8",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz",
-      "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==",
-      "cpu": [
-        "x64"
-      ],
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -3490,21 +3220,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/esbuild/node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
diff --git a/package.json b/package.json
index 464b26948..5f5377df4 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@esbuild/linux-x64": "^0.19.8",
     "@gouvminint/vue-dsfr": "^3.6.0",
     "@vueform/multiselect": "^2.6.2",
     "axios": "^1.6.2",
diff --git a/tsconfig.json b/tsconfig.json
index 4ac6cad20..a84a6a8f5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowJs": true,
     "experimentalDecorators": true,
     "noEmit": true,
     "paths": {