squash new oauth2 flow

This commit is contained in:
lesion
2022-11-04 12:22:21 +01:00
parent 19ca1b0283
commit 44e9533828
24 changed files with 935 additions and 427 deletions

View File

@@ -77,13 +77,12 @@ export default ({ app, store }) => {
Vue.filter('when', (event) => {
const start = dayjs.unix(event.start_datetime).tz().locale(app.i18n.locale || store.state.settings.instance_locale)
const end = dayjs.unix(event.end_datetime).tz().locale(app.i18n.locale || store.state.settings.instance_locale)
// multidate
if (event.multidate) {
return `${start.format('dddd D MMMM HH:mm')} - ${end.format('dddd D MMMM HH:mm')}`
}
const end = event.end_datetime && dayjs.unix(event.end_datetime).tz().locale(app.i18n.locale || store.state.settings.instance_locale)
// normal event
return `${start.format('dddd D MMMM HH:mm')}-${end.format('HH:mm')}`
let time = start.format('dddd D MMMM HH:mm')
if (end) {
time += event.multidate ? `-${end.format('dddd D MMMM HH:mm')}` : `-${end.format('HH:mm')}`
}
return time
})
}