diff --git a/src/components/Projects/ProjectsMenu.vue b/src/components/Projects/ProjectsMenu.vue index 7f8d3e6825dbcf77580deaa85b8c4a3e92d338e5..4f8aa13af56b3c64452f6c7f52a95cc89c6d0b03 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 0ba6c479e87d2fcd4a1161721a59eb5e26baaef2..0aee4cb7a9a9aad710100851c68d712fc33d7a39 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 8c1fcdb06d17dbfc4209c2b1bb069c16642b5ef7..089980c86dd06cbf77be1ceb022f6ac82eb7d4a8 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 2e5d99c9f8c7477feb667c2b0b99e00edf8ed992..77999234edfc163742fdb7e3e131f7416b566ce8 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); }