fix static pages after redirection from login and redirect after logout only...

fix static pages after redirection from login and redirect after logout only for admin right restricted pages

src/store/index.js

@@ -179,6 +179,7 @@ export default new Vuex.Store({
     },
 
     LOGOUT({ commit }) {
+      const pageNoRedirect = ["liste-signalements", "details-type-signalement", "details-signalement", "project_detail", "mentions", "aide", "index"]
       axios
         .get(`${this.state.configuration.VUE_APP_DJANGO_API_BASE}logout/`)
         .then((response) => {
@@ -186,7 +187,7 @@ export default new Vuex.Store({
             commit("SET_USER", false);
             commit("SET_USER_LEVEL_PROJECTS", null);
             commit("SET_USER_PERMISSIONS", null);
-            router.push("/");
+            if (!pageNoRedirect.includes(router.history.current.name)) router.push("/");
           }
         })
         .catch((error) => {

src/views/flatpages/Default.vue

 <template>
   <div v-if="flatpage" class="row">
     <div class="ten wide column">
-      {{ this.$route.params.url }}
       <h1>{{ flatpage.title }}</h1>
       <div v-html="flatpage.content"></div>
     </div>
@@ -9,13 +8,17 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "Default",
+
   computed: {
+    ...mapState(["staticPages"]),
     flatpage() {
-      if (this.$store.state.staticPages) {
-        return this.$store.state.staticPages.find(
-          (page) => page.url === this.$route.path
+      if (this.staticPages) {
+        return this.staticPages.find(
+          (page) => page.url === `/${this.$route.name}/`
         );
       }
       return null;

src/views/flatpages/with_right_menu.vue

@@ -23,18 +23,23 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "With_right_menu",
+
   data() {
     return {
       sections: [],
     };
   },
+
   computed: {
+    ...mapState(["staticPages"]),
     flatpage() {
-      if (this.$store.state.staticPages) {
-        return this.$store.state.staticPages.find(
-          (page) => page.url === this.$route.path
+      if (this.staticPages) {
+        return this.staticPages.find(
+          (page) => page.url === `/${this.$route.name}/`
         );
       }
       return null;