encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show events by default viewing past months

Browse Source
This commit is contained in:
les
2019-09-19 19:20:16 +02:00
parent f4f452aa26
commit 93e7f2da9d
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/Calendar.vue
View File

@@ -40,9 +40,9 @@ export default {
}, },
computed: { computed: {
...mapGetters(['filteredEventsWithPast']), ...mapGetters(['filteredEventsWithPast']),
...mapState(['tags', 'filters']), ...mapState(['tags', 'filters', 'in_past']),
// TODO: should be better // TODO: could be better
attributes () { attributes () {
const colors = ['green', 'orange', 'yellow', 'teal', 'indigo', 'blue', 'red', 'purple', 'pink', 'grey'] const colors = ['green', 'orange', 'yellow', 'teal', 'indigo', 'blue', 'red', 'purple', 'pink', 'grey']
const tags = take(this.tags, 10).map(t => t.tag) const tags = take(this.tags, 10).map(t => t.tag)
@@ -51,7 +51,7 @@ export default {
const that = this const that = this
function getColor (event) { function getColor (event) {
const color = { class: event.past && !that.filters.show_past_events ? 'past-event vc-rounded-full' : 'vc-rounded-full', color: 'blue' } const color = { class: event.past && !that.filters.show_past_events && !that.in_past ? 'past-event vc-rounded-full' : 'vc-rounded-full', color: 'blue' }
const tag = get(event, 'tags[0]') const tag = get(event, 'tags[0]')
if (!tag) { return color } if (!tag) { return color }
const idx = tags.indexOf(tag) const idx = tags.indexOf(tag)

12
components/Home.vue
View File

@@ -9,7 +9,7 @@
Calendar Calendar
.row.m-0 .row.m-0
.p-0.col-sm-6.col-lg-4.col-xl-3(v-for='event in filteredEvents') .p-0.col-sm-6.col-lg-4.col-xl-3(v-for='event in events')
a(:id='event.newDay' v-if='event.newDay') a(:id='event.newDay' v-if='event.newDay')
.d-block.d-sm-none .d-block.d-sm-none
el-divider {{event.start_datetime|day}} el-divider {{event.start_datetime|day}}
@@ -46,12 +46,12 @@ export default {
} }
}, },
components: { Calendar, Event }, components: { Calendar, Event },
data () {
return { }
},
computed: { computed: {
...mapGetters(['filteredEvents']), events () {
...mapState(['events', 'settings']) return this.in_past ? this.filteredEventsWithPast : this.filteredEvents
},
...mapGetters(['filteredEvents', 'filteredEventsWithPast']),
...mapState(['events', 'settings', 'in_past'])
} }
} }
</script> </script>

7
store/index.js
View File

@@ -15,6 +15,7 @@ export const state = () => ({
recurrent_event_visible: false, recurrent_event_visible: false,
enable_federation: false enable_federation: false
}, },
in_past: false,
filters: { filters: {
tags: [], tags: [],
places: [], places: [],
@@ -135,6 +136,9 @@ export const mutations = {
}, },
setUserLocale (state, user_locale) { setUserLocale (state, user_locale) {
state.user_locale = user_locale state.user_locale = user_locale
},
setPast (state, in_past) {
state.in_past = in_past
} }
} }
@@ -151,6 +155,9 @@ export const actions = {
commit('showRecurrentEvents', settings.allow_recurrent_event && settings.recurrent_event_visible) commit('showRecurrentEvents', settings.allow_recurrent_event && settings.recurrent_event_visible)
}, },
async updateEvents ({ commit }, page) { async updateEvents ({ commit }, page) {
const month = moment().month()
const year = moment().year()
commit('setPast', page.year<year || page.year===year && page.month<=month )
const events = await this.$axios.$get(`/event/${page.month - 1}/${page.year}`) const events = await this.$axios.$get(`/event/${page.month - 1}/${page.year}`)
commit('setEvents', events) commit('setEvents', events)
}, },