:recycle: cleaning up vuex store

vue-theme/src/store/modules/event.js

@@ -6,37 +6,31 @@ const state = {
     singleEvent: null,
 }
 
+const now = new Date()
+
 const getters = {
     allEvents: state => state.all,
     allEventsLoaded: state => state.loaded,
-    pastEvents: state => {
-        const now = new Date()
-        return state.all.filter(event => {
-            return parseInt(event.end) > now
-        })
-    },
-    upcomingAndCurrentEvents: state => {
-        const now = new Date()
-        return state.all.filter(event => {
-            return parseInt(event.end) <= now
-        })
-    },
+    pastEvents: state => state.all.filter(event => parseInt(event.end) > now),
+    upcomingAndCurrentEvents: state.all.filter(event => parseInt(event.end) <= now),
 }
 
 const actions = {
     getAllEvents({ commit }, { sortType, params }) {
         commit('CLEAR_EVENTS')
         commit('EVENTS_LOADED', false)
-        return api.getByType({ type: 'event', sort: sortType, cb: events => {
+        const storeFetch = (events => {
             commit('STORE_FETCHED_EVENTS', { events })
             commit('EVENTS_LOADED', true)
-        }, params })
+        })
+        return api.getByType({ type: 'event', sort: sortType, params, cb: storeFetch })
     },
     getMoreEvents({ commit }, { sortType, params }) {
-        return api.getByType({ type: 'event', sort: sortType, cb: events => {
+        const storeFetch = (events => {
             commit('ADD_TO_FETCHED_EVENTS', { events })
             commit('EVENTS_LOADED', true)
-        }, params })
+        })
+        return api.getByType({ type: 'event', sort: sortType, params, cb: storeFetch })
     },
     getSingleEvent({ commit }, id) {
         commit('CLEAR_SINGLE_EVENTS')

vue-theme/src/store/modules/exhibition.js

@@ -6,39 +6,32 @@ const state = {
     singleExhibition: null,
 }
 
+const now = new Date()
+
 const getters = {
     allExhibitions: state => state.all,
     allExhibitionsLoaded: state => state.loaded,
-    pastExhibitions: state => {
-        return state.all.filter(exhibition => {
-            const now = new Date()
-            return parseInt(exhibition.end) > now
-        })
-    },
-    upcomingAndCurrentExhibitions: state => {
-        return state.all
-        // return state.all.filter(exhibition => {
-        //     const now = new Date()
-        //     // return parseInt(exhibition.end) <= now
-        //     return parseInt(exhibition.end) <= now
-        // })
-    },
+    pastExhibitions: state => state.all.filter(exhibition => parseInt(exhibition.end) > now),
+    upcomingAndCurrentExhibitions: state => state.all,
+    // upcomingAndCurrentExhibitions: state => state.all.filter(exhibition => parseInt(exhibition.end) <= now)
 }
 
 const actions = {
     getAllExhibitions({ commit },{ sortType, params }) {
         commit('CLEAR_EXHIBITIONS')
         commit('EXHIBITIONS_LOADED', false)
-        return api.getByType({ type: 'exhibition', sort: sortType, cb: exhibitions => {
+        const storeFetch = (exhibitions => {
             commit('STORE_FETCHED_EXHIBITIONS', { exhibitions })
             commit('EXHIBITIONS_LOADED', true)
-        }, params })
+        })
+        return api.getByType({ type: 'exhibition', sort: sortType, params, cb: storeFetch })
     },
-    getMoreExhibitions({ commit },{ sortType, params }) {
-        return api.getByType({ type: 'exhibition', sort: sortType, cb: exhibitions => {
+    getMoreExhibitions({ commit }, { sortType, params }) {
+        const storeFetch = (exhibitions => {
             commit('ADD_TO_FETCHED_EXHIBITIONS', { exhibitions })
             commit('EXHIBITIONS_LOADED', true)
-        }, params })
+        })
+        return api.getByType({ type: 'exhibition', sort: sortType, params, cb: storeFetch })
     },
     getSingleExhibition({ commit }, id) {
         commit('CLEAR_SINGLE_EXHIBITIONS')

vue-theme/src/store/modules/post.js

@@ -15,16 +15,18 @@ const actions = {
     getAllPosts({ commit }, { sortType, params }) {
         commit('CLEAR_POSTS')
         commit('POSTS_LOADED', false)
-        return api.getByType({ type: 'post', sort: sortType, cb: posts => {
+        const storeFetch = (posts => {
             commit('STORE_FETCHED_POSTS', { posts })
             commit('POSTS_LOADED', true)
-        }, params })
+        }) 
+        return api.getByType({ type: 'post', sort: sortType, params, cb: storeFetch)
     },
     getMorePosts({ commit }, { sortType, params }) {
-        return api.getByType({ type: 'post', sort: sortType, cb: posts => {
+        const storeFetch = (posts => {
             commit('ADD_TO_FETCHED_POSTS', { posts })
             commit('POSTS_LOADED', true)
-        }, params })
+        })
+        return api.getByType({ type: 'post', sort: sortType, params, cb: storeFetch })
     },
     getSinglePost({ commit }, id) {
         commit('CLEAR_SINGLE_POSTS')