NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Squashed commit of the following:

Browse source 
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:

    commit fc8a9f4506
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:42:24 2023 +0100

        address some issues with recurrent events, fix #247

    commit f7357666ca
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:16:52 2023 +0100

        fix event import from URL

    commit e1bca6f46a
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:15:42 2023 +0100

         add Duch (nl) locale (thanks @jeoenepraat)

    commit 5f8afdbc12
    Merge: 57a052a 92ca5ab
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 11:39:50 2023 +0100

        Merge remote-tracking branch 'weblate/master'

    commit 57a052a7fa
    Merge: 63d1d2e 55137d2
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 11:39:33 2023 +0100

        Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f'

    commit 92ca5abf5e
    Author: 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/

    commit 63d1d2ee53
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:41:06 2023 +0100

        minor

    commit d2759a55a5
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:38:39 2023 +0100

        wrong user / admin merge dark theme settings - fix #244

    commit b401d829db
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:24:45 2023 +0100

        remove a small warning

    commit ccffe5f7b0
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 24 11:40:36 2023 +0100

        push tags on release

    commit 55137d2ac2
    Author: 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>

    commit b654f29d8b
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 13:21:17 2023 +0100

        update changelog

    commit 0cd1ee9d89
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 13:17:29 2023 +0100

        increase rate limit max requests per minutes

    commit b6dafc082e
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:45:39 2023 +0100

        minor

    commit 0fa7769844
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:45:18 2023 +0100

        location saving is not working when geocoding is disabled, fix #238

    commit 07f9e2d9ee
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:33:40 2023 +0100

        really fix #232

    commit bae930799e
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:33:09 2023 +0100

        downgrade mariadb (sequelize is not ready)

    commit d733d7fef1
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 00:16:28 2023 +0100

        aargh

    commit 98b22aad70
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 21 00:56:06 2023 +0100

        minor

    commit fc098b603d
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 21 00:55:44 2023 +0100

        missing i18n in setup, fix #239

    commit 3eaf72af19
    Merge: bba196b d6c6034
    Author: lesion <lesion@autistici.org>
    Date:   Mon Feb 20 21:17:37 2023 +0100

        Merge remote-tracking branch 'weblate/master'

    commit bba196b068
    Author: lesion <lesion@autistici.org>
    Date:   Sat Feb 18 00:05:52 2023 +0100

        update changelog, v1.6.3

    commit bb9f7cca47
    Author: lesion <lesion@autistici.org>
    Date:   Sat Feb 18 00:04:28 2023 +0100

        minor

    commit 80d2dbd06b
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 17 23:40:28 2023 +0100

        minor

    commit d6c6034630
    Author: 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/

    commit d125cf1506
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 17 21:56:31 2023 +0100

        set a default user_locale path

    commit 4367960a62
    Merge: c8cc5c6 87dd179
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 7 17:46:58 2023 +0100

        Merge branch 'master' into gh

    commit c8cc5c6c97
    Merge: 88e0c90 550e221
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jan 9 17:15:21 2023 +0100

        Merge branch 'master' into gh

    commit 88e0c90a66
    Merge: 421aa12 f212ac1
    Author: lesion <lesion@autistici.org>
    Date:   Thu Dec 15 09:54:41 2022 +0100

        Merge branch 'master' into gh

    commit 421aa12781
    Merge: 5f6cc46 b3488e7
    Author: lesion <lesion@autistici.org>
    Date:   Wed Sep 28 12:26:08 2022 +0200

        Merge branch 'master' into gh

    commit 5f6cc46cdc
    Merge: b66feb9 171d968
    Author: lesion <lesion@autistici.org>
    Date:   Mon Aug 8 00:08:12 2022 +0200

        Merge branch 'master' into gh

    commit b66feb92e2
    Merge: 80c55d5 05d068f
    Author: lesion <lesion@autistici.org>
    Date:   Tue Jun 21 23:48:40 2022 +0200

        Merge branch 'master' into gh

    commit 80c55d5601
    Merge: 814090e a154fdf
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 17:27:00 2022 +0200

        Merge branch 'master' into gh

    commit 814090e9b6
    Merge: 616c542 2e3aba9
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 17:19:31 2022 +0200

        Merge branch 'master' into gh

    commit 616c54229a
    Merge: e4cb22e 82dcaf9
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 16:57:05 2022 +0200

        Merge branch 'master' into gh

    commit e4cb22ee33
    Merge: 5dddfbd 8657937
    Author: lesion <lesion@autistici.org>
    Date:   Fri Mar 11 23:41:22 2022 +0100

        Merge branch 'master' into gh

    commit 5dddfbd29e
    Merge: 60e9d95 10c6b0d
    Author: lesion <lesion@autistici.org>
    Date:   Fri Mar 11 23:22:12 2022 +0100

        Merge branch 'master' into gh

    commit 60e9d95ba8
    Merge: 79445ca ad93f83
    Author: lesion <lesion@autistici.org>
    Date:   Tue Dec 7 01:35:18 2021 +0100

        Merge branch 'master' into gh

    commit 79445ca8a7
    Merge: 9472d8d cd313ef
    Author: les <lesion@autistici.org>
    Date:   Thu Jun 24 21:52:25 2021 +0200

        Merge branch 'master' into gh

    commit 9472d8d919
    Merge: f960149 9e9643e
    Author: les <lesion@autistici.org>
    Date:   Fri Mar 26 22:27:41 2021 +0100

        Merge branch 'dev' into gh

    commit f9601492dc
    Author: les <lesion@autistici.org>
    Date:   Fri Dec 6 11:30:41 2019 +0100

        update dependencies

    commit f8c7fa2b45
    Author: les <lesion@autistici.org>
    Date:   Fri Dec 6 11:41:13 2019 +0100

        minor

    commit 33ca266535
    Author: 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 2023-03-19 23:26:57 +01:00
parent fc8a9f4506
commit 99d78e2492
No known key found for this signature in database
GPG key ID: 352918250B012177
35 changed files with 1907 additions and 1899 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG
View file

@ -1,6 +1,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
### UNRELEASED ### UNRELEASED
- optimize home page using lazy loading (v-lazy)
- show a progress
- improve search flow (order by, press enter or icon...)
- add Duch (nl) locale (thanks @jeoenepraat)
- fix #244, dark theme user / admin preference merge issue
- fix some issues with recurrent events, #247
- filters / helpers refactoring
- use luxon instead of dayjs, new $time plugin
### 1.6.4 - 22 feb '23 ### 1.6.4 - 22 feb '23
- add missing i18n during setup - add missing i18n during setup

51
assets/helper.js
View file

@ -1,51 +0,0 @@
import dayjs from 'dayjs'
export function attributesFromEvents(_events) {
// merge events with same date
let attributes = []
const now = dayjs().unix()
for (let e of _events) {
const key = dayjs.unix(e.start_datetime).tz().format('MMDD') // Math.floor(e.start_datetime/(3600*24)) // dayjs.unix(e.start_datetime).tz().format('YYYYMMDD')
const c = (e.end_datetime || e.start_datetime) < now ? 'vc-past' : ''
if (e.multidate === true) {
attributes.push({
dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) },
highlight: {
start: { fillMode: 'outline' },
base: { fillMode: 'light' },
end: { fillMode: 'outline' },
}
})
continue
}
const i = attributes.find(a => a.day === key)
if (!i) {
attributes.push({
day: key, key: e.id, n: 1, dates: new Date(e.start_datetime * 1000),
dot: { color: 'teal', class: c }
})
continue
}
i.n++
if (i.n >= 20) {
i.dot = { color: 'purple', class: c }
} else if (i.n >= 10) {
i.dot = { color: 'red', class: c }
} else if (i.n >= 5) {
i.dot = { color: 'orange', class: c }
} else if (i.n >= 3) {
i.dot = { color: 'yellow', class: c }
} else {
i.dot = { color: 'teal', class: c }
}
}
// add a bar to highlight today
attributes.push({ key: 'today', dates: new Date(), highlight: { color: 'green', fillMode: 'outline' } })
return attributes
}

10
assets/style.css
View file

