From a8c760c7f7a8927d29c923cc0dcef82772e289bd Mon Sep 17 00:00:00 2001 From: lesion Date: Tue, 31 May 2022 15:26:31 +0200 Subject: [PATCH] do not use vuex to store all tags/places/filters --- server/routes.js | 2 -- store/index.js | 29 ++--------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/server/routes.js b/server/routes.js index 55fedb95..5175c57a 100644 --- a/server/routes.js +++ b/server/routes.js @@ -69,9 +69,7 @@ app.use((error, _req, res, _next) => { app.use(async (req, res, next) => { if (config.status === 'READY') { - const eventController = require('./api/controller/event') const announceController = require('./api/controller/announce') - res.locals.meta = await eventController._getMeta() res.locals.announcements = await announceController._getVisible() } res.locals.status = config.status diff --git a/store/index.js b/store/index.js index b86aa819..af636242 100644 --- a/store/index.js +++ b/store/index.js @@ -1,13 +1,6 @@ -// const dayjs = require('dayjs') -// const timezone = require('dayjs/plugin/timezone') -// dayjs.extend(timezone) - export const state = () => ({ locale: '', user_locale: {}, - filters: { tags: [], places: [], show_recurrent: false }, - tags: [], - places: [], settings: { instance_timezone: 'Europe/Rome', instance_name: '', @@ -26,13 +19,8 @@ export const state = () => ({ }) export const mutations = { - update (state, { tags, places }) { - state.tags = tags - state.places = places - }, setSettings (state, settings) { state.settings = settings - state.filters.show_recurrent = settings.recurrent_event_visible }, setSetting (state, setting) { state.settings[setting.key] = setting.value @@ -43,11 +31,6 @@ export const mutations = { setUserlocale (state, messages) { state.user_locale = messages }, - setFilters (state, filters) { - state.filters.tags = [...filters.tags] - state.filters.places = [...filters.places] - state.filters.show_recurrent = filters.show_recurrent - }, setAnnouncements (state, announcements) { state.announcements = announcements } @@ -56,25 +39,17 @@ export const mutations = { export const actions = { // this method is called server side only for each request for nuxt // we use it to get configuration from db, set locale, etc... - nuxtServerInit ({ commit }, { req, res }) { + nuxtServerInit ({ commit }, { _req, res }) { commit('setSettings', res.locals.settings) - // dayjs.tz.(res.locals.settings.instance_timezone) + // dayjs.tz.(res.locals.settings.instance_timezone) if (res.locals.status === 'READY') { commit('setAnnouncements', res.locals.announcements) - commit('update', res.locals.meta) } }, async updateAnnouncements ({ commit }) { const announcements = await this.$axios.$get('/announcements') commit('setAnnouncements', announcements) }, - async updateMeta ({ commit }) { - const { tags, places } = await this.$axios.$get('/event/meta') - commit('update', { tags, places }) - }, - setFilters ({ commit }, filters) { - commit('setFilters', filters) - }, setAnnouncements ({ commit }, announcements) { commit('setAnnouncements', announcements) },