diff --git a/src/components/Account/UserProjectsList.vue b/src/components/Account/UserProjectsList.vue index 45f1eeee7cbbcd2e28daab3e9c9a27a993f6c468..3d7302a19b701d5d3d7363424e1459f849b69017 100644 --- a/src/components/Account/UserProjectsList.vue +++ b/src/components/Account/UserProjectsList.vue @@ -206,21 +206,48 @@ export default { <style lang="less" scoped> -.item { +.ui.divided.items { + .item { + .item-content-wrapper { + width: 100%; + margin: 0; + padding: 1em 0; + display: flex; + + .middle.aligned.content { + .header { + font-size: 1.28571429em; + font-weight: 600; + color: rgb(31, 31, 31) + } + } + } + } + > .item:nth-child(2) { + border: none !important; + } +} +@media only screen and (min-width: 767px) { .item-content-wrapper { - width: 100%; - display: flex; align-items: flex-start; .middle.aligned.content { width: 100%; - .header { - font-size: 1.28571429em; - font-weight: 600; - color: rgb(31, 31, 31) - } + padding: 0 0 0 1.5em; } } } +@media only screen and (max-width: 767px) { + .item-content-wrapper { + flex-direction: column; + align-items: center; + + .middle.aligned.content { + width: 70%; + padding: 1.5em 0 0; + } + } +} + </style> diff --git a/src/components/Project/Detail/ProjectFeatureTypes.vue b/src/components/Project/Detail/ProjectFeatureTypes.vue index 005814012a5b1cd7afd2069a42c3b4756b58e3c4..fe4bb06d87e962c868f6f55d7330c777dc50bc6b 100644 --- a/src/components/Project/Detail/ProjectFeatureTypes.vue +++ b/src/components/Project/Detail/ProjectFeatureTypes.vue @@ -675,8 +675,7 @@ export default { }, toggleDeleteFeatureType(featureType) { - this.featureTypeToDelete = featureType; - this.$emit('modal', 'deleteFeatureType'); + this.$emit('delete', featureType); }, } diff --git a/src/components/Project/Detail/ProjectHeader.vue b/src/components/Project/Detail/ProjectHeader.vue index 211f4667a938b09944b9eb83ebd695877cf60fde..dd049e9e255c99d5faccd98884884782bec758e1 100644 --- a/src/components/Project/Detail/ProjectHeader.vue +++ b/src/components/Project/Detail/ProjectHeader.vue @@ -274,6 +274,7 @@ export default { .project-header { .row { + margin-top: 3em; .right-column { display: flex; diff --git a/src/components/Project/Detail/ProjectModal.vue b/src/components/Project/Detail/ProjectModal.vue index 16502bbce370af89023207e8be62bc0e29da2c9f..8ce274e2e9249dd4dd323c701defb2ff17554e77 100644 --- a/src/components/Project/Detail/ProjectModal.vue +++ b/src/components/Project/Detail/ProjectModal.vue @@ -75,6 +75,12 @@ export default { isSubscriber: { type: Boolean, default: false + }, + featureTypeToDelete: { + type: Object, + default: () => { + return {}; + } } }, @@ -91,14 +97,20 @@ export default { ]), handleModalAction() { - this.$emit('action'); + this.$emit('action', this.projectModalType); } } }; </script> -<style lang="less" scoped> +<style scoped> + +.page { + margin: 0; + min-width: 100%; + z-index: 9999999999; +} .alert { color: red; diff --git a/src/views/Project/ProjectDetail.vue b/src/views/Project/ProjectDetail.vue index 0ae1fa9ea29d95a5cde850b570e50f312007f12d..2a4f9f30ffae8f0b93674ea8e40290db108eff6b 100644 --- a/src/views/Project/ProjectDetail.vue +++ b/src/views/Project/ProjectDetail.vue @@ -57,6 +57,7 @@ <ProjectFeatureTypes :loading="projectInfoLoading" :project="project" + @delete="toggleDeleteFeatureTypeModal" /> </div> @@ -110,6 +111,7 @@ <ProjectModal :is-subscriber="is_suscriber" + :feature-type-to-delete="featureTypeToDelete" @action="handleModalAction" /> </div> @@ -247,6 +249,7 @@ export default { 'DISCARD_LOADER', ]), ...mapMutations('modals', [ + 'OPEN_PROJECT_MODAL', 'CLOSE_PROJECT_MODAL' ]), ...mapActions('projects', [ @@ -329,7 +332,7 @@ export default { }) .then((data) => { this.is_suscriber = data.is_suscriber; - this.modalType = false; + this.CLOSE_PROJECT_MODAL(); if (this.is_suscriber) { this.infoMessage = 'Vous êtes maintenant abonné aux notifications de ce projet.'; @@ -361,7 +364,7 @@ export default { deleteFeatureType() { featureTypeAPI.deleteFeatureType(this.featureTypeToDelete.slug) .then((response) => { - this.modalType = false; + this.CLOSE_PROJECT_MODAL(); if (response === 'success') { this.GET_PROJECT(); this.retrieveProjectInfo(); @@ -376,6 +379,13 @@ export default { }); } this.featureTypeToDelete = null; + }) + .catch(() => { + this.DISPLAY_MESSAGE({ + comment: `Une erreur est survenu lors de la suppression du type de signalement ${this.featureTypeToDelete.title}.`, + level: 'negative', + }); + this.CLOSE_PROJECT_MODAL(); }); }, @@ -393,9 +403,9 @@ export default { } }, - toggleModalType(featureType) { + toggleDeleteFeatureTypeModal(featureType) { this.featureTypeToDelete = featureType; - this.modalType = 'deleteFeatureType'; + this.OPEN_PROJECT_MODAL('deleteFeatureType'); }, async initMap() {