@ -108,7 +108,11 @@ li {
/* margin-top: 16px; /* margin-top: 16px;
margin-right: 16px; */ margin-right: 16px; */
transition: all .5s; transition: all .5s;
min-height: 288px;
overflow: hidden; overflow: hidden;
box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
border-radius: 4px;
} }
.event .title { .event .title {
@ -127,11 +131,10 @@ li {
flex: 1 1 auto; flex: 1 1 auto;
} }
.event .place span { /* .event .place span {
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} } */
.event a { .event a {
text-decoration: none; text-decoration: none;
@ -148,6 +151,7 @@ li {
#event { #event {
max-width: 1200px; max-width: 1200px;
overflow-wrap: break-word;
} }
/* .tags .v-chip .v-chip__content { /* .tags .v-chip .v-chip__content {

17
components/Calendar.vue
View file

@ -9,29 +9,26 @@
@input='click' @input='click'
@update:from-page='updatePage' @update:from-page='updatePage'
:locale='$i18n.locale' :locale='$i18n.locale'
:popover="{ visibility: 'click' }"
:attributes='attributes' :attributes='attributes'
transition='fade' transition='fade'
aria-label='Calendar' aria-label='Calendar'
is-expanded is-expanded
is-inline) is-inline)
.calh.d-flex.justify-center.align-center(slot='placeholder') .calh.text-center(slot='placeholder')
v-progress-circular(indeterminate) v-progress-circular.mt-5(indeterminate color='primary')
</template> </template>
</template> </template>
<script> <script>
import { mapState, mapGetters } from 'vuex' import { mapState, mapGetters } from 'vuex'
import dayjs from 'dayjs'
import { mdiChevronDown, mdiClose } from '@mdi/js' import { mdiChevronDown, mdiClose } from '@mdi/js'
import { attributesFromEvents } from '../assets/helper'
export default { export default {
name: 'Calendar', name: 'Calendar',
data () { data ({$time}) {
const month = dayjs.tz().month() + 1 const month = $time.currentMonth()
const year = dayjs.tz().year() const year = $time.currentYear()
return { return {
mdiChevronDown, mdiClose, mdiChevronDown, mdiClose,
selectedDate: null, selectedDate: null,
@ -42,15 +39,15 @@ export default {
...mapState(['settings', 'events']), ...mapState(['settings', 'events']),
...mapGetters(['is_dark']), ...mapGetters(['is_dark']),
attributes () { attributes () {
return attributesFromEvents(this.events) return this.$time.attributesFromEvents(this.events)
} }
}, },
methods: { methods: {
updatePage (page) { updatePage (page) {
if (page.month !== this.page.month || page.year !== this.page.year) { if (page.month !== this.page.month || page.year !== this.page.year) {
this.$root.$emit('monthchange', page)
this.page.month = page.month this.page.month = page.month
this.page.year = page.year this.page.year = page.year
this.$root.$emit('monthchange', page)
} }
}, },
click (day) { click (day) {

59
components/DateInput.vue
View file

@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
v-col(cols=12) v-col(cols=12)
.text-center .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(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_multidate_event' value='multidate' label='multidate') {{ $t('event.multidate') }}
v-btn(v-if='settings.allow_recurrent_event' value='recurrent' label="recurrent") {{ $t('event.recurrent') }} 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-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 }} v-btn(v-for='f in frequencies' :key='f.value' :value='f.value') {{ f.text }}
client-only client-only
.datePicker.mt-3 .datePicker.mt-3
v-input(:value='fromDate' :rules="[$validators.required('common.when')]") v-input(:value='fromDate' :rules="[$validators.required('common.when')]")
@ -23,10 +22,9 @@ v-col(cols=12)
:is-dark="is_dark" :is-dark="is_dark"
is-inline is-inline
is-expanded is-expanded
:min-date='type !== "recurrent" && new Date()') :min-date='new Date()')
//- template(#placeholder) .calh.text-center(slot='placeholder')
.d-flex.calh.justify-center(slot='placeholder') v-progress-circular(indeterminate color='primary')
v-progress-circular(indeterminate)
div.text-center.mb-2(v-if='type === "recurrent"') div.text-center.mb-2(v-if='type === "recurrent"')
span(v-if='value.recurrent.frequency !== "1m" && value.recurrent.frequency !== "2m"') {{ whenPatterns }} span(v-if='value.recurrent.frequency !== "1m" && value.recurrent.frequency !== "2m"') {{ whenPatterns }}
@ -94,10 +92,9 @@ v-col(cols=12)
</template> </template>
<script> <script>
import dayjs from 'dayjs' import { DateTime } from 'luxon'
import { mapState, mapActions, mapGetters } from 'vuex' import { mapState, mapActions, mapGetters } from 'vuex'
import List from '@/components/List' import List from '@/components/List'
import { attributesFromEvents } from '../assets/helper'
import { mdiClockTimeFourOutline, mdiClockTimeEightOutline, mdiClose } from '@mdi/js' import { mdiClockTimeFourOutline, mdiClockTimeEightOutline, mdiClose } from '@mdi/js'
export default { export default {
@ -127,34 +124,33 @@ export default {
fromDate () { fromDate () {
if (this.value.from) { if (this.value.from) {
if (this.value.multidate) { 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 { } else {
return new Date(this.value.from) return new Date(this.value.from)
} }
} }
}, },
todayEvents() { todayEvents() {
const start = dayjs.tz(this.value.from).startOf('day').unix() const start = this.$time.startOfDay(this.value.from)
const end = dayjs.tz(this.value.from).endOf('day').unix() const end = this.$time.endOfDay(this.value.from)
return this.events.filter(e => e.start_datetime >= start && e.start_datetime <= end) return this.events.filter(e => e.start_datetime >= start && e.start_datetime <= end)
}, },
attributes() { 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() { whenPatterns() {
if (!this.value.from) { return } 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 freq = this.value.recurrent.frequency
const weekDay = date.format('dddd') const weekDay = date.toFormat('EEEE')
if (freq === '1w' || freq === '2w') { if (freq === '1w' || freq === '2w') {
return this.$t(`event.recurrent_${freq}_days`, { days: weekDay }).toUpperCase() return this.$t(`event.recurrent_${freq}_days`, { days: weekDay }).toUpperCase()
} else if (freq === '1m' || freq === '2m') { } else if (freq === '1m' || freq === '2m') {
const monthDay = date.format('D') const n = Math.floor((date.day) / 7) + 1
const n = Math.floor((monthDay - 1) / 7) + 1
const patterns = [ 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' } // { 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 // 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) { if (lastWeek) {
patterns.push( patterns.push(
{ {
@ -215,13 +211,14 @@ export default {
if (from && from.start) { if (from && from.start) {
from = from.start from = from.start
} }
let due = this.value.due let due = this.value.multidate ? null : this.value.due
if (due && due.start) { if (due && due.start) {
due = due.start due = due.start
} }
this.$emit('input', { ...this.value, from, due, recurrent: null, multidate: false }) this.$emit('input', { ...this.value, from, due, recurrent: null, multidate: false })
} }
} else if (what === 'frequency') { } else if (what === 'frequency') {
if (typeof value === 'undefined') { value = '1w' }
this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, frequency: value } }) this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, frequency: value } })
} else if (what === 'recurrentType') { } else if (what === 'recurrentType') {
this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, type: value } }) this.$emit('input', { ...this.value, recurrent: { ...this.value.recurrent, type: value } })
@ -238,28 +235,22 @@ export default {
const [fromHour, fromMinute] = this.value.fromHour.split(':') const [fromHour, fromMinute] = this.value.fromHour.split(':')
if (!this.value.multidate) { if (!this.value.multidate) {
if (hour < fromHour) { 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 { } else {
this.value.due = dayjs(this.value.from).toDate() this.value.due = DateTime.fromJSDate(this.value.from, {zone: this.settings.instance_timezone}).toJSDate()
}
} }
} else { } else {
this.value.due = DateTime.fromJSDate(this.value.due, {zone: this.settings.instance_timezone}).set({ hour, minute }).toJSDate()
}
} else {
if (!this.value.multidate) {
this.value.due = null 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 }) 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...) // change date in calendar (could be a range or a recurrent event...)
} else if (what === 'date') { } else if (what === 'date') {
if (value === null) { if (value === null) {

2
components/Editor.vue
View file

@ -224,7 +224,7 @@ export default {
transition: opacity .5s; transition: opacity .5s;
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
overflow: scroll; overflow: auto;
// position: absolute; // position: absolute;
} }

8
components/Event.vue
View file

@ -1,13 +1,13 @@
<template lang="pug"> <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") nuxt-link(:to='`/event/${event.slug || event.id}`' itemprop="url")
MyPicture(v-if='!hide_thumbs' :event='event' thumb :lazy='lazy') 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') v-icon.float-right.mr-1(v-if='event.parentId' color='success' v-text='mdiRepeat')
.title.p-name(itemprop="name") {{ event.title }} .title.p-name(itemprop="name") {{ event.title }}
v-card-text.body.pt-0.pb-0 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 }} 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="event.end_datetime | unixFormat('YYYY-MM-DDTHH:mm')") {{ event.end_datetime | unixFormat('YYYY-MM-DD HH:mm') }} .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> 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 }} .d-none(itemprop='address') {{ event.place.address }}
@ -22,7 +22,7 @@ import MyPicture from '~/components/MyPicture'
import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js' import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js'
export default { export default {
data({ $store }) { data() {
return { mdiRepeat, mdiMapMarker, mdiCalendar } return { mdiRepeat, mdiMapMarker, mdiCalendar }
}, },
components: { components: {

2
components/List.vue
View file

@ -9,7 +9,7 @@ div#list
v-for='event in computedEvents' v-for='event in computedEvents'
:key='`${event.id}_${event.start_datetime}`' small) :key='`${event.id}_${event.start_datetime}`' small)
v-list-item-content 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}} span.primary--text.ml-1 @{{event.place.name}}
v-list-item-title(v-text='event.title') v-list-item-title(v-text='event.title')
</template> </template>

15
components/NavSearch.vue
View file

@ -5,11 +5,12 @@
client-only(v-if='showSearchBar') client-only(v-if='showSearchBar')
v-menu(offset-y :close-on-content-click='false' tile) v-menu(offset-y :close-on-content-click='false' tile)
template(v-slot:activator="{on ,attrs}") template(v-slot:activator="{on ,attrs}")
v-text-field(hide-details outlined v-text-field(hide-details outlined v-model='query'
:placeholder='$t("common.search")' :placeholder='$t("common.search")' @click:clear="setFilter(['query', null])"
@input="v => setFilter(['query', v])" clearable :clear-icon='mdiClose') @keypress.enter="setFilter(['query', query])" clearable :clear-icon='mdiClose')
template(v-slot:append v-if='settings.allow_recurrent_event || settings.allow_multidate_event') template(v-slot:append)
v-icon(v-text='mdiCog' v-bind='attrs' v-on='on') 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(outlined :rounded='"0"')
v-card-text v-card-text
v-row(dense) v-row(dense)
@ -36,12 +37,12 @@
<script> <script>
import { mapState, mapActions } from 'vuex' import { mapState, mapActions } from 'vuex'
import Calendar from '@/components/Calendar' import Calendar from '@/components/Calendar'
import { mdiClose, mdiCog } from '@mdi/js' import { mdiClose, mdiCog, mdiMagnify } from '@mdi/js'
export default { export default {
data: ({ $store }) => ({ data: ({ $store }) => ({
oldRoute: '', oldRoute: '',
mdiClose, mdiCog, mdiClose, mdiCog, mdiMagnify,
collections: [], collections: [],
show_recurrent: $store.state.settings.recurrent_event_visible, show_recurrent: $store.state.settings.recurrent_event_visible,
show_multidate: true, show_multidate: true,

2
components/admin/Moderation.vue
View file

@ -41,7 +41,7 @@ v-container
template(v-slot:item.content='{ item }') template(v-slot:item.content='{ item }')
span(v-html='item.data.content') span(v-html='item.data.content')
template(v-slot:item.created='{ item }') template(v-slot:item.created='{ item }')
span {{item.created | dateFormat('lll')}} span {{$time.format(item.created, 'ff')}}
template(v-slot:item.user='{ item }') template(v-slot:item.user='{ item }')
a(:href='item.ap_user.url || item.ap_user.ap_id' target='_blank') {{item.ap_user.preferredUsername}} a(:href='item.ap_user.url || item.ap_user.ap_id' target='_blank') {{item.ap_user.preferredUsername}}
template(v-slot:item.event='{ item }') template(v-slot:item.event='{ item }')

4
components/admin/Settings.vue
View file

@ -71,7 +71,7 @@ v-container
import SMTP from './SMTP.vue' import SMTP from './SMTP.vue'
import Geolocation from './Geolocation.vue' import Geolocation from './Geolocation.vue'
import { mapActions, mapState } from 'vuex' import { mapActions, mapState } from 'vuex'
import moment from 'dayjs' import { DateTime } from 'luxon'
import tzNames from './tz.json' import tzNames from './tz.json'
import { mdiAlert, mdiArrowRight, mdiMap } from '@mdi/js' import { mdiAlert, mdiArrowRight, mdiMap } from '@mdi/js'
const locales = require('../../locales/index') const locales = require('../../locales/index')
@ -127,7 +127,7 @@ export default {
set (value) { this.setSetting({ key: 'allow_geolocation', value }) } set (value) { this.setSetting({ key: 'allow_geolocation', value }) }
}, },
filteredTimezones () { filteredTimezones () {
const current_timezone = moment.tz.guess() const current_timezone = DateTime.local().zoneName
tzNames.unshift(current_timezone) tzNames.unshift(current_timezone)
return tzNames return tzNames
} }

2
components/admin/Users.vue
View file

@ -12,7 +12,7 @@ v-container
//- ADD NEW USER //- ADD NEW USER
v-dialog(v-model='newUserDialog' :fullscreen='$vuetify.breakpoint.xsOnly') v-dialog(v-model='newUserDialog' :fullscreen='$vuetify.breakpoint.xsOnly')
v-card(color='secondary') v-card
v-card-title {{$t('common.new_user')}} v-card-title {{$t('common.new_user')}}
v-card-text v-card-text
v-form(v-model='valid' ref='user_form' lazy-validation @submit.prevent='createUser') v-form(v-model='valid' ref='user_form' lazy-validation @submit.prevent='createUser')

4
locales/en.json
View file

@ -159,8 +159,8 @@
"recurrent_2w_days": "A {days} every other", "recurrent_2w_days": "A {days} every other",
"recurrent_1m_days": "The {days} of each month", "recurrent_1m_days": "The {days} of each month",
"recurrent_2m_days": "The {days} a month every other", "recurrent_2m_days": "The {days} a month every other",
"recurrent_1m_ordinal": "The {n} {days} of each month", "recurrent_1m_ordinal": "Each {n} {days} of the month",
"recurrent_2m_ordinal": "The {n} {days} a month every other", "recurrent_2m_ordinal": "Each {n} {days} a month every other",
"each_week": "Each week", "each_week": "Each week",
"each_2w": "Every other weeks", "each_2w": "Every other weeks",
"each_month": "Each month", "each_month": "Each month",

9
locales/it.json
View file

@ -96,7 +96,9 @@
"getting_there": "Come arrivare", "getting_there": "Come arrivare",
"calendar": "Calendario", "calendar": "Calendario",
"home": "Home", "home": "Home",
"about": "Cos'è" "about": "Cos'è",
"admin_actions": "Gestisci",
"recurring_event_actions": "Gestisci ricorrenza"
}, },
"login": { "login": {
"description": "Entrando puoi pubblicare nuovi eventi.", "description": "Entrando puoi pubblicare nuovi eventi.",
@ -158,8 +160,8 @@
"recurrent_2w_days": "Un {days} ogni due", "recurrent_2w_days": "Un {days} ogni due",
"recurrent_1m_days": "Il giorno {days} di ogni mese", "recurrent_1m_days": "Il giorno {days} di ogni mese",
"recurrent_2m_days": "Il giorno {days} ogni due mesi", "recurrent_2m_days": "Il giorno {days} ogni due mesi",
"recurrent_1m_ordinal": "Il {n} {days} di ogni mese", "recurrent_1m_ordinal": "Ogni {n} {days} del mese",
"recurrent_2m_ordinal": "Il {n} {days} un mese sì e uno no", "recurrent_2m_ordinal": "Ogni {n} {days} un mese sì e uno no",
"each_week": "Ogni settimana", "each_week": "Ogni settimana",
"each_2w": "Ogni due settimane", "each_2w": "Ogni due settimane",
"each_month": "Ogni mese", "each_month": "Ogni mese",
@ -191,6 +193,7 @@
"allow_registration_description": "Vuoi abilitare la registrazione?", "allow_registration_description": "Vuoi abilitare la registrazione?",
"allow_anon_event": "Si possono inserire eventi anonimi (previa conferma)?", "allow_anon_event": "Si possono inserire eventi anonimi (previa conferma)?",
"allow_recurrent_event": "Abilita eventi ricorrenti", "allow_recurrent_event": "Abilita eventi ricorrenti",
"allow_multidate_event": "Abilita eventi di più giorni",
"allow_geolocation": "Abilita la geolocalizzazione degli eventi", "allow_geolocation": "Abilita la geolocalizzazione degli eventi",
"recurrent_event_visible": "Appuntamenti ricorrenti visibili di default", "recurrent_event_visible": "Appuntamenti ricorrenti visibili di default",
"federation": "Federazione / ActivityPub", "federation": "Federazione / ActivityPub",

3
nuxt.config.js
View file

@ -41,7 +41,8 @@ module.exports = {
** Plugins to load before mounting the App ** Plugins to load before mounting the App
*/ */
plugins: [ plugins: [
'@/plugins/filters', // text filters, datetime filters, generic transformation helpers etc. '@/plugins/helpers',
'@/plugins/time', // datetime filters
'@/plugins/axios', // axios baseurl configuration '@/plugins/axios', // axios baseurl configuration
'@/plugins/validators', // inject validators '@/plugins/validators', // inject validators
'@/plugins/api', // api helpers '@/plugins/api', // api helpers

24
package.json
View file

@ -42,7 +42,7 @@
"accept-language": "^3.0.18", "accept-language": "^3.0.18",
"axios": "^0.27.2", "axios": "^0.27.2",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"body-parser": "^1.20.0", "body-parser": "^1.20.2",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"cookie-session": "^2.0.0", "cookie-session": "^2.0.0",
"cookie-universal-nuxt": "^2.2.2", "cookie-universal-nuxt": "^2.2.2",
@ -55,17 +55,18 @@
"http-signature": "^1.3.6", "http-signature": "^1.3.6",
"https-proxy-agent": "^5.0.1", "https-proxy-agent": "^5.0.1",
"ical.js": "^1.5.0", "ical.js": "^1.5.0",
"ics": "^3.0.1", "ics": "^3.1.0",
"jsdom": "^21.1.0", "jsdom": "^21.1.0",
"leaflet": "^1.9.2", "leaflet": "^1.9.2",
"linkify-html": "^4.0.2", "linkify-html": "^4.0.2",
"linkifyjs": "4.1.0", "linkifyjs": "4.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"luxon": "^3.3.0",
"mariadb": "^2.5.6", "mariadb": "^2.5.6",
"memory-cache": "^0.2.0", "memory-cache": "^0.2.0",
"microformat-node": "^2.0.1", "microformat-node": "^2.0.1",
"minify-css-string": "^1.0.0", "minify-css-string": "^1.0.0",
"mkdirp": "^2.1.3", "mkdirp": "^2.1.5",
"multer": "^1.4.5-lts.1", "multer": "^1.4.5-lts.1",
"mysql2": "^2.3.3", "mysql2": "^2.3.3",
"nuxt-edge": "2.17.0-27941778.c493723", "nuxt-edge": "2.17.0-27941778.c493723",
@ -77,12 +78,12 @@
"passport-http-bearer": "^1.0.1", "passport-http-bearer": "^1.0.1",
"passport-oauth2-client-password": "^0.1.2", "passport-oauth2-client-password": "^0.1.2",
"passport-oauth2-client-public": "^0.0.1", "passport-oauth2-client-public": "^0.0.1",
"pg": "^8.9.0", "pg": "^8.10.0",
"sequelize": "^6.28.0", "sequelize": "^6.28.0",
"sequelize-slugify": "^1.6.2", "sequelize-slugify": "^1.6.2",
"sharp": "^0.27.2", "sharp": "^0.27.2",
"sqlite3": "^5.1.4", "sqlite3": "^5.1.4",
"telegraf": "^4.9.1", "telegraf": "^4.12.2",
"tiptap": "^1.32.0", "tiptap": "^1.32.0",
"tiptap-extensions": "^1.35.0", "tiptap-extensions": "^1.35.0",
"umzug": "^2.3.0", "umzug": "^2.3.0",
@ -91,26 +92,21 @@
"vuetify": "2.6.14", "vuetify": "2.6.14",
"winston": "^3.8.2", "winston": "^3.8.2",
"winston-daily-rotate-file": "^4.7.1", "winston-daily-rotate-file": "^4.7.1",
"yargs": "^17.7.0" "yargs": "^17.7.1"
}, },
"devDependencies": { "devDependencies": {
"@nuxtjs/vuetify": "^1.12.3", "@nuxtjs/vuetify": "^1.12.3",
"jest": "^29.4.2", "jest": "^29.5.0",
"jest-environment-node": "^29.4.2", "jest-environment-node": "^29.5.0",
"prettier": "^2.8.1", "prettier": "^2.8.1",
"pug": "^3.0.2", "pug": "^3.0.2",
"pug-plain-loader": "^1.1.0", "pug-plain-loader": "^1.1.0",
"sass": "^1.56.2", "sass": "^1.59.2",
"sequelize-cli": "^6.3.0", "sequelize-cli": "^6.3.0",
"supertest": "^6.3.3", "supertest": "^6.3.3",
"webpack": "4", "webpack": "4",
"webpack-cli": "^4.10.0" "webpack-cli": "^4.10.0"
}, },
"resolutions": {
"nth-check": "^2.0.1",
"glob-parent": "^5.1.2",
"moment": "^2.29.2"
},
"jest": { "jest": {
"testEnvironment": "jsdom" "testEnvironment": "jsdom"
}, },

56
pages/add/_edit.vue
View file

@ -34,6 +34,7 @@ v-container.container.pa-0.pa-md-3
//- When //- When
DateInput(ref='when' v-model='date' :event='event') DateInput(ref='when' v-model='date' :event='event')
//- Description //- Description
v-col.px-0(cols='12') v-col.px-0(cols='12')
Editor.px-3.ma-0( Editor.px-3.ma-0(
@ -70,7 +71,6 @@ v-container.container.pa-0.pa-md-3
<script> <script>
import { mapState } from 'vuex' import { mapState } from 'vuex'
import debounce from 'lodash/debounce' import debounce from 'lodash/debounce'
import dayjs from 'dayjs'
import { mdiFileImport, mdiFormatTitle, mdiTagMultiple, mdiCloseCircle } from '@mdi/js' import { mdiFileImport, mdiFormatTitle, mdiTagMultiple, mdiCloseCircle } from '@mdi/js'
@ -103,7 +103,7 @@ export default {
return true return true
}, },
async asyncData({ params, $axios, error, $auth, store }) { async asyncData({ params, $axios, error, $auth, $time }) {
if (params.edit) { if (params.edit) {
const data = { event: { place: {}, media: [] } } const data = { event: { place: {}, media: [] } }
@ -123,15 +123,15 @@ export default {
data.event.place.name = event.place.name data.event.place.name = event.place.name
data.event.place.address = event.place.address || '' data.event.place.address = event.place.address || ''
const from = dayjs.unix(event.start_datetime).tz() const from = $time.fromUnix(event.start_datetime)
const due = event.end_datetime && dayjs.unix(event.end_datetime).tz() const due = event.end_datetime && $time.fromUnix(event.end_datetime)
data.date = { data.date = {
recurrent: event.recurrent, recurrent: event.recurrent,
from: from.toDate(), from: from.toJSDate(),
due: due && due.toDate(), due: due && due.toJSDate(),
multidate: event.multidate, multidate: event.multidate,
fromHour: from.format('HH:mm'), fromHour: from.toFormat('HH:mm'),
dueHour: due && due.format('HH:mm') dueHour: due && (due.toFormat('HH:mm') === '23:59' ? null : due.toFormat('HH:mm'))
} }
data.event.title = event.title data.event.title = event.title
@ -139,13 +139,15 @@ export default {
data.event.id = event.id data.event.id = event.id
data.event.tags = event.tags data.event.tags = event.tags
data.event.media = event.media || [] data.event.media = event.media || []
data.event.parentId = event.parentId
data.event.recurrent = event.recurrent
return data return data
} }
return {} return {}
}, },
data() { data({ $time }) {
const month = dayjs.tz().month() + 1 const month = $time.currentMonth()
const year = dayjs.tz().year() const year = $time.currentYear()
return { return {
mdiFileImport, mdiFormatTitle, mdiTagMultiple, mdiCloseCircle, mdiFileImport, mdiFormatTitle, mdiTagMultiple, mdiCloseCircle,
valid: false, valid: false,
@ -189,15 +191,15 @@ export default {
this.event = Object.assign(this.event, event) this.event = Object.assign(this.event, event)
this.$refs.where.selectPlace({ name: event.place.name || event.place, address: event.place.address }) this.$refs.where.selectPlace({ name: event.place.name || event.place, address: event.place.address })
const from = dayjs.unix(this.event.start_datetime) const from = this.$time.fromUnix(this.event.start_datetime)
const due = this.event.end_datetime && dayjs.unix(this.event.end_datetime) const due = this.event.end_datetime && this.$time.fromUnix(this.event.end_datetime)
this.date = { this.date = {
recurrent: this.event.recurrent || null, recurrent: this.event.recurrent || null,
from: from.toDate(), from: from.toJSDate(),
due: due && due.toDate(), due: due && due.toJSDate(),
multidate: event.multidate, multidate: event.multidate,
fromHour: from.format('HH:mm'), fromHour: from.toFormat('HH:mm'),
dueHour: due && due.format('HH:mm') dueHour: due && due.toFormat('HH:mm')
} }
this.openImportDialog = false this.openImportDialog = false
}, },
@ -236,13 +238,11 @@ export default {
if (this.event.place.longitude) { formData.append('place_longitude', this.event.place.longitude) } if (this.event.place.longitude) { formData.append('place_longitude', this.event.place.longitude) }
formData.append('description', this.event.description) formData.append('description', this.event.description)
formData.append('multidate', !!this.date.multidate) formData.append('multidate', !!this.date.multidate)
let [hour, minute] = this.date.fromHour.split(':') formData.append('start_datetime', this.$time.fromDateInput(this.date.from, this.date.fromHour))
formData.append('start_datetime', dayjs(this.date.from).tz().hour(Number(hour)).minute(Number(minute)).second(0).unix()) if (!!this.date.multidate) {
if (this.date.dueHour) { formData.append('end_datetime', this.$time.fromDateInput(this.date.due, this.date.dueHour || '23:59'))
[hour, minute] = this.date.dueHour.split(':') } else if (this.date.dueHour) {
formData.append('end_datetime', dayjs(this.date.due).tz().hour(Number(hour)).minute(Number(minute)).second(0).unix()) formData.append('end_datetime', this.$time.fromDateInput(this.date.from, this.date.dueHour))
} else if (!!this.date.multidate) {
formData.append('end_datetime', dayjs(this.date.due).tz().hour(24).minute(0).second(0).unix())
} }
if (this.edit) { if (this.edit) {
@ -251,11 +251,13 @@ export default {
if (this.event.tags) { this.event.tags.forEach(tag => formData.append('tags[]', tag.tag || tag)) } if (this.event.tags) { this.event.tags.forEach(tag => formData.append('tags[]', tag.tag || tag)) }
try { try {
if (this.edit) { if (this.edit) {
await this.$axios.$put('/event', formData) const ret = await this.$axios.$put('/event', formData)
this.$router.push(`/event/${ret.slug}`)
} else { } else {
await this.$axios.$post('/event', formData) const ret = await this.$axios.$post('/event', formData)
this.$router.push(`/event/${ret.slug}`)
} }
this.$router.push('/')
this.$nextTick(() => { this.$nextTick(() => {
this.$root.$message(this.$auth.loggedIn ? (this.edit ? 'event.saved' : 'event.added') : 'event.added_anon', { color: 'success' }) this.$root.$message(this.$auth.loggedIn ? (this.edit ? 'event.saved' : 'event.added') : 'event.added_anon', { color: 'success' })
}) })

65
pages/event/_slug.vue
View file

@ -1,9 +1,8 @@
<template lang="pug"> <template lang="pug">
v-container#event.pa-0.pa-sm-2 v-container#event.pa-0.pa-sm-2(itemscope itemtype="https://schema.org/Event" v-touch="{ left: goNext, right: goPrev }")
//- EVENT PAGE //- EVENT PAGE
//- gancio supports microformats (http://microformats.org/wiki/h-event) //- gancio supports microformats (http://microformats.org/wiki/h-event)
//- and microdata https://schema.org/Event //- and microdata https://schema.org/Event
v-card.h-event(itemscope itemtype="https://schema.org/Event" v-touch="{ left: goNext, right: goPrev }")
v-card-text v-card-text
v-row v-row
@ -18,18 +17,18 @@ v-container#event.pa-0.pa-sm-2
.title.text-h5 .title.text-h5
strong.p-name.text--primary(itemprop="name") {{event.title}} strong.p-name.text--primary(itemprop="name") {{event.title}}
v-divider v-divider
v-card-text v-card-text.eventDetails
time.dt-start.text-button(:datetime='event.start_datetime|unixFormat("YYYY-MM-DD HH:mm")' itemprop="startDate" :content="event.start_datetime|unixFormat('YYYY-MM-DDTHH:mm')") time.dt-start(: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' small) v-icon(v-text='mdiCalendar' small)
strong.ml-2 {{event|when}} strong.ml-2.text-uppercase {{$time.when(event)}}
.d-none.dt-end(itemprop="endDate" :content="event.end_datetime|unixFormat('YYYY-MM-DDTHH:mm')") {{event.end_datetime|unixFormat('YYYY-MM-DD HH:mm')}} .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,"yyyy-MM-dd'T'HH:mm")}}
div.text-caption.mb-3 {{event.start_datetime|from}} div.font-weight-light.mb-3 {{$time.from(event.start_datetime)}}
small(v-if='event.parentId') ({{event|recurrentDetail}}) small(v-if='event.parentId') ({{$time.recurrentDetail(event)}})
.text-h6.p-location.h-adr(itemprop="location" itemscope itemtype="https://schema.org/Place") .p-location.h-adr(itemprop="location" itemscope itemtype="https://schema.org/Place")
v-icon(v-text='mdiMapMarker' small) v-icon(v-text='mdiMapMarker' small)
nuxt-link.vcard.ml-2.p-name.text-decoration-none.text-button(itemprop="name" :to='`/place/${encodeURIComponent(event.place.name)}`') {{event.place && event.place.name}} nuxt-link.vcard.ml-2.p-name.text-decoration-none.text-uppercase(itemprop="name" :to='`/place/${encodeURIComponent(event.place.name)}`') {{event.place && event.place.name}}
.text-caption.p-street-address(itemprop='address') {{event.place && event.place.address}} .text-weight-light.p-street-address(itemprop='address') {{event.place && event.place.address}}
//- tags, hashtags //- tags, hashtags
v-card-text.pt-0(v-if='event.tags && event.tags.length') v-card-text.pt-0(v-if='event.tags && event.tags.length')
@ -72,7 +71,7 @@ v-container#event.pa-0.pa-sm-2
v-list-item-title(v-text="$t('common.add_to_calendar')") v-list-item-title(v-text="$t('common.add_to_calendar')")
//- download flyer //- download flyer
v-list-item(v-if='hasMedia' :href='event | mediaURL("download")') v-list-item(v-if='hasMedia' :href='$helper.mediaURL(event, "download")')
v-list-item-icon v-list-item-icon
v-icon(v-text='mdiFileDownloadOutline') v-icon(v-text='mdiFileDownloadOutline')
v-list-item-content v-list-item-content
@ -88,9 +87,23 @@ v-container#event.pa-0.pa-sm-2
//- resources from fediverse //- resources from fediverse
#resources.mt-1(v-if='settings.enable_federation') #resources.mt-1(v-if='settings.enable_federation')
//- div.float-right(v-if='settings.hide_boosts') div.mb-3(v-if='!settings.hide_boosts && (event.boost?.length || event.likes?.length) ')
//- small.mr-3 🔖 {{event.likes.length}} client-only
//- small ✊ {{event.boost.length}}<br/> v-menu(open-on-hover top offset-y)
template( v-slot:activator="{ on, attrs }")
span.mr-3(v-bind='attrs' v-on='on') <v-icon color='primary' v-text='mdiBookmark' /> {{event.likes.length}}
v-list
v-list-item(v-for='(like, idx) in event.likes' :key='idx')
v-list-item-title(v-text='like')
v-menu(open-on-hover top offset-y)
template( v-slot:activator="{ on, attrs }")
span(v-bind='attrs' v-on='on') <v-icon v-text='mdiShareAll' /> {{event.boost.length}}
v-list
v-list-item(v-for='(boost, idx) in event.boost' :key='idx')
v-list-item-title(v-text='boost')
template(slot='placeholder')
span.mr-3 <v-icon color='primary' v-text='mdiBookmark' /> {{event.likes.length}}
span <v-icon v-text='mdiShareAll' /> {{event.boost.length}}
v-dialog(v-model='showResources' max-width="900" width="900" :fullscreen='$vuetify.breakpoint.xsOnly' v-dialog(v-model='showResources' max-width="900" width="900" :fullscreen='$vuetify.breakpoint.xsOnly'
destroy-on-close) destroy-on-close)
@ -129,7 +142,7 @@ v-container#event.pa-0.pa-sm-2
v-icon.mr-1(v-show='resource.hidden' v-text='mdiEyeOff') v-icon.mr-1(v-show='resource.hidden' v-text='mdiEyeOff')
a(:href='resource.data.url || resource.data.context') a(:href='resource.data.url || resource.data.context')
small {{resource.data.published|dateFormat('ddd, D MMMM HH:mm')}} small {{$time.format(resource.data.published,'ff')}}
v-card-text v-card-text
@ -162,7 +175,7 @@ v-container#event.pa-0.pa-sm-2
<script> <script>
import { mapState } from 'vuex' import { mapState } from 'vuex'
import get from 'lodash/get' import get from 'lodash/get'
import moment from 'dayjs' import { DateTime } from 'luxon'
import clipboard from '../../assets/clipboard' import clipboard from '../../assets/clipboard'
import MyPicture from '~/components/MyPicture' import MyPicture from '~/components/MyPicture'
import EventAdmin from '@/components/eventAdmin' import EventAdmin from '@/components/eventAdmin'
@ -171,8 +184,8 @@ import EmbedEvent from '@/components/embedEvent'
const { htmlToText } = require('html-to-text') const { htmlToText } = require('html-to-text')
import { mdiArrowLeft, mdiArrowRight, mdiDotsVertical, mdiCodeTags, mdiClose, mdiMap, import { mdiArrowLeft, mdiArrowRight, mdiDotsVertical, mdiCodeTags, mdiClose, mdiMap,
mdiEye, mdiEyeOff, mdiDelete, mdiRepeat, mdiLock, mdiFileDownloadOutline, mdiEye, mdiEyeOff, mdiDelete, mdiRepeat, mdiLock, mdiFileDownloadOutline, mdiShareAll,
mdiCalendarExport, mdiCalendar, mdiContentCopy, mdiMapMarker, mdiChevronUp } from '@mdi/js' mdiCalendarExport, mdiCalendar, mdiContentCopy, mdiMapMarker, mdiChevronUp, mdiBookmark } from '@mdi/js'
export default { export default {
name: 'Event', name: 'Event',
@ -194,7 +207,7 @@ export default {
data () { data () {
return { return {
mdiArrowLeft, mdiArrowRight, mdiDotsVertical, mdiCodeTags, mdiCalendarExport, mdiCalendar, mdiFileDownloadOutline, mdiArrowLeft, mdiArrowRight, mdiDotsVertical, mdiCodeTags, mdiCalendarExport, mdiCalendar, mdiFileDownloadOutline,
mdiMapMarker, mdiContentCopy, mdiClose, mdiDelete, mdiEye, mdiEyeOff, mdiRepeat, mdiLock, mdiMap, mdiChevronUp, mdiMapMarker, mdiContentCopy, mdiClose, mdiDelete, mdiEye, mdiEyeOff, mdiRepeat, mdiLock, mdiMap, mdiChevronUp, mdiBookmark, mdiShareAll,
currentAttachment: 0, currentAttachment: 0,
event: {}, event: {},
diocane: '', diocane: '',
@ -244,23 +257,23 @@ export default {
{ property: 'og:type', content: 'event' }, { property: 'og:type', content: 'event' },
{ {
property: 'og:image', property: 'og:image',
content: this.$options.filters.mediaURL(this.event) content: this.$helper.mediaURL(this.event)
}, },
{ property: 'og:site_name', content: this.settings.title }, { property: 'og:site_name', content: this.settings.title },
{ {
property: 'og:updated_time', property: 'og:updated_time',
content: moment.unix(this.event.start_datetime).format() content: DateTime.fromSeconds(this.event.start_datetime, { zone: this.settings.instance_timezone }).toISO()
}, },
{ {
property: 'article:published_time', property: 'article:published_time',
content: moment.unix(this.event.start_datetime).format() content: DateTime.fromSeconds(this.event.start_datetime, { zone: this.settings.instance_timezone }).toISO()
}, },
{ property: 'article:section', content: 'event' }, { property: 'article:section', content: 'event' },
{ property: 'twitter:card', content: 'summary' }, { property: 'twitter:card', content: 'summary' },
{ property: 'twitter:title', content: this.event.title }, { property: 'twitter:title', content: this.event.title },
{ {
property: 'twitter:image', property: 'twitter:image',
content: this.$options.filters.mediaURL(this.event) content: this.$helper.mediaURL(this.event)
}, },
{ {
property: 'twitter:description', property: 'twitter:description',
@ -268,7 +281,7 @@ export default {
} }
], ],
link: [ link: [
{ rel: 'image_src', href: this.$options.filters.mediaURL(this.event) }, { rel: 'image_src', href: this.$helper.mediaURL(this.event) },
{ {
rel: 'alternate', rel: 'alternate',
type: 'application/rss+xml', type: 'application/rss+xml',
@ -303,7 +316,7 @@ export default {
mounted () { mounted () {
window.addEventListener('keydown', this.keyDown) window.addEventListener('keydown', this.keyDown)
}, },
destroyed () { beforeDestroy () {
window.removeEventListener('keydown', this.keyDown) window.removeEventListener('keydown', this.keyDown)
}, },
methods: { methods: {

5
pages/export.vue
View file

@ -81,7 +81,6 @@ v-container.pa-0.pa-md-3
</template> </template>
<script> <script>
import dayjs from 'dayjs'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import FollowMe from '../components/FollowMe' import FollowMe from '../components/FollowMe'
import Search from '@/components/Search' import Search from '@/components/Search'
@ -95,9 +94,9 @@ export default {
Search Search
}, },
mixins: [clipboard], mixins: [clipboard],
async asyncData ({ $axios, params, store, $api }) { async asyncData ({ $axios, params, store, $api, $time }) {
const events = await $api.getEvents({ const events = await $api.getEvents({
start: dayjs().unix(), start: $time.currentTimestamp(),
show_recurrent: false show_recurrent: false
}) })
return { events } return { events }

81
pages/index.vue
View file

@ -10,14 +10,17 @@ v-container.px-2.px-sm-6.pt-0
Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement') Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
//- Events //- Events
#events.mt-sm-4.mt-2 #events.mt-sm-4.mt-2(v-if='!$fetchState.pending')
Event(:event='event' v-for='(event, idx) in visibleEvents' :lazy='idx>2' :key='event.id') v-lazy.event(:value='idx<9' v-for='(event, idx) in visibleEvents' :key='event.id' :min-height='hide_thumbs ? 105 : undefined' :options="{ threshold: .5, rootMargin: '500px' }")
Event(:event='event' :lazy='idx<9')
.text-center(v-else)
v-progress-circular.justify-center.align-center(color='primary' indeterminate model-value='20')
</template> </template>
<script> <script>
import { mapState, mapActions } from 'vuex' import { mapState, mapActions, mapGetters } from 'vuex'
import debounce from 'lodash/debounce' import { DateTime } from 'luxon'
import dayjs from 'dayjs'
import Event from '@/components/Event' import Event from '@/components/Event'
import Announcement from '@/components/Announcement' import Announcement from '@/components/Announcement'
import ThemeView from '@/components/ThemeView' import ThemeView from '@/components/ThemeView'
@ -28,22 +31,24 @@ export default {
components: { Event, Announcement, ThemeView }, components: { Event, Announcement, ThemeView },
middleware: 'setup', middleware: 'setup',
fetch () { fetch () {
if (this.filter.query) {
return this.getEvents({
query: this.filter.query,
older: true
})
} else {
return this.getEvents({ return this.getEvents({
start: this.start, start: this.start,
end: this.end end: this.end,
}) })
},
activated() {
if (this.$fetchState.timestamp <= Date.now() - 60000) {
this.$fetch()
} }
}, },
data () { data ({ $time }) {
return { return {
mdiMagnify, mdiCloseCircle, mdiMagnify, mdiCloseCircle,
isCurrentMonth: true, isCurrentMonth: true,
now: dayjs().unix(), now: $time.nowUnix(),
start: dayjs().startOf('month').unix(), start: $time.startMonth(),
end: null, end: null,
tmpEvents: [], tmpEvents: [],
selectedDay: null, selectedDay: null,
@ -70,16 +75,14 @@ export default {
}, },
computed: { computed: {
...mapState(['settings', 'announcements', 'events', 'filter']), ...mapState(['settings', 'announcements', 'events', 'filter']),
...mapGetters(['hide_thumbs']),
visibleEvents () { visibleEvents () {
if (this.filter.query && this.filter.query.length > 2) { const now = this.$time.nowUnix()
return this.tmpEvents
}
const now = dayjs().unix()
if (this.selectedDay) { if (this.selectedDay) {
const min = dayjs.tz(this.selectedDay).startOf('day').unix() const min = this.selectedDay.startOf('day').toUnixInteger()
const max = dayjs.tz(this.selectedDay).endOf('day').unix() const max = this.selectedDay.endOf('day').toUnixInteger()
return this.events.filter(e => (e.start_datetime <= max && (e.end_datetime || e.start_datetime) >= min) && (this.filter.show_recurrent || !e.parentId)) return this.events.filter(e => (e.start_datetime < max && (e.end_datetime || e.start_datetime) > min) && (this.filter.show_recurrent || !e.parentId))
} else if (this.isCurrentMonth) { } else if (this.isCurrentMonth && !this.filter.query) {
return this.events.filter(e => ((e.end_datetime ? e.end_datetime > now : e.start_datetime + 3 * 60 * 60 > now) && (this.filter.show_recurrent || !e.parentId))) return this.events.filter(e => ((e.end_datetime ? e.end_datetime > now : e.start_datetime + 3 * 60 * 60 > now) && (this.filter.show_recurrent || !e.parentId)))
} else { } else {
return this.events.filter(e => this.filter.show_recurrent || !e.parentId) return this.events.filter(e => this.filter.show_recurrent || !e.parentId)
@ -91,14 +94,7 @@ export default {
this.$root.$on('monthchange', this.monthChange) this.$root.$on('monthchange', this.monthChange)
if (process.client) { if (process.client) {
this.storeUnsubscribe = this.$store.subscribeAction( { after: (action, state) => { this.storeUnsubscribe = this.$store.subscribeAction( { after: (action, state) => {
if (action.type === 'setFilter') { if (action.type === 'setFilter') { this.$fetch() }
if (this.filter.query && this.filter.query.length > 2) {
this.search()
} else {
this.tmpEvents = []
this.$fetch()
}
}
}}) }})
} }
}, },
@ -111,37 +107,36 @@ export default {
}, },
methods: { methods: {
...mapActions(['getEvents']), ...mapActions(['getEvents']),
search: debounce(async function() {
this.tmpEvents = await this.$api.getEvents({
start: 0,
show_recurrent: this.filter.show_recurrent,
show_multidate: this.filter.show_multidate,
query: this.filter.query
})
}, 200),
async monthChange ({ year, month }) { async monthChange ({ year, month }) {
if (this.filter.query) return
this.$nuxt.$loading.start() this.$nuxt.$loading.start()
let isCurrentMonth let isCurrentMonth
// unselect current selected day // unselect current selected day
this.selectedDay = null this.selectedDay = null
const now = DateTime.local({zone: this.settings.instance_timezone})
// check if current month is selected // check if current month is selected
if (month - 1 === dayjs.tz().month() && year === dayjs.tz().year()) { if (month === now.month && year === now.year) {
isCurrentMonth = true isCurrentMonth = true
this.start = dayjs().startOf('month').unix() this.start = now.startOf('month').toUnixInteger()
this.end = null
} else { } else {
isCurrentMonth = false isCurrentMonth = false
this.start = dayjs().year(year).month(month - 1).startOf('month').unix() // .startOf('week').unix() this.start = DateTime.local(year, month, { zone: this.settings.instance_timezone }).toUnixInteger()
this.end = DateTime.local(year, month, { zone: this.settings.instance_timezone }).plus({ month: !this.$vuetify.breakpoint.smAndDown ? 1 : 0 }).endOf('month').toUnixInteger() // .endOf('week').unix()
} }
this.end = dayjs().year(year).month(month).endOf('month').unix() // .endOf('week').unix()
await this.$fetch() await this.$fetch()
this.$nuxt.$loading.finish() this.$nuxt.$loading.finish()
this.$nextTick( () => this.isCurrentMonth = isCurrentMonth) this.$nextTick( () => this.isCurrentMonth = isCurrentMonth)
}, },
dayChange (day) { dayChange (day) {
this.selectedDay = day ? dayjs.tz(day).format('YYYY-MM-DD') : null if (!day) {
this.selectedDay = null
return
}
const date = DateTime.fromJSDate(day)
this.selectedDay = day ? DateTime.local({ zone: this.settings.instance_timezone }).set({ year: date.year, month: date.month, day: date.day}) : null
} }
} }
} }

15
pages/place/_place.vue
View file

@ -1,19 +1,21 @@
<template> <template>
<v-container class='px-0' fluid> <v-container class='px-2 px-sm-6 pt-0'>
<h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-10 mx-auto w-100 text-underline'> <h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-10 mx-auto w-100 text-underline'>
<u>{{ place.name }}</u> <u>{{ place.name }}</u>
</h1> </h1>
<span class="d-block text-subtitle text-center w-100 mb-14">{{ place.address }}</span> <span class="d-block text-subtitle text-center w-100 mb-14">{{ place.address }}</span>
<!-- Events --> <!-- Events -->
<div class="mb-2 mt-1 pl-1 pl-sm-2" id="events"> <div id="events">
<Event :event='event' v-for='(event, idx) in events' :lazy='idx > 2' :key='event.id'></Event> <v-lazy class='event' :value='idx<9' v-for='(event, idx) in events' :key='event.id' :min-height='hide_thumbs ? 105 : undefined' :options="{ threshold: .5, rootMargin: '500px' }">
<Event :event='event' :lazy='idx > 9' />
</v-lazy>
</div> </div>
</v-container> </v-container>
</template> </template>
<script> <script>
import { mapState } from 'vuex' import { mapState, mapGetters } from 'vuex'
import Event from '@/components/Event' import Event from '@/components/Event'
export default { export default {
@ -29,7 +31,10 @@ export default {
] ]
} }
}, },
computed: mapState(['settings']), computed: {
...mapState(['settings']),
...mapGetters(['hide_thumbs']),
},
asyncData({ $axios, params, error }) { asyncData({ $axios, params, error }) {
try { try {
const place = params.place const place = params.place

5
pages/search.vue
View file

@ -11,7 +11,6 @@ v-container#home(fluid)
<script> <script>
import { mapState } from 'vuex' import { mapState } from 'vuex'
import dayjs from 'dayjs'
import Event from '@/components/Event' import Event from '@/components/Event'
import Announcement from '@/components/Announcement' import Announcement from '@/components/Announcement'
import Calendar from '@/components/Calendar' import Calendar from '@/components/Calendar'
@ -20,11 +19,11 @@ import { mdiMagnify } from '@mdi/js'
export default { export default {
name: 'Index', name: 'Index',
components: { Event, Announcement, Calendar }, components: { Event, Announcement, Calendar },
data () { data ({ $time }) {
return { return {
mdiMagnify, mdiMagnify,
events: [], events: [],
start: dayjs().startOf('month').unix(), start: $time.startMonth(),
end: null, end: null,
} }
}, },

13
pages/tag/_tag.vue
View file

@ -1,17 +1,19 @@
<template> <template>
<v-container class='px-0' fluid> <v-container class='px-2 px-sm-6 pt-0' fluid>
<h1 class='d-block text-h3 font-weight-black text-center text-uppercase mt-10 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1> <h1 class='d-block text-h3 font-weight-black text-center text-uppercase mt-10 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
<!-- Events --> <!-- Events -->
<div class="mb-2 mt-1 pl-1 pl-sm-2" id="events"> <div class="mb-2 mt-1 pl-1 pl-sm-2" id="events">
<Event :event='event' v-for='(event, idx) in events' :lazy='idx>2' :key='event.id'></Event> <v-lazy class='event' :value='idx<9' v-for='(event, idx) in events' :key='event.id' :min-height='hide_thumbs ? 105 : undefined' :options="{ threshold: .5, rootMargin: '500px' }">
<Event :event='event' :lazy='idx>9' />
</v-lazy>
</div> </div>
</v-container> </v-container>
</template> </template>
<script> <script>
import { mapState } from 'vuex' import { mapState, mapGetters } from 'vuex'
import Event from '@/components/Event' import Event from '@/components/Event'
export default { export default {
@ -28,7 +30,10 @@ export default {
] ]
} }
}, },
computed: mapState(['settings']), computed: {
...mapState(['settings']),
...mapGetters(['hide_thumbs']),
},
async asyncData ({ $axios, params, error }) { async asyncData ({ $axios, params, error }) {
try { try {
const tag = params.tag const tag = params.tag

92
plugins/filters.js
View file

@ -1,92 +0,0 @@
import Vue from 'vue'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
import utc from 'dayjs/plugin/utc'
import timezone from 'dayjs/plugin/timezone'
import localizedFormat from 'dayjs/plugin/localizedFormat'
import 'dayjs/locale/it'
import 'dayjs/locale/en'
import 'dayjs/locale/es'
import 'dayjs/locale/ca'
import 'dayjs/locale/pl'
import 'dayjs/locale/eu'
import 'dayjs/locale/nb'
import 'dayjs/locale/fr'
import 'dayjs/locale/de'
import 'dayjs/locale/gl'
import 'dayjs/locale/sk'
import 'dayjs/locale/ru'
import 'dayjs/locale/pt'
import 'dayjs/locale/zh'
dayjs.extend(relativeTime)
dayjs.extend(utc)
dayjs.extend(timezone)
dayjs.extend(localizedFormat)
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
app.i18n.defaultLocale = store.state.settings.instance_locale
const instance_timezone = store.state.settings.instance_timezone
dayjs.tz.setDefault(instance_timezone)
dayjs.locale(app.i18n.locale || store.state.settings.instance_locale)
// replace links with anchors
// TODO: remove fb tracking id?
Vue.filter('linkify', value => value.replace(/(https?:\/\/([^\s]+))/g, '<a href="$1">$2</a>'))
Vue.filter('url2host', url => url.match(/^https?:\/\/(.[^/:]+)/i)[1])
Vue.filter('datetime', value => dayjs.tz(value).locale(app.i18n.locale || store.state.settings.instance_locale).format('ddd, D MMMM HH:mm'))
Vue.filter('dateFormat', (value, format) => dayjs.tz(value).format(format))
Vue.filter('unixFormat', (timestamp, format) => dayjs.unix(timestamp).tz().format(format))
// shown in mobile homepage
Vue.filter('day', value => dayjs.unix(value).tz().locale(app.i18n.locale || store.state.settings.instance_locale).format('dddd, D MMM'))
Vue.filter('mediaURL', (event, type, format = '.jpg') => {
const mediaPath = type === 'download' ? '/download/' : '/media/'
if (event.media && event.media.length) {
if (type === 'alt') {
return event.media[0].name
} else {
return store.state.settings.baseurl + mediaPath + (type === 'thumb' ? 'thumb/' : '') + event.media[0].url.replace(/.jpg$/, format)
}
} else if (type !== 'alt') {
return store.state.settings.baseurl + mediaPath + (type === 'thumb' ? 'thumb/' : '') + 'logo.svg'
}
return ''
})
Vue.filter('from', timestamp => dayjs.unix(timestamp).tz().locale(app.i18n.locale || store.state.settings.instance_locale).fromNow())
Vue.filter('recurrentDetail', event => {
const parent = event.parent
if (!parent.recurrent || !parent.recurrent.frequency) return 'error!'
const { frequency, type } = parent.recurrent
let recurrent
if (frequency === '1w' || frequency === '2w') {
recurrent = app.i18n.t(`event.recurrent_${frequency}_days`, { days: dayjs.unix(parent.start_datetime).tz().format('dddd') })
} else if (frequency === '1m' || frequency === '2m') {
const d = type === 'ordinal' ? dayjs.unix(parent.start_datetime).date() : dayjs.unix(parent.start_datetime).tz().format('dddd')
if (type === 'ordinal') {
recurrent = app.i18n.t(`event.recurrent_${frequency}_days`, { days: d })
} else {
recurrent = app.i18n.t(`event.recurrent_${frequency}_ordinal`,
{ n: app.i18n.t('ordinal.' + type), days: d })
}
}
return recurrent
})
Vue.filter('when', (event) => {
const start = dayjs.unix(event.start_datetime).tz().locale(app.i18n.locale || store.state.settings.instance_locale)
const end = event.end_datetime && dayjs.unix(event.end_datetime).tz().locale(app.i18n.locale || store.state.settings.instance_locale)
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
})
}

21
plugins/helpers.js Normal file
View file

@ -0,0 +1,21 @@
export default ({ store }, inject) => {
const helper = {
mediaURL (event, type, format = '.jpg') {
const mediaPath = type === 'download' ? '/download/' : '/media/'
if (event.media && event.media.length) {
if (type === 'alt') {
return event.media[0].name
} else {
return store.state.settings.baseurl + mediaPath + (type === 'thumb' ? 'thumb/' : '') + event.media[0].url.replace(/.jpg$/, format)
}
} else if (type !== 'alt') {
return store.state.settings.baseurl + mediaPath + (type === 'thumb' ? 'thumb/' : '') + 'logo.svg'
}
return ''
}
}
inject('helper', helper)
}

170
plugins/time.js Normal file
View file

@ -0,0 +1,170 @@
import { DateTime, Settings } from 'luxon'
export default ({ app, store }, inject) => {
const zone = Settings.defaultZoneName = store.state.settings.instance_timezone
Settings.defaultLocale = app.i18n.locale || store.state.settings.instance_locale
const time = {
format (date, format) {
return DateTime.fromISO(date, {
zone: store.state.settings.instance_timezone,
locale: app.i18n.locale || store.state.settings.instance_locale
}).toFormat(format || '')
},
unixFormat (timestamp, format='EEEE d MMMM HH:mm') {
return DateTime.fromSeconds(timestamp, {
zone: store.state.settings.instance_timezone,
locale: app.i18n.locale || store.state.settings.instance_locale
}).toFormat(format)
},
fromUnix (timestamp) {
return DateTime.fromSeconds(timestamp, { zone })
},
fromDateInput (date, time) {
const [hour, minute] = time.split(':')
return DateTime.fromJSDate(date, { zone })
.set({ hour: Number(hour), minute: Number(minute), second: 0 })
.toUnixInteger()
},
currentMonth () {
return DateTime.local({ zone }).month
},
currentYear () {
return DateTime.local({ zone }).year
},
when (event) {
const currentYear = app.$time.currentYear()
const opt = {
zone: store.state.settings.instance_timezone,
locale: app.i18n.locale || store.state.settings.instance_locale
}
const start = DateTime.fromSeconds(event.start_datetime, opt)
let time = start.toFormat('EEEE d MMMM HH:mm')
const end = event.end_datetime && DateTime.fromSeconds(event.end_datetime, opt)
if (end) {
time += event.multidate ? ` → ${end.toFormat('EEEE d MMMM')}` : `-${end.toFormat('HH:mm')}`
}
if (currentYear !== start.year) {
time += ` (${start.year})`
}
return time
},
nowUnix () {
const opt = {
zone,
locale: app.i18n.locale || store.state.settings.instance_locale
}
return DateTime.local(opt).toUnixInteger()
},
startMonth () { return DateTime.local({ zone }).startOf('month').toUnixInteger() },
startOfDay (date) { return DateTime.fromJSDate(date, { zone }).startOf('day').toUnixInteger()},
endOfDay (date) { return DateTime.fromJSDate(date, { zone }).endOf('day').toUnixInteger()},
recurrentDetail (event) {
const parent = event.parent
if (!parent.recurrent || !parent.recurrent.frequency) return 'error!'
const { frequency, type } = parent.recurrent
let recurrent
if (frequency === '1w' || frequency === '2w') {
recurrent = app.i18n.t(`event.recurrent_${frequency}_days`, { days: DateTime.fromSeconds(parent.start_datetime).toFormat('EEEE') })
} else if (frequency === '1m' || frequency === '2m') {
const d = type === 'ordinal' ? DateTime.fromSeconds(parent.start_datetime).toDate() : DateTime.fromSeconds(parent.start_datetime).toFormat('EEEE')
if (type === 'ordinal') {
recurrent = app.i18n.t(`event.recurrent_${frequency}_days`, { days: d })
} else {
recurrent = app.i18n.t(`event.recurrent_${frequency}_ordinal`,
{ n: app.i18n.t('ordinal.' + type), days: d })
}
}
return recurrent
},
currentTimestamp () {
return DateTime.local().toUnixInteger()
},
from (timestamp) {
const opt = {
zone: store.state.settings.instance_timezone,
locale: app.i18n.locale || store.state.settings.instance_locale
}
return DateTime.fromSeconds(timestamp, opt).toRelative()
},
/**
* @description build v-calendar attributes
* @link https://vcalendar.io/attributes.html
*/
attributesFromEvents(events) {
const attributes = []
const opt = {
zone: store.state.settings.instance_timezone,
locale: app.i18n.locale || store.state.settings.instance_locale
}
const now = DateTime.local(opt).toUnixInteger()
for (const e of events) {
const tmp = DateTime.fromSeconds(e.start_datetime, opt)
const start = DateTime.local().set({ year: tmp.year, month: tmp.month, day: tmp.day })
// merge events with same date
const key = `${start.month}${start.day}`
const c = (e.end_datetime || e.start_datetime) < now ? 'vc-past' : ''
if (e.multidate === true) {
attributes.push({
dates: { start: start.toJSDate(), end: DateTime.fromSeconds(e.end_datetime).toJSDate() },
highlight: {
start: { fillMode: 'outline' },
base: { fillMode: 'light' },
end: { fillMode: 'outline' },
}
})
continue
}
const i = attributes.find(a => a.day === key)
if (!i) {
attributes.push({
day: key,
key: e.id, n: 1,
dates: start.toJSDate(),
dot: { color: 'teal', class: c }
})
continue
}
i.n++
if (i.n >= 20) {
i.dot = { color: 'purple', class: c }
} else if (i.n >= 10) {
i.dot = { color: 'red', class: c }
} else if (i.n >= 5) {
i.dot = { color: 'orange', class: c }
} else if (i.n >= 3) {
i.dot = { color: 'yellow', class: c }
} else {
i.dot = { color: 'teal', class: c }
}
}
// add a bar to highlight today
attributes.push({ key: 'today', dates: new Date(), highlight: { color: 'green', fillMode: 'outline' }})
return attributes
}
}
inject('time', time)
}

8
plugins/v-calendar.js
View file

@ -1,9 +1,3 @@
import Vue from 'vue' import Vue from 'vue'
import VCalendar from 'v-calendar' import VCalendar from 'v-calendar'
export default () => { Vue.use(VCalendar, { componentPrefix: 'vc' })
Vue.use(VCalendar, {
componentPrefix: 'vc',
// why is that ?!
// firstDayOfWeek: 2
})
}

86
server/api/controller/event.js
View file

@ -1,7 +1,7 @@
const crypto = require('crypto') const crypto = require('crypto')
const path = require('path') const path = require('path')
const config = require('../../config') const config = require('../../config')
const fs = require('fs') const fs = require('fs/promises')
const { Op } = require('sequelize') const { Op } = require('sequelize')
const linkifyHtml = require('linkify-html') const linkifyHtml = require('linkify-html')
const Sequelize = require('sequelize') const Sequelize = require('sequelize')
@ -85,73 +85,6 @@ const eventController = {
return res.json(ret) return res.json(ret)
}, },
// async search(req, res) {
// const search = req.query.search.trim().toLocaleLowerCase()
// const show_recurrent = req.query.show_recurrent || false
// const end = req.query.end
// const replacements = []
// const where = {
// // do not include parent recurrent event
// recurrent: null,
// // confirmed event only
// is_visible: true,
// }
// if (!show_recurrent) {
// where.parentId = null
// }
// if (end) {
// where.start_datetime = { [Op.lte]: end }
// }
// if (search) {
// replacements.push(search)
// where[Op.or] =
// [
// { title: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('title')), 'LIKE', '%' + search + '%') },
// Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), 'LIKE', '%' + search + '%'),
// Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=${Col('event.id')} AND LOWER(${Col('tagTag')}) = ?`))
// ]
// }
// const events = await Event.findAll({
// where,
// attributes: {
// exclude: ['likes', 'boost', 'userId', 'is_visible', 'createdAt', 'updatedAt', 'description', 'resources']
// },
// order: [['start_datetime', 'DESC']],
// include: [
// {
// model: Tag,
// // order: [Sequelize.literal('(SELECT COUNT("tagTag") FROM event_tags WHERE tagTag = tag) DESC')],
// attributes: ['tag'],
// through: { attributes: [] }
// },
// { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] }
// ],
// replacements,
// limit: 30,
// }).catch(e => {
// log.error('[EVENT]', e)
// return res.json([])
// })
// const ret = events.map(e => {
// e = e.get()
// e.tags = e.tags ? e.tags.map(t => t && t.tag) : []
// return e
// })
// return res.json(ret)
// },
async _get(slug) { async _get(slug) {
// retrocompatibility, old events URL does not use slug, use id as fallback // retrocompatibility, old events URL does not use slug, use id as fallback
const id = Number(slug) || -1 const id = Number(slug) || -1
@ -494,8 +427,8 @@ const eventController = {
try { try {
const old_path = path.resolve(config.upload_path, event.media[0].url) const old_path = path.resolve(config.upload_path, event.media[0].url)
const old_thumb_path = path.resolve(config.upload_path, 'thumb', event.media[0].url) const old_thumb_path = path.resolve(config.upload_path, 'thumb', event.media[0].url)
fs.unlinkSync(old_path) await fs.unlink(old_path)
fs.unlinkSync(old_thumb_path) await fs.unlink(old_thumb_path)
} catch (e) { } catch (e) {
log.info(e.toString()) log.info(e.toString())
} }
@ -573,8 +506,8 @@ const eventController = {
try { try {
const old_path = path.join(config.upload_path, event.media[0].url) const old_path = path.join(config.upload_path, event.media[0].url)
const old_thumb_path = path.join(config.upload_path, 'thumb', event.media[0].url) const old_thumb_path = path.join(config.upload_path, 'thumb', event.media[0].url)
fs.unlinkSync(old_thumb_path) await fs.unlink(old_thumb_path)
fs.unlinkSync(old_path) await fs.unlink(old_path)
} catch (e) { } catch (e) {
log.info(e.toString()) log.info(e.toString())
} }
@ -746,7 +679,7 @@ const eventController = {
const start_date = dayjs.unix(e.start_datetime) const start_date = dayjs.unix(e.start_datetime)
let cursor = start_date > startAt ? start_date : startAt let cursor = start_date > startAt ? start_date : startAt
startAt = cursor startAt = cursor
const duration = dayjs.unix(e.end_datetime).diff(start_date, 's') const duration = e.end_datetime ? e.end_datetime-e.start_datetime : 0
const frequency = recurrent.frequency const frequency = recurrent.frequency
const type = recurrent.type const type = recurrent.type
@ -782,9 +715,14 @@ const eventController = {
} }
log.debug(cursor) log.debug(cursor)
event.start_datetime = cursor.unix() event.start_datetime = cursor.unix()
event.end_datetime = event.start_datetime + duration event.end_datetime = e.end_datetime ? event.start_datetime + duration : null
try {
const newEvent = await Event.create(event) const newEvent = await Event.create(event)
return newEvent.addTags(e.tags) return newEvent.addTags(e.tags)
} catch (e) {
console.error(event)
log.error('[RECURRENT EVENT]', e)
}
}, },
/** /**

3
server/api/controller/locale.js
View file

@ -18,7 +18,8 @@ const localeController = {
// check if we have a user custom messages // check if we have a user custom messages
let customLocaleMessages = {} let customLocaleMessages = {}
const customLocalePath = path.resolve(config.user_locale, `${locale}.json`)
const customLocalePath = config.user_locale && path.resolve(config.user_locale, `${locale}.json`)
if (config.user_locale && fs.existsSync(customLocalePath)) { if (config.user_locale && fs.existsSync(customLocalePath)) {
try { try {
customLocaleMessages = require(customLocalePath) customLocaleMessages = require(customLocalePath)

2
server/api/controller/place.js
View file

@ -18,7 +18,7 @@ module.exports = {
const format = req.params.format || 'json' const format = req.params.format || 'json'
log.debug(`Events for place: ${placeName}`) log.debug(`Events for place: ${placeName}`)
const events = await eventController._select({ places: String(place.id), show_recurrent: true }) const events = await eventController._select({ places: String(place.id), show_recurrent: true, older: true })
switch (format) { switch (format) {
case 'rss': case 'rss':

2
server/api/controller/tag.js
View file

@ -33,7 +33,7 @@ module.exports = {
const eventController = require('./event') const eventController = require('./event')
const format = req.params.format || 'json' const format = req.params.format || 'json'
const tags = req.params.tag const tags = req.params.tag
const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true }) const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true, older: true })
switch (format) { switch (format) {
case 'rss': case 'rss':
return exportController.feed(req, res, events, return exportController.feed(req, res, events,

4
server/api/limiter.js
View file

@ -7,11 +7,11 @@ const instanceApiRateLimiter = {
DDOSProtectionApiRateLimiter: (process.env.NODE_ENV === 'test' ? next : rateLimit({ DDOSProtectionApiRateLimiter: (process.env.NODE_ENV === 'test' ? next : rateLimit({
windowMs: 60 * 1000, // 1 minutes windowMs: 60 * 1000, // 1 minutes
max: 150, // Limit each IP to 150 requests per `window` max: 250, // Limit each IP to 150 requests per `window`
standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
legacyHeaders: false, // Disable the `X-RateLimit-*` headers legacyHeaders: false, // Disable the `X-RateLimit-*` headers
handler: (request, response, next, options) => { handler: (request, response, next, options) => {
log.warn(`DDOS protection api rate limiter: > 150req/minute/ip ${request.ip}`) log.warn(`DDOS protection api rate limiter: > 250req/minute/ip ${request.ip}`)
return response.status(options.statusCode).send(options.message) return response.status(options.statusCode).send(options.message)
} }
})), })),

6
server/routes.js
View file

@ -7,8 +7,13 @@ const helpers = require('./helpers')
const api = require('./api') const api = require('./api')
async function main () { async function main () {
const log = require('./log')
try {
await initialize.start() await initialize.start()
} catch (e) {
log.error('[ERROR]' + e)
}
app.use([ app.use([
helpers.initSettings, helpers.initSettings,
@ -19,7 +24,6 @@ async function main () {
// const promBundle = require('express-prom-bundle') // const promBundle = require('express-prom-bundle')
// const metricsMiddleware = promBundle({ includeMethod: true }) // const metricsMiddleware = promBundle({ includeMethod: true })
const log = require('./log')
app.enable('trust proxy') app.enable('trust proxy')

8
store/index.js
View file

@ -1,5 +1,3 @@
import dayjs from 'dayjs'
export const state = () => ({ export const state = () => ({
localSettings : { localSettings : {
hide_thumbs: null, hide_thumbs: null,
@ -109,10 +107,12 @@ export const actions = {
}, },
async getEvents ({ commit, state }, params = {}) { async getEvents ({ commit, state }, params = {}) {
const events = await this.$api.getEvents({ const events = await this.$api.getEvents({
start: params.start || dayjs().startOf('month').unix(), start: params.start || this.$time.startMonth(),
end: params.end || null, end: params.end || null,
show_recurrent: state.filter.show_recurrent, show_recurrent: state.filter.show_recurrent,
show_multidate: state.filter.show_multidate show_multidate: state.filter.show_multidate,
...( params.query && { query: params.query }),
...( params.older && { older: params.older })
}) })
commit('setEvents', events) commit('setEvents', events)
} }

2698
yarn.lock
View file

File diff suppressed because it is too large Load diff