From be0cfc5d2aeacad4309aae1b219ca96993d83986 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 16 Oct 2020 14:46:45 +0200 Subject: [PATCH] s/moment/dayjs --- plugins/filters.js | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/plugins/filters.js b/plugins/filters.js index 29da3cc3..259a2c67 100644 --- a/plugins/filters.js +++ b/plugins/filters.js @@ -1,52 +1,59 @@ import Vue from 'vue' -import moment from 'moment-timezone' +import dayjs from 'dayjs' +import relativeTime from 'dayjs/plugin/relativeTime' +import utc from 'dayjs/plugin/utc' +import timezone from 'dayjs/plugin/timezone' + +dayjs.extend(relativeTime) +dayjs.extend(utc) +dayjs.extend(timezone) export default ({ app, store }) => { // set timezone to instance_timezone!! // to show local time relative to event's place // not where in the world I'm looking at the page from - moment.tz.setDefault(store.state.settings.instance_timezone) - moment.locale(store.state.locale) + dayjs.tz.setDefault(store.state.settings.instance_timezone) + dayjs.locale(store.state.locale) // replace links with anchors // TODO: remove fb tracking id? Vue.filter('linkify', value => value.replace(/(https?:\/\/([^\s]+))/g, '$2')) Vue.filter('url2host', url => url.match(/^https?:\/\/(.[^/:]+)/i)[1]) - Vue.filter('datetime', value => moment(value).locale(store.state.locale).format('ddd, D MMMM HH:mm')) - Vue.filter('dateFormat', (value, format) => moment(value).format(format)) - Vue.filter('unixFormat', (timestamp, format) => moment.unix(timestamp).format(format)) + Vue.filter('datetime', value => dayjs(value).locale(store.state.locale).format('ddd, D MMMM HH:mm')) + Vue.filter('dateFormat', (value, format) => dayjs(value).format(format)) + Vue.filter('unixFormat', (timestamp, format) => dayjs.unix(timestamp).format(format)) // shown in mobile homepage - Vue.filter('day', value => moment.unix(value).locale(store.state.locale).format('dddd, D MMM')) + Vue.filter('day', value => dayjs.unix(value).locale(store.state.locale).format('dddd, D MMM')) - Vue.filter('from', timestamp => moment.unix(timestamp).from()) + Vue.filter('from', timestamp => dayjs.unix(timestamp).from()) // format event start/end datetime based on page Vue.filter('recurrentDetail', event => { const { frequency, days, type } = event.parent.recurrent let recurrent if (frequency === '1w' || frequency === '2w') { - recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => moment().day(d - 1).format('dddd')) }) + recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => dayjs().day(d - 1).format('dddd')) }) } else if (frequency === '1m' || frequency === '2m') { - const d = type === 'ordinal' ? days : days.map(d => moment().day(d - 1).format('dddd')) + const d = type === 'ordinal' ? days : days.map(d => dayjs().day(d - 1).format('dddd')) recurrent = app.i18n.tc(`event.recurrent_${frequency}_${type}`, days.length, { days: d }) } return recurrent }) Vue.filter('when', (event) => { - const start = moment.unix(event.start_datetime) - const end = moment.unix(event.end_datetime) + const start = dayjs.unix(event.start_datetime) + const end = dayjs.unix(event.end_datetime) // const normal = `${start.format('dddd, D MMMM (HH:mm-')}${end.format('HH:mm) ')}` // // recurrent event // if (event.parent && where !== 'home') { // const { frequency, days, type } = event.parent.recurrent // if (frequency === '1w' || frequency === '2w') { - // const recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => moment().day(d - 1).format('dddd')) }) + // const recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => dayjs().day(d - 1).format('dddd')) }) // return `${normal} - ${recurrent}` // } else if (frequency === '1m' || frequency === '2m') { - // const d = type === 'ordinal' ? days : days.map(d => moment().day(d - 1).format('dddd')) + // const d = type === 'ordinal' ? days : days.map(d => dayjs().day(d - 1).format('dddd')) // const recurrent = app.i18n.tc(`event.recurrent_${frequency}_${type}`, days.length, { days: d }) // return `${normal} - ${recurrent}` // }