From a522f9117cb7bd4f806f0f97358fd336d274b352 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Mon, 17 Sep 2018 09:19:38 +0200
Subject: [PATCH] Remove filter from state, move to router

---
 client/src/layouts/DefaultLayout.vue |  2 +-
 client/src/pages/room.vue            |  2 --
 client/src/router/index.js           | 10 +++++-----
 client/src/store/index.js            | 10 ----------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue
index b255b2e8..9ac57942 100644
--- a/client/src/layouts/DefaultLayout.vue
+++ b/client/src/layouts/DefaultLayout.vue
@@ -25,7 +25,7 @@
 
     computed: {
       showFilter() {
-        return this.$store.state.showFilter
+        return this.$route.meta.filter;
       },
       specialContainerClass() {
         let cls = this.$store.state.specialContainerClass;
diff --git a/client/src/pages/room.vue b/client/src/pages/room.vue
index aad94a13..44f6812f 100644
--- a/client/src/pages/room.vue
+++ b/client/src/pages/room.vue
@@ -36,12 +36,10 @@
     },
 
     beforeDestroy() {
-      this.$store.dispatch('showFilter');
       this.$store.dispatch('setSpecialContainerClass', '');
     },
 
     created() {
-      this.$store.dispatch('hideFilter');
     },
 
     data() {
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 78d8bb78..76f2f256 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -12,9 +12,9 @@ import basicknowledge from '@/pages/basicknowledge'
 import p404 from '@/pages/p404'
 
 const routes = [
-  {path: '/', name: 'module', component: module},
-  {path: '/module', name: 'module', component: module},
-  {path: '/rooms', name: 'rooms', component: rooms},
+  {path: '/', name: 'module', component: module, meta: {filter: true}},
+  {path: '/module', name: 'module', component: module, meta: {filter: true}},
+  {path: '/rooms', name: 'rooms', component: rooms, meta: {filter: true}},
   {path: '/room/new', name: 'new-room', component: newRoom},
   {path: '/room/:slug', name: 'room', component: room, props: true},
   {path: '/article', name: 'article', component: article, meta: {layout: 'simple'}},
@@ -28,9 +28,9 @@ const routes = [
     ]
   },
   {path: '*', component: p404}
-]
+];
 
-Vue.use(Router)
+Vue.use(Router);
 export default new Router({
   routes,
   mode: 'history',
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 49740265..9f815cd1 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -8,7 +8,6 @@ export default new Vuex.Store({
 
   state: {
     specialContainerClass: '',
-    showFilter: true,
     showModal: false,
     contentBlockPosition: {},
     scrollPosition: 0,
@@ -20,12 +19,6 @@ export default new Vuex.Store({
   getters: {},
 
   actions: {
-    hideFilter({commit}) {
-      commit('setFilter', false)
-    },
-    showFilter({commit}) {
-      commit('setFilter', true)
-    },
     setSpecialContainerClass({commit}, payload) {
       commit('setSpecialContainerClass', payload);
     },
@@ -56,9 +49,6 @@ export default new Vuex.Store({
   },
 
   mutations: {
-    setFilter(state, payload) {
-      state.showFilter = payload;
-    },
     setModal(state, payload) {
       state.showModal = payload;
     },