IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

get closer to master

Browse Source
This commit is contained in:
Moriz Wahl 2023-06-02 18:25:13 +02:00
parent 0b4e309611
commit fdf4eb6bdc
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/pages/index.vue
View File

@ -197,9 +197,11 @@ export default {
}, },
finalFilters() { finalFilters() {
let filter = this.postsFilter let filter = this.postsFilter
filter = { if (this.hashtag) {
...filter, filter = {
tags_some: this.hashtag ? { id: this.hashtag } : undefined, ...filter,
tags_some: this.hashtag ? { id: this.hashtag } : undefined,
}
} }
return filter return filter
}, },

20
webapp/store/posts.js
View File

@ -57,13 +57,6 @@ export const mutations = {
delete filter.language_in delete filter.language_in
state.filter = filter state.filter = filter
}, },
RESET_POST_TYPE(state) {
const filter = clone(state.filter)
delete filter.eventStart_gte
delete filter.postType_in
state.order = 'createdAt_desc'
state.filter = filter
},
TOGGLE_CATEGORY(state, categoryId) { TOGGLE_CATEGORY(state, categoryId) {
const filter = clone(state.filter) const filter = clone(state.filter)
update(filter, 'categories_some.id_in', (categoryIds) => xor(categoryIds, [categoryId])) update(filter, 'categories_some.id_in', (categoryIds) => xor(categoryIds, [categoryId]))
@ -82,6 +75,13 @@ export const mutations = {
if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
state.filter = filter state.filter = filter
}, },
RESET_POST_TYPE(state) {
const filter = clone(state.filter)
delete filter.eventStart_gte
delete filter.postType_in
state.order = 'createdAt_desc'
state.filter = filter
},
TOGGLE_POST_TYPE(state, postType) { TOGGLE_POST_TYPE(state, postType) {
const filter = clone(state.filter) const filter = clone(state.filter)
if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) { if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
@ -124,15 +124,15 @@ export const getters = {
filteredCategoryIds(state) { filteredCategoryIds(state) {
return get(state.filter, 'categories_some.id_in') || [] return get(state.filter, 'categories_some.id_in') || []
}, },
filteredPostTypes(state) {
return get(state.filter, 'postType_in') || []
},
filteredLanguageCodes(state) { filteredLanguageCodes(state) {
return get(state.filter, 'language_in') || [] return get(state.filter, 'language_in') || []
}, },
filteredByUsersFollowed(state) { filteredByUsersFollowed(state) {
return !!get(state.filter, 'author.followedBy_some.id') return !!get(state.filter, 'author.followedBy_some.id')
}, },
filteredPostTypes(state) {
return get(state.filter, 'postType_in') || []
},
filteredByPostsInMyGroups(state) { filteredByPostsInMyGroups(state) {
return !!get(state.filter, 'postsInMyGroups') return !!get(state.filter, 'postsInMyGroups')
}, },