start a better events selection

store/index.js

@@ -1,10 +1,10 @@
-import moment from 'moment-timezone'
+import dayjs from 'dayjs'
 import intersection from 'lodash/intersection'
 
 export const state = () => ({
   locale: '',
   user_locale: {},
-  events: [],
+  filters: { tags: [], places: [] },
   tags: [],
   places: [],
   settings: {
@@ -20,113 +20,27 @@ export const state = () => ({
     enable_trusted_instances: true,
     trusted_instances: []
   },
-  in_past: false,
-  filters: {
-    tags: [],
-    places: [],
-    show_past_events: false,
-    show_recurrent_events: false,
-    show_pinned_event: false
-  },
   announcements: []
 })
 
-export const getters = {
-
-  // filter matches search tag/place
-  filteredEvents: state => {
-    const search_for_tags = !!state.filters.tags.length
-    const search_for_places = !!state.filters.places.length
-
-    return state.events.filter(e => {
-      // filter past events
-      if (!state.filters.show_past_events && e.past) { return false }
-
-      // filter recurrent events
-      if (!state.filters.show_recurrent_events && e.parentId) { return false }
-
-      if (search_for_places && !state.filters.places.includes(e.place.id)) {
-        return false
-      }
-
-      if (search_for_tags) {
-        const common_tags = intersection(e.tags, state.filters.tags)
-        if (common_tags.length === 0) { return false }
-      }
-
-      if (!search_for_places && !search_for_tags) { return true }
-
-      return true
-    })
-  },
-
-  // filter matches search tag/place including past events
-  filteredEventsWithPast: state => {
-    const search_for_tags = !!state.filters.tags.length
-    const search_for_places = !!state.filters.places.length
-
-    return state.events.filter(e => {
-      // filter recurrent events
-      if (!state.filters.show_recurrent_events && e.parentId) { return false }
-
-      if (search_for_places && !state.filters.places.includes(e.place.id)) {
-        return false
-      }
-
-      if (search_for_tags) {
-        const common_tags = intersection(e.tags, state.filters.tags)
-        if (common_tags.length === 0) { return false }
-      }
-
-      return true
-    })
-  }
-}
-
 export const mutations = {
-  setEvents (state, events) {
-    // set`past` and `newDay` flags to event
-    let lastDay = null
-    state.events = events.map(e => {
-      const currentDay = moment.unix(e.start_datetime).date()
-      e.newDay = (!lastDay || lastDay !== currentDay) && currentDay
-      lastDay = currentDay
-      const end_datetime = e.end_datetime || e.start_datetime + 3600 * 2
-      const past = ((moment().unix()) - end_datetime) > 0
-      e.past = !!past
-      return e
-    })
-  },
-  addEvent (state, event) {
-    state.events.push(event)
-  },
-  updateEvent (state, event) {
-    state.events = state.events.map((e) => {
-      if (e.id !== event.id) { return e }
-      return event
-    })
-  },
-  delEvent (state, eventId) {
-    state.events = state.events.filter(ev => {
-      return ev.id !== eventId
-    })
-  },
+  // setEvents (state, events) {
+  //   // set`past` and `newDay` flags to event
+  //   let lastDay = null
+  //   state.events = events.map(e => {
+  //     const currentDay = dayjs.unix(e.start_datetime).date()
+  //     e.newDay = (!lastDay || lastDay !== currentDay) && currentDay
+  //     lastDay = currentDay
+  //     const end_datetime = e.end_datetime || e.start_datetime + 3600 * 2
+  //     const past = ((dayjs().unix()) - end_datetime) > 0
+  //     e.past = !!past
+  //     return e
+  //   })
+  // },
   update (state, { tags, places }) {
     state.tags = tags
     state.places = places
   },
-  setSearchTags (state, tags) {
-    state.filters.tags = tags
-  },
-  setSearchPlaces (state, places) {
-    state.filters.places = places
-  },
-  showPastEvents (state, show) {
-    state.filters.show_past_events = show
-  },
-  showRecurrentEvents (state, show) {
-    state.filters.show_recurrent_events = show
-  },
   setSettings (state, settings) {
     state.settings = settings
   },
@@ -136,8 +50,9 @@ export const mutations = {
   setLocale (state, locale) {
     state.locale = locale
   },
-  setPast (state, in_past) {
-    state.in_past = in_past
+  setFilters (state, filters) {
+    state.filters.tags = [...filters.tags]
+    state.filters.places = [...filters.places]
   },
   setAnnouncements (state, announcements) {
     state.announcements = announcements
@@ -149,23 +64,8 @@ export const actions = {
   // we use it to get configuration from db, set locale, etc...
   nuxtServerInit ({ commit }, { req }) {
     commit('setSettings', req.settings)
-
-    commit('setEvents', req.events)
     commit('setAnnouncements', req.announcements)
     commit('update', req.meta)
-
-    // apply settings
-    commit('showRecurrentEvents', req.settings.allow_recurrent_event && req.settings.recurrent_event_visible)
-  },
-  async updateEvents ({ commit }, page) {
-    const [month, year] = [moment().month(), moment().year()]
-    const in_past = page.year < year || (page.year === year && page.month <= month)
-    // commit('setPast', in_past)
-    const start_datetime = moment().year(page.year).month(page.month - 1).startOf('month').startOf('week').unix()
-    const query = `start=${start_datetime}`
-    const events = await this.$axios.$get(`/event?${query}`)
-    commit('setEvents', events)
-    commit('showPastEvents', in_past)
   },
   async updateAnnouncements ({ commit }) {
     const announcements = await this.$axios.$get('/announcements')
@@ -176,16 +76,13 @@ export const actions = {
     commit('update', { tags, places })
   },
   async addEvent ({ commit }, formData) {
-    const event = await this.$axios.$post('/event', formData)
-    if (event.user) {
-      commit('addEvent', event)
-    }
+    await this.$axios.$post('/event', formData)
   },
   async updateEvent ({ commit }, formData) {
-    const event = await this.$axios.$put('/event', formData)
-    if (event.user) {
-      commit('updateEvent', event)
-    }
+    await this.$axios.$put('/event', formData)
+  },
+  setFilters({ commit }, filters) {
+    commit('setFilters', filters)
   },
   setAnnouncements ({ commit }, announcements) {
     commit('setAnnouncements', announcements)
@@ -193,18 +90,6 @@ export const actions = {
   delEvent ({ commit }, eventId) {
     commit('delEvent', eventId)
   },
-  setSearchTags ({ commit }, tags) {
-    commit('setSearchTags', tags)
-  },
-  setSearchPlaces ({ commit }, places) {
-    commit('setSearchPlaces', places)
-  },
-  showPastEvents ({ commit }, show) {
-    commit('showPastEvents', show)
-  },
-  showRecurrentEvents ({ commit }, show) {
-    commit('showRecurrentEvents', show)
-  },
   async setSetting ({ commit }, setting) {
     await this.$axios.$post('/settings', setting)
     commit('setSetting', setting)