Squashed commit of the following:
commit 5c0d380740c24e0467cef916fd0560cb26409f9f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:25 2023 +0100 update yarn.lock commit 909ee71ecb8f27e4fba72430aecc92bf527e6cd4 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:09 2023 +0100 Squashed commit of the following: commitfc8a9f4506Author: lesion <lesion@autistici.org> Date: Tue Mar 14 16:42:24 2023 +0100 address some issues with recurrent events, fix #247 commitf7357666caAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:16:52 2023 +0100 fix event import from URL commite1bca6f46aAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:15:42 2023 +0100 add Duch (nl) locale (thanks @jeoenepraat) commit5f8afdbc12Merge:57a052a92ca5abAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:50 2023 +0100 Merge remote-tracking branch 'weblate/master' commit57a052a7faMerge:63d1d2e55137d2Author: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:33 2023 +0100 Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f' commit92ca5abf5eAuthor: joenepraat <joenepraat@posteo.org> Date: Fri Mar 10 23:16:32 2023 +0000 Translated using Weblate (Dutch) Currently translated at 68.3% (214 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit63d1d2ee53Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:41:06 2023 +0100 minor commitd2759a55a5Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:38:39 2023 +0100 wrong user / admin merge dark theme settings - fix #244 commitb401d829dbAuthor: lesion <lesion@autistici.org> Date: Thu Mar 9 21:24:45 2023 +0100 remove a small warning commitccffe5f7b0Author: lesion <lesion@autistici.org> Date: Fri Feb 24 11:40:36 2023 +0100 push tags on release commit55137d2ac2Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 23 23:56:16 2023 +0000 Bump sequelize from 6.28.0 to 6.29.0 Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.28.0 to 6.29.0. - [Release notes](https://github.com/sequelize/sequelize/releases) - [Commits](https://github.com/sequelize/sequelize/compare/v6.28.0...v6.29.0) --- updated-dependencies: - dependency-name: sequelize dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> commitb654f29d8bAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 13:21:17 2023 +0100 update changelog commit0cd1ee9d89Author: lesion <lesion@autistici.org> Date: Wed Feb 22 13:17:29 2023 +0100 increase rate limit max requests per minutes commitb6dafc082eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:39 2023 +0100 minor commit0fa7769844Author: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:18 2023 +0100 location saving is not working when geocoding is disabled, fix #238 commit07f9e2d9eeAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:40 2023 +0100 really fix #232 commitbae930799eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:09 2023 +0100 downgrade mariadb (sequelize is not ready) commitd733d7fef1Author: lesion <lesion@autistici.org> Date: Wed Feb 22 00:16:28 2023 +0100 aargh commit98b22aad70Author: lesion <lesion@autistici.org> Date: Tue Feb 21 00:56:06 2023 +0100 minor commitfc098b603dAuthor: lesion <lesion@autistici.org> Date: Tue Feb 21 00:55:44 2023 +0100 missing i18n in setup, fix #239 commit3eaf72af19Merge:bba196bd6c6034Author: lesion <lesion@autistici.org> Date: Mon Feb 20 21:17:37 2023 +0100 Merge remote-tracking branch 'weblate/master' commitbba196b068Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:05:52 2023 +0100 update changelog, v1.6.3 commitbb9f7cca47Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:04:28 2023 +0100 minor commit80d2dbd06bAuthor: lesion <lesion@autistici.org> Date: Fri Feb 17 23:40:28 2023 +0100 minor commitd6c6034630Author: fadelkon <fadelkon@posteo.net> Date: Thu Feb 16 22:09:23 2023 +0000 Translated using Weblate (Catalan) Currently translated at 100.0% (313 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/ca/ commitd125cf1506Author: lesion <lesion@autistici.org> Date: Fri Feb 17 21:56:31 2023 +0100 set a default user_locale path commit4367960a62Merge:c8cc5c687dd179Author: lesion <lesion@autistici.org> Date: Tue Feb 7 17:46:58 2023 +0100 Merge branch 'master' into gh commitc8cc5c6c97Merge:88e0c90550e221Author: lesion <lesion@autistici.org> Date: Mon Jan 9 17:15:21 2023 +0100 Merge branch 'master' into gh commit88e0c90a66Merge:421aa12f212ac1Author: lesion <lesion@autistici.org> Date: Thu Dec 15 09:54:41 2022 +0100 Merge branch 'master' into gh commit421aa12781Merge:5f6cc46b3488e7Author: lesion <lesion@autistici.org> Date: Wed Sep 28 12:26:08 2022 +0200 Merge branch 'master' into gh commit5f6cc46cdcMerge:b66feb9171d968Author: lesion <lesion@autistici.org> Date: Mon Aug 8 00:08:12 2022 +0200 Merge branch 'master' into gh commitb66feb92e2Merge:80c55d505d068fAuthor: lesion <lesion@autistici.org> Date: Tue Jun 21 23:48:40 2022 +0200 Merge branch 'master' into gh commit80c55d5601Merge:814090ea154fdfAuthor: lesion <lesion@autistici.org> Date: Mon Jun 6 17:27:00 2022 +0200 Merge branch 'master' into gh commit814090e9b6Merge:616c5422e3aba9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 17:19:31 2022 +0200 Merge branch 'master' into gh commit616c54229aMerge:e4cb22e82dcaf9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 16:57:05 2022 +0200 Merge branch 'master' into gh commite4cb22ee33Merge:5dddfbd8657937Author: lesion <lesion@autistici.org> Date: Fri Mar 11 23:41:22 2022 +0100 Merge branch 'master' into gh commit5dddfbd29eMerge:60e9d9510c6b0dAuthor: lesion <lesion@autistici.org> Date: Fri Mar 11 23:22:12 2022 +0100 Merge branch 'master' into gh commit60e9d95ba8Merge:79445caad93f83Author: lesion <lesion@autistici.org> Date: Tue Dec 7 01:35:18 2021 +0100 Merge branch 'master' into gh commit79445ca8a7Merge:9472d8dcd313efAuthor: les <lesion@autistici.org> Date: Thu Jun 24 21:52:25 2021 +0200 Merge branch 'master' into gh commit9472d8d919Merge:f9601499e9643eAuthor: les <lesion@autistici.org> Date: Fri Mar 26 22:27:41 2021 +0100 Merge branch 'dev' into gh commitf9601492dcAuthor: les <lesion@autistici.org> Date: Fri Dec 6 11:30:41 2019 +0100 update dependencies commitf8c7fa2b45Author: les <lesion@autistici.org> Date: Fri Dec 6 11:41:13 2019 +0100 minor commit33ca266535Author: les <lesion@autistici.org> Date: Fri Dec 6 11:38:15 2019 +0100 prepare gh as a mirror commit 5c8875411631048210eb50030e83cb272a40d54a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:40 2023 +0100 update deps commit 7eac4fce324a6e75cdda296d672317cf2497c005 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:25 2023 +0100 refactoring event detail page commit dc9ca88bc62708b869be3f3efe51d9155fe17830 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:17:35 2023 +0100 show hide boosts/bookmarks, fix #241 commit d4a25b1dd0b9404e0de7ca5cf546f0d29bc8943e Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:13:58 2023 +0100 minor with unixFormat commit 239d6bcab19ef3cf53d1b2544a5c9a36ba8dd25b Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:25 2023 +0100 minor commit b149f980db8245c12a6940997be6d5657bddf829 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:05 2023 +0100 minor commit 6f2955c584ec9da2c10991fb09ab57735a31385d Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:49 2023 +0100 minor commit dd586c38c9ef2f0b408ef90eb27dffe53355305a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:31 2023 +0100 minor on style commit 544823717b9801e63bef15394b25bfbcd842c10f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:15 2023 +0100 fix multidate issue, go to event on save commit 9ef0c75d03ee2d69f89034b28d6991f85ffefb06 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:09:47 2023 +0100 use v-lazy, improve search, full tag/place events commit ac91072b79960815e0535e63ac45e0b5c6100764 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:51 2023 +0100 increase DDOS limiter to 250 req/min commit d0ca92efb4afe48d2fd236083d9e290ab8d49704 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:14 2023 +0100 update changelog commit 2d54f19225acc4118d60ef8c9d12f9495e6776ca Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:46:51 2023 +0100 use luxon instead of dayjs, new $time plugin
This commit is contained in:
lesion
@@ -9,29 +9,26 @@
|
||||
@input='click'
|
||||
@update:from-page='updatePage'
|
||||
:locale='$i18n.locale'
|
||||
:popover="{ visibility: 'click' }"
|
||||
:attributes='attributes'
|
||||
transition='fade'
|
||||
aria-label='Calendar'
|
||||
is-expanded
|
||||
is-inline)
|
||||
.calh.d-flex.justify-center.align-center(slot='placeholder')
|
||||
v-progress-circular(indeterminate)
|
||||
.calh.text-center(slot='placeholder')
|
||||
v-progress-circular.mt-5(indeterminate color='primary')
|
||||
|
||||
</template>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapGetters } from 'vuex'
|
||||
import dayjs from 'dayjs'
|
||||
import { mdiChevronDown, mdiClose } from '@mdi/js'
|
||||
import { attributesFromEvents } from '../assets/helper'
|
||||
|
||||
export default {
|
||||
name: 'Calendar',
|
||||
data () {
|
||||
const month = dayjs.tz().month() + 1
|
||||
const year = dayjs.tz().year()
|
||||
data ({$time}) {
|
||||
const month = $time.currentMonth()
|
||||
const year = $time.currentYear()
|
||||
return {
|
||||
mdiChevronDown, mdiClose,
|
||||
selectedDate: null,
|
||||
@@ -42,15 +39,15 @@ export default {
|
||||
...mapState(['settings', 'events']),
|
||||
...mapGetters(['is_dark']),
|
||||
attributes () {
|
||||
return attributesFromEvents(this.events)
|
||||
return this.$time.attributesFromEvents(this.events)
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
updatePage (page) {
|
||||
if (page.month !== this.page.month || page.year !== this.page.year) {
|
||||
this.$root.$emit('monthchange', page)
|
||||
this.page.month = page.month
|
||||
this.page.year = page.year
|
||||
this.$root.$emit('monthchange', page)
|
||||
}
|
||||
},
|
||||
click (day) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template lang="pug">
|
||||
v-col(cols=12)
|
||||
.text-center
|
||||
v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-if='!event.parentId' v-model='type' color='primary' @change='type => change("type", type)')
|
||||
v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-if="!event.parentId && !event.recurrent" v-model='type' color='primary' @change='type => change("type", type)')
|
||||
v-btn(value='normal' label="normal") {{ $t('event.normal') }}
|
||||
v-btn(v-if='settings.allow_multidate_event' value='multidate' label='multidate') {{ $t('event.multidate') }}
|
||||
v-btn(v-if='settings.allow_recurrent_event' value='recurrent' label="recurrent") {{ $t('event.recurrent') }}
|
||||
@@ -10,7 +10,6 @@ v-col(cols=12)
|
||||
|
||||
v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-if='type === "recurrent"' color='primary' :value='value.recurrent.frequency' @change='fq => change("frequency", fq)')
|
||||
v-btn(v-for='f in frequencies' :key='f.value' :value='f.value') {{ f.text }}
|
||||
|
||||
client-only
|
||||
.datePicker.mt-3
|
||||
v-input(:value='fromDate' :rules="[$validators.required('common.when')]")
|
||||
@@ -23,10 +22,9 @@ v-col(cols=12)
|
||||
:is-dark="is_dark"
|
||||
is-inline
|
||||
is-expanded
|
||||
:min-date='type !== "recurrent" && new Date()')
|
||||
//- template(#placeholder)
|
||||
.d-flex.calh.justify-center(slot='placeholder')
|
||||
v-progress-circular(indeterminate)
|
||||
:min-date='new Date()')
|
||||
.calh.text-center(slot='placeholder')
|
||||
v-progress-circular(indeterminate color='primary')
|
||||
|
||||
div.text-center.mb-2(v-if='type === "recurrent"')
|
||||
span(v-if='value.recurrent.frequency !== "1m" && value.recurrent.frequency !== "2m"') {{ whenPatterns }}
|
||||
@@ -94,10 +92,9 @@ v-col(cols=12)
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import dayjs from 'dayjs'
|
||||
import { DateTime } from 'luxon'
|
||||
import { mapState, mapActions, mapGetters } from 'vuex'
|
||||
import List from '@/components/List'
|
||||
import { attributesFromEvents } from '../assets/helper'
|
||||
import { mdiClockTimeFourOutline, mdiClockTimeEightOutline, mdiClose } from '@mdi/js'
|
||||
|
||||
export default {
|
||||
@@ -127,34 +124,33 @@ export default {
|
||||
fromDate () {
|
||||
if (this.value.from) {
|
||||
if (this.value.multidate) {
|
||||
return ({ start: dayjs(this.value.from).toDate(), end: dayjs(this.value.due).toDate() })
|
||||
return ({ start: new Date(this.value.from), end: new Date(this.value.due) })
|
||||
} else {
|
||||
return new Date(this.value.from)
|
||||
}
|
||||
}
|
||||
},
|
||||
todayEvents() {
|
||||
const start = dayjs.tz(this.value.from).startOf('day').unix()
|
||||
const end = dayjs.tz(this.value.from).endOf('day').unix()
|
||||
const start = this.$time.startOfDay(this.value.from)
|
||||
const end = this.$time.endOfDay(this.value.from)
|
||||
return this.events.filter(e => e.start_datetime >= start && e.start_datetime <= end)
|
||||
},
|
||||
attributes() {
|
||||
return attributesFromEvents(this.events.filter(e => e.id !== this.event.id))
|
||||
return this.$time.attributesFromEvents(this.events.filter(e => e.id !== this.event.id))
|
||||
},
|
||||
whenPatterns() {
|
||||
if (!this.value.from) { return }
|
||||
const date = dayjs(this.value.from)
|
||||
const date = DateTime.fromJSDate(this.value.from)
|
||||
|
||||
const freq = this.value.recurrent.frequency
|
||||
const weekDay = date.format('dddd')
|
||||
const weekDay = date.toFormat('EEEE')
|
||||
if (freq === '1w' || freq === '2w') {
|
||||
return this.$t(`event.recurrent_${freq}_days`, { days: weekDay }).toUpperCase()
|
||||
} else if (freq === '1m' || freq === '2m') {
|
||||
const monthDay = date.format('D')
|
||||
const n = Math.floor((monthDay - 1) / 7) + 1
|
||||
const n = Math.floor((date.day) / 7) + 1
|
||||
|
||||
const patterns = [
|
||||
{ label: this.$t(`event.recurrent_${freq}_days`, { days: monthDay }), key: 'ordinal' }
|
||||
{ label: this.$t(`event.recurrent_${freq}_days`, { days: date.day }), key: 'ordinal' }
|
||||
// { label: this.$tc(`event.recurrent_${freq}_ordinal`, { n, days: weekDay }), key: 'weekday' }
|
||||
]
|
||||
|
||||
@@ -168,7 +164,7 @@ export default {
|
||||
}
|
||||
|
||||
// if selected day is in last week, propose also this type of selection
|
||||
const lastWeek = date.daysInMonth() - monthDay < 7
|
||||
const lastWeek = date.endOf('month').day - date.day < 7
|
||||
if (lastWeek) {
|
||||
patterns.push(
|
||||
{
|
||||
@@ -215,13 +211,14 @@ export default {
|
||||
if (from && from.start) {
|
||||
from = from.start
|
||||
}
|
||||
let due = this.value.due
|
||||
let due = this.value.multidate ? null : this.value.due
|
||||
if (due && due.start) {
|
||||
due = due.start
|
||||
}
|
||||
this.$emit('input', { ...this.value, from, due, recurrent: null, multidate: false })
|
||||
}
|
||||
} else if (what === 'frequency') {
|
||||
if (typeof value === 'undefined') { value = '1w' }
|
||||
this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, frequency: value } })
|
||||
} else if (what === 'recurrentType') {
|
||||
this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, type: value } })
|
||||
@@ -238,28 +235,22 @@ export default {
|
||||
const [fromHour, fromMinute] = this.value.fromHour.split(':')
|
||||
if (!this.value.multidate) {
|
||||
if (hour < fromHour) {
|
||||
this.value.due = dayjs(this.value.from).add(1, 'day').toDate()
|
||||
this.value.due = DateTime.fromJSDate(this.value.from, {zone: this.settings.instance_timezone}).plus({day: 1}).toJSDate()
|
||||
} else {
|
||||
this.value.due = dayjs(this.value.from).toDate()
|
||||
this.value.due = DateTime.fromJSDate(this.value.from, {zone: this.settings.instance_timezone}).toJSDate()
|
||||
}
|
||||
} else {
|
||||
this.value.due = DateTime.fromJSDate(this.value.due, {zone: this.settings.instance_timezone}).set({ hour, minute }).toJSDate()
|
||||
}
|
||||
} else {
|
||||
this.value.due = null
|
||||
if (!this.value.multidate) {
|
||||
this.value.due = null
|
||||
} else {
|
||||
this.value.due = DateTime.fromJSDate(this.value.due, {zone: this.settings.instance_timezone}).set({ hour: 23, minute:59 }).toJSDate()
|
||||
}
|
||||
}
|
||||
this.$emit('input', { ...this.value, dueHour: value })
|
||||
|
||||
// if (value) {
|
||||
// // const [hour, minute] = value.split(':')
|
||||
// // let due = dayjs.tz(this.value.due || this.value.from).hour(Number(hour)).minute(Number(minute)).second(0)
|
||||
|
||||
// // add a day
|
||||
// // if (dayjs(this.value.from).hour() > Number(hour) && !this.value.multidate) {
|
||||
// // due = due.add(1, 'day')
|
||||
// // }
|
||||
// // due = due.hour(hour).minute(minute).second(0)
|
||||
// } else {
|
||||
// this.$emit('input', { ...this.value, dueHour: null })
|
||||
// }
|
||||
// change date in calendar (could be a range or a recurrent event...)
|
||||
} else if (what === 'date') {
|
||||
if (value === null) {
|
||||
|
||||
@@ -224,7 +224,7 @@ export default {
|
||||
transition: opacity .5s;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
overflow: scroll;
|
||||
overflow: auto;
|
||||
// position: absolute;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<template lang="pug">
|
||||
v-card.h-event.event.d-flex(itemscope itemtype="https://schema.org/Event")
|
||||
div.d-flex.flex-column.flex-grow-1(itemscope itemtype="https://schema.org/Event")
|
||||
nuxt-link(:to='`/event/${event.slug || event.id}`' itemprop="url")
|
||||
MyPicture(v-if='!hide_thumbs' :event='event' thumb :lazy='lazy')
|
||||
v-icon.float-right.mr-1(v-if='event.parentId' color='success' v-text='mdiRepeat')
|
||||
.title.p-name(itemprop="name") {{ event.title }}
|
||||
|
||||
v-card-text.body.pt-0.pb-0
|
||||
time.dt-start.subtitle-1(:datetime='event.start_datetime | unixFormat("YYYY-MM-DD HH:mm")' itemprop="startDate" :content="event.start_datetime | unixFormat('YYYY-MM-DDTHH:mm')") <v-icon v-text='mdiCalendar'></v-icon> {{ event | when }}
|
||||
.d-none.dt-end(v-if='event.end_datetime' itemprop="endDate" :content="event.end_datetime | unixFormat('YYYY-MM-DDTHH:mm')") {{ event.end_datetime | unixFormat('YYYY-MM-DD HH:mm') }}
|
||||
time.dt-start.subtitle-1(:datetime='$time.unixFormat(event.start_datetime, "yyyy-MM-dd HH:mm")' itemprop="startDate" :content="$time.unixFormat(event.start_datetime, \"yyyy-MM-dd'T'HH:mm\")") <v-icon v-text='mdiCalendar'></v-icon> {{ $time.when(event) }}
|
||||
.d-none.dt-end(v-if='event.end_datetime' itemprop="endDate" :content="$time.unixFormat(event.end_datetime,\"yyyy-MM-dd'T'HH:mm\")") {{ $time.unixFormat(event.end_datetime)}}
|
||||
nuxt-link.place.d-block.p-location.pl-0(text :to='`/place/${encodeURIComponent(event.place.name)}`' itemprop="location" itemscope itemtype="https://schema.org/Place") <v-icon v-text='mdiMapMarker'></v-icon> <span itemprop='name'>{{ event.place.name }}</span>
|
||||
.d-none(itemprop='address') {{ event.place.address }}
|
||||
|
||||
@@ -22,7 +22,7 @@ import MyPicture from '~/components/MyPicture'
|
||||
import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js'
|
||||
|
||||
export default {
|
||||
data({ $store }) {
|
||||
data() {
|
||||
return { mdiRepeat, mdiMapMarker, mdiCalendar }
|
||||
},
|
||||
components: {
|
||||
|
||||
@@ -9,7 +9,7 @@ div#list
|
||||
v-for='event in computedEvents'
|
||||
:key='`${event.id}_${event.start_datetime}`' small)
|
||||
v-list-item-content
|
||||
v-list-item-subtitle <v-icon small color='success' v-if='event.parentId' v-text='mdiRepeat'></v-icon> {{event|when}}
|
||||
v-list-item-subtitle <v-icon small color='success' v-if='event.parentId' v-text='mdiRepeat'></v-icon> {{$time.when(event)}}
|
||||
span.primary--text.ml-1 @{{event.place.name}}
|
||||
v-list-item-title(v-text='event.title')
|
||||
</template>
|
||||
|
||||
@@ -5,11 +5,12 @@
|
||||
client-only(v-if='showSearchBar')
|
||||
v-menu(offset-y :close-on-content-click='false' tile)
|
||||
template(v-slot:activator="{on ,attrs}")
|
||||
v-text-field(hide-details outlined
|
||||
:placeholder='$t("common.search")'
|
||||
@input="v => setFilter(['query', v])" clearable :clear-icon='mdiClose')
|
||||
template(v-slot:append v-if='settings.allow_recurrent_event || settings.allow_multidate_event')
|
||||
v-icon(v-text='mdiCog' v-bind='attrs' v-on='on')
|
||||
v-text-field(hide-details outlined v-model='query'
|
||||
:placeholder='$t("common.search")' @click:clear="setFilter(['query', null])"
|
||||
@keypress.enter="setFilter(['query', query])" clearable :clear-icon='mdiClose')
|
||||
template(v-slot:append)
|
||||
v-icon.mr-2(v-if='query' v-text='mdiMagnify' @click="setFilter(['query', query])")
|
||||
v-icon(v-if='settings.allow_recurrent_event || settings.allow_multidate_event' v-text='mdiCog' v-bind='attrs' v-on='on')
|
||||
v-card(outlined :rounded='"0"')
|
||||
v-card-text
|
||||
v-row(dense)
|
||||
@@ -36,12 +37,12 @@
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
import Calendar from '@/components/Calendar'
|
||||
import { mdiClose, mdiCog } from '@mdi/js'
|
||||
import { mdiClose, mdiCog, mdiMagnify } from '@mdi/js'
|
||||
|
||||
export default {
|
||||
data: ({ $store }) => ({
|
||||
oldRoute: '',
|
||||
mdiClose, mdiCog,
|
||||
mdiClose, mdiCog, mdiMagnify,
|
||||
collections: [],
|
||||
show_recurrent: $store.state.settings.recurrent_event_visible,
|
||||
show_multidate: true,
|
||||
|
||||
@@ -41,7 +41,7 @@ v-container
|
||||
template(v-slot:item.content='{ item }')
|
||||
span(v-html='item.data.content')
|
||||
template(v-slot:item.created='{ item }')
|
||||
span {{item.created | dateFormat('lll')}}
|
||||
span {{$time.format(item.created, 'ff')}}
|
||||
template(v-slot:item.user='{ item }')
|
||||
a(:href='item.ap_user.url || item.ap_user.ap_id' target='_blank') {{item.ap_user.preferredUsername}}
|
||||
template(v-slot:item.event='{ item }')
|
||||
|
||||
@@ -71,7 +71,7 @@ v-container
|
||||
import SMTP from './SMTP.vue'
|
||||
import Geolocation from './Geolocation.vue'
|
||||
import { mapActions, mapState } from 'vuex'
|
||||
import moment from 'dayjs'
|
||||
import { DateTime } from 'luxon'
|
||||
import tzNames from './tz.json'
|
||||
import { mdiAlert, mdiArrowRight, mdiMap } from '@mdi/js'
|
||||
const locales = require('../../locales/index')
|
||||
@@ -127,7 +127,7 @@ export default {
|
||||
set (value) { this.setSetting({ key: 'allow_geolocation', value }) }
|
||||
},
|
||||
filteredTimezones () {
|
||||
const current_timezone = moment.tz.guess()
|
||||
const current_timezone = DateTime.local().zoneName
|
||||
tzNames.unshift(current_timezone)
|
||||
return tzNames
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ v-container
|
||||
//- ADD NEW USER
|
||||
v-dialog(v-model='newUserDialog' :fullscreen='$vuetify.breakpoint.xsOnly')
|
||||
|
||||
v-card(color='secondary')
|
||||
v-card
|
||||
v-card-title {{$t('common.new_user')}}
|
||||
v-card-text
|
||||
v-form(v-model='valid' ref='user_form' lazy-validation @submit.prevent='createUser')
|
||||
|
||||
Reference in New Issue
Block a user