diff --git a/public/config/config.json b/public/config/config.json index bdcc148275da77a08f4776c8f46e3c15857a6307..1eea174255484f212873d244b115ef343ae52341 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -7,8 +7,8 @@ "VUE_APP_APPLICATION_FAVICO":"/geocontrib/img/geo2f.ico", "VUE_APP_APPLICATION_ABSTRACT":"Application de saisie d'informations géographiques contributive", "VUE_APP_LOGO_PATH":"/geocontrib/img/logo-neogeo-circle.png", - "VUE_APP_DJANGO_BASE":"http://localhost:8010", - "VUE_APP_DJANGO_API_BASE":"http://localhost:8010/api/", + "VUE_APP_DJANGO_BASE":"http://localhost", + "VUE_APP_DJANGO_API_BASE":"http://localhost/api/", "VUE_APP_CATALOG_NAME": "Datasud", "VUE_APP_IDGO": true, "VUE_APP_RELOAD_INTERVAL": 15000, diff --git a/src/components/Projects/ProjectsMenu.vue b/src/components/Projects/ProjectsMenu.vue index 536a0332d7f9c660da18b0ebbc24331490492aa0..e2367c2e580422e42c2361a5a2ac2aea8502d5dd 100644 --- a/src/components/Projects/ProjectsMenu.vue +++ b/src/components/Projects/ProjectsMenu.vue @@ -10,7 +10,7 @@ /> </div> </div> - <div :class="['ui menu filters', isFiltersVisible ? '' : 'hidden']"> + <div class="ui menu filters hidden"> <div class="item"> <label> Niveau d'autorisation requis @@ -66,7 +66,6 @@ export default { data() { return { - isFiltersVisible: false, moderationOptions: [ { label: 'Tous', @@ -148,12 +147,11 @@ export default { const icon = document.getElementsByClassName('caret'); icon[0].classList.toggle('right'); 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/services/project-api.js b/src/services/project-api.js index 92355eacd009a6c6729e5f2dd7e8b39cbb055b86..8fd0655b4ce7662cbff5de1f1e51e97a05c3d5a8 100644 --- a/src/services/project-api.js +++ b/src/services/project-api.js @@ -4,7 +4,7 @@ const projectAPI = { async getProject( baseUrl, projectSlug ) { const response = await axios.get( - `${baseUrl}projects/${projectSlug}` + `${baseUrl}projects/${projectSlug}/` ); if ( response.status === 200 && @@ -71,7 +71,7 @@ const projectAPI = { async deleteProject(baseUrl, projectSlug) { const response = await axios.delete( - `${baseUrl}projects/${projectSlug}` + `${baseUrl}projects/${projectSlug}/` ); if ( response.status === 204 ) { return 'success'; diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue index f24b1d0c2081ec2d6d85ca5d27aea6789d882cd9..9aa6a3887aa020bf9a9577a00a37349578c09021 100644 --- a/src/views/project/Project_detail.vue +++ b/src/views/project/Project_detail.vue @@ -1,7 +1,14 @@ <template> <div v-frag> <div - v-if="permissions && permissions.can_view_project && project" + v-if="loading" + :class="{ active: loading }" + class="ui inverted dimmer" + > + <div class="ui loader" /> + </div> + <div + v-else-if="permissions && permissions.can_view_project && project" v-frag > <div @@ -784,6 +791,7 @@ export default { data() { return { + loading: false, infoMessage: '', importMessage: null, arraysOffline: [], @@ -979,9 +987,13 @@ export default { }, retrieveProjectInfo() { - this.GET_PROJECT(this.slug); - this.GET_PROJECT_INFO(this.slug) + this.loading = true; + Promise.all([ + this.GET_PROJECT(this.slug), + this.GET_PROJECT_INFO(this.slug) + ]) .then(() => { + this.loading = false; this.projectInfoLoading = false; setTimeout(() => { let map = mapUtil.getMap(); @@ -991,6 +1003,7 @@ export default { }) .catch((err) => { console.error(err); + this.loading = false; this.projectInfoLoading = false; }); }, @@ -1322,4 +1335,8 @@ export default { .centered-text { text-align: center; } + +.dimmer { + height: calc(100vh - 61px - 40px); +} </style>