ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Remove filter from state, move to router

This commit is contained in:
Ramon Wenger 2018-09-17 09:19:38 +02:00
parent 0e30f0bd45
commit a522f9117c
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/layouts/DefaultLayout.vue
View File

@ -25,7 +25,7 @@
computed: { computed: {
showFilter() { showFilter() {
return this.$store.state.showFilter return this.$route.meta.filter;
}, },
specialContainerClass() { specialContainerClass() {
let cls = this.$store.state.specialContainerClass; let cls = this.$store.state.specialContainerClass;

2
client/src/pages/room.vue
View File

@ -36,12 +36,10 @@
}, },
beforeDestroy() { beforeDestroy() {
this.$store.dispatch('showFilter');
this.$store.dispatch('setSpecialContainerClass', ''); this.$store.dispatch('setSpecialContainerClass', '');
}, },
created() { created() {
this.$store.dispatch('hideFilter');
}, },
data() { data() {

10
client/src/router/index.js
View File

@ -12,9 +12,9 @@ import basicknowledge from '@/pages/basicknowledge'
import p404 from '@/pages/p404' import p404 from '@/pages/p404'
const routes = [ const routes = [
{path: '/', name: 'module', component: module}, {path: '/', name: 'module', component: module, meta: {filter: true}},
{path: '/module', name: 'module', component: module}, {path: '/module', name: 'module', component: module, meta: {filter: true}},
{path: '/rooms', name: 'rooms', component: rooms}, {path: '/rooms', name: 'rooms', component: rooms, meta: {filter: true}},
{path: '/room/new', name: 'new-room', component: newRoom}, {path: '/room/new', name: 'new-room', component: newRoom},
{path: '/room/:slug', name: 'room', component: room, props: true}, {path: '/room/:slug', name: 'room', component: room, props: true},
{path: '/article', name: 'article', component: article, meta: {layout: 'simple'}}, {path: '/article', name: 'article', component: article, meta: {layout: 'simple'}},
@ -28,9 +28,9 @@ const routes = [
] ]
}, },
{path: '*', component: p404} {path: '*', component: p404}
] ];
Vue.use(Router) Vue.use(Router);
export default new Router({ export default new Router({
routes, routes,
mode: 'history', mode: 'history',

10
client/src/store/index.js
View File

@ -8,7 +8,6 @@ export default new Vuex.Store({
state: { state: {
specialContainerClass: '', specialContainerClass: '',
showFilter: true,
showModal: false, showModal: false,
contentBlockPosition: {}, contentBlockPosition: {},
scrollPosition: 0, scrollPosition: 0,
@ -20,12 +19,6 @@ export default new Vuex.Store({
getters: {}, getters: {},
actions: { actions: {
hideFilter({commit}) {
commit('setFilter', false)
},
showFilter({commit}) {
commit('setFilter', true)
},
setSpecialContainerClass({commit}, payload) { setSpecialContainerClass({commit}, payload) {
commit('setSpecialContainerClass', payload); commit('setSpecialContainerClass', payload);
}, },
@ -56,9 +49,6 @@ export default new Vuex.Store({
}, },
mutations: { mutations: {
setFilter(state, payload) {
state.showFilter = payload;
},
setModal(state, payload) { setModal(state, payload) {
state.showModal = payload; state.showModal = payload;
}, },