From 7261ac925af595acca73451cb08c642888850791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Wed, 19 Jan 2022 15:41:13 +0100
Subject: [PATCH] fix comment in messages & caret style on project filters

---
 src/components/Projects/ProjectsMenu.vue | 14 +++++++-------
 src/views/Projects.vue                   |  2 +-
 src/views/project/Project_detail.vue     | 19 +++++++++++++++----
 src/views/registration/Login.vue         |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/Projects/ProjectsMenu.vue b/src/components/Projects/ProjectsMenu.vue
index 7f8d3e68..4f8aa13a 100644
--- a/src/components/Projects/ProjectsMenu.vue
+++ b/src/components/Projects/ProjectsMenu.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="filters-container">
     <div class="ui styled accordion">
-      <div class="title collapsible-filters">
+      <div
+      :class="['title collapsible-filters', {active: isFiltersVisible}]"
+      >
         FILTRES
-        <i
-          :class="isFiltersVisible ? 'caret down' : 'caret right'"
-          class="ui icon"
-        />
+        <i class="ui dropdown icon caret right" />
       </div>
     </div>
     <div
@@ -146,13 +145,14 @@ export default {
   mounted() {
     const el = document.getElementsByClassName('collapsible-filters');
 
-    el[0].addEventListener('click', function() {
+    el[0].addEventListener('click', () => {
       const content = document.getElementsByClassName('filters');
-      content[0].classList.toggle('hidden');
       if (content[0].style.maxHeight){
         content[0].style.maxHeight = null;
+        this.isFiltersVisible = false;
       } else {
         content[0].style.maxHeight = content[0].scrollHeight + 5 + 'px';
+        this.isFiltersVisible = true;
       }
     });
   },
diff --git a/src/views/Projects.vue b/src/views/Projects.vue
index 0ba6c479..0aee4cb7 100644
--- a/src/views/Projects.vue
+++ b/src/views/Projects.vue
@@ -24,7 +24,7 @@
     </div>
 
     <!-- FILTRES DES PROJETS -->
-    <projects-menu
+    <ProjectsMenu
       @filter="setProjectsFilters"
     />
 
diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue
index 8c1fcdb0..089980c8 100644
--- a/src/views/project/Project_detail.vue
+++ b/src/views/project/Project_detail.vue
@@ -1148,9 +1148,14 @@ export default {
         .then((response) => {
           if (response === 'success') {
             this.$router.push('/');
-            this.DISPLAY_MESSAGE(`Le projet ${this.project.title} a bien été supprimé.`);
+            this.DISPLAY_MESSAGE({
+              comment: `Le projet ${this.project.title} a bien été supprimé.`, level: 'positive'
+            });
           } else {
-            this.DISPLAY_MESSAGE(`Une erreur est survenu lors de la suppression du projet ${this.project.title}.`);
+            this.DISPLAY_MESSAGE({
+              comment: `Une erreur est survenu lors de la suppression du projet ${this.project.title}.`,
+              level: 'negative'
+            });
           }
         });
     },
@@ -1162,9 +1167,15 @@ export default {
           if (response === 'success') {
             this.GET_PROJECT();
             this.retrieveProjectInfo();
-            this.DISPLAY_MESSAGE(`Le type de signalement ${this.featureTypeToDelete.title} a bien été supprimé.`);
+            this.DISPLAY_MESSAGE({
+              comment: `Le type de signalement ${this.featureTypeToDelete.title} a bien été supprimé.`,
+              level: 'positive',
+            });
           } else {
-            this.DISPLAY_MESSAGE(`Une erreur est survenu lors de la suppression du type de signalement ${this.featureTypeToDelete.title}.`);
+            this.DISPLAY_MESSAGE({
+              comment: `Une erreur est survenu lors de la suppression du type de signalement ${this.featureTypeToDelete.title}.`,
+              level: 'negative',
+            });
           }
           this.featureTypeToDelete = null;
         });
diff --git a/src/views/registration/Login.vue b/src/views/registration/Login.vue
index 2e5d99c9..77999234 100644
--- a/src/views/registration/Login.vue
+++ b/src/views/registration/Login.vue
@@ -103,7 +103,7 @@ export default {
     if (this.$store.state.user) {
       this.$store.commit(
         'DISPLAY_MESSAGE',
-        "Vous êtes déjà connecté, vous allez être redirigé vers la page d'accueil."
+        { comment: "Vous êtes déjà connecté, vous allez être redirigé vers la page d'accueil." }
       );
       setTimeout(() => this.$router.push('/'), 3100);
     }
-- 
GitLab