ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor 'TOGGLE_EVENTS_ENDED' and 'eventsEnded' in store to contain the event start date

Browse Source
This commit is contained in:
Wolfgang Huß 2023-06-02 11:04:28 +02:00
parent 4f078e4b24
commit 52798c1174
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/FilterMenu/EventsByFilter.vue
View File

@ -5,9 +5,9 @@
<labeled-button <labeled-button
icon="check" icon="check"
:label="$t('filter-menu.ended.all.label')" :label="$t('filter-menu.ended.all.label')"
:filled="eventsEnded === ''" :filled="!eventsEnded"
:title="$t('filter-menu.ended.all.hint')" :title="$t('filter-menu.ended.all.hint')"
@click="toggleEventsEnded('')" @click="toggleEventsEnded(false)"
data-test="all-button" data-test="all-button"
/> />
</li> </li>
@ -15,9 +15,9 @@
<labeled-button <labeled-button
icon="calendar" icon="calendar"
:label="$t('filter-menu.ended.onlyEnded.label')" :label="$t('filter-menu.ended.onlyEnded.label')"
:filled="eventsEnded === 'eventStart_gte'" :filled="!!eventsEnded"
:title="$t('filter-menu.ended.onlyEnded.hint')" :title="$t('filter-menu.ended.onlyEnded.hint')"
@click="toggleEventsEnded('eventStart_gte')" @click="toggleEventsEnded(true)"
data-test="not-ended-button" data-test="not-ended-button"
/> />
</li> </li>

2
webapp/pages/index.vue
View File

@ -203,7 +203,7 @@ export default {
filter = { filter = {
...filter, ...filter,
tags_some: this.hashtag ? { id: this.hashtag } : undefined, tags_some: this.hashtag ? { id: this.hashtag } : undefined,
eventStart_gte: this.eventsEnded === 'eventStart_gte' ? new Date() : undefined, eventStart_gte: this.eventsEnded,
} }
return filter return filter
}, },

8
webapp/store/posts.js
View File

@ -18,7 +18,7 @@ export const state = () => {
...defaultFilter, ...defaultFilter,
}, },
order: 'createdAt_desc', order: 'createdAt_desc',
eventsEnded: '', eventsEnded: null,
} }
} }
@ -60,7 +60,7 @@ const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
adjustOrder(state) adjustOrder(state)
} }
const TOGGLE_EVENTS_ENDED = (state, value) => { const TOGGLE_EVENTS_ENDED = (state, value) => {
state.eventsEnded = value state.eventsEnded = value ? new Date() : null
} }
const TOGGLE_ORDER = (state, value) => { const TOGGLE_ORDER = (state, value) => {
state.order = value state.order = value
@ -68,9 +68,9 @@ const TOGGLE_ORDER = (state, value) => {
const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => { const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => {
if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) { if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) {
if (eventSetInPostTypeFilter(state)) { if (eventSetInPostTypeFilter(state)) {
TOGGLE_EVENTS_ENDED(state, 'eventStart_gte') TOGGLE_EVENTS_ENDED(state, true)
} else { } else {
TOGGLE_EVENTS_ENDED(state, '') TOGGLE_EVENTS_ENDED(state, false)
} }
} }
} }