diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..c1935240 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gancio_plugins/gancio-plugin-telegram-bridge"] + path = gancio_plugins/gancio-plugin-telegram-bridge + url = https://framagit.org/les/gancio-plugin-telegram-bridge.git diff --git a/CHANGELOG b/CHANGELOG index 64d1e459..cbeb5a5c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,40 @@ All notable changes to this project will be documented in this file. +### 1.6.1 - 15 dec '22 + - allow edit tags in admin panel, fix #170 + - fix header / fallback image upload, fix #222 + - fix WPGancio MU + - fix recurrent events label + - update translations (de, es, eu, gl) + +### 1.6.0 - 11 dec '22 + - new plugin system - fix #177 + - new "publish on telegram" plugin: (thanks @fadelkon) + - people can now choose the language displayed - fix #171 + - admin could choose a custom fallback image - fix #195 + - it is now possible NOT to enter the end time of an event - fix #188 + - live search + - improve event import + - add Apple touch icon - fix #200 + - add nominatim / openstreetmap search feature (thanks @sedum) + - new hide calendar option + - new hide thumbs from homepage option + - linkable admin tab + - friendly instances label is now customizable (thanks @sedum) + - i18n refactoring + - Wordpress plugin now supports MU installation + - new chinese translation + - new portuguese translation + - improved navbar layout + - improved event layout + - complete oauth2 refactoring + - fix ics unique uuid + - fix place "[Object]" issue - #194 + - fix random restart while downloading random media + - fix mobile dialog layout + - urlencode place and tag urls + + ### 1.5.6 - 22 set '22 - update linkifyjs, sequelizem, nuxt deps - improve homepage loading time diff --git a/assets/style.css b/assets/style.css index 935e1af5..bf88e46f 100644 --- a/assets/style.css +++ b/assets/style.css @@ -13,26 +13,50 @@ li { background-color: #434343; } +.v-application { + font-family: sans-serif; +} + .v-application .p-description.text-body-1 { letter-spacing: normal !important; } +/* https://github.com/vuetifyjs/vuetify/issues/8875#issuecomment-559900683 */ +.v-slide-group__prev { + display: none !important; +} + +.v-toolbar .v-list-item__subtitle, +.v-toolbar h4 { + white-space: break-spaces; + word-wrap: break-word; + word-break: break-word; +} + #home { max-width: 1400px; - padding: 0px; - overflow: hidden; + /* padding: 0px; */ + /* overflow: hidden; */ } #events { margin: 0 auto; display: flex; flex-wrap: wrap; + gap: 16px; justify-content: center; } -#calh { +@media only screen and (max-width: 600px) { + #events { + gap: 8px; + } +} + +.calh { /* this is to avoid content shift layout as v-calendar does not support SSR */ height: 268px; + max-width: 600px; } .container { @@ -44,8 +68,8 @@ li { max-width: 800px; } -.v-dialog .v-dialog--fullscreen { - max-width: 100%; +.v-dialog--fullscreen { + max-width: 100% !important; } .v-application p { @@ -81,8 +105,8 @@ li { width: 330px; max-width: 500px !important; flex-grow: 1; - margin-top: .4em; - margin-right: .4em; + /* margin-top: 16px; + margin-right: 16px; */ transition: all .5s; overflow: hidden; } @@ -96,7 +120,7 @@ li { -webkit-box-orient: vertical; font-size: 1.1em !important; line-height: 1.2em !important; - text-decoration: none; + /* text-decoration: none; */ } .event .body { @@ -113,6 +137,11 @@ li { text-decoration: none; } +.event a:hover, +.event a:focus { + text-decoration: underline; +} + .vc-past { opacity: 0.4; } @@ -121,12 +150,12 @@ li { max-width: 1200px; } -.tags .v-chip .v-chip__content { +/* .tags .v-chip .v-chip__content { max-width: 120px; white-space: nowrap; overflow: hidden; display: block; -} +} */ .cursorPointer { diff --git a/components/Appbar.vue b/components/Appbar.vue new file mode 100644 index 00000000..2d3da1e3 --- /dev/null +++ b/components/Appbar.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/components/Calendar.vue b/components/Calendar.vue index 6b15fa4c..1bdca9f8 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -1,50 +1,64 @@ + + diff --git a/components/MyPicture.vue b/components/MyPicture.vue index ef4a863d..6f8c2142 100644 --- a/components/MyPicture.vue +++ b/components/MyPicture.vue @@ -10,7 +10,7 @@ :height="height" :width="width" :style="{ 'object-position': thumbnailPosition }"> - + diff --git a/components/NavBar.vue b/components/NavBar.vue new file mode 100644 index 00000000..0789db27 --- /dev/null +++ b/components/NavBar.vue @@ -0,0 +1,29 @@ + + + diff --git a/components/NavHeader.vue b/components/NavHeader.vue new file mode 100644 index 00000000..715fbbf4 --- /dev/null +++ b/components/NavHeader.vue @@ -0,0 +1,99 @@ + + \ No newline at end of file diff --git a/components/NavSearch.vue b/components/NavSearch.vue new file mode 100644 index 00000000..240647a1 --- /dev/null +++ b/components/NavSearch.vue @@ -0,0 +1,43 @@ + + + \ No newline at end of file diff --git a/components/Snackbar.vue b/components/Snackbar.vue index 03a75b17..031370a8 100644 --- a/components/Snackbar.vue +++ b/components/Snackbar.vue @@ -6,6 +6,7 @@ v-snackbar( :top="top" :left="left" :right="right" + transition='scroll-x-reverse-transition' :timeout="timeout") v-icon.mr-3(color="white" v-text='icon') span {{ message }} @@ -25,7 +26,7 @@ export default { bottom: true, top: false, left: false, - right: false, + right: true, active: false, timeout: 5000, message: '' diff --git a/components/WhereInput.vue b/components/WhereInput.vue index 900d5f6f..0caa47c4 100644 --- a/components/WhereInput.vue +++ b/components/WhereInput.vue @@ -1,5 +1,5 @@ diff --git a/components/admin/Announcement.vue b/components/admin/Announcement.vue index 07f78450..4de08c24 100644 --- a/components/admin/Announcement.vue +++ b/components/admin/Announcement.vue @@ -22,6 +22,7 @@ v-container v-data-table( v-if='announcements.length' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' + :header-props='{ sortIcon: mdiChevronDown }' :headers='headers' :items='announcements') template(v-slot:item.actions='{ item }') @@ -35,21 +36,21 @@ import { mapActions } from 'vuex' import cloneDeep from 'lodash/cloneDeep' import Editor from '../Editor' import Announcement from '../Announcement' -import { mdiPlus, mdiChevronRight, mdiChevronLeft } from '@mdi/js' +import { mdiPlus, mdiChevronRight, mdiChevronLeft, mdiChevronDown } from '@mdi/js' export default { components: { Editor, Announcement }, data() { return { - mdiPlus, mdiChevronRight, mdiChevronLeft, + mdiPlus, mdiChevronRight, mdiChevronLeft, mdiChevronDown, valid: false, dialog: false, editing: false, announcements: [], loading: false, headers: [ - { value: 'title', text: 'Title' }, - { value: 'actions', text: 'Actions', align: 'right' } + { value: 'title', text: this.$t('common.title') }, + { value: 'actions', text: this.$t('common.actions'), align: 'right' } ], announcement: { title: '', announcement: '' } } diff --git a/components/admin/Collections.vue b/components/admin/Collections.vue index 2df2b028..5dd87531 100644 --- a/components/admin/Collections.vue +++ b/components/admin/Collections.vue @@ -4,7 +4,7 @@ v-container v-spacer v-text-field(v-model='search' :append-icon='mdiMagnify' outlined rounded - label='Search' + :label="$t('common.search')" single-line hide-details) v-card-subtitle(v-html="$t('admin.collections_description')") @@ -33,7 +33,7 @@ v-container :prepend-icon="mdiTagMultiple" chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint :disabled="!collection.id" - placeholder='Tutte' + placeholder='All' @input.native='searchTags' @focus='searchTags' :delimiters="[',', ';']" @@ -75,6 +75,7 @@ v-container :headers='filterHeaders' :items='filters' :hide-default-footer='filters.length < 5' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }') template(v-slot:item.actions='{ item }') v-btn(@click='removeFilter(item)' color='error' icon) @@ -94,6 +95,7 @@ v-container :headers='collectionHeaders' :items='collections' :hide-default-footer='collections.length < 5' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' :search='search') template(v-slot:item.filters='{ item }') @@ -108,12 +110,12 @@ v-container + + diff --git a/components/admin/Moderation.vue b/components/admin/Moderation.vue index 82e54141..3b94d45f 100644 --- a/components/admin/Moderation.vue +++ b/components/admin/Moderation.vue @@ -10,6 +10,7 @@ v-container :items-per-page='5' :search='instancesFilter' :hide-default-footer='instances.length<5' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' dense :headers='instancesHeader' @click:row='instanceSelected') @@ -24,6 +25,7 @@ v-container :search='usersFilter' :hide-default-footer='users.length<5' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' + :header-props='{ sortIcon: mdiChevronDown }' dense :headers='usersHeader') template(v-slot:item.blocked="{ item }") v-icon(@click='toggleUserBlock(item)' v-text='item.blocked ? mdiCheckboxIntermediate : mdiCheckboxBlankOutline') @@ -34,6 +36,7 @@ v-container :headers='resourcesHeader' :hide-default-footer='resources.length<10' :items-per-page='10' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }') template(v-slot:item.content='{ item }') span(v-html='item.data.content') @@ -62,33 +65,33 @@ v-container import { mapState, mapActions } from 'vuex' import get from 'lodash/get' import { mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate, -mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight } from '@mdi/js' +mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight, mdiChevronDown } from '@mdi/js' export default { name: 'Moderation', data () { return { mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate, - mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight, + mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight, mdiChevronDown, instances: [], resources: [], users: [], usersHeader: [ - { value: 'object.preferredUsername', text: 'Name' }, - { value: 'blocked', text: 'Blocked' } + { value: 'object.preferredUsername', text: this.$t('common.name') }, + { value: 'blocked', text: this.$t('admin.blocked') } ], instancesHeader: [ - { value: 'domain', text: 'Domain' }, - { value: 'name', text: 'Name' }, - { value: 'blocked', text: 'Blocked' }, - { value: 'users', text: 'known users' } + { value: 'domain', text: this.$t('admin.domain') }, + { value: 'name', text: this.$t('common.name') }, + { value: 'blocked', text: this.$t('admin.blocked') }, + { value: 'users', text: this.$t('admin.known_users') } ], resourcesHeader: [ - { value: 'created', text: 'Created' }, - { value: 'event', text: 'Event' }, - { value: 'user', text: 'user' }, - { value: 'content', text: 'Content' }, - { value: 'actions', text: 'Actions' } + { value: 'created', text: this.$t('admin.created_at') }, + { value: 'event', text: this.$t('common.event') }, + { value: 'user', text: this.$t('common.user') }, + { value: 'content', text: this.$t('common.content') }, + { value: 'actions', text: this.$t('common.actions') } ], usersFilter: '', instancesFilter: '' diff --git a/components/admin/Places.vue b/components/admin/Places.vue index 57a2d010..6c8c26b7 100644 --- a/components/admin/Places.vue +++ b/components/admin/Places.vue @@ -4,7 +4,7 @@ v-container v-spacer v-text-field(v-model='search' :append-icon='mdiMagnify' outlined rounded - label='Search' + :label="$t('common.search')" single-line hide-details) v-card-subtitle(v-html="$t('admin.place_description')") @@ -19,11 +19,24 @@ v-container v-model='place.name' :placeholder='$t("common.name")') - v-text-field( - :rules="[$validators.required('common.address')]" + v-combobox(ref='address' + :prepend-icon='mdiMapSearch' + @input.native='searchAddress' :label="$t('common.address')" - v-model='place.address' - :placeholder='$t("common.address")') + :rules="[ v => $validators.required('common.address')(v)]" + :value='place.address' + persistent-hint hide-no-data clearable no-filter + :loading='loading' + @change='selectAddress' + @focus='searchAddress' + :items="addressList" + :hint="$t('event.address_description')") + template(v-slot:item="{ item, attrs, on }") + v-list-item(v-bind='attrs' v-on='on') + v-list-item-content(two-line v-if='item') + v-list-item-title(v-text='item.name') + v-list-item-subtitle(v-text='`${item.address}`') + v-card-actions v-spacer @@ -36,8 +49,11 @@ v-container :headers='headers' :items='places' :hide-default-footer='places.length < 5' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' :search='search') + template(v-slot:item.map='{ item }') + span {{item.latitude && item.longitude && 'YEP' }} template(v-slot:item.actions='{ item }') v-btn(@click='editPlace(item)' color='primary' icon) v-icon(v-text='mdiPencil') @@ -46,32 +62,46 @@ v-container diff --git a/components/admin/Plugin.vue b/components/admin/Plugin.vue new file mode 100644 index 00000000..26358aed --- /dev/null +++ b/components/admin/Plugin.vue @@ -0,0 +1,86 @@ + + diff --git a/components/admin/SMTP.vue b/components/admin/SMTP.vue index 0bda92fd..67b2d7a6 100644 --- a/components/admin/SMTP.vue +++ b/components/admin/SMTP.vue @@ -7,7 +7,9 @@ v-card v-text-field(v-model='admin_email' @blur="save('admin_email', admin_email )" - :label="$t('admin.sender_email')" + :label="$t('admin.admin_email')" + :hint="$t('admin.admin_email_help')" + persistent-hint :rules="$validators.email") v-switch(v-model='smtp.sendmail' diff --git a/components/admin/Settings.vue b/components/admin/Settings.vue index 32bd7757..4bb3cd97 100644 --- a/components/admin/Settings.vue +++ b/components/admin/Settings.vue @@ -39,6 +39,10 @@ v-container inset :label="$t('admin.allow_anon_event')") + v-switch.mt-1(v-model='allow_multidate_event' + inset + :label="$t('admin.allow_multidate_event')") + v-switch.mt-1(v-model='allow_recurrent_event' inset :label="$t('admin.allow_recurrent_event')") @@ -48,37 +52,44 @@ v-container inset :label="$t('admin.recurrent_event_visible')") + v-switch.mt-1(v-model='allow_geolocation' + inset + :label="$t('admin.allow_geolocation')") + v-dialog(v-model='showSMTP' destroy-on-close max-width='700px' :fullscreen='$vuetify.breakpoint.xsOnly') SMTP(@close='showSMTP = false') v-card-actions v-btn(text @click='showSMTP=true') - {{$t('admin.show_smtp_setup')}} - v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}} - v-icon(v-text='mdiArrowRight') + {{$t('admin.show_smtp_setup')}} + + v-btn(text @click='$emit("complete")' color='primary' v-if='setup') {{$t('common.next')}} + v-icon(v-text='mdiArrowRight') diff --git a/components/admin/Theme.vue b/components/admin/Theme.vue index 76df7c7d..1bc47c09 100644 --- a/components/admin/Theme.vue +++ b/components/admin/Theme.vue @@ -2,19 +2,56 @@ v-container v-card-title {{$t('common.theme')}} v-card-text - //- LOGO - v-file-input.mt-5(ref='upload' - :label="$t('admin.favicon')" - @change='uploadLogo' - accept='image/*') - template(slot='append-outer') - v-btn(color='warning' text @click='resetLogo') {{$t('common.reset')}} - v-img(:src='`/logo.png?${logoKey}`' - max-width="60px" max-height="60px" contain) v-switch.mt-5(v-model='is_dark' inset :label="$t('admin.is_dark')") + + v-switch.mt-5(v-model='hide_thumbs' + inset + :label="$t('admin.hide_thumbs')") + + v-switch.mt-5(v-model='hide_calendar' + inset + :label="$t('admin.hide_calendar')") + + v-card-title {{$t('admin.default_images')}} + v-card-subtitle(v-html="$t('admin.default_images_help')") + v-card-text + v-row + v-col(cols='4') + //- LOGO + v-file-input.mt-5(ref='upload' + :label="$t('admin.favicon')" + @change='uploadLogo' + accept='image/*') + template(slot='append-outer') + v-btn(color='warning' text @click='resetLogo') {{$t('common.reset')}} + v-img.mt-2(:src='`/logo.png?${logoKey}`' max-height="60px" contain) + + v-col(cols='4') + //- FALLBACK IMAGE + v-file-input.mt-5(ref='upload' + :label="$t('admin.fallback_image')" + persistent-hint + @change='uploadFallbackImage' + accept='image/*') + template(slot='append-outer') + v-btn(color='warning' text @click='resetFallbackImage') {{$t('common.reset')}} + v-img.mt-2(:src='`/fallbackimage.png?${fallbackImageKey}`' max-height="150px" contain) + + v-col(cols='4') + //- HEADER IMAGE + v-file-input.mt-5(ref='upload' + :label="$t('admin.header_image')" + persistent-hint + @change='uploadHeaderImage' + accept='image/*') + template(slot='append-outer') + v-btn(color='warning' text @click='resetHeaderImage') {{$t('common.reset')}} + v-img.mt-2(:src='`/headerimage.png?${headerImageKey}`' max-height="150px" contain) + + //- TODO choose theme colors //- v-row @@ -45,8 +82,8 @@ v-container :label="$t('common.url')") v-card-actions v-spacer - v-btn(link @click='linkModal=false' color='error') {{$t('common.cancel')}} - v-btn(link @click='addFooterLink' color='primary' :disabled='!valid') {{$t('common.add')}} + v-btn(outlined @click='linkModal=false' color='error') {{$t('common.cancel')}} + v-btn(outlined @click='addFooterLink' color='primary' :disabled='!valid') {{$t('common.add')}} v-card-title {{$t('admin.footer_links')}} v-card-text @@ -73,10 +110,13 @@ import { mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp } from '@mdi/js' export default { name: 'Theme', data () { + const t = new Date().getMilliseconds() return { mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp, valid: false, - logoKey: 0, + logoKey: t, + fallbackImageKey: t, + headerImageKey: t, link: { href: '', label: '' }, linkModal: false // menu: [false, false, false, false] @@ -97,7 +137,15 @@ export default { this.$vuetify.theme.dark = value this.setSetting({ key: 'theme.is_dark', value }) } - } + }, + hide_thumbs: { + get () { return this.settings.hide_thumbs }, + set (value) { this.setSetting({ key: 'hide_thumbs', value }) } + }, + hide_calendar: { + get () { return this.settings.hide_calendar }, + set (value) { this.setSetting({ key: 'hide_calendar', value }) } + }, // 'colors[0]': { // get () { // return this.settings['theme.colors'] || [0, 0] @@ -120,18 +168,35 @@ export default { this.setSetting({ key: 'footerLinks', value: [ - { href: '/about', label: 'about' }, - { href: '/', label: 'home' }] + { href: '/', label: 'common.home' }, + { href: '/about', label: 'common.about' } + ] }) }, forceLogoReload () { this.logoKey++ }, + forceFallbackImageReload () { + this.fallbackImageKey++ + }, + forceHeaderImageReload () { + this.headerImageKey++ + }, resetLogo (e) { this.setSetting({ key: 'logo', value: null }) .then(this.forceLogoReload) e.stopPropagation() }, + resetFallbackImage (e) { + this.setSetting({ key: 'fallback_image', value: null }) + .then(this.forceFallbackImageReload) + e.stopPropagation() + }, + resetHeaderImage (e) { + this.setSetting({ key: 'header_image', value: null }) + .then(this.forceHeaderImageReload) + e.stopPropagation() + }, updateColor (i, v) { this.colors[i] = v.hex this.$vuetify.theme.themes.dark[i] = v.hex @@ -177,6 +242,32 @@ export default { } }, + async uploadFallbackImage (file) { + const formData = new FormData() + formData.append('fallbackImage', file) + try { + await this.$axios.$post('/settings/fallbackImage', formData) + this.$root.$emit('message', { + message: 'Fallback image updated' + }) + this.forceFallbackImageReload() + } catch (e) { + + } + }, + async uploadHeaderImage (file) { + const formData = new FormData() + formData.append('headerImage', file) + try { + await this.$axios.$post('/settings/headerImage', formData) + this.$root.$emit('message', { + message: 'Header image updated' + }) + this.forceHeaderImageReload() + } catch (e) { + + } + }, save (key, value) { if (this.settings[key] !== value) { this.setSetting({ key, value }) diff --git a/components/admin/Users.vue b/components/admin/Users.vue index ac099d72..b231fd2a 100644 --- a/components/admin/Users.vue +++ b/components/admin/Users.vue @@ -4,7 +4,7 @@ v-container v-spacer v-text-field(v-model='search' :append-icon='mdiMagnify' outlined rounded - label='Search' + :label="$t('common.search')" single-line hide-details) v-btn(color='primary' text @click='newUserDialog = true') {{$t('common.new_user')}} @@ -32,6 +32,7 @@ v-container :headers='headers' :items='users' :hide-default-footer='users.length<5' + :header-props='{ sortIcon: mdiChevronDown }' :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }' :search='search') template(v-slot:item.is_active='{item}') @@ -49,7 +50,7 @@ v-container diff --git a/locales/ca.json b/locales/ca.json index 25467f93..9f7f426b 100644 --- a/locales/ca.json +++ b/locales/ca.json @@ -89,7 +89,19 @@ "max_events": "Nre. màx. d'activitats", "close": "Tanca", "blobs": "Blobs", - "collections": "Coŀleccions" + "collections": "Coŀleccions", + "show_map": "Mostra el mapa", + "latitude": "Latitud", + "longitude": "Longitud", + "getting_there": "Com arribar", + "plugins": "Complements", + "home": "Inici", + "help_translate": "Ajuda amb la traducció", + "calendar": "Calendari", + "about": "Sobre aquesta agenda", + "content": "Contingut", + "admin_actions": "Accions d'administració", + "recurring_event_actions": "Accions d'activitats recorrents" }, "login": { "description": "Amb la sessió iniciada pots afegir activitats noves.", @@ -128,6 +140,8 @@ "added": "S'ha afegit l'activitat", "added_anon": "S'ha afegit l'activitat però encara ha de ser confirmada.", "where_description": "On es farà? Si no està posat, escriu-ho i prem Enter.", + "coordinates_search": "Cerca de coordenades", + "coordinates_search_description": "Podeu cercar el lloc pel nom o enganxar el parell de coordenades", "confirmed": "S'ha confirmat l'activitat", "not_found": "No s'ha trobat l'activitat", "remove_confirmation": "Segur que vols esborrar l'activitat?", @@ -142,10 +156,10 @@ "normal_description": "Tria el dia.", "recurrent_1w_days": "Cada {days}", "recurrent_2w_days": "Un de cada dos {days}", - "recurrent_1m_days": "|El dia {days} de cada mes|Els dies {days} de cada mes", - "recurrent_2m_days": "|El dia {days} d'un de cada dos mesos|Els dies {days} d'un de cada dos mesos", + "recurrent_1m_days": "El dia {days} de cada mes", + "recurrent_2m_days": "El dia {days} d'un de cada dos mesos", "recurrent_1m_ordinal": "El {n} {days} de cada mes", - "recurrent_2m_ordinal": "|El {n} {days} de cada dos mesos|Els {n} {days} de cada dos mesos", + "recurrent_2m_ordinal": "El {n} {days} de cada dos mesos", "each_week": "Cada setmana", "each_2w": "Cada dues setmanes", "each_month": "Cada mes", @@ -153,7 +167,7 @@ "from": "Des de les", "image_too_big": "La imatge és massa gran! Max 4 MB", "interact_with_me_at": "Interacciona amb mi a", - "follow_me_description": "Entre les diverses maneres d'estar al dia de les activitats que es publiquen aquí a {title},\n pots seguir-nos al compte {account} des de Mastodon o altres, i afegir recursos des d'allà.

\nSi no has sentit mai sobre «Mastodon» o «Fedivers», recomanem fer un cop d'ull a aquesta breu introducció al Fedivers.

Introdueix la teva instància a sota (ex: kolektiva.social o mastodont.cat)", + "follow_me_description": "Entre les diverses maneres d'estar al dia de les activitats que es publiquen aquí a {title},\npots seguir-nos al compte {account} des de Mastodon o altres, i afegir recursos des d'allà.

\nSi no has sentit mai sobre «Mastodon» o «Fedivers», recomanem fer un cop d'ull a aquest vídeo introductori i llegir-ne més a aquest portal en català.

Introdueix la teva instància a sota (ex: kolektiva.social, mastodont.cat, ...)", "interact_with_me": "Segueix-nos al fedivers", "remove_recurrent_confirmation": "Estàs segur/a d'esborrar aquesta activitat periòdica?\nNo s'esborraran les ocurrències antigues, només es deixaran de crear les futures.", "ics": "ICS", @@ -164,9 +178,11 @@ "saved": "S'ha desat l'activitat", "import_description": "Pots importar activitats des d'altres instàncies o plataformes que facin servir formats estàndards (ics o h-event)", "remove_media_confirmation": "Confirmeu l'eliminació de la imatge?", - "download_flyer": "Baixa el flyer", + "download_flyer": "Baixa el cartell", "alt_text_description": "Descripció per a persones amb discapacitat visual", - "choose_focal_point": "Tria el punt focal" + "choose_focal_point": "Tria el punt focal", + "address_description": "Quina és l'adreça completa del lloc?", + "address_description_osm": "Quina és l'adreça completa del lloc? (gràcies a la comunitat d'OpenStreetMap)" }, "admin": { "place_description": "En el cas que un lloc és incorrecte o l'adreça ha de canviar, pots arreglar-ho.
Tingues en compte que totes les activitats passades i futures associades amb aquest lloc també canviaran d'adreça.", @@ -179,6 +195,7 @@ "allow_registration_description": "Vols deixar el registre obert?", "allow_anon_event": "Vols permetre activitats anònimes (s'han de confirmar manualment)?", "allow_recurrent_event": "Habilitar activitats periòdiques", + "allow_geolocation": "Habilitar la geolocalització d' esdeveniments", "recurrent_event_visible": "Mostra per defecte les activitats periòdiques", "federation": "Federació / ActivityPub", "enable_federation": "Activa la federació", @@ -215,6 +232,9 @@ "instance_name_help": "Nom del compte ActivityPub per a seguir", "enable_trusted_instances": "Mostra les instàncies amigues", "trusted_instances_help": "Les instàncies amigues apareixen en la capçalera, a la barra de navegació superior", + "trusted_instances_label": "Etiqueta de navegació a instàncies amigues", + "trusted_instances_label_default": "Instàncies amigues", + "trusted_instances_label_help": "L'etiqueta per defecte és 'Instàncies amigues'", "add_trusted_instance": "Afegeix una instància amiga", "instance_place_help": "L'etiqueta per mostrar al menú de les altres instàncies amigues", "delete_trusted_instance_confirm": "Segur que vols eliminar aquest element del menú d'instàncies amigues?", @@ -239,7 +259,7 @@ "new_blob": "Nou blob", "blobs_description": "Els blobs són agrupacions d'activitats per etiquetes i llocs. Es mostren a la pàgina principal", "edit_blob": "Edita el blob", - "enable_admin_user_confirm": "N'estàs segur que vols donar drets d'administrador a {user}?", + "enable_admin_user_confirm": "N'estàs segur/a de donar drets d'administració a {user}?", "smtp_port": "Port SMTP", "smtp_use_sendmail": "Utilitza sendmail", "new_collection": "Col·lecció nova", @@ -247,7 +267,18 @@ "disable_admin_user_confirm": "N'estàs segur de suprimir els permisos d'administrador de {usuari}?", "collections_description": "Les col·leccions són agrupacions d'esdeveniments per etiquetes i llocs. Es mostraran a la pàgina d'inici", "smtp_secure": "SMTP segur (TLS o STARTTLS)", - "sender_email": "Correu remitent" + "sender_email": "Correu remitent", + "hide_thumbs": "Amaga les miniatures dels cartells", + "hide_calendar": "Amaga el calendari", + "fallback_image": "Cartell per defecte", + "config_plugin": "Configura el complement", + "header_image": "Imatge de capçalera", + "default_images": "Cartell per defecte", + "blocked": "Bloquejat/da", + "domain": "Domini", + "known_users": "Usuàries conegudes", + "created_at": "Creada", + "default_images_help": "Actualitza la pàgina per veure els canvis." }, "auth": { "not_confirmed": "Encara no s'ha confirmat…", diff --git a/locales/de.json b/locales/de.json index 1761976b..a3f897a8 100644 --- a/locales/de.json +++ b/locales/de.json @@ -88,7 +88,19 @@ "associate": "Partner:in", "collections": "Sammlungen", "max_events": "Maximale Anzahl an Veranstaltungen", - "close": "Schließe" + "close": "Schließe", + "show_map": "Karte anzeigen", + "latitude": "Breite", + "longitude": "Länge", + "getting_there": "Anreise", + "calendar": "Kalender", + "home": "Startseite", + "about": "Über", + "plugins": "Plugins", + "help_translate": "Hilf beim Übersetzen mit", + "content": "Inhalt", + "admin_actions": "Aktionen der Administrierenden", + "recurring_event_actions": "Einstellungen für regelmäßige Veranstaltungen" }, "admin": { "delete_footer_link_confirm": "Möchtest du diesen Link löschen?", @@ -120,8 +132,11 @@ "wrong_domain_warning": "Die \"baseurl\" die in config.json konfiguriert ist ({baseurl}) unterscheidet sich von derjenigen ({url}) die du besuchst", "instance_place_help": "Diese Textzeile wird im Menü der anderen befreundeten Instanzen angezeigt", "place_description": "Falls ein Ort falsch ist oder sich die Adresse ändert, kannst du ihn ändern.
Bitte beachte, dass alle Veranstaltungen, die mit diesem Ort verbunden sind, die Adresse ändern (auch zurückliegende).", - "enable_admin_user_confirm": "Achte darauf, dass du der nutzenden Person {user} Admin-Rechte hinzufügst", + "enable_admin_user_confirm": "Bist du dir sicher, dass du der nutzenden Person {user} Admin-Rechte gewährst?", "trusted_instances_help": "Befreundete Instanzen werden in der Navigationsleiste oben auf der Seite angezeigt", + "trusted_instances_label": "Navigationsbezeichnung zu Friend-Instanzen", + "trusted_instances_label_default": "Freundliche Instanzen", + "trusted_instances_label_help": "Die Standardbezeichnung ist 'Freundliche Instanzen'", "delete_announcement_confirm": "Möchtest du diesen Hinweis entfernen?", "instance_timezone_description": "Gancio wurde dazu entwickelt, um die Veranstaltungen eines bestimmten Ortes, z. B. einer Stadt, zu erfassen. Wenn du die Zeitzone dieses Ortes eingibst und auswählst, werden alle Zeiten angezeigt und wie ausgewählt eingegeben.", "instance_locale_description": "Die Sprache, in der die Seiten angezeigt werden, ist die von der nutzenden Person bevorzugte Sprache. In einigen Fällen ist es jedoch erforderlich, die Meldungen für alle auf dieselbe Weise anzuzeigen (z. B. bei der Veröffentlichung über ActivityPub oder beim Versand bestimmter E-Mails). In diesen Fällen wird die oben gewählte Sprache verwendet.", @@ -155,6 +170,7 @@ "enable_federation": "Federation aktivieren", "allow_anon_event": "Kann man auch anonyme Veranstaltungen (vorausgesetzt, diese werden genehmigt) eintragen?", "allow_registration_description": "Möchtest du die Registrierung aktivieren?", + "allow_geolocation": "Aktivieren der Ereignis-Geolokalisierung", "federation": "Föderation / ActivityPub", "enable_federation_help": "Bei Aktivierung kann diese Instanz vom Fediverse aus verfolgt werden", "add_instance": "Instanz hinzufügen", @@ -165,7 +181,38 @@ "smtp_hostname": "SMTP-Hostname", "smtp_description": "", "smtp_test_button": "Versenden einer Test-E-Mail", - "smtp_test_success": "Eine Test-E-Mail wurde an {admin_email} gesendet, überprüfe deine Mailbox" + "smtp_test_success": "Eine Test-E-Mail wurde an {admin_email} gesendet, überprüfe deine Mailbox", + "fallback_image": "Ersatzbild", + "header_image": "Bild der Überschrift", + "default_images": "Standard Bilder", + "config_plugin": "Plugin Konfiguration", + "hide_thumbs": "Vorschaubilder ausblenden", + "hide_calendar": "Kalender verstecken", + "admin_email_help": "Die Adresse, die wir als Absender für den Versand von E-Mails verwenden. Sie ist auch die Adresse, an die deine E-Mails an die Administrator:innen geschickt werden.", + "blocked": "Geblockt", + "domain": "Domain", + "known_users": "Bekannte Nutzer:innen", + "created_at": "Erstellt am", + "geocoding_provider_type": "Software für Georeferenzierung", + "geocoding_provider_type_help": "Die Standard-Software ist Nominatim", + "geocoding_provider": "Anbieter von Geocodierung", + "geocoding_provider_help": "Der Standard-Anbieter ist Nominatim", + "geocoding_countrycodes": "Gebietskennziffern", + "geocoding_countrycodes_help": "Ermöglicht die Einrichtung eines Filters für die Suche auf der Grundlage von Ländercodes", + "geocoding_test_button": "Geokodierung testen", + "geocoding_test_success": "Der Geokodierdienst unter {service_name} funktioniert", + "geocoding_test_error": "Der Dienst ist unter der angegebenen Adresse nicht zu erreichen: {service_name}", + "tilelayer_provider": "Kachel-LayerAnbieter", + "tilelayer_provider_help": "Der Standard-Anbieter ist OpenStreetMap", + "tilelayer_provider_attribution": "Namensnennung", + "tilelayer_test_button": "Kachel-Layer testen", + "tilelayer_test_success": "Der Kachel-Layer-Dienst unter {service_name} funktioniert", + "tilelayer_test_error": "Der Dienst ist unter der angegebenen Adresse nicht zu erreichen: {service_name}", + "geolocation": "Geolokation", + "allow_multidate_event": "Lasse mehrtägige Veranstaltungen zu", + "admin_email": "E-Mail von der administrierenden Person", + "geolocation_description": "1. Bestimme einen Anbieter für einen Geokodierdienst.
Derzeit gibt es unter den im Wiki von OpenStreetMap, Anbietern Unterstützung für die Software Nominatim und Photon.
Du kannst eine der entsprechenden offiziellen Demos verwenden, indem du den Link in das Feld \"Geocoding provider\" kopierst:
2. Definiere einen Anbieter für Kartenebenen.
Eine Liste von ihnen findest du hier: https://leaflet-extras.github.io/leaflet-providers/preview/", + "default_images_help": "Du musst die Seite neu laden, um die Änderungen sehen zu können." }, "settings": { "update_confirm": "Willst du deine Änderung speichern?", @@ -229,10 +276,12 @@ "remove_recurrent_confirmation": "Bist du dir sicher, dass du diese wiederkehrende Veranstaltung entfernen möchtest?\nFrühere Veranstaltungen werden beibehalten, aber es werden keine zukünftigen Veranstaltungen mehr hinzugefügt.", "anon_description": "Du kannst eine Veranstaltung hinzufügen, ohne dich zu registrieren oder anzumelden,\nmusst dann aber warten, bis jemand es liest und bestätigt, dass es eine zulässige Veranstaltung ist.\nEs ist nicht möglich, den Eintrag zu verändern.

\nDu kannst dich stattdessen anmelden oder registrieren. In diesem Fall solltest du so schnell wie möglich eine Antwort erhalten. ", "where_description": "Wo ist die Veranstaltung? Wenn der Ort noch nicht beschrieben wurde, kannst du ihn selbst eintragen.", + "coordinates_search": "Suche nach Koordinaten", + "coordinates_search_description": "Sie können den Ort anhand des Namens suchen oder das Koordinatenpaar einfügen.", "follow_me_description": "Eine Möglichkeit, über die hier auf {title} veröffentlichten Veranstaltungen auf dem Laufenden zu bleiben, besteht darin, dem Account {account} aus dem Fediverse zu folgen, zum Beispiel über Mastodon, und von dort aus eventuell Ressourcen für eine Veranstaltung hinzuzufügen.

\nWenn Du noch nie von Mastodon und dem Fediverse gehört hast, empfehlen wir dir, diesen Artikel zu lesen.

Gib unten deine Instanz ein (z.B. mastodon.social)", "media_description": "Du kannst (optional) einen Flyer hinzufügen", "edit_recurrent": "Bearbeite eine sich wiederholende Veranstaltung :", - "show_recurrent": "regelmäßige Veranstaltungen", + "show_recurrent": "wiederkehrende Termine", "show_past": "auch ältere Veranstaltungen", "only_future": "nur zukünftige Veranstaltungen", "recurrent_description": "Wähle die Häufigkeit und Tage aus", @@ -242,11 +291,11 @@ "normal_description": "Wähle den Tag aus.", "recurrent_1w_days": "Jeden {days}", "recurrent_2w_days": "Jeden zweiten {days} eine", - "recurrent_1m_days": "|Der {days} in jedem Monat|{days} in jedem Monat", - "recurrent_2m_days": "Jeder {days} im Monat", + "recurrent_1m_days": "Der {days} in jedem Monat", + "recurrent_2m_days": "Der {days} jeden zweiten Monat", "recurrent_1m_ordinal": "Jeden {n} {days} im Monat", "each_week": "Jede Woche", - "recurrent_2m_ordinal": "Jeden {n} {days} im Monat", + "recurrent_2m_ordinal": "Der {n} {days} jeden zweiten Monat", "each_month": "Jeden Monat", "due": "bis", "from": "von", @@ -256,7 +305,9 @@ "download_flyer": "Lade den Flyer herunter", "remove_media_confirmation": "Möchtest du das Bild löschen?", "alt_text_description": "Beschreibung für Menschen mit Sehbehinderungen", - "choose_focal_point": "Auswahl des Schwerpunkts" + "choose_focal_point": "Auswahl des Schwerpunkts", + "address_description": "Was ist die Adresse?", + "address_description_osm": "Wo ist die Adresse? (OpenStreetMap contributors)" }, "register": { "first_user": "Admin erstellt", diff --git a/locales/email/pl.json b/locales/email/pl.json index e33c1125..b4a66960 100644 --- a/locales/email/pl.json +++ b/locales/email/pl.json @@ -18,5 +18,11 @@ "admin_register": { "subject": "Nowa rejestracja", "content": "{{user.email}} poprosił(a) o rejestrację na {{config.title}}: 
{{user.description}}

Zatwierdź ją tutaj." + }, + "event_confirm": { + "content": "Żeby potwierdzić to wydarzenie wejdź w ten link" + }, + "test": { + "subject": "Serwer SMTP skonfigurowany prawidłowo" } } diff --git a/locales/email/pt.json b/locales/email/pt.json index 0967ef42..6c419d32 100644 --- a/locales/email/pt.json +++ b/locales/email/pt.json @@ -1 +1,29 @@ -{} +{ + "register": { + "subject": "Pedido de registo recebido", + "content": "Recebemos o pedido de registo. Vamos confirmar assim que possível." + }, + "confirm": { + "content": "Olá, sua conta em {{config.title}} foi confirmada. Escreva para {{config.admin_email}} para obter qualquer informação.", + "subject": "Você pode agora começar a publicar eventos" + }, + "event_confirm": { + "content": "Você pode confirmar este evento nesta página" + }, + "test": { + "subject": "Sua configuração SMTP está funcionando", + "content": "Este é um e-mail de teste, se estiver lendo isto, sua configuração está funcionando." + }, + "user_confirm": { + "subject": "Você pode agora começar a publicar eventos", + "content": "Olá, sua conta em {{config.title}} foi criada. Confirme e escolha uma senha.." + }, + "admin_register": { + "subject": "Novo registro", + "content": "{{user.email}} pediu o registro em {{config.title}}: 
{{user.description}}

Confirme aqui." + }, + "recover": { + "subject": "Recuperação de senha", + "content": "Olá, você solicitou a recuperação de sua senha em {{config.title}}. Clique aqui para confirmar." + } +} diff --git a/locales/email/zh.json b/locales/email/zh.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/locales/email/zh.json @@ -0,0 +1 @@ +{} diff --git a/locales/en.json b/locales/en.json index 7ead1f87..b074a9f5 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1,295 +1,345 @@ { - "common": { - "add_event": "Add event", - "next": "Next", - "export": "Export", - "send": "Send", - "where": "Where", - "address": "Address", - "when": "When", - "what": "What", - "media": "Media", - "login": "Login", - "email": "E-mail", - "password": "Password", - "register": "Register", - "description": "Description", - "remove": "Remove", - "hide": "Hide", - "search": "Search", - "edit": "Edit", - "info": "Info", - "confirm": "Confirm", - "admin": "Admin", - "users": "Users", - "events": "Events", - "places": "Places", - "settings": "Options", - "actions": "Actions", - "deactivate": "Turn off", - "remove_admin": "Remove admin", - "activate": "Activate", - "save": "Save", - "preview": "Preview", - "logout": "Log out", - "share": "Share", - "name": "Name", - "associate": "Associate", - "edit_event": "Edit event", - "related": "Related", - "add": "Add", - "logout_ok": "Logged out", - "copy": "Copy", - "recover_password": "Recover password", - "new_password": "New password", - "new_user": "New user", - "ok": "Ok", - "cancel": "Cancel", - "enable": "Enable", - "disable": "Disable", - "me": "You", - "password_updated": "Password changed.", - "resources": "Resources", - "n_resources": "no resource|a resource|{n} resources", - "activate_user": "Confirmed", - "displayname": "Display name", - "federation": "Federation", - "set_password": "Set password", - "copy_link": "Copy link", - "send_via_mail": "Send e-mail", - "add_to_calendar": "Add to calendar", - "instances": "Instances", - "copied": "Copied", - "embed": "Embed", - "embed_title": "Embed this event on your website", - "embed_help": "Copying the following code into your website and the event will be shown like here", - "feed": "RSS Feed", - "feed_url_copied": "Open the copied feed URL in your RSS feed reader", - "follow_me_title": "Follow updates from fediverse", - "follow": "Follow", - "moderation": "Moderation", - "user": "User", - "authorize": "Authorize", - "title": "Title", - "filter": "Filter", - "event": "Event", - "pause": "Pause", - "start": "Start", - "fediverse": "Fediverse", - "skip": "Skip", - "delete": "Remove", - "announcements": "Announcements", - "url": "URL", - "place": "Place", - "tags": "Tags", - "theme": "Theme", - "reset": "Reset", - "import": "Import", - "max_events": "N. max events", - "label": "Label", - "collections": "Collections", - "close": "Close" - }, - "login": { - "description": "By logging in you can publish new events.", - "check_email": "Check your e-mail inbox and spam.", - "not_registered": "Not registered?", - "forgot_password": "Forgot your password?", - "error": "Could not log in. Check your login info.", - "insert_email": "Enter your e-mail address", - "ok": "Logged in" - }, - "recover": { - "not_valid_code": "Something went wrong." - }, - "export": { - "intro": "Unlike the unsocial platforms that do everything to keep users and data about them, we believe that information, like people, must be free. For this you can stay updated on the events you want, without necessarily going through this site.", - "email_description": "You can get events that interest sent via e-mail.", - "insert_your_address": "Enter your e-mail address", - "feed_description": "To follow updates from a computer or smartphone without the need to periodically open this site, use RSS feeds.

\n\n

With RSS feeds you use a special app to receive updates from sites that interest you. It's a good way to follow many sites quickly, without the need to create an account or other complications.

\n\n
  • If you have Android, we recommend Flym or Feeder
    • \n
  • For iPhone / iPad you can use Feed4U
    • \n
  • For desktop / laptop we recommend Feedbro, to be installed on Firefox or Chrome .
    • \n
    \nAdding this link to your RSS feed reader will keep you up to date.", - "ical_description": "Computers and smartphones are commonly equipped with a calendar app capable of importing a remote calendar.", - "list_description": "If you have a website and want to show a list of events, use the following code" - }, - "register": { - "description": "Social movements should organize and self-finance.
    \n
    Before you can publish, the account must be approved, consider that behind this site you will find real people, so write two lines to let us know what events you would like to publish.", - "error": "Error: ", - "complete": "Registration has to be confirmed.", - "first_user": "Administrator created" - }, - "event": { - "anon": "Anon", - "anon_description": "You can add an event without registering or logging in, but will have to wait for someone to read it,\nconfirming that it is a suitable event. It will not be possible to modify it.

    \nYou can instead log in or register. Otherwise go ahead and get an answer as soon as possible. ", - "same_day": "on same day", - "what_description": "Title", - "description_description": "Description", - "tag_description": "Tag", - "media_description": "You can add a flyer (optional)", - "added": "Event added", - "saved": "Event saved", - "added_anon": "Event added, but has yet to be confirmed.", - "updated": "Event updated", - "where_description": "Where's the event? If not present you can create it.", - "confirmed": "Event confirmed", - "not_found": "Could not find event", - "remove_confirmation": "Are you sure you want to remove this event?", - "recurrent": "Recurring", - "edit_recurrent": "Edit recurring event:", - "show_recurrent": "recurring events", - "show_past": "also prior events", - "only_future": "only upcoming events", - "recurrent_description": "Choose frequency and select days", - "multidate_description": "Is it a festival? Choose when it starts and ends", - "multidate": "More days", - "normal": "Normal", - "normal_description": "Choose the day.", - "recurrent_1w_days": "Each {days}", - "recurrent_2w_days": "A {days} every other", - "recurrent_1m_days": "|The {days} of each month|{days} of each month", - "recurrent_2m_days": "|The {days} a month every other|The {days} a month every other", - "recurrent_1m_ordinal": "The {n} {days} of each month", - "recurrent_2m_ordinal": "|The {n} {days} a month every other|The {n} {days} a month every other", - "each_week": "Each week", - "each_2w": "Every other weeks", - "each_month": "Each month", - "due": "until", - "from": "From", - "image_too_big": "The image can't be bigger than 4MB", - "interact_with_me_at": "Interact with me on fediverse at", - "follow_me_description": "One of the ways to stay up to date on events published here on {title},\nis following the account {account} from the fediverse, for example via Mastodon, and possibly add resources to an event from there.

    \nIf you have never heard of Mastodon and the fediverse we recommend reading this article.

    Enter your instance below (e.g. mastodon.social)", - "interact_with_me": "Follow me", - "remove_recurrent_confirmation": "Are you sure you want to remove this recurring event?\nPast events will be maintained, but no further events will be created.", - "import_URL": "Import from URL", - "import_ICS": "Import from ICS", - "ics": "ICS", - "import_description": "You can import events from other platforms and other instances through standard formats (ics and h-event)", - "alt_text_description": "Description for people with visual impairments", - "choose_focal_point": "Choose the focal point", - "remove_media_confirmation": "Do you confirm the image removal?", - "download_flyer": "Download flyer" - }, - "admin": { - "place_description": "If you have gotten the place or address wrong, you can change it.
    All current and past events associated with this place will change address.", - "event_confirm_description": "You can confirm events entered by anonymous users here", - "delete_user": "Remove", - "remove_admin": "Remove admin", - "disable_user_confirm": "Are you sure you want to disable {user}?", - "delete_user_confirm": "Are you sure you want to remove {user}?", - "disable_admin_user_confirm": "Are you sure to remove admin permissions from {user}?", - "enable_admin_user_confirm": "Are sure to add admin permissions to {user}", - "user_remove_ok": "User removed", - "user_create_ok": "User created", - "event_remove_ok": "Event removed", - "allow_registration_description": "Allow open registrations?", - "allow_anon_event": "Allow anonymous events (has to be confirmed)?", - "allow_recurrent_event": "Allow recurring events", - "recurrent_event_visible": "Show recurring events by default", - "federation": "Federation / ActivityPub", - "enable_federation": "Turn on federation", - "enable_federation_help": "It will be possible to follow this instance from the fediverse", - "add_instance": "Add instance", - "select_instance_timezone": "Time zone", - "enable_resources": "Turn on resources", - "enable_resources_help": "Allows adding resources to the event from the fediverse", - "hide_boost_bookmark": "Hides boost/bookmarks", - "hide_boost_bookmark_help": "Hides the small icons showing the number of boosts and bookmarks coming from the fediverse", - "block": "Block", - "unblock": "Unblock", - "user_add_help": "An e-mail with instructions on confirming the subscription and choosing a password will be sent to the new user", - "instance_name": "Instance name", - "show_resource": "Show resource", - "hide_resource": "Hide resource", - "delete_resource": "Delete resource", - "delete_resource_confirm": "Are you sure you want to delete this resource?", - "block_user": "Block user", - "filter_instances": "Filter instances", - "filter_users": "Filter users", - "resources": "Resources", - "user_blocked": "User {user} blocked", - "favicon": "Logo", - "user_block_confirm": "Are you sure you want to block user {user}?", - "instance_block_confirm": "Are you sure you want block instance {instance}?", - "delete_announcement_confirm": "Are you sure you want to remove the announcement?", - "announcement_remove_ok": "Announce removed", - "announcement_description": "In this section you can insert announcements to remain on the homepage", - "instance_locale": "Default language", - "instance_timezone_description": "Gancio is designed to collect the events of a specific place, such as a city. All events in this place will be shown in the time zone chosen for it.", - "instance_locale_description": "Preferred user language for pages. Sometimes messages must be shown in the same language for everyone (for example when publishing via ActivityPub or when sending some e-mails). In these cases the language selected above will be used.", - "title_description": "It is used in the title of the page, in the subject of the e-mail to export RSS and ICS feeds.", - "description_description": "Appears in the header next to the title", - "instance_place": "Indicative place of this instance", - "instance_name_help": "ActivityPub's account to follow", - "enable_trusted_instances": "Turn on friendly instances", - "trusted_instances_help": "The list of friendly instances will be shown in the header", - "add_trusted_instance": "Add a friendly instance", - "instance_place_help": "The label to show in instances of others", - "delete_trusted_instance_confirm": "Do you really want to delete this item from the friend instance menu?", - "is_dark": "Dark theme", - "add_link": "Add link", - "footer_links": "Footer links", - "delete_footer_link_confirm": "Sure to remove this link?", - "edit_place": "Edit place", - "new_announcement": "New announcement", - "show_smtp_setup": "Email settings", - "smtp_hostname": "SMTP Hostname", - "smtp_port": "SMTP Port", - "smtp_secure": "SMTP Secure (TLS or STARTTLS)", - "smtp_description": "", - "smtp_test_success": "A test email is sent to {admin_email}, please check your inbox", - "smtp_test_button": "Send a test email", - "smtp_use_sendmail": "Use sendmail", - "sender_email": "Sender e-mail", - "widget": "Widget", - "wrong_domain_warning": "The baseurl configured in config.json ({baseurl}) differs from the one you're visiting ({url})", - "new_collection": "New collection", - "collections_description": "Collections are groupings of events by tags and places. They will be displayed on the home page", - "edit_collection": "Edit Collection" - }, - "auth": { - "not_confirmed": "Not confirmed yet…", - "fail": "Could not log in. Are you sure the password is correct?" - }, - "settings": { - "update_confirm": "Do you want to save your modification?", - "change_password": "Change your password", - "password_updated": "Password changed.", - "danger_section": "Dangerous section", - "remove_account": "By pressing the following button your user account will be deleted. Events you published won't be.", - "remove_account_confirm": "You are about to permanently delete your account" - }, - "error": { - "nick_taken": "This nickname is already in use.", - "email_taken": "This e-mail is already in use." - }, - "confirm": { - "title": "User confirmation", - "not_valid": "Something went wrong.", - "valid": "Your account is confirmed, you can now log in" - }, - "ordinal": { - "1": "first", - "2": "second", - "3": "third", - "4": "fourth", - "5": "fifth", - "-1": "last" - }, - "validators": { - "required": "{fieldName} is required", - "email": "Insert a valid email" - }, - "about": "\n

    Gancio is a shared agenda for local communities.

    \n ", - "oauth": { - "authorization_request": "The application {app} asks for the following authorization on {instance_name}:", - "redirected_to": "After confirmation you will be redirected to {url}", - "scopes": { - "event:write": "Add and edit your events" - } - }, - "setup": { - "completed": "Setup completed", - "completed_description": "

    You can now login with the following user:

    User: {email}
    Password: {password}

    ", - "copy_password_dialog": "Yes, you have to copy the password!", - "start": "Start", - "https_warning": "You're visiting from HTTP, remember to change baseurl in config.json if you switch to HTTPS!" + "common": { + "add_event": "Add event", + "next": "Next", + "export": "Export", + "send": "Send", + "where": "Where", + "address": "Address", + "when": "When", + "what": "What", + "media": "Media", + "login": "Login", + "email": "E-mail", + "password": "Password", + "register": "Register", + "description": "Description", + "remove": "Remove", + "hide": "Hide", + "search": "Search", + "edit": "Edit", + "info": "Info", + "confirm": "Confirm", + "admin": "Admin", + "users": "Users", + "events": "Events", + "places": "Places", + "settings": "Options", + "actions": "Actions", + "deactivate": "Turn off", + "remove_admin": "Remove admin", + "activate": "Activate", + "save": "Save", + "preview": "Preview", + "logout": "Log out", + "share": "Share", + "name": "Name", + "associate": "Associate", + "edit_event": "Edit event", + "related": "Related", + "add": "Add", + "logout_ok": "Logged out", + "copy": "Copy", + "recover_password": "Recover password", + "new_password": "New password", + "new_user": "New user", + "ok": "Ok", + "cancel": "Cancel", + "enable": "Enable", + "disable": "Disable", + "me": "You", + "password_updated": "Password changed.", + "resources": "Resources", + "n_resources": "no resource|a resource|{n} resources", + "activate_user": "Confirmed", + "displayname": "Display name", + "federation": "Federation", + "set_password": "Set password", + "copy_link": "Copy link", + "send_via_mail": "Send e-mail", + "add_to_calendar": "Add to calendar", + "instances": "Instances", + "copied": "Copied", + "embed": "Embed", + "embed_title": "Embed this event on your website", + "embed_help": "Copying the following code into your website and the event will be shown like here", + "feed": "RSS Feed", + "feed_url_copied": "Open the copied feed URL in your RSS feed reader", + "follow_me_title": "Follow updates from fediverse", + "follow": "Follow", + "moderation": "Moderation", + "user": "User", + "authorize": "Authorize", + "title": "Title", + "filter": "Filter", + "event": "Event", + "pause": "Pause", + "start": "Start", + "fediverse": "Fediverse", + "skip": "Skip", + "delete": "Remove", + "announcements": "Announcements", + "url": "URL", + "place": "Place", + "tags": "Tags", + "tag": "Tag", + "theme": "Theme", + "reset": "Reset", + "import": "Import", + "max_events": "N. max events", + "label": "Label", + "collections": "Collections", + "close": "Close", + "plugins": "Plugins", + "help_translate": "Help Translate", + "show_map": "Show map", + "calendar": "Calendar", + "home": "Home", + "about": "About", + "content": "Content", + "admin_actions": "Admin actions", + "recurring_event_actions": "Recurring event actions" + }, + "login": { + "description": "By logging in you can publish new events.", + "check_email": "Check your e-mail inbox and spam.", + "not_registered": "Not registered?", + "forgot_password": "Forgot your password?", + "error": "Could not log in. Check your login info.", + "insert_email": "Enter your e-mail address", + "ok": "Logged in" + }, + "recover": { + "not_valid_code": "Something went wrong." + }, + "export": { + "intro": "Unlike the unsocial platforms that do everything to keep users and data about them, we believe that information, like people, must be free. For this you can stay updated on the events you want, without necessarily going through this site.", + "email_description": "You can get events that interest sent via e-mail.", + "insert_your_address": "Enter your e-mail address", + "feed_description": "To follow updates from a computer or smartphone without the need to periodically open this site, use RSS feeds.

    \n\n

    With RSS feeds you use a special app to receive updates from sites that interest you. It's a good way to follow many sites quickly, without the need to create an account or other complications.

    \n\n
  • If you have Android, we recommend Flym or Feeder
    • \n
  • For iPhone / iPad you can use Feed4U
    • \n
  • For desktop / laptop we recommend Feedbro, to be installed on Firefox or Chrome .
    • \n
    \nAdding this link to your RSS feed reader will keep you up to date.", + "ical_description": "Computers and smartphones are commonly equipped with a calendar app capable of importing a remote calendar.", + "list_description": "If you have a website and want to show a list of events, use the following code" + }, + "register": { + "description": "Social movements should organize and self-finance.
    \n
    Before you can publish, the account must be approved, consider that behind this site you will find real people, so write two lines to let us know what events you would like to publish.", + "error": "Error: ", + "complete": "Registration has to be confirmed.", + "first_user": "Administrator created" + }, + "event": { + "anon": "Anon", + "anon_description": "You can add an event without registering or logging in, but will have to wait for someone to read it,\nconfirming that it is a suitable event. It will not be possible to modify it.

    \nYou can instead log in or register. Otherwise go ahead and get an answer as soon as possible. ", + "same_day": "on same day", + "what_description": "Title", + "description_description": "Description", + "tag_description": "Tag", + "media_description": "You can add a flyer (optional)", + "added": "Event added", + "saved": "Event saved", + "added_anon": "Event added, but has yet to be confirmed.", + "updated": "Event updated", + "where_description": "Where's the event? If not present you can create it.", + "address_description": "What is the address?", + "address_description_osm": "What is the address? (OpenStreetMap contributors)", + "confirmed": "Event confirmed", + "not_found": "Could not find event", + "remove_confirmation": "Are you sure you want to remove this event?", + "recurrent": "Recurring", + "edit_recurrent": "Edit recurring event:", + "show_recurrent": "recurring events", + "show_past": "also prior events", + "only_future": "only upcoming events", + "recurrent_description": "Choose frequency and select days", + "multidate_description": "Is it a festival? Choose when it starts and ends", + "multidate": "More days", + "normal": "Normal", + "normal_description": "Choose the day.", + "recurrent_1w_days": "Each {days}", + "recurrent_2w_days": "A {days} every other", + "recurrent_1m_days": "The {days} of each month", + "recurrent_2m_days": "The {days} a month every other", + "recurrent_1m_ordinal": "The {n} {days} of each month", + "recurrent_2m_ordinal": "The {n} {days} a month every other", + "each_week": "Each week", + "each_2w": "Every other weeks", + "each_month": "Each month", + "due": "until", + "from": "From", + "image_too_big": "The image can't be bigger than 4MB", + "interact_with_me_at": "Interact with me on fediverse at", + "follow_me_description": "One of the ways to stay up to date on events published here on {title},\nis following the account {account} from the fediverse, for example via Mastodon, and possibly add resources to an event from there.

    \nIf you have never heard of Mastodon and the fediverse we recommend reading this article.

    Enter your instance below (e.g. mastodon.social)", + "interact_with_me": "Follow me", + "remove_recurrent_confirmation": "Are you sure you want to remove this recurring event?\nPast events will be maintained, but no further events will be created.", + "import_URL": "Import from URL", + "import_ICS": "Import from ICS", + "ics": "ICS", + "import_description": "You can import events from other platforms and other instances through standard formats (ics and h-event)", + "alt_text_description": "Description for people with visual impairments", + "choose_focal_point": "Choose the focal point", + "remove_media_confirmation": "Do you confirm the image removal?", + "download_flyer": "Download flyer" + }, + "admin": { + "place_description": "If you have gotten the place or address wrong, you can change it.
    All current and past events associated with this place will change address.", + "event_confirm_description": "You can confirm events entered by anonymous users here", + "delete_user": "Remove", + "remove_admin": "Remove admin", + "disable_user_confirm": "Are you sure you want to disable {user}?", + "delete_user_confirm": "Are you sure you want to remove {user}?", + "disable_admin_user_confirm": "Are you sure to remove admin permissions from {user}?", + "enable_admin_user_confirm": "Are you sure to add admin permissions to {user}?", + "user_remove_ok": "User removed", + "user_create_ok": "User created", + "event_remove_ok": "Event removed", + "allow_registration_description": "Allow open registrations?", + "allow_anon_event": "Allow anonymous events (has to be confirmed)?", + "allow_multidate_event": "Allow multi-day events", + "allow_recurrent_event": "Allow recurring events", + "allow_geolocation": "Allow events geolocation", + "recurrent_event_visible": "Show recurring events by default", + "federation": "Federation / ActivityPub", + "enable_federation": "Turn on federation", + "enable_federation_help": "It will be possible to follow this instance from the fediverse", + "add_instance": "Add instance", + "select_instance_timezone": "Time zone", + "enable_resources": "Turn on resources", + "enable_resources_help": "Allows adding resources to the event from the fediverse", + "hide_boost_bookmark": "Hides boost/bookmarks", + "hide_boost_bookmark_help": "Hides the small icons showing the number of boosts and bookmarks coming from the fediverse", + "block": "Block", + "unblock": "Unblock", + "user_add_help": "An e-mail with instructions on confirming the subscription and choosing a password will be sent to the new user", + "instance_name": "Instance name", + "show_resource": "Show resource", + "hide_resource": "Hide resource", + "delete_resource": "Delete resource", + "delete_resource_confirm": "Are you sure you want to delete this resource?", + "delete_tag_confirm": "Are you sure you want to remove the tag \"{tag}\"? The tag will be removed from {n} events.", + "block_user": "Block user", + "filter_instances": "Filter instances", + "filter_users": "Filter users", + "resources": "Resources", + "user_blocked": "User {user} blocked", + "favicon": "Logo", + "user_block_confirm": "Are you sure you want to block user {user}?", + "instance_block_confirm": "Are you sure you want block instance {instance}?", + "delete_announcement_confirm": "Are you sure you want to remove the announcement?", + "announcement_remove_ok": "Announce removed", + "announcement_description": "In this section you can insert announcements to remain on the homepage", + "instance_locale": "Default language", + "instance_timezone_description": "Gancio is designed to collect the events of a specific place, such as a city. All events in this place will be shown in the time zone chosen for it.", + "instance_locale_description": "Preferred user language for pages. Sometimes messages must be shown in the same language for everyone (for example when publishing via ActivityPub or when sending some e-mails). In these cases the language selected above will be used.", + "title_description": "It is used in the title of the page, in the subject of the e-mail to export RSS and ICS feeds.", + "description_description": "Appears in the header next to the title", + "instance_place": "Indicative place of this instance", + "instance_name_help": "ActivityPub's account to follow", + "enable_trusted_instances": "Turn on friendly instances", + "trusted_instances_help": "The list of friendly instances will be shown in the header", + "trusted_instances_label": "Navigation label to friendly instances", + "trusted_instances_label_default": "Friendly instances", + "trusted_instances_label_help": "The default label is 'Friendly instances'", + "add_trusted_instance": "Add a friendly instance", + "instance_place_help": "The label to show in instances of others", + "delete_trusted_instance_confirm": "Do you really want to delete this item from the friend instance menu?", + "is_dark": "Dark theme", + "add_link": "Add link", + "footer_links": "Footer links", + "delete_footer_link_confirm": "Sure to remove this link?", + "edit_place": "Edit place", + "edit_tag": "Edit tag", + "edit_tag_help": "You can change the tag by replacing it with a new one or merging it with an existing one. The {n} associated events will also be changed.", + "new_announcement": "New announcement", + "show_smtp_setup": "Email settings", + "smtp_hostname": "SMTP Hostname", + "smtp_port": "SMTP Port", + "smtp_secure": "SMTP Secure (TLS or STARTTLS)", + "smtp_description": "", + "smtp_test_success": "A test email is sent to {admin_email}, please check your inbox", + "smtp_test_button": "Send a test email", + "smtp_use_sendmail": "Use sendmail", + "admin_email": "Admin e-mail", + "admin_email_help": "The address we use as the sender to send emails. This is also the address to which admin emails are sent", + "widget": "Widget", + "wrong_domain_warning": "The baseurl configured in config.json ({baseurl}) differs from the one you're visiting ({url})", + "new_collection": "New collection", + "collections_description": "Collections are groupings of events by tags and places. They will be displayed on the home page", + "edit_collection": "Edit Collection", + "config_plugin": "Plugin configuration", + "plugins_description": "", + "fallback_image": "Fallback image", + "header_image": "Header image", + "hide_thumbs": "Hide thumbs", + "hide_calendar": "Hide calendar", + "default_images": "Default images", + "default_images_help": "You have to refresh the page to see the changes.", + "blocked": "Blocked", + "domain": "Domain", + "known_users": "Known users", + "created_at": "Created at", + "geolocation_description": "1. Define a provider for geocoding service.
    Currently, among those listed in the wiki of OpenStreetMap, there is support for software Nominatim and Photon.
    You can use one of the related official demos by copying the link in the 'Geocoding provider' field:
    2. Define a provider for map layers.
    You can find a list of them here: https://leaflet-extras.github.io/leaflet-providers/preview/", + "geocoding_provider_type": "Geocoding software", + "geocoding_provider_type_help": "The default software is Nominatim", + "geocoding_provider": "Geocoding provider", + "geocoding_provider_help": "The default provider is Nominatim", + "geocoding_countrycodes": "Country codes", + "geocoding_countrycodes_help": "Allows you to set a filter to searches based on area codes", + "geocoding_test_button": "Test geocoding", + "geocoding_test_success": "The geocoding service at {service_name} is working", + "geocoding_test_error": "The geocoding service is not reachable at {service_name}", + "tilelayer_provider": "Tilelayer provider", + "tilelayer_provider_help": "The default provider is OpenStreetMap", + "tilelayer_provider_attribution": "Attribution", + "tilelayer_test_button": "Test tilelayer", + "tilelayer_test_success": "The tilelayer service at {service_name} is working", + "tilelayer_test_error": "The tilelayer service is not reachable at {service_name}", + "geolocation": "Geolocation" + }, + "auth": { + "not_confirmed": "Not confirmed yet…", + "fail": "Could not log in. Are you sure the password is correct?" + }, + "settings": { + "update_confirm": "Do you want to save your modification?", + "change_password": "Change your password", + "password_updated": "Password changed.", + "danger_section": "Dangerous section", + "remove_account": "By pressing the following button your user account will be deleted. Events you published won't be.", + "remove_account_confirm": "You are about to permanently delete your account" + }, + "error": { + "nick_taken": "This nickname is already in use.", + "email_taken": "This e-mail is already in use." + }, + "confirm": { + "title": "User confirmation", + "not_valid": "Something went wrong.", + "valid": "Your account is confirmed, you can now log in" + }, + "ordinal": { + "1": "first", + "2": "second", + "3": "third", + "4": "fourth", + "5": "fifth", + "-1": "last" + }, + "validators": { + "required": "{fieldName} is required", + "email": "Insert a valid email" + }, + "about": "\n

    Gancio is a shared agenda for local communities.

    \n ", + "oauth": { + "authorization_request": "The application {app} asks for the following authorization on {instance_name}:", + "redirected_to": "After confirmation you will be redirected to {url}", + "scopes": { + "event:write": "Add and edit your events" } + }, + "setup": { + "completed": "Setup completed", + "completed_description": "

    You can now login with the following user:

    User: {email}
    Password: {password}

    ", + "copy_password_dialog": "Yes, you have to copy the password!", + "start": "Start", + "https_warning": "You're visiting from HTTP, remember to change baseurl in config.json if you switch to HTTPS!" + } } diff --git a/locales/es.json b/locales/es.json index f23670bd..b8f74766 100644 --- a/locales/es.json +++ b/locales/es.json @@ -87,7 +87,21 @@ "reset": "Reset", "theme": "Tema", "label": "Etiqueta", - "max_events": "Número de eventos máximo" + "max_events": "Número de eventos máximo", + "show_map": "Mostrar mapa", + "latitude": "Latitud", + "longitude": "Longitud", + "getting_there": "Cómo llegar", + "collections": "Colecciones", + "plugins": "Complementos", + "home": "Página principal", + "about": "Sobre el sitio", + "close": "Cerrar", + "help_translate": "Ayuda a traducir", + "calendar": "Calendario", + "content": "Contenido", + "admin_actions": "Acciones de administrador", + "recurring_event_actions": "Acciones de eventos recurrentes" }, "login": { "description": "Entrando podrás publicar nuevos eventos.", @@ -102,7 +116,7 @@ "not_valid_code": "Mmmmm algo no salió bien..." }, "export": { - "intro": "A diferencia de las plataformas del capitalismo, que hacen todo lo posible para mantener datos y usuarios dentro de ellas, creemos las informaciones, así como las personas, deben ser libres. Para ello, puedes mantenerte enterado sobre los eventos que te interesan como mejor te parezca, sin necesariamente tener que pasar por este sitio.", + "intro": "A diferencia de las plataformas antisociales, que hacen todo lo posible para mantener datos y usuarios dentro de ellas, creemos que la información, así como las personas, debe ser libre. Por este motivo, puedes mantenerte enterado sobre los eventos que te interesan como mejor te parezca, sin necesariamente tener que pasar por este sitio.", "email_description": "Puedes recibir por mail los eventos que te interesan.", "insert_your_address": "Casilla de correo", "feed_description": "Para seguir las actualizaciones desde un ordenador o teléfono inteligente sin la necesidad de abrir periódicamente el sitio, el método recomendado es usar los feeds RSS.

    \n\n

    Con rss feeds, utilizas una aplicación especial para recibir actualizaciones de los sitios que más te interesan, como por ejemplo éste. Es una buena manera de seguir muchos sitios muy rápidamente, sin la necesidad de crear una cuenta u otras complicaciones.

    \n\n
  • Si tienes Android, te sugerimos Feeder o Feeder
    • \n
  • Para iPhone/iPad puedes usar Feed4U
    • \n
  • En el caso de un ordenador aconsejamos Feedbro, se instala como plugin de Firefox o de Chrome y funciona con todos los principales sistemas.
    • \n
    \nAgregando este link a tu lector de feed, estarás siempre actualizado/a.", @@ -110,7 +124,7 @@ "list_description": "Si tienes un sitio web y quieres mostrar una lista de eventos, puedes usar el siguiente código" }, "register": { - "description": "Los movimientos sociales necesitan organizarse y autofinanciarse.
    \nEste es un regalo para ustedes, úsenlo solamente para eventos con fines no comerciales y obviamente antifascistas, antisexistas y antirracistas.\n
    Antes de que puedas publicar, debemos aprobar la cuenta . Como imaginarás, detrás de este sitio hay personas de carne y hueso, por esto te pedimos escribir algo para hacernos saber que tipos de eventos te gustaría publicar.", + "description": "Los movimientos sociales necesitan organizarse y autofinanciarse.
    \n
    Antes de que puedas publicar, debemos aprobar la cuenta . Como imaginarás, detrás de este sitio hay personas de carne y hueso, por esto te pedimos escribir algo para hacernos saber que tipos de eventos te gustaría publicar.", "error": "Error: ", "complete": "Confirmaremos el registro lo antes posible.", "first_user": "Administrador creado y activado" @@ -126,6 +140,8 @@ "added": "Evento agregado", "added_anon": "Evento agregado, será confirmado cuanto antes.", "where_description": "¿Dónde es? Si el lugar no está, escribilo.", + "coordinates_search": "Buscar coordenadas", + "coordinates_search_description": "Puede buscar el lugar por nombre o pegar el par de coordenadas.", "confirmed": "Evento confirmado", "not_found": "Evento no encontrado", "remove_confirmation": "¿Estás seguro/a de querér eliminar este evento?", @@ -137,16 +153,16 @@ "normal_description": "Selecciona el día.", "recurrent_1w_days": "Cada {days}", "recurrent_2w_days": "Un {days} cada dos", - "recurrent_1m_days": "|El día {days} de cada mes|Los días {days} de cada mes", - "recurrent_2m_days": "|El día {days} cada dos meses|Los días {days} cada dos meses", + "recurrent_1m_days": "El día {days} de cada mes", + "recurrent_2m_days": "El día {days} cada dos meses", "recurrent_1m_ordinal": "El {n} {days} de cada mes", - "recurrent_2m_ordinal": "|El {n} {days} un mes sí y el otro no|El {n} {days} un mes sí y el otro no", + "recurrent_2m_ordinal": "El {n} {days} un mes sí y el otro no", "each_week": "Cada semana", "each_2w": "Cada dos semanas", "each_month": "Cada mes", "due": "a las", "from": "Desde las", - "image_too_big": "La imagén es demasiado grande! Tamaño máx 4M", + "image_too_big": "La imagen no puede ser mayor a 4 MB", "interact_with_me_at": "Sígueme en el fediverso en", "show_recurrent": "Eventos recurrentes", "show_past": "eventos pasados", @@ -160,7 +176,13 @@ "import_description": "Puedes importar eventos de otras plataformas y otras instancias mediante formatos estandars (ics y h-event)", "edit_recurrent": "Editar evento recurrente:", "updated": "Evento actualizado", - "saved": "Evento guardado" + "saved": "Evento guardado", + "choose_focal_point": "Elige el punto central", + "address_description_osm": "¿Cuál es la dirección? (colaboradores de OpenStreetMap)", + "address_description": "¿Cuál es la dirección?", + "alt_text_description": "Descripción para personas con baja visión", + "download_flyer": "Descargar folleto", + "remove_media_confirmation": "¿Confirmas la eliminación de la imagen?" }, "admin": { "place_description": "En el caso de que un lugar sea incorrecto o cambie de dirección, puedes cambiarlo.
    Todos los eventos presentes y pasados asociados con este lugar cambiarán de dirección.", @@ -174,6 +196,7 @@ "allow_anon_event": "¿Se pueden ingresar eventos anónimos (sujeto a confirmación)?", "allow_comments": "Habilitar comentarios", "allow_recurrent_event": "Habilitar eventos fijos", + "allow_geolocation": "Habilitar la geolocalización de eventos", "recurrent_event_visible": "Eventos fijos visibles por defecto", "federation": "Federación / ActivityPub", "enable_federation": "Habilitar la federación", @@ -210,6 +233,9 @@ "instance_name_help": "Nombre de la cuenta de ActivityPub a seguir", "enable_trusted_instances": "Habilitar las solicitudes amistosas", "trusted_instances_help": "Las instancias amistosas aparecerán en la barra de navegación en la parte superior de la página", + "trusted_instances_label": "Etichetta di navigazione alle istanze amiche", + "trusted_instances_label_default": "Instancias amigables", + "trusted_instances_label_help": "La etiqueta predeterminada es 'Instancias amigables'", "add_trusted_instance": "Añade una instancia de amigo", "instance_place_help": "Esta cadena se mostrará en el menú de las otras instancias amigas", "delete_trusted_instance_confirm": "¿Realmente quieres borrar este elemento del menú de instancias amistosas?", @@ -228,7 +254,34 @@ "smtp_test_success": "Un correo de prueba se ha enviado a {admin_email}. Por favos, comprueba tu bandeja de entrada", "smtp_test_button": "Enviar correo de prueba", "admin_email": "Correo del administrador", - "smtp_description": "
    • El administrador debería recibir un correo cuando son añadidos eventos anónimos (si está habilitado).
    • El administrador debería recibir un correo de petición de registro (si está habilitado).
    • El usuario debería recibir un correo de petición de registro.
    • El usuario debería recibir un correo de confirmación de registro.
    • El usuario debería recibir un correo de confirmación cuando el administrador le subscriba directamente.
    • El usuario debería recibir un correo para restaurar la contraseña cuando la haya olvidado.
    " + "smtp_description": "
    • El administrador debería recibir un correo cuando son añadidos eventos anónimos (si está habilitado).
    • El administrador debería recibir un correo de petición de registro (si está habilitado).
    • El usuario debería recibir un correo de petición de registro.
    • El usuario debería recibir un correo de confirmación de registro.
    • El usuario debería recibir un correo de confirmación cuando el administrador le subscriba directamente.
    • El usuario debería recibir un correo para restaurar la contraseña cuando la haya olvidado.
    ", + "disable_admin_user_confirm": "¿Estás seguro que quieres quitar los permisos de administrador de {user}?", + "enable_admin_user_confirm": "¿Estás seguro que quieres conceder permisos de administrador a {user}?", + "smtp_port": "Puerto SMTP", + "smtp_secure": "SMTP Seguro (TLS o STARTTLS)", + "edit_collection": "Editar colección", + "config_plugin": "Configuración de complemento", + "fallback_image": "Imagen por defecto", + "header_image": "Imagan de encabezado", + "hide_thumbs": "Esconder miniaturas", + "hide_calendar": "Esconder calendario", + "default_images": "Imágenes por defecto", + "sender_email": "Correo de remitente", + "event_remove_ok": "Evento eliminado", + "smtp_use_sendmail": "Usar sendmail", + "wrong_domain_warning": "El parámetro baseurl configurado en config.json ({baseurl}) difiere del que estás visitando ({url})", + "new_collection": "Nueva colección", + "collections_description": "Las colecciones son agrupaciones de eventos por etiquetas y ubicaciones. Serán desplegadas en la página de inicio", + "domain": "Dominio", + "created_at": "Creado a las", + "blocked": "Bloqueado", + "known_users": "Usuarios conocidos", + "default_images_help": "Tienes que actualizas la página para ver los cambios.", + "geocoding_provider": "Proveedor de geocodificación", + "admin_email_help": "La dirección que usamos como remitente para enviar emails. Esta es también la dirección a la cual los emails de administración son enviados", + "allow_multidate_event": "Permitir eventos de múltiples días", + "geocoding_countrycodes": "Códigos de país", + "geocoding_provider_help": "El proveedor por defecto es Nominatim" }, "auth": { "not_confirmed": "Todavía no hemos confirmado este email…", @@ -274,6 +327,8 @@ "setup": { "completed": "Configuración completada", "start": "Inicio", - "completed_description": "

    Puedes ingresar con el siguiente usuario:

    Usuario: {email}
    Contraseña: {password}

    " + "completed_description": "

    Puedes ingresar con el siguiente usuario:

    Usuario: {email}
    Contraseña: {password}

    ", + "copy_password_dialog": "Sí, ¡tienes que copiar la contraseña!", + "https_warning": "¡Si estás visitando a través de HTTP, recuerda cambiar el parámetro baseurl en config.json si cambias a HTTPS!" } } diff --git a/locales/esm.js b/locales/esm.js deleted file mode 100644 index 59762610..00000000 --- a/locales/esm.js +++ /dev/null @@ -1,13 +0,0 @@ -export default { - ca: 'Català', - de: 'Deutsch', - en: 'English', - es: 'Español', - eu: 'Euskara', - fr: 'Francais', - gl: 'Galego', - it: 'Italiano', - nb: 'Norwegian Bokmål', - pl: 'Polski', - sk: 'Slovak' -} diff --git a/locales/eu.json b/locales/eu.json index d69e3f4c..7654a816 100644 --- a/locales/eu.json +++ b/locales/eu.json @@ -25,7 +25,7 @@ "events": "Ekitaldiak", "places": "Lekuak", "settings": "Aukerak", - "actions": "Ekintzak", + "actions": "Eragiketak", "deactivate": "Desaktibatu", "remove_admin": "Kendu administratzaile baimena", "activate": "Aktibatu", @@ -89,7 +89,16 @@ "tags": "Etiketak", "close": "Itxi", "blobs": "Mordoak", - "collections": "Bildumak" + "collections": "Bildumak", + "plugins": "Pluginak", + "help_translate": "Lagundu itzultzen", + "show_map": "Erakutsi mapa", + "calendar": "Egutegia", + "home": "Etxea", + "about": "Honi buruz", + "recurring_event_actions": "Ekitaldi errepikarien eragiketak", + "content": "Edukia", + "admin_actions": "Administratzaile eragiketak" }, "login": { "description": "Saioa hasten baduzu ekitaldi berriak sortu ahal izango dituzu.", @@ -142,10 +151,10 @@ "normal_description": "Aukeratu eguna.", "recurrent_1w_days": "{days}(e)ro", "recurrent_2w_days": "Bi {days}(e)z behin", - "recurrent_1m_days": "|Hilabetero {days}etan|Hilabetero {days}etan", - "recurrent_2m_days": "|{days}etan bi hilabetez behin|{days}etan bi hilabetez behin", + "recurrent_1m_days": "Hilabetero {days}etan", + "recurrent_2m_days": "{days}etan bi hilabetez behin", "recurrent_1m_ordinal": "Hilabeteko {n}. {days}(e)ro", - "recurrent_2m_ordinal": "|Bi hilabetez behin {n}. {days}(e)an|Bi hilabetez behin {n}. {days}(e)an", + "recurrent_2m_ordinal": "Bi hilabetez behin {n}. {days}(e)an", "each_week": "Astero", "each_2w": "Bi astez behin", "each_month": "Hilero", @@ -166,7 +175,9 @@ "remove_media_confirmation": "Irudiaren ezabaketa baieztatzen duzu?", "alt_text_description": "Ikusmen-urritasunak dituztenentzako deskripzioa", "choose_focal_point": "Aukeratu arretagunea", - "download_flyer": "Deskargatu eskuorria" + "download_flyer": "Deskargatu eskuorria", + "address_description": "Zein da helbidea?", + "address_description_osm": "Zein da helbidea? (OpenStreetMap kolaboratzaileak)" }, "admin": { "place_description": "Lekua edo helbidea oker badago, alda dezakezu.
    Leku honekin lotutako iraganeko eta etorkizuneko ekitaldien helbidea aldatuko da.", @@ -215,6 +226,9 @@ "instance_name_help": "Jarraitu beharreko ActivityPub kontua", "enable_trusted_instances": "Gaitu instantzia adiskidetsuak", "trusted_instances_help": "Kideak diren instantzien zerrenda goiburuan erakutsiko da", + "trusted_instances_label": "Nabigazio etiketa lagunarteko instantzietarako", + "trusted_instances_label_default": "Instantzia atseginak", + "trusted_instances_label_help": "Etiketa lehenetsia 'Instantzia atseginak' da", "add_trusted_instance": "Gehitu kide den instantzia bat", "instance_place_help": "Beste instantzietan agertuko den izena", "delete_trusted_instance_confirm": "Ziur al zaude instantzia hau menuko zerrendatik kendu nahi duzula?", @@ -246,8 +260,38 @@ "edit_collection": "Editatu bilduma", "disable_admin_user_confirm": "Ziur al zaude {user}(r)i administratzaile baimenak kendu nahi dizkiozula?", "collections_description": "Bildumak, etiketen eta lekuen arabera multzokatutako ekitaldiak dira. Hasierako orrialdean bistaratuko dira", - "enable_admin_user_confirm": "Ziur zaude {user}-(r)i administratzaile baimenak gehitu nahi dizkiozula", - "new_collection": "Bilduma berria" + "enable_admin_user_confirm": "Ziur zaude {user}-(r)i administratzaile baimenak gehitu nahi dizkiozula?", + "new_collection": "Bilduma berria", + "allow_geolocation": "Baimendu ekitaldiak geokokatzea", + "hide_thumbs": "Ezkutatu iruditxoak", + "hide_calendar": "Ezkutatu egutegia", + "config_plugin": "Pluginaren konfigurazioa", + "fallback_image": "Lehenetsitako irudia", + "header_image": "Goiburuko irudia", + "default_images": "Lehenetsitako irudiak", + "blocked": "Blokeatuta", + "domain": "Domeinua", + "default_images_help": "Orrialdea freskatu behar duzu aldaketak ikusteko.", + "known_users": "Erabiltzaile ezagunak", + "created_at": "Noiz sortua:", + "geocoding_provider_type_help": "Software lehenetsia Nominatim da", + "geocoding_provider": "Geokodeketaren hornitzailea", + "geocoding_countrycodes": "Estatuen kodeak", + "geocoding_countrycodes_help": "Baimendu iragazki bat ezartzen zonalde kodearen arabera", + "geocoding_test_button": "Probatu geokodeketa", + "tilelayer_provider_help": "Lehenetsitako hornitzailea OpenStreetMap da", + "tilelayer_provider_attribution": "Atribuzioa", + "geocoding_test_error": "Geokodeketa zerbitzua {service_name}-(e)n ez dago atzigarri", + "tilelayer_provider": "Lauza-geruzen hornitzailea", + "tilelayer_test_button": "Probatu lauza-geruza", + "tilelayer_test_error": "Lauza-geruzen zerbitzua {service_name}(e)n ez dago atzigarri", + "admin_email_help": "Epostak bidaltzeko erabiltzen dugun helbidea. Administrazio epostak ere horra bidaltzen dira", + "allow_multidate_event": "Baimendu egun anitzeko ekitaldiak", + "geocoding_provider_type": "Geokodeketarako softwarea", + "geocoding_provider_help": "Lehenetsitako hornitzailea Nominatim da", + "geolocation": "Geokokapena", + "geocoding_test_success": "Geokodeketa zerbitzua {service_name}-(e)n martxan dago", + "tilelayer_test_success": "Lauza-geruzen zerbitzua {service_name}(e)n martxan dago" }, "auth": { "not_confirmed": "Oraindik baieztatu gabe dago…", diff --git a/locales/fr.json b/locales/fr.json index ab9fbea2..1bd0b3cf 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -89,7 +89,11 @@ "max_events": "Nb. max d'événements", "blobs": "Blobs", "close": "Fermer", - "collections": "Collections" + "collections": "Collections", + "show_map": "Afficher la carte", + "latitude": "Latitude", + "longitude": "Longitude", + "getting_there": "Comment s'y rendre" }, "event": { "follow_me_description": "Une des manières de rester informé sur les évènements publiés ici sur {title}\nest de suivre le compte {account} sur le fediverse, par exemple via Mastodon, et pourquoi pas d'ajouter des ressources à un évènement à partir de là.

    \nSi vous n'avez jamais entendu parler de Mastodon and du fediverse, nous vous recommandons de lire cet article (en anglais).

    Saisissez votre nom d'instance ci-dessous (par ex. mastodon.social)", @@ -104,7 +108,7 @@ "from": "Du", "each_month": "Chaque mois", "each_week": "Chaque semaine", - "recurrent_1m_days": "|Chaque {days} du mois|Chaque {days} du mois", + "recurrent_1m_days": "Chaque {days} du mois", "recurrent_1w_days": "Chaque {days}", "normal_description": "Choisissez un jour.", "normal": "Normal", @@ -119,6 +123,8 @@ "not_found": "Impossible de trouver l'évènement", "confirmed": "Évènement confirmé", "where_description": "Où est l'évènement ? S'il n'apparaît pas, vous pouvez le créer.", + "coordinates_search": "Recherche de coordonnées", + "coordinates_search_description": "Vous pouvez rechercher le lieu par son nom ou coller la paire de coordonnées", "added_anon": "Évènement ajouté, mais il doit encore être confirmé.", "added": "Évènement ajouté", "media_description": "Vous pouvez ajouter un tract (facultatif)", @@ -130,8 +136,8 @@ "anon": "Anonyme", "ics": "ICS", "each_2w": "Une semaine sur deux", - "recurrent_2m_ordinal": "|Le {n} {days} du mois un mois sur|Les {n} {days} du mois un mois sur deux", - "recurrent_2m_days": "|Le {days} un mois sur deux|Les {jours} un mois sur deux", + "recurrent_2m_ordinal": "Les {n} {days} du mois un mois sur deux", + "recurrent_2m_days": "Le {days} un mois sur deux", "recurrent_2w_days": "Un {days} sur deux", "edit_recurrent": "Modifier l’évènement récurrent :", "updated": "Évènement mis à jour", @@ -168,6 +174,9 @@ "instance_place_help": "Le nom à afficher dans les autres instances", "add_trusted_instance": "Ajouter une instance associée", "trusted_instances_help": "La liste des instances associées seront affichées dans l'entête", + "trusted_instances_label": "Étiquette de navigation vers les instances amies", + "trusted_instances_label_default": "Instances amies", + "trusted_instances_label_help": "L'étiquette par défaut est 'Instances amies'", "enable_trusted_instances": "Activer les instances associées", "instance_name_help": "Compte ActivityPub à suivre", "instance_place": "Lieu indicatif de cette instance", @@ -204,6 +213,7 @@ "allow_recurrent_event": "Autoriser les évènements récurrents", "allow_anon_event": "Autoriser les évènements anonymes (doivent être confirmés) ?", "allow_registration_description": "Autoriser l'ouverture des inscriptions ?", + "allow_geolocation": "Autoriser la géolocalisation des événements", "user_create_ok": "Utilisateur créé", "user_remove_ok": "Utilisateur supprimé", "delete_user_confirm": "Êtes-vous sûr·e de vouloir supprimer {user} ?", diff --git a/locales/gl.json b/locales/gl.json index 2761b181..89d23aec 100644 --- a/locales/gl.json +++ b/locales/gl.json @@ -89,7 +89,19 @@ "tags": "Cancelos", "close": "Pechar", "blobs": "Blobs", - "collections": "Coleccións" + "collections": "Coleccións", + "show_map": "Mostrar mapa", + "latitude": "Latitude", + "longitude": "Longitude", + "getting_there": "Chegar lá", + "plugins": "Complementos", + "help_translate": "Axuda coa tradución", + "calendar": "Calendario", + "home": "Inicio", + "about": "Acerca de", + "content": "Contido", + "admin_actions": "Accións de Admin", + "recurring_event_actions": "Accións de eventos recurrentes" }, "recover": { "not_valid_code": "Algo fallou." @@ -114,13 +126,15 @@ "saved": "Evento gardado", "updated": "Evento actualizado", "where_description": "Onde será o evento? Se non existe podes crealo.", + "coordinates_search": "Procurar coordenadas", + "coordinates_search_description": "Pode procurar o lugar pelo nome ou colar o par de coordenadas.", "not_found": "Non atopamos o evento", "show_recurrent": "eventos recurrentes", "show_past": "tamén eventos previos", "only_future": "só eventos futuros", "recurrent_2w_days": "Cada {days} días", - "recurrent_2m_ordinal": "|O {n} {days} en meses alternos|O {n} {days} en meses alternos", - "recurrent_2m_days": "|O {days} cada dous meses|O {days} cada dous meses", + "recurrent_2m_ordinal": "O {n} {days} en meses alternos", + "recurrent_2m_days": "O {days} cada dous meses", "each_month": "Cada mes", "due": "ata", "from": "Desde", @@ -149,7 +163,7 @@ "recurrent_1w_days": "Cada {days}", "recurrent_1m_ordinal": "O {n} {days} de cada mes", "image_too_big": "A imaxe non pode superar os 4MB", - "recurrent_1m_days": "|O {days} de cada mes|{days} de cada mes", + "recurrent_1m_days": "O {days} de cada mes", "each_2w": "Cada dúas semanas", "follow_me_description": "Un dos xeitos de recibir actualizacións dos eventos que se publican aquí en {title},\né seguindo a conta {account} no fediverso, por exemplo a través de Mastodon, e posiblemente tamén engadir recursos para un evento desde alí.

    \nSe nunco escoitaches falar de Mastodon e o fediverso recomendámosche ler este artigo.

    Escribe aquí a túa instancia (ex. mastodon.social)", "ics": "ICS", @@ -157,7 +171,9 @@ "alt_text_description": "Descrición para persoas con problemas de visión", "choose_focal_point": "Elixe onde centrar a atención", "remove_media_confirmation": "Confirmas a eliminación da imaxe?", - "download_flyer": "Descargar folleto" + "download_flyer": "Descargar folleto", + "address_description": "Cal é o enderezo?", + "address_description_osm": "Cal é o enderezo? (Contribuíntes a OpenStreetMap)" }, "admin": { "place_description": "Se escribiches mal o lugar ou enderezo, podes cambialo.
    Cambiará o enderezo de tódolos eventos actuais e pasados asociados a este lugar.", @@ -187,6 +203,7 @@ "resources": "Recursos", "allow_registration_description": "Permitir o rexistro libre?", "allow_anon_event": "Permitir eventos anónimos (haberá que confirmalos)?", + "allow_geolocation": "Permitir a geolocalização de eventos", "event_confirm_description": "Aquí podes confirmar os eventos engadidos por usuarias anónimas", "remove_admin": "Eliminar admin", "delete_user": "Eliminar", @@ -214,6 +231,9 @@ "instance_locale_description": "Idioma preferido para as páxinas. A veces as mensaxes teñen que mostrarse no mesmo idioma para tódalas persoas (por exemplo cando publicas vía ActivityPub ou cando envías os emails). Nestos casos usarase o idioma elexido aquí arriba.", "enable_trusted_instances": "Activar instancias amigas", "trusted_instances_help": "A lista das instancias amigas será mostrada na cabeceira", + "trusted_instances_label": "Etiqueta de navegação para instâncias de amigos", + "trusted_instances_label_default": "Casos amigáveis", + "trusted_instances_label_help": "A etiqueta padrão é 'Instâncias amigáveis'", "delete_trusted_instance_confirm": "Tes a certeza de querer eliminar este elemento do menú de instancias amigas?", "instance_place_help": "A etiqueta a mostrar nas instancias de outras", "add_link": "Engadir ligazón", @@ -237,8 +257,38 @@ "disable_admin_user_confirm": "Tes certeza de querer retirar os permisos de administración a {user}?", "sender_email": "Remitente", "collections_description": "As coleccións son agrupamentos de eventos por etiqueta ou lugar. Pode ser mostrado na páxina de inicio", - "enable_admin_user_confirm": "Tes a certeza de querer darlle permisos de administración a {user}?", - "smtp_use_sendmail": "Usar sendmail" + "enable_admin_user_confirm": "Tes a certeza de engadir permiso de admin a {user}?", + "smtp_use_sendmail": "Usar sendmail", + "config_plugin": "Configuración do complemento", + "known_users": "Usuarias coñecidas", + "created_at": "Creado o", + "fallback_image": "Imaxe por omisión", + "header_image": "Imaxe da cabeceira", + "hide_thumbs": "Agochar miniaturas", + "hide_calendar": "Agochar calendario", + "default_images": "Imaxes por defecto", + "blocked": "Bloqueado", + "domain": "Dominio", + "default_images_help": "Tes que actualizar a páxina para ver os cambios.", + "geocoding_provider_type": "Software Geocoding", + "geocoding_provider_type_help": "O software por defecto é Nominatim", + "geocoding_provider": "Provedor Geocoding", + "geocoding_provider_help": "O provedor por defecto é Nominatim", + "geocoding_countrycodes": "Códigos de país", + "geocoding_countrycodes_help": "Permíteche establecer un filtro para as buscas en función do código", + "geocoding_test_button": "Comproba a codificación", + "geocoding_test_success": "O servizo geocoding en {service_name} funciona", + "geocoding_test_error": "O servizo geocoding non está accesible en {service_name}", + "tilelayer_provider": "Provedor de teselas do mapa", + "tilelayer_provider_help": "O provedor por defecto é OpenStreetMap", + "tilelayer_provider_attribution": "Atribución", + "tilelayer_test_button": "Comproba as capas", + "tilelayer_test_success": "O servizo de capas en {service_name} funciona", + "tilelayer_test_error": "O servizo de capas en {service_name} non está accesible", + "geolocation": "Xeolocalización", + "allow_multidate_event": "Permitir eventos de varios días", + "admin_email_help": "O enderezo que se usará como remitente para os emails. Tamén é o enderezo ao que se envían emails de administración", + "geolocation_description": "1. Define un provedor para o servizo geocoding.
    Actualmente, entre os que aparecen na wiki de OpenStreetMap, temos soporte para Nominatim e Photon.
    Podes usar unha das demos oficiais indicadas copiando a ligazón no campo 'Provedor Geocoding':
    2. Define un provedor para capas do mapa.
    Aquí hai unha lista: https://leaflet-extras.github.io/leaflet-providers/preview/" }, "auth": { "not_confirmed": "Aínda non foi confirmado…", diff --git a/locales/index.js b/locales/index.js index 1af61059..5808cf03 100644 --- a/locales/index.js +++ b/locales/index.js @@ -1,13 +1,15 @@ module.exports = { - en: 'English', - eu: 'Euskara', + ca: 'Català', de: 'Deutsch', + en: 'English', es: 'Español', + eu: 'Euskara', + fr: 'Francais', gl: 'Galego', it: 'Italiano', - ca: 'Català', - fr: 'Francais', nb: 'Norwegian Bokmål', + pl: 'Polski', + pt: 'Português', sk: 'Slovak', - pl: 'Polski' + zh: '中国' } diff --git a/locales/it.json b/locales/it.json index 53c5a401..a8daeca3 100644 --- a/locales/it.json +++ b/locales/it.json @@ -1,288 +1,335 @@ { - "common": { - "add_event": "Aggiungi evento", - "next": "Continua", - "export": "Esporta", - "send": "Invia", - "where": "Dove", - "address": "Indirizzo", - "when": "Quando", - "what": "Cosa", - "media": "Media", - "login": "Entra", - "email": "E-mail", - "password": "Password", - "register": "Registrati", - "description": "Descrizione", - "remove": "Elimina", - "hide": "Nascondi", - "search": "Cerca", - "edit": "Modifica", - "info": "Info", - "confirm": "Conferma", - "admin": "Amministra", - "users": "Utenti", - "events": "Eventi", - "places": "Luoghi", - "settings": "Opzioni", - "actions": "Azioni", - "deactivate": "Disattiva", - "remove_admin": "Rimuovi Admin", - "activate": "Attiva", - "save": "Salva", - "preview": "Anteprima", - "logout": "Esci", - "share": "Esporta", - "name": "Nome", - "associate": "Associa", - "edit_event": "Modifica evento", - "related": "Memoria storica", - "add": "Aggiungi", - "logout_ok": "Uscita correttamente", - "copy": "Copia", - "recover_password": "Recupera password", - "new_password": "Nuova password", - "new_user": "Nuovo utente", - "ok": "OK", - "cancel": "Annulla", - "enable": "Abilita", - "disable": "Disabilita", - "me": "Tu", - "password_updated": "Password modificata.", - "activate_user": "Confermato", - "displayname": "Nome mostrato", - "federation": "Federazione", - "set_password": "Imposta password", - "copy_link": "Copia link", - "send_via_mail": "Invia e-mail", - "add_to_calendar": "Aggiungi al calendario", - "instances": "Istanze", - "copied": "Copiato", - "embed": "Incorpora", - "embed_title": "Mostra questo evento sul tuo sito web", - "embed_help": "Copiando il seguente codice sul tuo sito web l'evento verrà incluso come qui di lato", - "feed": "Feed RSS", - "feed_url_copied": "URL copiato, incollalo nel tuo lettore di Feed RSS", - "follow_me_title": "Segui gli aggiornamenti dal fediverso", - "follow": "Segui", - "n_resources": "nessuna risorsa|una risorsa|{n} risorse", - "resources": "Risorse", - "moderation": "Moderazione", - "authorize": "Autorizza", - "title": "Titolo", - "user": "Utente", - "filter": "Filtra", - "event": "Evento", - "pause": "Pausa", - "start": "Avvia", - "fediverse": "Fediverso", - "skip": "Salta", - "delete": "Elimina", - "announcements": "Annunci", - "url": "URL", - "place": "Luogo", - "tags": "Etichette", - "theme": "Tema", - "reset": "Reset", - "import": "Importa", - "max_events": "N. massimo eventi", - "label": "Etichetta", - "collections": "Bolle" - }, - "login": { - "description": "Entrando puoi pubblicare nuovi eventi.", - "check_email": "Controlla la tua posta (anche lo spam).", - "not_registered": "Non sei registrata?", - "forgot_password": "Dimenticato la password?", - "error": "Errore durante il login, controlla i dati.", - "insert_email": "Inserisci l'indirizzo e-mail", - "ok": "Tutto rego" - }, - "recover": { - "not_valid_code": "Mmmmm qualcosa è andato storto." - }, - "export": { - "intro": "Contrariamente alle piattaforme del capitalismo, che fanno di tutto per tenere i dati e gli utenti al loro interno, crediamo che le informazioni, come le persone, debbano essere libere. Per questo puoi rimanere aggiornata sugli eventi che vuoi, come meglio credi, senza necessariamente passare da questo sito.", - "email_description": "Puoi ricevere via posta elettronica gli eventi che ti interessano.", - "insert_your_address": "Inserisci il tuo indirizzo e-mail", - "feed_description": "Per seguire gli aggiornamenti da computer o smartphone senza la necessità di aprire periodicamente il sito, il metodo consigliato è quello dei Feed RSS.

    \n\n

    Con i feed rss utilizzi un'apposita applicazione per ricevere aggiornamenti dai siti che più ti interessano. È un buon metodo per seguire anche molti siti in modo molto rapido, senza necessità di creare un account o altre complicazioni.

    \n\n
  • Se hai Android, ti consigliamo Flym o Feeder
    • \n
  • Per iPhone/iPad puoi usare Feed4U
    • \n
  • Per il computer fisso/portatile consigliamo Brief, da installare all'interno di Firefox e compatibile con tutti i principali sistemi operativi.
    • \n
    \nAggiungendo questo link al tuo lettore di feed, rimarrai aggiornata.", - "ical_description": "I computer e gli smartphone sono comunemente attrezzati con un'applicazione per gestire un calendario. A questi programmi solitamente è possibile far importare un calendario remoto.", - "list_description": "Se hai un sito web e vuoi mostrare una lista di eventi, puoi usare il seguente codice" - }, - "register": { - "description": "I movimenti hanno bisogno di organizzarsi e autofinanziarsi.
    \nUsatelo solo per eventi non commerciali, antifascisti, antisessisti, antirazzisti.
    Prima di poter pubblicare dobbiamo approvare l'account, considera che dietro questo sito ci sono delle persone di carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.", - "error": "Errore: ", - "complete": "Confermeremo la registrazione quanto prima.", - "first_user": "Amministratore creato e attivo" - }, - "event": { - "anon": "Anonimo", - "anon_description": "Puoi inserire un evento senza registrarti o fare il login, ma in questo caso dovrai aspettare che qualcuno lo legga confermando che si tratta di un evento adatto a questo spazio, delegando questa scelta. Inoltre non sarà possibile modificarlo.

    \nPuoi invece fare il login o registrarti, altrimenti vai avanti, lo confermeremo appena possibile. ", - "same_day": "Stesso giorno", - "what_description": "Titolo", - "description_description": "Descrizione", - "tag_description": "Etichetta", - "media_description": "Puoi aggiungere un volantino (opzionale)", - "added": "Evento aggiunto", - "saved": "Evento salvato", - "added_anon": "Evento aggiunto, verrà confermato quanto prima.", - "updated": "Evento aggiornato", - "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.", - "confirmed": "Evento confermato", - "not_found": "Evento non trovato", - "remove_confirmation": "Vuoi eliminare questo evento?", - "remove_recurrent_confirmation": "Sei sicura di voler eliminare questo evento ricorrente?\nGli eventi passati verranno mantenuti ma non ne verranno creati altri.", - "recurrent": "Ricorrente", - "edit_recurrent": "Modifica evento ricorrente:", - "show_recurrent": "appuntamenti ricorrenti", - "show_past": "eventi passati", - "recurrent_description": "Scegli la frequenza e seleziona i giorni", - "multidate_description": "Un festival o una tre giorni? Scegli quando comincia e quando finisce", - "multidate": "Più giorni", - "normal": "Normale", - "normal_description": "Scegli il giorno.", - "recurrent_1w_days": "Ogni {days}", - "recurrent_2w_days": "Un {days} ogni due", - "recurrent_1m_days": "Il giorno {days} di ogni mese", - "recurrent_2m_days": "Il giorno {days} ogni due mesi", - "recurrent_1m_ordinal": "Il {n} {days} di ogni mese", - "recurrent_2m_ordinal": "Il {n} {days} un mese sì e uno no", - "each_week": "Ogni settimana", - "each_2w": "Ogni due settimane", - "each_month": "Ogni mese", - "due": "alle", - "from": "Dalle", - "image_too_big": "L'immagine non può essere più grande di 4MB", - "interact_with_me": "Seguimi dal fediverso", - "follow_me_description": "Tra i vari modi di rimanere aggiornati degli eventi pubblicati qui su {title},\npuoi seguire l'account {account} dal fediverso, ad esempio via Mastodon, ed eventualmente aggiungere risorse ad un evento da lì.

    \nSe non hai mai sentito parlare di Mastodon e del fediverso ti consigliamo di leggere questo articolo.

    Inserisci la tua istanza qui sotto (es. mastodon.cisti.org o mastodon.bida.im)", - "only_future": "solo eventi futuri", - "interact_with_me_at": "Seguimi nel fediverso su", - "import_ICS": "Importa da ICS", - "import_URL": "Importa da URL (ics o h-event)", - "ics": "ICS", - "import_description": "Puoi importare eventi da altre piattaforme e da altre istanze attraverso i formati standard (ics e h-event)", - "alt_text_description": "Descrizione per persone con disabilità visive", - "choose_focal_point": "Scegli il punto centrale cliccando", - "remove_media_confirmation": "Confermi l'eliminazione dell'immagine?", - "download_flyer": "Scarica volantino" - }, - "admin": { - "place_description": "Nel caso in cui un luogo sia errato o cambi indirizzo, puoi modificarlo.
    Considera che tutti gli eventi associati a questo luogo cambieranno indirizzo (anche quelli passati).", - "event_confirm_description": "Puoi confermare qui gli eventi inseriti da utenti anonimi", - "delete_user": "Elimina", - "remove_admin": "Rimuovi admin", - "disable_user_confirm": "Vuoi disabilitare {user}?", - "delete_user_confirm": "Vuoi rimuovere {user}?", - "user_remove_ok": "Utente eliminato", - "user_create_ok": "Utente creato", - "allow_registration_description": "Vuoi abilitare la registrazione?", - "allow_anon_event": "Si possono inserire eventi anonimi (previa conferma)?", - "allow_recurrent_event": "Abilita eventi ricorrenti", - "recurrent_event_visible": "Appuntamenti ricorrenti visibili di default", - "federation": "Federazione / ActivityPub", - "enable_federation": "Abilita la federazione", - "enable_federation_help": "Sarà possibile seguire questa istanza dal fediverso", - "add_instance": "Aggiungi istanza", - "select_instance_timezone": "Fuso orario", - "instance_timezone_description": "Gancio è pensato per raccogliere gli eventi di un luogo specifico come ad esempio una città. Scrivendo e selezionando il fuso orario di questo luogo, tutti gli orari saranno mostrati e inseriti secondo quanto scelto.", - "enable_resources": "Abilita risorse", - "enable_resources_help": "Permette di aggiungere risorse agli eventi dal fediverso", - "hide_boost_bookmark": "Nasconde n. condivisioni e segnalibri", - "hide_boost_bookmark_help": "Nasconde le piccole icone che mostrano il numero di boost e segnalibri in arrivo dal fediverso", - "block": "Blocca", - "unblock": "Sblocca", - "user_add_help": "Manderemo un'e-mail al nuovo utente con le istruzioni per confermare l'iscrizione e scegliere una password", - "resources": "Risorse", - "hide_resource": "Nascondi risorsa", - "show_resource": "Mostra risorsa", - "delete_resource": "Elimina risorsa", - "delete_resource_confirm": "Sei sicurǝ di voler eliminare questa risorsa?", - "block_user": "Blocca questo utente", - "user_blocked": "L'utente {user} non potrà più aggiungere risorse", - "filter_instances": "Filtra istanze", - "filter_users": "Filtra utenti", - "instance_name": "Nome istanza", - "favicon": "Logo", - "user_block_confirm": "Confermi di voler bloccare l'utente {user}?", - "instance_block_confirm": "Confermi di voler bloccare l'istanza {instance}?", - "delete_announcement_confirm": "Vuoi eliminare questo l'annuncio?", - "announcement_remove_ok": "Annuncio rimosso", - "announcement_description": "In questa sezione puoi inserire annunci che rimarranno in homepage", - "instance_locale": "Lingua predefinita", - "instance_locale_description": "La lingua utilizzata per mostrare le pagine è quella preferita dall'utente. In alcuni casi però dobbiamo mostrare dei messaggi per tutti allo stesso modo (ad esempio quando pubblichiamo via ActivityPub o nell'invio di alcune e-mail). In questi casi useremo la lingua selezionata qui sopra.", - "instance_place": "Luogo indicativo di questa istanza", - "title_description": "Viene usato nel titolo della pagina, nell'oggetto delle e-mail, nell'esportazione dei flussi RSS e degli ICS.", - "description_description": "Compare nell'intestazione accanto al titolo", - "instance_name_help": "Nome dell'account ActivityPub da seguire", - "enable_trusted_instances": "Abilita istanze amiche", - "trusted_instances_help": "Le istanze amiche compariranno nella barra di navigazione in cima alla pagina", - "add_trusted_instance": "Aggiungi un'istanza amica", - "instance_place_help": "Verrà mostrata questa stringa nel menù delle altre istanze amiche", - "delete_trusted_instance_confirm": "Vuoi davvero eliminare questa voce dal menù delle istanze amiche?", - "is_dark": "Tema scuro", - "add_link": "Aggiungi link", - "footer_links": "Collegamenti del piè di pagina", - "delete_footer_link_confirm": "Vuoi eliminare questo collegamento?", - "edit_place": "Modifica luogo", - "new_announcement": "Nuovo annuncio", - "show_smtp_setup": "Impostazioni email", - "widget": "Widget", - "smtp_description": "
    • L'amministratore riceve una email quando viene aggiunto un evento anonimo (se abilitati).
    • L'amministratore riceve le mail di richiesta di registrazione (se abilitata).
    • Le persone ricevono una mail di conferma della registrazione richiesta.
    • Le persone ricevono le email della registrazione confermata.
    • Le persone ricevono una mail di avviso quando vengono registrate direttamente da admin.
    • Le persone ricevono la mail per modificare la password quando l'hanno dimenticata
    ", - "smtp_hostname": "SMTP Hostname", - "smtp_test_success": "Una mail di test è stata inviata all'indirizzo {admin_email}, controlla la tua casella di posta", - "smtp_test_button": "Invia una mail di prova", - "admin_email": "E-mail dell'admin", - "new_collection": "Crea bolla", - "wrong_domain_warning": "Il \"baseurl\" configurato in config.json ({baseurl}) è diverso da quello che stai visitando ({url})", - "collections_description": "Le bolle sono raggruppamenti di eventi per tag e posti.", - "edit_collection": "Modifica bolla" - }, - "auth": { - "not_confirmed": "Non ancora confermato…", - "fail": "Autenticazione fallita. Sicura la password è giusta? E l'e-mail?" - }, - "settings": { - "update_confirm": "Vuoi salvare le modifiche?", - "change_password": "Cambia password", - "password_updated": "Password modificata.", - "danger_section": "Sezione pericolosa", - "remove_account": "Premendo il seguente tasto il tuo utente verrà eliminato. Gli eventi da te pubblicati invece no.", - "remove_account_confirm": "Stai per eliminare definitivamente il tuo account" - }, - "error": { - "nick_taken": "Questo nome utente è già presente.", - "email_taken": "Questa e-mail è già registrata." - }, - "confirm": { - "title": "Conferma utente", - "not_valid": "Qualcosa è andato storto.", - "valid": "Il tuo account è stato confermato, ora puoi entrare" - }, - "ordinal": { - "1": "primo", - "2": "secondo", - "3": "terzo", - "4": "quarto", - "5": "quinto", - "-1": "ultimo" - }, - "validators": { - "required": "Campo {fieldName} necessario", - "email": "Inserisci un'e-mail valida" - }, - "about": "\n

    Gancio è un'agenda condivisa per le comunità locali.

    \n ", - "oauth": { - "authorization_request": "L'applicazione esterna {app} richiede l'autorizzazione a svolgere le sequenti attività su {instance_name}:", - "redirected_to": "Dopo la conferma sarai reindirizzata all'indirizzo {url}", - "scopes": { - "event:write": "Pubblicare/modificare i tuoi eventi" - } - }, - "setup": { - "completed": "Setup completato", - "completed_description": "

    Puoi entrare con le seguenti credenziali:

    Utente: {email}
    Password: {password}

    ", - "copy_password_dialog": "Sì, devi copiare la password!", - "start": "Inizia", - "https_warning": "Stai visitando il setup da HTTP, ricorda di cambiare il baseurl nel config.json quando passerai ad HTTPS!" + "common": { + "add_event": "Aggiungi evento", + "next": "Continua", + "export": "Esporta", + "send": "Invia", + "where": "Dove", + "address": "Indirizzo", + "when": "Quando", + "what": "Cosa", + "media": "Media", + "login": "Entra", + "email": "E-mail", + "password": "Password", + "register": "Registrati", + "description": "Descrizione", + "remove": "Elimina", + "hide": "Nascondi", + "search": "Cerca", + "edit": "Modifica", + "info": "Info", + "confirm": "Conferma", + "admin": "Amministra", + "users": "Utenti", + "events": "Eventi", + "places": "Luoghi", + "settings": "Opzioni", + "actions": "Azioni", + "deactivate": "Disattiva", + "remove_admin": "Rimuovi Admin", + "activate": "Attiva", + "save": "Salva", + "preview": "Anteprima", + "logout": "Esci", + "share": "Esporta", + "name": "Nome", + "associate": "Associa", + "edit_event": "Modifica evento", + "related": "Memoria storica", + "add": "Aggiungi", + "logout_ok": "Uscita correttamente", + "copy": "Copia", + "recover_password": "Recupera password", + "new_password": "Nuova password", + "new_user": "Nuovo utente", + "ok": "OK", + "cancel": "Annulla", + "enable": "Abilita", + "disable": "Disabilita", + "me": "Tu", + "password_updated": "Password modificata.", + "activate_user": "Confermato", + "displayname": "Nome mostrato", + "federation": "Federazione", + "set_password": "Imposta password", + "copy_link": "Copia link", + "send_via_mail": "Invia e-mail", + "add_to_calendar": "Aggiungi al calendario", + "instances": "Istanze", + "copied": "Copiato", + "embed": "Incorpora", + "embed_title": "Mostra questo evento sul tuo sito web", + "embed_help": "Copiando il seguente codice sul tuo sito web l'evento verrà incluso come qui di lato", + "feed": "Feed RSS", + "feed_url_copied": "URL copiato, incollalo nel tuo lettore di Feed RSS", + "follow_me_title": "Segui gli aggiornamenti dal fediverso", + "follow": "Segui", + "n_resources": "nessuna risorsa|una risorsa|{n} risorse", + "resources": "Risorse", + "moderation": "Moderazione", + "authorize": "Autorizza", + "title": "Titolo", + "user": "Utente", + "filter": "Filtra", + "event": "Evento", + "pause": "Pausa", + "start": "Avvia", + "fediverse": "Fediverso", + "skip": "Salta", + "delete": "Elimina", + "announcements": "Annunci", + "url": "URL", + "place": "Luogo", + "tags": "Etichette", + "theme": "Tema", + "reset": "Reset", + "import": "Importa", + "max_events": "N. massimo eventi", + "label": "Etichetta", + "collections": "Bolle", + "plugins": "Plugin", + "help_translate": "Aiuta a tradurre", + "show_map": "Mostra mappa", + "latitude": "Latitudine", + "longitude": "Longitudine", + "getting_there": "Come arrivare", + "calendar": "Calendario", + "home": "Home", + "about": "Cos'è" + }, + "login": { + "description": "Entrando puoi pubblicare nuovi eventi.", + "check_email": "Controlla la tua posta (anche lo spam).", + "not_registered": "Non sei registrata?", + "forgot_password": "Dimenticato la password?", + "error": "Errore durante il login, controlla i dati.", + "insert_email": "Inserisci l'indirizzo e-mail", + "ok": "Tutto rego" + }, + "recover": { + "not_valid_code": "Mmmmm qualcosa è andato storto." + }, + "export": { + "intro": "Contrariamente alle piattaforme del capitalismo, che fanno di tutto per tenere i dati e gli utenti al loro interno, crediamo che le informazioni, come le persone, debbano essere libere. Per questo puoi rimanere aggiornata sugli eventi che vuoi, come meglio credi, senza necessariamente passare da questo sito.", + "email_description": "Puoi ricevere via posta elettronica gli eventi che ti interessano.", + "insert_your_address": "Inserisci il tuo indirizzo e-mail", + "feed_description": "Per seguire gli aggiornamenti da computer o smartphone senza la necessità di aprire periodicamente il sito, il metodo consigliato è quello dei Feed RSS.

    \n\n

    Con i feed rss utilizzi un'apposita applicazione per ricevere aggiornamenti dai siti che più ti interessano. È un buon metodo per seguire anche molti siti in modo molto rapido, senza necessità di creare un account o altre complicazioni.

    \n\n
  • Se hai Android, ti consigliamo Flym o Feeder
    • \n
  • Per iPhone/iPad puoi usare Feed4U
    • \n
  • Per il computer fisso/portatile consigliamo Brief, da installare all'interno di Firefox e compatibile con tutti i principali sistemi operativi.
    • \n
    \nAggiungendo questo link al tuo lettore di feed, rimarrai aggiornata.", + "ical_description": "I computer e gli smartphone sono comunemente attrezzati con un'applicazione per gestire un calendario. A questi programmi solitamente è possibile far importare un calendario remoto.", + "list_description": "Se hai un sito web e vuoi mostrare una lista di eventi, puoi usare il seguente codice" + }, + "register": { + "description": "I movimenti hanno bisogno di organizzarsi e autofinanziarsi.
    \nUsatelo solo per eventi non commerciali, antifascisti, antisessisti, antirazzisti.
    Prima di poter pubblicare dobbiamo approvare l'account, considera che dietro questo sito ci sono delle persone di carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.", + "error": "Errore: ", + "complete": "Confermeremo la registrazione quanto prima.", + "first_user": "Amministratore creato e attivo" + }, + "event": { + "anon": "Anonimo", + "anon_description": "Puoi inserire un evento senza registrarti o fare il login, ma in questo caso dovrai aspettare che qualcuno lo legga confermando che si tratta di un evento adatto a questo spazio, delegando questa scelta. Inoltre non sarà possibile modificarlo.

    \nPuoi invece fare il login o registrarti, altrimenti vai avanti, lo confermeremo appena possibile. ", + "same_day": "Stesso giorno", + "what_description": "Titolo", + "description_description": "Descrizione", + "tag_description": "Etichetta", + "media_description": "Puoi aggiungere un volantino (opzionale)", + "added": "Evento aggiunto", + "saved": "Evento salvato", + "added_anon": "Evento aggiunto, verrà confermato quanto prima.", + "updated": "Evento aggiornato", + "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.", + "address_description": "A che indirizzo?", + "address_description_osm": "A che indirizzo? (OpenStreetMap)", + "coordinates_search_description": "Puoi ricercare il posto per nome, o incollare la coppia di coordinate.", + "confirmed": "Evento confermato", + "not_found": "Evento non trovato", + "remove_confirmation": "Vuoi eliminare questo evento?", + "remove_recurrent_confirmation": "Sei sicura di voler eliminare questo evento ricorrente?\nGli eventi passati verranno mantenuti ma non ne verranno creati altri.", + "recurrent": "Ricorrente", + "edit_recurrent": "Modifica evento ricorrente:", + "show_recurrent": "appuntamenti ricorrenti", + "show_past": "eventi passati", + "recurrent_description": "Scegli la frequenza e seleziona i giorni", + "multidate_description": "Un festival o una tre giorni? Scegli quando comincia e quando finisce", + "multidate": "Più giorni", + "normal": "Normale", + "normal_description": "Scegli il giorno.", + "recurrent_1w_days": "Ogni {days}", + "recurrent_2w_days": "Un {days} ogni due", + "recurrent_1m_days": "Il giorno {days} di ogni mese", + "recurrent_2m_days": "Il giorno {days} ogni due mesi", + "recurrent_1m_ordinal": "Il {n} {days} di ogni mese", + "recurrent_2m_ordinal": "Il {n} {days} un mese sì e uno no", + "each_week": "Ogni settimana", + "each_2w": "Ogni due settimane", + "each_month": "Ogni mese", + "due": "alle", + "from": "Dalle", + "image_too_big": "L'immagine non può essere più grande di 4MB", + "interact_with_me": "Seguimi dal fediverso", + "follow_me_description": "Tra i vari modi di rimanere aggiornati degli eventi pubblicati qui su {title},\npuoi seguire l'account {account} dal fediverso, ad esempio via Mastodon, ed eventualmente aggiungere risorse ad un evento da lì.

    \nSe non hai mai sentito parlare di Mastodon e del fediverso ti consigliamo di leggere questo articolo.

    Inserisci la tua istanza qui sotto (es. mastodon.cisti.org o mastodon.bida.im)", + "only_future": "solo eventi futuri", + "interact_with_me_at": "Seguimi nel fediverso su", + "import_ICS": "Importa da ICS", + "import_URL": "Importa da URL (ics o h-event)", + "ics": "ICS", + "import_description": "Puoi importare eventi da altre piattaforme e da altre istanze attraverso i formati standard (ics e h-event)", + "alt_text_description": "Descrizione per persone con disabilità visive", + "choose_focal_point": "Scegli il punto centrale cliccando", + "remove_media_confirmation": "Confermi l'eliminazione dell'immagine?", + "download_flyer": "Scarica volantino" + }, + "admin": { + "place_description": "Nel caso in cui un luogo sia errato o cambi indirizzo, puoi modificarlo.
    Considera che tutti gli eventi associati a questo luogo cambieranno indirizzo (anche quelli passati).", + "event_confirm_description": "Puoi confermare qui gli eventi inseriti da utenti anonimi", + "delete_user": "Elimina", + "remove_admin": "Rimuovi admin", + "disable_user_confirm": "Vuoi disabilitare {user}?", + "delete_user_confirm": "Vuoi rimuovere {user}?", + "user_remove_ok": "Utente eliminato", + "user_create_ok": "Utente creato", + "allow_registration_description": "Vuoi abilitare la registrazione?", + "allow_anon_event": "Si possono inserire eventi anonimi (previa conferma)?", + "allow_recurrent_event": "Abilita eventi ricorrenti", + "allow_geolocation": "Abilita la geolocalizzazione degli eventi", + "recurrent_event_visible": "Appuntamenti ricorrenti visibili di default", + "federation": "Federazione / ActivityPub", + "enable_federation": "Abilita la federazione", + "enable_federation_help": "Sarà possibile seguire questa istanza dal fediverso", + "add_instance": "Aggiungi istanza", + "select_instance_timezone": "Fuso orario", + "instance_timezone_description": "Gancio è pensato per raccogliere gli eventi di un luogo specifico come ad esempio una città. Scrivendo e selezionando il fuso orario di questo luogo, tutti gli orari saranno mostrati e inseriti secondo quanto scelto.", + "enable_resources": "Abilita risorse", + "enable_resources_help": "Permette di aggiungere risorse agli eventi dal fediverso", + "hide_boost_bookmark": "Nasconde n. condivisioni e segnalibri", + "hide_boost_bookmark_help": "Nasconde le piccole icone che mostrano il numero di boost e segnalibri in arrivo dal fediverso", + "block": "Blocca", + "unblock": "Sblocca", + "user_add_help": "Manderemo un'e-mail al nuovo utente con le istruzioni per confermare l'iscrizione e scegliere una password", + "resources": "Risorse", + "hide_resource": "Nascondi risorsa", + "show_resource": "Mostra risorsa", + "delete_resource": "Elimina risorsa", + "delete_resource_confirm": "Sei sicurǝ di voler eliminare questa risorsa?", + "block_user": "Blocca questo utente", + "user_blocked": "L'utente {user} non potrà più aggiungere risorse", + "filter_instances": "Filtra istanze", + "filter_users": "Filtra utenti", + "instance_name": "Nome istanza", + "favicon": "Logo", + "user_block_confirm": "Confermi di voler bloccare l'utente {user}?", + "instance_block_confirm": "Confermi di voler bloccare l'istanza {instance}?", + "delete_announcement_confirm": "Vuoi eliminare questo l'annuncio?", + "announcement_remove_ok": "Annuncio rimosso", + "announcement_description": "In questa sezione puoi inserire annunci che rimarranno in homepage", + "instance_locale": "Lingua predefinita", + "instance_locale_description": "La lingua utilizzata per mostrare le pagine è quella preferita dall'utente. In alcuni casi però dobbiamo mostrare dei messaggi per tutti allo stesso modo (ad esempio quando pubblichiamo via ActivityPub o nell'invio di alcune e-mail). In questi casi useremo la lingua selezionata qui sopra.", + "instance_place": "Luogo indicativo di questa istanza", + "title_description": "Viene usato nel titolo della pagina, nell'oggetto delle e-mail, nell'esportazione dei flussi RSS e degli ICS.", + "description_description": "Compare nell'intestazione accanto al titolo", + "instance_name_help": "Nome dell'account ActivityPub da seguire", + "enable_trusted_instances": "Abilita istanze amiche", + "trusted_instances_help": "Le istanze amiche compariranno nella barra di navigazione in cima alla pagina", + "trusted_instances_label": "Etichetta di navigazione alle istanze amiche", + "trusted_instances_label_default": "Istanze amiche", + "trusted_instances_label_help": "L'etichetta di default è 'Istanze amiche'", + "add_trusted_instance": "Aggiungi un'istanza amica", + "instance_place_help": "Verrà mostrata questa stringa nel menù delle altre istanze amiche", + "delete_trusted_instance_confirm": "Vuoi davvero eliminare questa voce dal menù delle istanze amiche?", + "is_dark": "Tema scuro", + "add_link": "Aggiungi link", + "footer_links": "Collegamenti del piè di pagina", + "delete_footer_link_confirm": "Vuoi eliminare questo collegamento?", + "edit_place": "Modifica luogo", + "edit_tag": "Modifica tag", + "edit_tag_help": "Puoi cambiare il tag sostituendolo con uno nuovo o unendolo ad uno gia' esistente. Verranno modificati anche i {n} eventi associati", + "new_announcement": "Nuovo annuncio", + "show_smtp_setup": "Impostazioni email", + "widget": "Widget", + "smtp_description": "
    • L'amministratore riceve una email quando viene aggiunto un evento anonimo (se abilitati).
    • L'amministratore riceve le mail di richiesta di registrazione (se abilitata).
    • Le persone ricevono una mail di conferma della registrazione richiesta.
    • Le persone ricevono le email della registrazione confermata.
    • Le persone ricevono una mail di avviso quando vengono registrate direttamente da admin.
    • Le persone ricevono la mail per modificare la password quando l'hanno dimenticata
    ", + "smtp_hostname": "SMTP Hostname", + "smtp_test_success": "Una mail di test è stata inviata all'indirizzo {admin_email}, controlla la tua casella di posta", + "smtp_test_button": "Invia una mail di prova", + "admin_email": "E-mail dell'admin", + "admin_email_help": "L'indirizzo che usiamo come mittente per inviare le e-mail. È anche l'indirizzo a cui vengono spedite le e-mail di amministrazione", + "new_collection": "Crea bolla", + "wrong_domain_warning": "Il \"baseurl\" configurato in config.json ({baseurl}) è diverso da quello che stai visitando ({url})", + "collections_description": "Le bolle sono raggruppamenti di eventi per tag e posti.", + "edit_collection": "Modifica bolla", + "config_plugin": "Configura plugin", + "fallback_image": "Immagine di ripiego", + "header_image": "Immagine di intestazione", + "hide_thumbs": "Nascondi immaginine", + "hide_calendar": "Nascondi calendario", + "default_images": "Immagini preimpostate", + "default_images_help": "Devi aggiornare la pagina per vedere le modifiche.", + "blocked": "Bloccato", + "domain": "Domini", + "known_users": "Utenti conosciuti", + "created_at": "Creato il", + "geolocation_description": "1. Definisci un fornitore per il servizio di georeferenziazione (geocodifica).
    Al momento, tra quelli elencati nella wiki di OpenStreetMap, è presente il supporto per i software Nominatim e Photon.
    Puoi utilizzare una delle relative demo ufficiali copiandone il link nel campo 'Fornitore georeferenziazione':
    2. Definisci un fornitore di layers per la mappa.
    Qui puoi trovarne una lista: https://leaflet-extras.github.io/leaflet-providers/preview/", + "geocoding_provider_type": "Software fornitore georeferenziazione", + "geocoding_provider_type_help": "Il software di default è Nominatim", + "geocoding_provider": "Fornitore georeferenziazione", + "geocoding_provider_help": "Il fornitore di default è Nominatim", + "geocoding_countrycodes": "Codici territoriali", + "geocoding_countrycodes_help": "Permette di impostare un filtro alle ricerche basato su codici territori nazionali", + "geocoding_test_button": "Test geocoding", + "geocoding_test_success": "Il servizio di geocoding all'indirizzo {service_name} sta funzionando", + "geocoding_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}", + "tilelayer_provider": "Fornitore tilelayer", + "tilelayer_provider_help": "Il fornitore di default è OpenStreetMap", + "tilelayer_provider_attribution": "Attribuzione", + "tilelayer_test_button": "Test tilelayer", + "tilelayer_test_success": "Il servizio di tilelayer all'indirizzo {service_name} sta funzionando", + "tilelayer_test_error": "Il servizio non è raggiungibile all'indirizzo: {service_name}", + "geolocation": "Geo e mappe" + }, + "auth": { + "not_confirmed": "Non ancora confermato…", + "fail": "Autenticazione fallita. Sicura la password è giusta? E l'e-mail?" + }, + "settings": { + "update_confirm": "Vuoi salvare le modifiche?", + "change_password": "Cambia password", + "password_updated": "Password modificata.", + "danger_section": "Sezione pericolosa", + "remove_account": "Premendo il seguente tasto il tuo utente verrà eliminato. Gli eventi da te pubblicati invece no.", + "remove_account_confirm": "Stai per eliminare definitivamente il tuo account" + }, + "error": { + "nick_taken": "Questo nome utente è già presente.", + "email_taken": "Questa e-mail è già registrata." + }, + "confirm": { + "title": "Conferma utente", + "not_valid": "Qualcosa è andato storto.", + "valid": "Il tuo account è stato confermato, ora puoi entrare" + }, + "ordinal": { + "1": "primo", + "2": "secondo", + "3": "terzo", + "4": "quarto", + "5": "quinto", + "-1": "ultimo" + }, + "validators": { + "required": "Campo {fieldName} necessario", + "email": "Inserisci un'e-mail valida" + }, + "about": "\n

    Gancio è un'agenda condivisa per le comunità locali.

    \n ", + "oauth": { + "authorization_request": "L'applicazione esterna {app} richiede l'autorizzazione a svolgere le sequenti attività su {instance_name}:", + "redirected_to": "Dopo la conferma sarai reindirizzata all'indirizzo {url}", + "scopes": { + "event:write": "Pubblicare/modificare i tuoi eventi" } + }, + "setup": { + "completed": "Setup completato", + "completed_description": "

    Puoi entrare con le seguenti credenziali:

    Utente: {email}
    Password: {password}

    ", + "copy_password_dialog": "Sì, devi copiare la password!", + "start": "Inizia", + "https_warning": "Stai visitando il setup da HTTP, ricorda di cambiare il baseurl nel config.json quando passerai ad HTTPS!" + } } diff --git a/locales/nb.json b/locales/nb.json index 19c9be38..4bc40fd4 100644 --- a/locales/nb.json +++ b/locales/nb.json @@ -61,6 +61,9 @@ "instance_place_help": "Etikett å vise i andres instanser", "add_trusted_instance": "Legg til en vennlig instans", "trusted_instances_help": "Liste over vennlige instanser vises i toppteksten", + "trusted_instances_label": "Navigasjonsetikett til venneforekomster", + "trusted_instances_label_default": "Vennlige tilfeller", + "trusted_instances_label_help": "Standardetiketten er 'Vennlige tilfeller'", "enable_trusted_instances": "Skru på vennlige instanser", "instance_name_help": "ActivityPub-konto å følge", "instance_place": "Indiker sted for denne instansen", @@ -81,6 +84,7 @@ "allow_recurrent_event": "Tillat gjentagende hendelser", "allow_anon_event": "Tillat anonyme hendelser (må bekreftes)?", "allow_registration_description": "Tillat selv-registrering?", + "allow_geolocation": "Tillat geolokalisering av hendelser", "event_confirm_description": "Du kan bekrefte hendelser som oppføres av anonyme brukere her", "place_description": "Hvis du har valgt feil sted eller adresse, kan du endre det.
    Alle nåværende og foregående hendelser tilknyttet dette stedet vil endre adresse." }, @@ -114,11 +118,13 @@ "image_too_big": "Bildet kan ikke være større enn 4 MB", "recurrent_2m_ordinal": "|Den {n} {days} i måneden annenhver|Den {n} {days} i måneden annenhver", "recurrent_1m_ordinal": "På {n} {days} i hver måned", - "recurrent_2m_days": "|På {days} i hver måned annenhver|{days} i hver måned annenhver", - "recurrent_1m_days": "|På {days} i hver måned|{days} i hver måned", + "recurrent_2m_days": "På {days} i hver måned annenhver", + "recurrent_1m_days": "På {days} i hver måned", "recurrent_2w_days": "En {days} annenhver", "multidate_description": "Er det en festival? Velg når den starter og slutter", "where_description": "Hvor finner hendelsen sted? Hvis den ikke finnes kan du opprette den.", + "coordinates_search": "Søk etter koordinater", + "coordinates_search_description": "Du kan søke etter sted etter navn, eller lime inn koordinatparet.", "added_anon": "Hendelse lagt til, men ikke bekreftet enda.", "added": "Hendelse lagt til", "media_description": "Du kan legge til et flygeblad (valgfritt)", @@ -133,7 +139,7 @@ "first_user": "Administrator opprettet", "complete": "Registrering må bekreftes.", "error": "Feil: ", - "description": "Sosiale bevegelser bør organisere og finansiere seg selv.
    \n
    Før du kan publisere, må kontoen godkjennes, ha i minnet at bak denne siden er det mennesker, så skriv to linjer om hvilke hendelser du ønsker å publisere." + "description": "Sosiale bevegelser bør organisere og finansiere seg selv.
    \n
    Før du kan publisere, må kontoen godkjennes, ha i minnet at bak denne siden er det mennesker, så skriv to linjer om hvilke hendelser du ønsker å publisere." }, "recover": { "not_valid_code": "Noe gikk galt." @@ -232,7 +238,11 @@ "federation": "Føderasjon", "n_resources": "ingen ressurs|én ressurs|{n} ressurser", "associate": "Tilknytt", - "import": "Importer" + "import": "Importer", + "show_map": "Vis kart", + "latitude": "breddegrad", + "longitude": "Lengdegrad", + "getting_there": "Slik kommer du deg dit" }, "about": "\n

    Gancio er en delt agenda for lokale gemenskaper.

    \n ", "validators": { diff --git a/locales/pl.json b/locales/pl.json index 0a4cfd52..a49386ad 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -19,6 +19,8 @@ "search": "Szukaj", "edit": "Edytuj", "info": "Informacje", - "confirm": "Potwierdź" + "confirm": "Potwierdź", + "admin": "Admin", + "users": "Użytkownik" } } diff --git a/locales/pt.json b/locales/pt.json index 0967ef42..a74aa379 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -1 +1,321 @@ -{} +{ + "common": { + "add_event": "Adicionar evento", + "description": "Descrição", + "send": "Enviar", + "address": "Endereço", + "next": "Próximo", + "when": "Quando", + "where": "Onde", + "login": "Login", + "export": "Exportar", + "email": "E-mail", + "what": "O que", + "media": "Media", + "password": "Senha", + "register": "Registrar", + "remove": "Remover", + "confirm": "Confirmar", + "events": "Eventos", + "settings": "Opções", + "actions": "Ações", + "edit": "Editar", + "admin": "Admin", + "places": "Lugares", + "hide": "Ocultar", + "search": "Buscar", + "info": "Info", + "users": "Usuários", + "share": "Compartilhar", + "name": "Nome", + "associate": "Associar", + "logout": "Sair", + "remove_admin": "Remover admin", + "activate": "Ativar", + "save": "Salvar", + "preview": "Pré-visualizar", + "edit_event": "Editar evento", + "add": "Adicionar", + "copy": "Copiar", + "ok": "Ok", + "cancel": "Cancelar", + "me": "Você", + "password_updated": "Senha alterada.", + "resources": "Recursos", + "activate_user": "Confirmado", + "copy_link": "Copiar link", + "send_via_mail": "Enviar e-mail", + "add_to_calendar": "Adicionar ao calendário", + "copied": "Copiado", + "recover_password": "Recuperar senha", + "new_password": "Nova senha", + "new_user": "Novo usuário", + "deactivate": "Desligar", + "related": "Relacionado", + "enable": "Habilitar", + "disable": "Desabilitar", + "federation": "Federação", + "set_password": "Definir senha", + "instances": "Instâncias", + "follow": "Seguir", + "moderation": "Moderação", + "user": "Usuário", + "authorize": "Autorizar", + "title": "Título", + "filter": "Filtro", + "event": "Evento", + "pause": "Pausa", + "start": "Início", + "feed": "Feed RSS", + "skip": "Pular", + "delete": "Remover", + "fediverse": "Fediverso", + "announcements": "Anúncios", + "place": "Local", + "url": "URL", + "logout_ok": "Deslogado", + "n_resources": "nenhum recurso|um recurso|{n} recursos", + "embed": "Incorporar", + "embed_title": "Incorpore este evento em sua página", + "embed_help": "Copie o seguinte código em sua página e o evento será exibido desta maneira", + "displayname": "Nome de exibição", + "feed_url_copied": "Abra a URL copiada do feed em seu leitor de RSS", + "follow_me_title": "Siga as atualizações pelo Fediverso", + "tags": "Marcadores", + "theme": "Tema", + "reset": "Reiniciar", + "import": "Importar", + "collections": "Coleções", + "max_events": "N. máximo de eventos", + "label": "Etiqueta", + "close": "Fechar", + "plugins": "Plugins", + "help_translate": "Ajude a traduzir", + "show_map": "Mostrar mapa", + "calendar": "Calendário", + "home": "Início", + "about": "Sobre", + "content": "Conteúdo", + "admin_actions": "Ações de admin", + "recurring_event_actions": "Ações de eventos recorrentes" + }, + "admin": { + "user_block_confirm": "Você está certo que quer bloquear o usuário {user}?", + "filter_instances": "Filtrar instâncias", + "user_add_help": "Um e-mail com instruções para confirmar a inscrição e escolher uma senha será enviada ao novo usuário", + "show_resource": "Mostrar recurso", + "block_user": "Bloquear usuário", + "filter_users": "Filtrar usuários", + "hide_resource": "Ocultar recurso", + "delete_resource": "Remover recurso", + "delete_resource_confirm": "Você está certo que quer remover este recurso?", + "show_smtp_setup": "Configurações de e-mail", + "resources": "Recursos", + "delete_announcement_confirm": "Você está certo que quer remover o anúncio?", + "smtp_hostname": "Hostname SMTP", + "collections_description": "Coleções são agrupamentos de eventos por marcadores e locais. Eles serão exibidos na página principal", + "new_collection": "Nova coleção", + "disable_admin_user_confirm": "Você está certo que quer remover permissões de administração de {user}?", + "enable_admin_user_confirm": "Você está certo que quer adicionar permissões de administrador para {user}?", + "event_remove_ok": "Evento removido", + "smtp_description": "
    • Administrador deve receber um e-mail quando um evento anônimo for adicionado (se habilitado).
    • Administrador deve receber um e-mail de requisição de registro (se habilitado).
    • Usuário deve receber um e-mail de solicitação de registro.
    • Usuário deve receber um e-mail de confirmação de registro.
    • Usuário deve recever um e-mail de confirmação quando registrado diretamente por um administrador.
    • Usuários devem receber um e-mail para recuperar a senha quando eles esquecerem ela
    ", + "allow_registration_description": "Permitir registro aberto de usuários?", + "block": "Bloquear", + "unblock": "Desbloquear", + "instance_name": "Nome da instância", + "favicon": "Logo", + "instance_block_confirm": "Você está certo que quer bloquear a instância {instance}?", + "enable_federation": "Habilitar federação", + "enable_federation_help": "Será possível seguir está instância a partir do Fediverso", + "add_instance": "Adicionar instância", + "hide_boost_bookmark_help": "Ocultar os pequenos ícones mostrando o número de impulsos e favoritos vindos do Fediverso", + "announcement_remove_ok": "Anúncio removido", + "instance_timezone_description": "Gancio é desenvolvido para coletar os eventos de um local específico, como uma cidade. Todos os eventos nesse local serão exibidos no fuso-horário escolhido para ele.", + "instance_locale_description": "Idioma de preferência para as páginas. Algumas vezes as mensagens precisam ser exibidas em um mesmo idioma para todos (por exemplo quando publicando através do ActivityPub ou quando enviar alguns e-mails). Nestes casos o idioma seleciona abaixo será o utilizado.", + "title_description": "É utilizado no título da página, no assunto do e-mail para exportar feeds RSS e ICS.", + "instance_name_help": "Conta ActivityPub para seguir", + "enable_trusted_instances": "Habilitar instâncias amigáveis", + "trusted_instances_help": "A lista de instâncias amigáveis que serão exibidas no cabeçalho", + "trusted_instances_label": "Etiqueta de navegação para instâncias amigas", + "trusted_instances_label_default": "Instâncias amigas", + "trusted_instances_label_help": "A etiqueta padrão é 'Instâncias amigas'", + "add_trusted_instance": "Adicione uma instância amigável", + "footer_links": "Links de rodapé", + "delete_footer_link_confirm": "Está certo que quer remover este link?", + "edit_place": "Editar local", + "smtp_port": "Porta SMTP", + "smtp_secure": "SMTP Seguro (TLS ou STARTTLS)", + "smtp_use_sendmail": "Utilizar sendmail", + "instance_place_help": "A etiqueta para exibir em outras instâncias", + "delete_trusted_instance_confirm": "Você quer realmente remover este item do menu de instâncias amigas?", + "sender_email": "E-mail do remetente", + "widget": "Widget", + "wrong_domain_warning": "A baseurl configurado em config.json ({baseurl}) é diferente da que você está visitando ({url})", + "edit_collection": "Editar Coleção", + "enable_resources_help": "Permitir adicionar recursos para o evento a partir do Fediverso", + "hide_boost_bookmark": "Ocultar impulsos/favoritos", + "select_instance_timezone": "Fuso horário", + "instance_locale": "Idioma padrão", + "enable_resources": "Habilitar recursos", + "delete_user": "Remover", + "remove_admin": "Remover administrador", + "place_description": "Se você colocou o local ou o endereço errado, você pode alterá-lo.
    Todos os eventos atuais e passados associados com esse local terão o endereço alterado.", + "event_confirm_description": "Você pode confirmar eventos criados por usuários anônimos aqui", + "disable_user_confirm": "Você está certo que quer desabilitar {user}?", + "delete_user_confirm": "Você está certo que quer remover {user}?", + "user_remove_ok": "Usuário removido", + "user_create_ok": "Usuário criado", + "allow_anon_event": "Permitir eventos anônimos (precisam ser confirmados)?", + "allow_recurrent_event": "Permitir eventos recorrentes", + "recurrent_event_visible": "Exibir eventos recorrentes por padrão", + "user_blocked": "Usuário {user} bloqueado", + "announcement_description": "Nesta seção você pode inserir anúncios que serão exibidos na página principal", + "description_description": "Exibido no cabeçalho próximo ao título", + "instance_place": "Local indicativo desta instância", + "is_dark": "Tema escuro", + "add_link": "Adicionar link", + "new_announcement": "Novo anúncio", + "federation": "Federação / ActivityPub", + "smtp_test_success": "Um e-mail de teste foi enviado para {admin_email}, por favor verifique sua caixa de entrada", + "smtp_test_button": "Enviar e-mail de teste", + "allow_geolocation": "Permitir geolocalização de eventos", + "config_plugin": "Configuração de plugin", + "fallback_image": "Imagem alternativa", + "header_image": "Imagem de cabeçalho", + "hide_thumbs": "Ocultar miniaturas", + "default_images_help": "Você precisa recarregar a página para ver as mudanças.", + "domain": "Domínio", + "default_images": "Imagens padrão", + "known_users": "Usuários conhecidos", + "created_at": "Criado em", + "hide_calendar": "Ocultar calendário", + "blocked": "Bloqueado" + }, + "event": { + "follow_me_description": "Uma das maneiras de se manter atualizado com os eventos publicados aqui em {title},\né seguir a conta {account} no Fediverso, por exemplo via Mastodon, e possivelmente adicionar recursos para um evento a partir de lá.

    \nSe você nunca ouviu falar sobre Mastodon ou do Fediverso nós recomendamos ler este artigo.

    Entre com sua instância abaixo (e.g. mastodon.social)", + "saved": "Evento salvo", + "recurrent": "Recorrente", + "ics": "ICS", + "recurrent_1m_days": "Dia {days} de cada mês", + "interact_with_me": "Siga-me", + "media_description": "Você pode adicionar um flyer (opcional)", + "same_day": "no mesmo dia", + "added": "Evento adicionado", + "what_description": "Título", + "description_description": "Descrição", + "tag_description": "Marcador", + "show_recurrent": "eventos recorrentes", + "anon": "Anônimo", + "anon_description": "Você pode adicionar um evento sem se registrar ou autenticar-se, mas você precisa esperar alguém para ler,\nconfirmar que é um evento adequado. Não será possível modifiá-lo.

    \nVocê pode ao invés autenticar-se ou registrar-se. De qualquer modo, vá em frente e consiga uma resposta o mais rápido possível. ", + "added_anon": "Evento adicionado, mas ainda precisa ser confirmado.", + "updated": "Evento atualizado", + "where_description": "Onde está o evento? Se não está visível você pode criá-lo.", + "confirmed": "Evento confirmado", + "not_found": "Não foi possível encontrar o evento", + "remove_confirmation": "Você está certo que quer remover este evento?", + "edit_recurrent": "Editar evento recorrente:", + "only_future": "apenas eventos futuros", + "recurrent_description": "Escolha a frequência e selecione os dias", + "multidate_description": "É um festival? Escolha quando ele começa e quando termina", + "multidate": "Mais dias", + "normal": "Normal", + "show_past": "também eventos anteriores", + "normal_description": "Escolha o dia.", + "recurrent_1w_days": "A cada {days}", + "each_week": "Toda semana", + "each_2w": "A cada duas semanas", + "each_month": "Todo mês", + "recurrent_2w_days": "{days} a cada dois", + "recurrent_2m_days": "Dia {days} a cada dois meses", + "recurrent_1m_ordinal": "{n} {days} de cada mês", + "recurrent_2m_ordinal": "{n} {days} a cada dois meses", + "due": "até", + "from": "De", + "image_too_big": "A imagem não pode ser maior que 4MB", + "interact_with_me_at": "Interaja comigo no Fediverso atráves de", + "remove_recurrent_confirmation": "Você está certo que quer remover este evento recorrente?\nEventos passados serão mantidos, mas nenhum evento seguinte será criado.", + "import_URL": "Importar a partir de URL", + "import_ICS": "Importar a partir de ICS", + "import_description": "Você pode importar eventos de outras plataformas e outras instâncias através de formatos padrão (ics e h-event)", + "alt_text_description": "Descrição para pessoas com deficiências visuais", + "choose_focal_point": "Escolha o ponto focal", + "remove_media_confirmation": "Você confirma a remoção da imagem?", + "download_flyer": "Baixar flyer", + "address_description": "Qual é o endereço?", + "address_description_osm": "Qual é o endereço? (contribuidores do OpenStreetMap)" + }, + "confirm": { + "not_valid": "Algo deu errado.", + "title": "Confirmação de usuário", + "valid": "Sua conta está confirmada, você pode agora autenticar-se" + }, + "export": { + "intro": "Diferente de plataformas não-sociais que fazem tudo para manter os usuários e os dados sobre eles, nós acreditamos que a informação, como pessoas, deve ser livre. Para isso você se atualizar sobre os eventos de seu interesse, sem necessariamente entrar nesta página.", + "insert_your_address": "Informe seu endereço de e-mail", + "feed_description": "Para seguir as atualizações de um computador ou smartphone sem que você precise acessar essa página periodicamente, utilize um feeds RSS.

    \n\n

    Com feeds RSS você pode utilizar um app especial para receber atualizações de páginas que te interessam. É uma boa maneira de seguir muitas páginas rapidamente, sem a necessidade de criar contas de usuários ou outras complicações.

    \n\n
  • Se você possui um Android, recomendamos Flym ou Feeder
    • \n
  • Para iPhone / iPad você pode utilizar Feed4U
    • \n
  • Para desktop / laptop nós recomendamos Feedbro, que pode ser instalado no Firefox ou Chrome .
    • \n
    \nAdicionado este link ao seu leitor de RSS irá mantê-lo atualizado.", + "ical_description": "Computadores e smartphones normalmente possuem aplicações de calendário capazes de importar um calendário remoto.", + "list_description": "Se você tem uma página e quer exibir uma lista de eventos, use o seguinte código", + "email_description": "Você pode obter os eventos que te interessam através de e-mail." + }, + "oauth": { + "authorization_request": "A aplicação {app} solicita autorização em {instance_name}:", + "scopes": { + "event:write": "Adicionar e editar os seus eventos" + }, + "redirected_to": "Depois da confirmação, você será redirecionado para {url}" + }, + "ordinal": { + "2": "segundo", + "1": "primeiro", + "5": "quinto", + "-1": "último", + "3": "terceiro", + "4": "quarto" + }, + "settings": { + "remove_account": "Ao pressionar este botão sua conta de usuário será removida. Eventos que você publicou serão mantidos.", + "remove_account_confirm": "Você está prestes a remover sua conta de usuário permanentemente", + "update_confirm": "Você quer salvar sua modificação?", + "change_password": "Alterar sua senha", + "password_updated": "Senha alterada.", + "danger_section": "Seção perigosa" + }, + "error": { + "email_taken": "Este e-mail já está em uso.", + "nick_taken": "Este nome de usuário já está em uso." + }, + "setup": { + "https_warning": "Você está acessando por HTTP, lembre-se de alterar o valor de baseurl em config.json se você mudar para HTTPS!", + "completed": "Configuração completa", + "start": "Iniciar", + "completed_description": "

    Você pode agora autenticar-se com o seguinte usuário:

    Usuário: {email}
    Senha: {password}

    ", + "copy_password_dialog": "Sim, você precisa copiar a senha!" + }, + "validators": { + "email": "Insira um e-mail válido", + "required": "{fieldName} é obrigatório" + }, + "about": "\n

    Gancio é uma agenda compartilhada para comunidades locais.

    \n ", + "login": { + "not_registered": "Não registrado?", + "forgot_password": "Esqueceu sua senha?", + "insert_email": "Informe seu endereço de e-mail", + "ok": "Autenticado", + "description": "Ao autenticar-se você pode publicar novos eventos.", + "check_email": "Verifique sua caixa de entrada e de spam.", + "error": "Autenticação não realizada. Verifique suas informações de autenticação." + }, + "recover": { + "not_valid_code": "Algo não funcionou corretamente." + }, + "register": { + "error": "Erro: ", + "complete": "Registro precisa ser confirmado.", + "first_user": "Administrador criado", + "description": "Movimentos sociais devem se organizar e se auto financiar.
    \n
    Antes de poder publicar, a conta precisa ser aprovada, considere que atrás deste site você vai encontrar pessoas reais, então escreva duas linhas para nos informar que eventos você gostaria de publicar." + }, + "auth": { + "fail": "Autenticação não efetuada. Você está certo que sua senha está correta?", + "not_confirmed": "Não confirmado ainda…" + } +} diff --git a/locales/zh.json b/locales/zh.json new file mode 100644 index 00000000..f4c5b3be --- /dev/null +++ b/locales/zh.json @@ -0,0 +1,293 @@ +{ + "common": { + "embed_help": "将以下代码复制并粘贴到你的网站，此事件将像这样显示", + "follow": "关注", + "add_event": "添加事件", + "send": "发送", + "where": "地点", + "address": "地址", + "when": "时间", + "what": "事件", + "media": "媒体", + "login": "登录", + "email": "电子邮箱", + "register": "注册", + "description": "描述", + "hide": "隐藏", + "search": "搜索", + "confirm": "确认", + "admin": "管理员", + "users": "用户", + "events": "事件", + "actions": "操作", + "deactivate": "取消", + "remove_admin": "移除管理员", + "activate": "激活", + "save": "该村", + "logout": "登出", + "name": "名称", + "associate": "合作者", + "add": "添加", + "recover_password": "重置密码", + "enable": "启用", + "me": "你", + "ok": "完成", + "resources": "资源", + "n_resources": "无资源|1 个资源|{n} 个资源", + "displayname": "显示名称", + "copy_link": "复制链接", + "send_via_mail": "发送电子邮件", + "embed": "嵌入式页面", + "feed_url_copied": "在你的 RSS 阅读器中打开复制的链接", + "follow_me_title": "在 Fediverse 网络中关注更新", + "feed": "RSS 源", + "moderation": "中等", + "authorize": "认证", + "title": "标题", + "filter": "筛选", + "pause": "暂停", + "start": "开始", + "announcements": "公告", + "url": "URL", + "place": "地点", + "theme": "主题", + "label": "标签", + "collections": "收藏", + "max_events": "最大事件数", + "next": "下一个", + "export": "导出", + "remove": "移除", + "settings": "选项", + "logout_ok": "已登出", + "new_password": "新密码", + "new_user": "新用户", + "places": "地点", + "edit": "编辑", + "cancel": "取消", + "password": "密码", + "info": "信息", + "preview": "预览", + "share": "分享", + "edit_event": "编辑事件", + "copy": "复制", + "related": "相关", + "set_password": "设置密码", + "instances": "实例", + "activate_user": "已确认", + "federation": "联盟", + "add_to_calendar": "添加到日历", + "copied": "已复制", + "embed_title": "在你的网页上嵌入此事件", + "user": "用户", + "event": "事件", + "fediverse": "Fediverse 网络", + "skip": "跳过", + "delete": "移除", + "import": "导入", + "tags": "标签", + "close": "关闭", + "disable": "禁用", + "password_updated": "密码已修改。", + "reset": "重置" + }, + "export": { + "list_description": "如果你有一个网站并希望展示一个事件列表，使用以下代码", + "email_description": "你可以通过发给你的电子邮件了解你感兴趣的事件。", + "insert_your_address": "输入你的电子邮箱地址", + "ical_description": "电脑和智能手机通常预装了能够导入远程日历的日历应用。", + "intro": "与那些竭尽全力保留用户和数据的非社交平台不同，我们认为信息和人一样，都必须是自由的。因此，即使不通过此网站，你仍可随时了解你想了解的事件之最新情况。", + "feed_description": "要想从电脑或智能手机上关注更新，而无需定期打开本网站，请使用RSS订阅。

    \n\n

    通过RSS订阅，您可以使用一个特殊的应用程序来接收你感兴趣的网站的更新。这是一个快速关注许多网站的好方法，不需要创建账户或做其他事。

    \n\n
  • 如果您使用 Android，我们推荐 Flym 或 Feeder。
    • \n
  • 对于iPhone/iPad，您可以使用 Feed4U
    • \n
  • 对于台式机/笔记本电脑，我们推荐可在 Firefox 或 Chrome 上安装的 Feedbro。
    • \n
    \n将此链接添加到你的RSS阅读器中，以获得最新信息。" + }, + "register": { + "description": "社会运动应该组织起来，并自筹资金
    \n
    在你能发布内容之前，你的账户必须审核通过，考虑到你可以通过此网站发现现实中的人，请写一些东西告诉我们你希望发布什么。", + "error": "错误： ", + "complete": "注册必须经过确认。", + "first_user": "管理员已创建" + }, + "event": { + "anon_description": "即使不登录或注册，你也可以创建事件，但必须等待一些人看到它，\n并确认这是一个合适的事件。此外你也不能够修改它。

    \n你也可以 登录 或 注册。或者继续浏览以得到答案。 ", + "anon": "匿名", + "same_day": "在同一天", + "what_description": "标题", + "description_description": "描述", + "added": "事件已添加", + "saved": "事件已保存", + "added_anon": "事件已添加，等待确认。", + "updated": "事件已更新", + "where_description": "事件的地点在哪里？如果不存在，你可以创建一个。", + "confirmed": "事件已确认", + "not_found": "找不到事件", + "recurrent": "日常事件", + "edit_recurrent": "编辑日常事件：", + "show_recurrent": "日常事件", + "show_past": "以及过往的事件", + "multidate_description": "这是一个节日吗？选择它开始和结束的时间", + "multidate": "更多日期", + "normal_description": "选择日期。", + "recurrent_2w_days": "每 {days} 天一次", + "each_week": "每周", + "each_2w": "隔周一次", + "due": "直到", + "from": "来自", + "image_too_big": "图片不能大于 4MB", + "interact_with_me_at": "在 Fediverse 网络上与我互动", + "interact_with_me": "关注我", + "remove_recurrent_confirmation": "你确定要移除这个日常事件吗？\n过去的事件仍将被维护，但不会再添加新事件。", + "import_URL": "从 URL 导入", + "import_ICS": "从 ICS 导入", + "ics": "ICS", + "alt_text_description": "为视觉障碍者提供的说明", + "choose_focal_point": "选择联络点", + "download_flyer": "下载传单", + "tag_description": "标签", + "media_description": "你可以添加一份传单（可选）", + "recurrent_description": "选择频率和日期", + "only_future": "仅限即将到来的事件", + "normal": "普通", + "recurrent_1w_days": "每 {days} 天", + "recurrent_1m_days": "|每月的第 {days} 天|每月的第 {days} 天", + "recurrent_1m_ordinal": "每月的第 {n} 个 {days}", + "each_month": "每月", + "follow_me_description": "一种对这里发布的 {title} 事件保持关注的方法，\n是在 Fediverse 网络，比如 Mastodon，上关注 {account}，亦有可能通过此方式给此事件添加资源。

    \n如果你没听说过 Mastodon 和 Fediverse，我们建议你阅读 这篇文章。

    在下方输入你的实例名称（例如：mastodon.social）", + "import_description": "你可以从其他平台和实例通过标准格式（ICS 和 hCalendar）导入事件", + "remove_media_confirmation": "你确认要删除图片吗？", + "remove_confirmation": "你确定要移除此事件吗？" + }, + "login": { + "check_email": "检查你的电子邮箱收件箱和垃圾邮件箱。", + "not_registered": "还未注册？", + "forgot_password": "忘记密码了？", + "insert_email": "输入你的电子邮箱地址", + "error": "无法登录，检查你的登录信息。", + "ok": "已登录", + "description": "登录以发布新事件。" + }, + "recover": { + "not_valid_code": "发生了一些错误。" + }, + "admin": { + "delete_user": "移除", + "remove_admin": "移除管理员", + "disable_user_confirm": "你确定禁用 {user} 吗？", + "disable_admin_user_confirm": "你确定移除 {user} 的管理员权限吗？", + "user_remove_ok": "用户已移除", + "user_create_ok": "用户已创建", + "event_remove_ok": "事件已移除", + "allow_registration_description": "允许公众注册？", + "allow_anon_event": "允许发布匿名事件（需要确认）？", + "allow_recurrent_event": "允许日常事件", + "federation": "联邦社交网络 / ActivityPub", + "enable_federation": "启用联邦社交网络", + "add_instance": "添加实例", + "select_instance_timezone": "时区", + "enable_resources": "启用资源", + "hide_boost_bookmark": "隐藏助力/书签", + "block": "屏蔽", + "unblock": "解除屏蔽", + "instance_name": "实例名称", + "hide_resource": "隐藏资源", + "delete_resource_confirm": "你确定要删除此资源吗？", + "filter_instances": "筛选实例", + "resources": "资源", + "favicon": "图标", + "user_block_confirm": "你确定要屏蔽用户 {user} 吗？", + "delete_announcement_confirm": "你确定要移除这个公告吗？", + "announcement_remove_ok": "公告已移除", + "instance_locale": "默认语言", + "title_description": "这将被用作页面的标题和电子邮件的主题，以导出 RSS 和 ICS 源。", + "description_description": "在标题旁的页眉中显示", + "instance_place_help": "在其他的实例中显示的标签", + "delete_trusted_instance_confirm": "你确定要从友好实例菜单中删除此项目吗？", + "edit_place": "编辑地点", + "new_announcement": "新公告", + "show_smtp_setup": "电子邮件设置", + "smtp_port": "SMTP 端口", + "smtp_secure": "SMTP 安全协议（TLS 或 STARTTLS）", + "smtp_test_success": "一封测试邮件已发送至 {admin_mail}，请检查你的收件箱", + "sender_email": "发件人", + "widget": "小组件", + "wrong_domain_warning": "在 config.json 中设置的 baseurl {baseurl} 与你正在访问的 {url} 不同", + "edit_collection": "编辑收藏", + "event_confirm_description": "你可以在此确认匿名用户提交的事件", + "recurrent_event_visible": "默认显示日常事件", + "place_description": "如果你弄错了地点或地址，你可以修改。
    与这个地点相关的当前和过去的所有事件都会改变地址。", + "delete_user_confirm": "你确定移除 {user} 吗？", + "enable_admin_user_confirm": "你确定授予 {user} 管理员权限吗", + "enable_federation_help": "这将允许从 Fediverse 上关注此实例", + "enable_resources_help": "允许从 Fediverse 为此事件添加资源", + "hide_boost_bookmark_help": "隐藏来自 Fediverse 上的助力和书签数量图标", + "block_user": "屏蔽用户", + "filter_users": "筛选用户", + "user_add_help": "一封带有确认订阅和设置密码指引的邮件将被发送给新用户", + "show_resource": "显示资源", + "delete_resource": "删除资源", + "user_blocked": "用户 {user} 已屏蔽", + "instance_block_confirm": "你确定要屏蔽实例 {instance} 吗？", + "announcement_description": "你可以在此段落插入显示于首页的公告", + "instance_timezone_description": "Gancio 被设计用来收集特定区域，比如一座城市所发生的事件。这里的所有事件将以所选择的时区显示。", + "instance_locale_description": "特定页面偏好的用户语言。有时信息必须以相同的语言对所有人显示（比如通过 ActivityPub 发布内容或发送一些电子邮件时）。在这种情况下将使用上面选择的语言。", + "instance_place": "该实例的指示性位置", + "trusted_instances_help": "友好实例的列表将被显示于页眉", + "footer_links": "页脚链接", + "smtp_description": "
    • 当匿名事件被添加时（如果启用），管理员应当收到邮件
      • 管理员应当会受到注册请求邮件（如果启用）。
    • 用户应当会受到注册请求邮件。
    • 用户应当收到注册确认邮件。
    • 当管理员直接订阅时，用户应当受到邮件。
    • 用户忘记密码时应当收到密码重置邮件。
    ", + "smtp_use_sendmail": "使用 sendmail", + "smtp_test_button": "发送测试邮件", + "new_collection": "新建收藏", + "collections_description": "收藏是按标签和地点分组的事件。它们将于主页上显示", + "enable_trusted_instances": "启用友好实例", + "add_trusted_instance": "添加一个友好实例", + "add_link": "添加链接", + "delete_footer_link_confirm": "确定移除此链接吗？", + "instance_name_help": "要关注的 ActivityPub 账号", + "is_dark": "暗色主题", + "smtp_hostname": "SMTP 主机名" + }, + "auth": { + "fail": "无法登录。你确定密码正确吗？", + "not_confirmed": "尚未确认……" + }, + "settings": { + "change_password": "修改密码", + "password_updated": "密码已修改。", + "remove_account_confirm": "你即将永久删除你的账号", + "update_confirm": "你希望保存你的修改吗？", + "remove_account": "按下下方的按钮后你的账号将被删除。你发布的事件不会删除。", + "danger_section": "危险段落" + }, + "error": { + "email_taken": "此电子邮箱地址已被使用。", + "nick_taken": "此昵称已被使用。" + }, + "confirm": { + "title": "用户确认", + "not_valid": "出现了一些错误。", + "valid": "你的账户已被确认，你现在可以 登录" + }, + "ordinal": { + "4": "第四", + "5": "第五", + "2": "第二", + "-1": "最后", + "1": "第一", + "3": "第三" + }, + "validators": { + "required": "{fieldName} 是必填项", + "email": "输入有效的电子邮箱地址" + }, + "oauth": { + "authorization_request": "应用 {app} 申请在 {instance_name} 上获得以下权限：", + "redirected_to": "在确认后你将被重定向到 {url}", + "scopes": { + "event:write": "添加与编辑你的事件" + } + }, + "setup": { + "completed_description": "

    你现在可以以以下用户登录

    用户名：{email}
    密码：{password}

    ", + "copy_password_dialog": "没错，你必须复制密码！", + "start": "开始", + "https_warning": "你正在使用 HTTP 访问，如果你切换到 HTTPS，记得在 config.json 中修改 baseurl！", + "completed": "安装完成" + }, + "about": "\n

    Gancio 是为本地社区设计的的共享日程表。

    \n " +} diff --git a/nuxt.config.js b/nuxt.config.js index a9bdb054..4210dc10 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,5 +1,8 @@ const config = require('./server/config.js') const minifyTheme = require('minify-css-string').default +const locales = require('./locales/index') + +import { ca, de, en, es, eu, fr, gl, it, nb, pl, pt, sk, zhHans } from 'vuetify/lib/locale' const isDev = (process.env.NODE_ENV !== 'production') module.exports = { @@ -30,16 +33,19 @@ module.exports = { /* ** Customize the progress-bar component */ - loading: '~/components/Loading.vue', + loading: { + color: 'orangered', + height: '3px' + }, //'~/components/Loading.vue', /* ** Plugins to load before mounting the App */ plugins: [ - '@/plugins/i18n.js', '@/plugins/filters', // text filters, datetime filters, generic transformation helpers etc. '@/plugins/axios', // axios baseurl configuration '@/plugins/validators', // inject validators '@/plugins/api', // api helpers + '@/plugins/i18n', { src: '@/plugins/v-calendar', ssr: false } // v-calendar ], @@ -48,6 +54,7 @@ module.exports = { */ modules: [ // Doc: https://axios.nuxtjs.org/usage + '@nuxtjs/i18n', '@nuxtjs/axios', '@nuxtjs/auth', '@nuxtjs/sitemap' @@ -76,6 +83,24 @@ module.exports = { } } }, + i18n: { + locales: Object.keys(locales).map(key => ({ + code: key, + name: locales[key], + file: `${key}.json`, + iso: key + })), + vueI18n: { + fallbackLocale: 'en', + silentTranslationWarn: true + }, + langDir: 'locales', + lazy: true, + strategy: 'no_prefix', + baseUrl: config.baseurl, + skipSettingLocaleOnNavigate: true, + skipNuxtState: true + }, serverMiddleware: ['server/routes'], @@ -87,6 +112,8 @@ module.exports = { prefix: '/api' }, auth: { + rewriteRedirects: true, + fullPathRedirect: true, // localStorage: false, // https://github.com/nuxt-community/auth-module/issues/425 cookie: { prefix: 'auth.', @@ -105,7 +132,7 @@ module.exports = { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }, logout: false, - user: { url: '/user', method: 'get', propertyName: false } + user: { url: '/user', method: 'get', propertyName: false, autoFetch: false } }, tokenRequired: true, tokenType: 'Bearer' @@ -114,6 +141,7 @@ module.exports = { }, buildModules: ['@nuxtjs/vuetify'], vuetify: { + lang: { locales: { ca, de, en, es, eu, fr, gl, it, nb, pl, pt, sk, zhHans } }, treeShake: true, theme: { options: { diff --git a/package.json b/package.json index 36eca7fb..38712722 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "gancio", - "version": "1.5.6", + "version": "1.6.0", "description": "A shared agenda for local communities", "author": "lesion", "scripts": { "build": "nuxt build --modern", "start:inspect": "NODE_ENV=production node --inspect node_modules/.bin/nuxt start --modern", "dev": "nuxt dev", - "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --bail=1", - "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest --bail=1", - "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest --bail=1", + "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --testEnvironment=jest-environment-node --bail=1", + "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest --testEnvironment=jest-environment-node --bail=1", + "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest --testEnvironment=jest-environment-node --bail=1", "start": "nuxt start --modern", "doc": "cd docs && bundle exec jekyll b", "doc:dev": "cd docs && bundle exec jekyll s --drafts", @@ -33,29 +33,31 @@ "node": ">=14 <=16" }, "dependencies": { - "@mdi/js": "^7.0.96", + "@mdi/js": "^7.1.96", "@nuxtjs/auth": "^4.9.1", "@nuxtjs/axios": "^5.13.5", + "@nuxtjs/i18n": "^7.3.0", "@nuxtjs/sitemap": "^2.4.0", "accept-language": "^3.0.18", "axios": "^0.27.2", "bcryptjs": "^2.4.3", "body-parser": "^1.20.0", "cookie-parser": "^1.4.6", + "cookie-session": "^2.0.0", "cors": "^2.8.5", - "dayjs": "^1.11.5", - "dompurify": "^2.3.10", + "dayjs": "^1.11.7", + "dompurify": "^2.4.1", "email-templates": "^10.0.1", "express": "^4.18.1", - "express-oauth-server": "lesion/express-oauth-server#master", "http-signature": "^1.3.6", "https-proxy-agent": "^5.0.1", "ical.js": "^1.5.0", "ics": "^2.40.0", - "jsdom": "^20.0.0", + "jsdom": "^20.0.2", "jsonwebtoken": "^8.5.1", - "linkify-html": "^4.0.0", - "linkifyjs": "4.0.0", + "leaflet": "^1.9.2", + "linkify-html": "^4.0.2", + "linkifyjs": "4.0.2", "lodash": "^4.17.21", "mariadb": "^3.0.1", "microformat-node": "^2.0.1", @@ -64,39 +66,51 @@ "multer": "^1.4.5-lts.1", "mysql2": "^2.3.3", "nuxt-edge": "2.16.0-27720022.54e852f", + "oauth2orize": "^1.11.1", + "passport": "^0.6.0", + "passport-anonymous": "^1.0.1", + "passport-custom": "^1.1.1", + "passport-http": "^0.3.0", + "passport-http-bearer": "^1.0.1", + "passport-oauth2-client-password": "^0.1.2", + "passport-oauth2-client-public": "^0.0.1", "pg": "^8.8.0", - "sequelize": "^6.23.0", + "sequelize": "^6.27.0", "sequelize-slugify": "^1.6.2", "sharp": "^0.27.2", - "sqlite3": "^5.0.11", + "sqlite3": "^5.1.4", + "telegraf": "^4.9.1", "tiptap": "^1.32.0", "tiptap-extensions": "^1.35.0", "umzug": "^2.3.0", "v-calendar": "^2.4.1", - "vue-i18n": "^8.26.7", - "vuetify": "2.6.10", + "vue2-leaflet": "^2.7.1", + "vuetify": "2.6.13", "winston": "^3.8.2", "winston-daily-rotate-file": "^4.7.1", "yargs": "^17.5.0" }, "devDependencies": { "@nuxtjs/vuetify": "^1.12.3", - "jest": "^29.0.3", - "prettier": "^2.7.1", + "jest": "^29.3.1", + "jest-environment-node": "^29.3.1", + "prettier": "^2.8.1", "pug": "^3.0.2", "pug-plain-loader": "^1.1.0", - "sass": "^1.53.0", + "sass": "^1.56.2", "sequelize-cli": "^6.3.0", - "supertest": "^6.2.4", + "supertest": "^6.3.3", "webpack": "4", "webpack-cli": "^4.10.0" }, "resolutions": { "nth-check": "^2.0.1", - "express-oauth-server/**/lodash": "^4.17.21", "glob-parent": "^5.1.2", "moment": "^2.29.2" }, + "jest": { + "testEnvironment": "jsdom" + }, "bin": { "gancio": "server/cli.js" }, diff --git a/pages/Admin.vue b/pages/Admin.vue index 50509723..6ddac5bd 100644 --- a/pages/Admin.vue +++ b/pages/Admin.vue @@ -6,51 +6,68 @@ v-container.container.pa-0.pa-md-3 v-tabs(v-model='selectedTab' show-arrows :next-icon='mdiChevronRight' :prev-icon='mdiChevronLeft') //- SETTINGS - v-tab {{$t('common.settings')}} - v-tab-item + v-tab(href='#settings') {{$t('common.settings')}} + v-tab-item(value='settings') Settings //- THEME - v-tab {{$t('common.theme')}} - v-tab-item + v-tab(href='#theme') {{$t('common.theme')}} + v-tab-item(value='theme') Theme //- USERS - v-tab + v-tab(href='#users') v-badge(:value='!!unconfirmedUsers.length' :content='unconfirmedUsers.length') {{$t('common.users')}} - v-tab-item + v-tab-item(value='users') Users(:users='users' @update='updateUsers') //- PLACES - v-tab {{$t('common.places')}} - v-tab-item + v-tab(href='#places') {{$t('common.places')}} + v-tab-item(value='places') Places + + //- TAGS + v-tab(href='#tags') {{$t('common.tags')}} + v-tab-item(value='tags') + Tags + + //- GEOCODING / MAPS + v-tab(href='#geolocation' v-if='settings.allow_geolocation') {{$t('admin.geolocation')}} + v-tab-item(value='geolocation') + client-only(placeholder='Loading...') + Geolocation + //- Collections - v-tab {{$t('common.collections')}} - v-tab-item + v-tab(href='#collections') {{$t('common.collections')}} + v-tab-item(value='collections') Collections //- EVENTS - v-tab + v-tab(href='#unconfirmed_events') v-badge(:value='!!unconfirmedEvents.length' :content='unconfirmedEvents.length') {{$t('common.events')}} - v-tab-item + v-tab-item(value='unconfirmed_events') Events(:unconfirmedEvents='unconfirmedEvents' @confirmed='id => { unconfirmedEvents = unconfirmedEvents.filter(e => e.id !== id)}') //- ANNOUNCEMENTS - v-tab {{$t('common.announcements')}} - v-tab-item + v-tab(href='#announcements') {{$t('common.announcements')}} + v-tab-item(value='announcements') Announcement + //- PLUGINS + v-tab(href='#plugins') {{$t('common.plugins')}} + v-tab-item(value='plugins') + Plugin + //- FEDERATION - v-tab {{$t('common.federation')}} - v-tab-item + v-tab(href='#federation') {{$t('common.federation')}} + v-tab-item(value='federation') Federation //- MODERATION - v-tab(v-if='settings.enable_federation') {{$t('common.moderation')}} - v-tab-item + v-tab(v-if='settings.enable_federation' href='#moderation') {{$t('common.moderation')}} + v-tab-item(value='moderation') Moderation - + \ No newline at end of file diff --git a/pages/about.vue b/pages/about.vue index 12abcb56..32dc8e60 100644 --- a/pages/about.vue +++ b/pages/about.vue @@ -6,7 +6,7 @@ v-container v-card-text(v-else v-html='about') v-card-actions(v-if='$auth.user && $auth.user.is_admin') v-spacer - v-btn(color='primary' text + v-btn(color='primary' outlined @click='save') {{$t('common.save')}} + + diff --git a/pages/index.vue b/pages/index.vue index 1d053502..b127c77a 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,70 +1,47 @@ + \ No newline at end of file diff --git a/pages/place/_place.vue b/pages/place/_place.vue index a1e1f500..43738ab9 100644 --- a/pages/place/_place.vue +++ b/pages/place/_place.vue @@ -33,7 +33,7 @@ export default { asyncData({ $axios, params, error }) { try { const place = params.place - return $axios.$get(`/place/${place}`) + return $axios.$get(`/place/${encodeURIComponent(place)}`) } catch (e) { error({ statusCode: 400, message: 'Error!' }) } diff --git a/pages/tag/_tag.vue b/pages/tag/_tag.vue index 8ff261c6..0307fa21 100644 --- a/pages/tag/_tag.vue +++ b/pages/tag/_tag.vue @@ -32,7 +32,7 @@ export default { async asyncData ({ $axios, params, error }) { try { const tag = params.tag - const events = await $axios.$get(`/tag/${tag}`) + const events = await $axios.$get(`/tag/${encodeURIComponent(tag)}`) return { events, tag } } catch (e) { error({ statusCode: 400, message: 'Error!' }) diff --git a/plugins/filters.js b/plugins/filters.js index 9a5329ba..a6e759ed 100644 --- a/plugins/filters.js +++ b/plugins/filters.js @@ -16,6 +16,8 @@ import 'dayjs/locale/fr' import 'dayjs/locale/de' import 'dayjs/locale/gl' import 'dayjs/locale/sk' +import 'dayjs/locale/pt' +import 'dayjs/locale/zh' dayjs.extend(relativeTime) dayjs.extend(utc) @@ -26,21 +28,21 @@ 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 - const locale = store.state.locale dayjs.tz.setDefault(instance_timezone) - dayjs.locale(locale) + 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, '$2')) Vue.filter('url2host', url => url.match(/^https?:\/\/(.[^/:]+)/i)[1]) - Vue.filter('datetime', value => dayjs.tz(value).locale(locale).format('ddd, D MMMM HH:mm')) + 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(store.state.locale).format('dddd, D MMM')) + 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) { @@ -59,6 +61,7 @@ export default ({ app, store }) => { 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') { @@ -76,15 +79,13 @@ export default ({ app, store }) => { }) Vue.filter('when', (event) => { - const start = dayjs.unix(event.start_datetime).tz() - const end = dayjs.unix(event.end_datetime).tz() + 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) - // multidate - if (event.multidate) { - return `${start.format('dddd D MMMM HH:mm')} - ${end.format('dddd D MMMM HH:mm')}` + let time = start.format('dddd D MMMM HH:mm') + if (end) { + time += event.multidate ? ` → ${end.format('dddd D MMMM HH:mm')}` : `-${end.format('HH:mm')}` } - - // normal event - return `${start.format('dddd D MMMM HH:mm')}-${end.format('HH:mm')}` + return time }) } diff --git a/plugins/i18n.js b/plugins/i18n.js index c3f2d37d..0b45be42 100644 --- a/plugins/i18n.js +++ b/plugins/i18n.js @@ -1,35 +1,36 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' -import merge from 'lodash/merge' +export default async ({ app, store, res, $vuetify }) => { -Vue.use(VueI18n) + $vuetify.lang.current = app.i18n.locale -export default async ({ app, store, res }) => { - const messages = {} - if (process.server) { - if (res.locals) { - store.commit('setLocale', res.locals.acceptedLocale) - if (res.locals.user_locale) { - store.commit('setUserLocale', res.locals.user_locale) - } - } + app.i18n.onLanguageSwitched = (oldLocale, newLocale) => { + $vuetify.lang.current = newLocale } - messages[store.state.locale] = await import(/* webpackChunkName: "lang-[request]" */`../locales/${store.state.locale}.json`) + // const messages = {} + // if (process.server) { + // if (res.locals) { + // store.commit('setLocale', res.locals.acceptedLocale) + // if (res.locals.user_locale) { + // store.commit('setUserLocale', res.locals.user_locale) + // } + // } + // } + + // messages[store.state.locale] = await import(/* webpackChunkName: "lang-[request]" */`../locales/${store.state.locale}.json`) // always include en fallback locale - if (store.state.locale !== 'en') { - messages.en = await import('../locales/en.json') - } + // if (store.state.locale !== 'en') { + // messages.en = await import('../locales/en.json') + // } - if (store.state.user_locale) { - merge(messages[store.state.locale], store.state.user_locale) - } + // if (store.state.user_locale) { + // merge(messages[store.state.locale], store.state.user_locale) + // } // Set i18n instance on app - app.i18n = new VueI18n({ - locale: store.state.locale, - fallbackLocale: 'en', - messages - }) + // app.i18n = new VueI18n({ + // locale: store.state.locale, + // fallbackLocale: 'en', + // messages + // }) } diff --git a/server/api/auth.js b/server/api/auth.js index e24a30a2..04d24c19 100644 --- a/server/api/auth.js +++ b/server/api/auth.js @@ -1,28 +1,10 @@ const log = require('../log') -const oauth = require('./oauth') -const get = require('lodash/get') const Auth = { - fillUser (req, res, next) { - const token = get(req.cookies, 'auth._token.local', null) - const authorization = get(req.headers, 'authorization', null) - if (!authorization && token) { - req.headers.authorization = token - } - - if (!authorization && !token) { - return next() - } - - oauth.oauthServer.authenticate()(req, res, () => { - res.locals.user = get(res, 'locals.oauth.token.user', null) - next() - }) - }, - - isAuth (_req, res, next) { - if (res.locals.user) { + isAuth (req, res, next) { + // TODO: check anon user + if (req.user) { next() } else { res.sendStatus(403) @@ -30,7 +12,7 @@ const Auth = { }, isAdmin (req, res, next) { - if (res.locals.user && res.locals.user.is_admin) { + if (req.user && req.user.is_admin) { next() } else { res.sendStatus(403) diff --git a/server/api/controller/event.js b/server/api/controller/event.js index 8ad33537..2c801af9 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -23,6 +23,32 @@ const log = require('../../log') const eventController = { + async _findOrCreatePlace (body) { + if (body.place_id) { + const place = await Place.findByPk(body.place_id) + if (!place) { + throw new Error(`Place not found`) + } + return place + } + + const place_name = body.place_name && body.place_name.trim() + const place_address = body.place_address && body.place_address.trim() + if (!place_address || !place_name) { + throw new Error(`place_id or place_name and place_address are required`) + } + let place = await Place.findOne({ where: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), Sequelize.Op.eq, place_name.toLocaleLowerCase()) }) + if (!place) { + place = await Place.create({ + name: place_name, + address: place_address, + latitude: body.place_latitude, + longitude: body.place_longitude + }) + } + return place + }, + async searchMeta(req, res) { const search = req.query.search @@ -34,7 +60,7 @@ const eventController = { Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('address')), 'LIKE', '%' + search + '%') ] }, - attributes: [['name', 'label'], 'address', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']], + attributes: [['name', 'label'], 'address', 'latitude', 'longitude', 'id', [Sequelize.cast(Sequelize.fn('COUNT', Sequelize.col('events.placeId')), 'INTEGER'), 'w']], include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }], group: ['place.id'], raw: true @@ -110,7 +136,7 @@ const eventController = { attributes: ['tag'], through: { attributes: [] } }, - { model: Place, required: true, attributes: ['id', 'name', 'address'] } + { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] } ], replacements, limit: 30, @@ -172,7 +198,7 @@ const eventController = { async get(req, res) { const format = req.params.format || 'json' - const is_admin = res.locals.user && res.locals.user.is_admin + const is_admin = req.user && req.user.is_admin const slug = req.params.event_slug // retrocompatibility, old events URL does not use slug, use id as fallback @@ -192,7 +218,7 @@ const eventController = { }, include: [ { model: Tag, required: false, attributes: ['tag'], through: { attributes: [] } }, - { model: Place, attributes: ['name', 'address', 'id'] }, + { model: Place, attributes: ['name', 'address', 'latitude', 'longitude', 'id'] }, { model: Resource, where: !is_admin && { hidden: false }, @@ -277,7 +303,7 @@ const eventController = { log.warn(`Trying to confirm a unknown event, id: ${id}`) return res.sendStatus(404) } - if (!res.locals.user.is_admin && res.locals.user.id !== event.userId) { + if (!req.user.is_admin && req.user.id !== event.userId) { log.warn(`Someone not allowed is trying to confirm -> "${event.title} `) return res.sendStatus(403) } @@ -303,7 +329,7 @@ const eventController = { const id = Number(req.params.event_id) const event = await Event.findByPk(id) if (!event) { return req.sendStatus(404) } - if (!res.locals.user.is_admin && res.locals.user.id !== event.userId) { + if (!req.user.is_admin && req.user.id !== event.userId) { log.warn(`Someone not allowed is trying to unconfirm -> "${event.title} `) return res.sendStatus(403) } @@ -362,8 +388,8 @@ const eventController = { res.sendStatus(200) }, - async isAnonEventAllowed(_req, res, next) { - if (!res.locals.settings.allow_anon_event && !res.locals.user) { + async isAnonEventAllowed(req, res, next) { + if (!res.locals.settings.allow_anon_event && !req.user) { return res.sendStatus(403) } next() @@ -389,29 +415,18 @@ const eventController = { // find or create the place let place - if (body.place_id) { - place = await Place.findByPk(body.place_id) + try { + place = await eventController._findOrCreatePlace(body) if (!place) { return res.status(400).send(`Place not found`) } - } else { - if (!body.place_name) { - return res.status(400).send(`Place not found`) - } - place = await Place.findOne({ where: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), Op.eq, body.place_name.trim().toLocaleLowerCase()) }) - if (!place) { - if (!body.place_address || !body.place_name) { - return res.status(400).send(`place_id or place_name and place_address required`) - } - place = await Place.create({ - name: body.place_name, - address: body.place_address - }) - } + } catch (e) { + return res.status(400).send(e.message) } + const eventDetails = { - title: body.title, + title: body.title.trim(), // sanitize and linkify html description: helpers.sanitizeHTML(linkifyHtml(body.description || '')), multidate: body.multidate, @@ -419,7 +434,7 @@ const eventController = { end_datetime: body.end_datetime, recurrent, // publish this event only if authenticated - is_visible: !!res.locals.user + is_visible: !!req.user } if (req.file || body.image_url) { @@ -453,9 +468,9 @@ const eventController = { } // associate user to event and reverse - if (res.locals.user) { - await res.locals.user.addEvent(event) - await event.setUser(res.locals.user) + if (req.user) { + await req.user.addEvent(event) + await event.setUser(req.user) } event = event.get() @@ -489,7 +504,7 @@ const eventController = { const body = req.body const event = await Event.findByPk(body.id) if (!event) { return res.sendStatus(404) } - if (!res.locals.user.is_admin && event.userId !== res.locals.user.id) { + if (!req.user.is_admin && event.userId !== req.user.id) { return res.sendStatus(403) } @@ -500,7 +515,7 @@ const eventController = { description: helpers.sanitizeHTML(linkifyHtml(body.description || '', { target: '_blank' })) || event.description, multidate: body.multidate, start_datetime: body.start_datetime || event.start_datetime, - end_datetime: body.end_datetime, + end_datetime: body.end_datetime || null, recurrent } @@ -543,27 +558,14 @@ const eventController = { // find or create the place let place - if (body.place_id) { - place = await Place.findByPk(body.place_id) + try { + place = await eventController._findOrCreatePlace(body) if (!place) { return res.status(400).send(`Place not found`) } - } else { - if (!body.place_name) { - return res.status(400).send(`Place not found`) - } - place = await Place.findOne({ where: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), Op.eq, body.place_name.trim().toLocaleLowerCase()) }) - if (!place) { - if (!body.place_address || !body.place_name) { - return res.status(400).send(`place_id or place_name and place_address required`) - } - place = await Place.create({ - name: body.place_name, - address: body.place_address - }) - } + } catch (e) { + return res.status(400).send(e.message) } - await event.setPlace(place) // create/assign tags @@ -596,7 +598,7 @@ const eventController = { async remove(req, res) { const event = await Event.findByPk(req.params.id) // check if event is mine (or user is admin) - if (event && (res.locals.user.is_admin || res.locals.user.id === event.userId)) { + if (event && (req.user.is_admin || req.user.id === event.userId)) { if (event.media && event.media.length && !event.recurrent) { try { const old_path = path.join(config.upload_path, event.media[0].url) @@ -624,7 +626,7 @@ const eventController = { /** * Method to search for events with pagination and filtering - * @returns + * @returns */ async _select({ start = dayjs().unix(), @@ -698,7 +700,7 @@ const eventController = { attributes: ['tag'], through: { attributes: [] } }, - { model: Place, required: true, attributes: ['id', 'name', 'address'] } + { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] } ], ...pagination, replacements diff --git a/server/api/controller/export.js b/server/api/controller/export.js index 176a6f6f..13ac9b8b 100644 --- a/server/api/controller/export.js +++ b/server/api/controller/export.js @@ -88,6 +88,7 @@ const exportController = { const start = tmpStart.utc(true).format('YYYY-M-D-H-m').split('-').map(Number) const end = tmpEnd.utc(true).format('YYYY-M-D-H-m').split('-').map(Number) return { + uid: `${e.id}@${settings.hostname}`, start, end, title: `[${settings.title}] ${e.title}`, diff --git a/server/api/controller/oauth.js b/server/api/controller/oauth.js index f72d0b6b..e7e76ed3 100644 --- a/server/api/controller/oauth.js +++ b/server/api/controller/oauth.js @@ -1,26 +1,357 @@ -const crypto = require('crypto') -const { promisify } = require('util') -const randomBytes = promisify(crypto.randomBytes) +const bodyParser = require('body-parser') +const cookieParser = require('cookie-parser') +const session = require('cookie-session') const OAuthClient = require('../models/oauth_client') const OAuthToken = require('../models/oauth_token') const OAuthCode = require('../models/oauth_code') + +const helpers = require('../../helpers.js') const User = require('../models/user') +const passport = require('passport') +const get = require('lodash/get') + +const BasicStrategy = require('passport-http').BasicStrategy +const ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy +const ClientPublicStrategy = require('passport-oauth2-client-public').Strategy +const BearerStrategy = require('passport-http-bearer').Strategy +const AnonymousStrategy = require('passport-anonymous').Strategy + +const oauth2orize = require('oauth2orize') const log = require('../../log') -const dayjs = require('dayjs') -async function randomString (len = 16) { - const bytes = await randomBytes(len * 8) - return crypto - .createHash('sha1') - .update(bytes) - .digest('hex') +passport.serializeUser((user, done) => done(null, user.id)) + +passport.deserializeUser(async (id, done) => { + const user = await User.findByPk(id) + done(null, user) +}) + +/** + * BasicStrategy & ClientPasswordStrategy + * + * These strategies are used to authenticate registered OAuth clients. They are + * employed to protect the `token` endpoint, which consumers use to obtain + * access tokens. The OAuth 2.0 specification suggests that clients use the + * HTTP Basic scheme to authenticate. Use of the client password strategy + * allows clients to send the same credentials in the request body (as opposed + * to the `Authorization` header). While this approach is not recommended by + * the specification, in practice it is quite common. + */ +async function verifyClient(client_id, client_secret, done) { + const client = await OAuthClient.findByPk(client_id, { raw: true }) + if (!client) { + return done(null, false) + } + if (client.client_secret && client_secret !== client.client_secret) { + return done(null, false) + } + + if (client) { client.grants = ['authorization_code', 'password'] } //sure ? + + return done(null, client) } -const oauthController = { +async function verifyPublicClient (client_id, done) { + if (client_id !== 'self') { + return done(null, false) + } + try { - // create client => http:///gancio.org/oauth#create-client + const client = await OAuthClient.findByPk(client_id, { raw: true }) + done(null, client) + } catch (e) { + done(null, { message: e.message }) + } +} + +passport.use(new AnonymousStrategy()) +passport.use(new BasicStrategy(verifyClient)) +passport.use(new ClientPasswordStrategy(verifyClient)) +passport.use(new ClientPublicStrategy(verifyPublicClient)) + +/** + * BearerStrategy + * + * This strategy is used to authenticate either users or clients based on an access token + * (aka a bearer token). If a user, they must have previously authorized a client + * application, which is issued an access token to make requests on behalf of + * the authorizing user. + */ + passport.use(new BearerStrategy({ passReqToCallback: true }, verifyToken)) + +async function verifyToken (req, accessToken, done) { + const token = await OAuthToken.findByPk(accessToken, + { include: [{ model: User, attributes: { exclude: ['password'] } }, { model: OAuthClient, as: 'client' }] }) + + if (!token) return done(null, false) + if (token.userId) { + if (!token.user) { + return done(null, false) + } + // To keep this example simple, restricted scopes are not implemented, + // and this is just for illustrative purposes. + done(null, token.user, { scope: '*' }) + } else { + + // The request came from a client only since userId is null, + // therefore the client is passed back instead of a user. + if (!token.client) { + return done(null, false) + } + // To keep this example simple, restricted scopes are not implemented, + // and this is just for illustrative purposes. + done(null, client, { scope: '*' }) + } +} + + +const oauthServer = oauth2orize.createServer() + + +// Register serialization and deserialization functions. +// +// When a client redirects a user to user authorization endpoint, an +// authorization transaction is initiated. To complete the transaction, the +// user must authenticate and approve the authorization request. Because this +// may involve multiple HTTP request/response exchanges, the transaction is +// stored in the session. +// +// An application must supply serialization functions, which determine how the +// client object is serialized into the session. Typically this will be a +// simple matter of serializing the client's ID, and deserializing by finding +// the client by ID from the database. +oauthServer.serializeClient((client, done) => { + done(null, client.id) +}) + +oauthServer.deserializeClient(async (id, done) => { + const client = await OAuthClient.findByPk(id) + done(null, client) +}) + +// Register supported grant types. +// +// OAuth 2.0 specifies a framework that allows users to grant client +// applications limited access to their protected resources. It does this +// through a process of the user granting access, and the client exchanging +// the grant for an access token. + +// Grant authorization codes. The callback takes the `client` requesting +// authorization, the `redirectUri` (which is used as a verifier in the +// subsequent exchange), the authenticated `user` granting access, and +// their response, which contains approved scope, duration, etc. as parsed by +// the application. The application issues a code, which is bound to these +// values, and will be exchanged for an access token. + +oauthServer.grant(oauth2orize.grant.code(async (client, redirect_uri, user, ares, done) => { + const authorizationCode = helpers.randomString(16); + await OAuthCode.create({ + redirect_uri, + authorizationCode, + clientId: client.id, + userId: user.id, + }) + return done(null, authorizationCode) +})) + + +// Grant implicit authorization. The callback takes the `client` requesting +// authorization, the authenticated `user` granting access, and +// their response, which contains approved scope, duration, etc. as parsed by +// the application. The application issues a token, which is bound to these +// values. + +oauthServer.grant(oauth2orize.grant.token((client, user, ares, done) => { + return oauthController.issueTokens(user.id, client.clientId, done) +})) + + +// Exchange authorization codes for access tokens. The callback accepts the +// `client`, which is exchanging `code` and any `redirectUri` from the +// authorization request for verification. If these values are validated, the +// application issues an access token on behalf of the user who authorized the +// code. The issued access token response can include a refresh token and +// custom parameters by adding these to the `done()` call + +oauthServer.exchange(oauth2orize.exchange.code(async (client, code, redirect_uri, done) => { + const oauthCode = await OAuthCode.findByPk(code) + if (!oauthCode || client.id !== oauthCode.clientId || client.redirectUris !== oauthCode.redirect_uri) { + return done(null, false) + } + return oauthController.issueTokens(oauthCode.userId, oauthCode.clientId, done) +})) + + + +// Exchange user id and password for access tokens. The callback accepts the +// `client`, which is exchanging the user's name and password from the +// authorization request for verification. If these values are validated, the +// application issues an access token on behalf of the user who authorized the code. +oauthServer.exchange(oauth2orize.exchange.password(async (client, username, password, scope, done) => { + // Validate the client + const oauthClient = await OAuthClient.findByPk(client.id) + if (!oauthClient) { // || oauthClient.client_secret !== client.clientSecret) { + return done(null, false) + } + const user = await User.findOne({ where: { email: username, is_active: true } }) + if (!user) { + return done(null, false) + } + // check if password matches + if (await user.comparePassword(password)) { + return oauthController.issueTokens(user.id, oauthClient.id, done) + } + return done(null, false) +})) + + +// Exchange the client id and password/secret for an access token. The callback accepts the +// `client`, which is exchanging the client's id and password/secret from the +// authorization request for verification. If these values are validated, the +// application issues an access token on behalf of the client who authorized the code. +oauthServer.exchange(oauth2orize.exchange.clientCredentials(async (client, scope, done) => { + // Validate the client + const oauthClient = await OAuthClient.findByPk(client.clientId) + if (!oauthClient || oauthClient.client_secret !== client.clientSecret) { + return done(null, false) + } + + return oauthController.issueTokens(null, oauthClient.id, done) +})) + +// issue new tokens and remove the old ones +oauthServer.exchange(oauth2orize.exchange.refreshToken(async (client, refreshToken, scope, done) => { + // db.refreshTokens.find(refreshToken, (error, token) => { + // if (error) return done(error) + // issueTokens(token.id, client.id, (err, accessToken, refreshToken) => { + // if (err) { + // done(err, null, null) + // } + // db.accessTokens.removeByUserIdAndClientId(token.userId, token.clientId, (err) => { + // if (err) { + // done(err, null, null) + // } + // db.refreshTokens.removeByUserIdAndClientId(token.userId, token.clientId, (err) => { + // if (err) { + // done(err, null, null) + // } + // done(null, accessToken, refreshToken) + // }) + // }) + // }) + // }) +})) + + +const oauthController = { + + // this is a middleware to authenticate a request + authenticate: [ + passport.initialize(), // initialize passport + cookieParser(), // parse cookies + session({ secret: 'secret', resave: true, saveUninitialized: true }), + passport.session(), + (req, res, next) => { // retrocompatibility + const token = get(req.cookies, 'auth._token.local', null) + const authorization = get(req.headers, 'authorization', null) + if (!authorization && token) { + req.headers.authorization = token + } + next() + }, + passport.authenticate(['bearer', 'oauth2-client-password', 'anonymous'], { session: false }) + ], + + login: [ + bodyParser.urlencoded({ extended: true }), // login is done via application/x-www-form-urlencoded form + passport.authenticate(['oauth2-client-public'], { session: false }), + oauthServer.token(), + oauthServer.errorHandler() + ], + + token: [ + bodyParser.urlencoded({ extended: true }), // login is done via application/x-www-form-urlencoded form + passport.authenticate(['bearer', 'oauth2-client-password'], { session: false }), + oauthServer.token(), + oauthServer.errorHandler() + ], + + authorization: [ + oauthServer.authorization(async (clientId, redirectUri, done) => { + const oauthClient = await OAuthClient.findByPk(clientId) + if (!oauthClient) { + return done(null, false) + } + + // WARNING: For security purposes, it is highly advisable to check that + // redirectUri provided by the client matches one registered with + // the server. For simplicity, this example does not. You have + // been warned. + return done(null, oauthClient, redirectUri); + }, async (client, user, done) => { + // Check if grant request qualifies for immediate approval + + // Auto-approve + if (client.isTrusted) return done(null, true); + if (!user) { + return done(null, false) + } + const token = await OAuthToken.findOne({ where: { clientId: client.id, userId: user.id }}) + // Auto-approve + if (token) { + return done(null, true) + } + // Otherwise ask user + return done(null, false) + + }), + (req, res, next) => { + //clean old transactionID + if(req.session.authorize){ + for(const key in req.session.authorize){ + if(key !== req.oauth2.transactionID){ + delete req.session.authorize[key]; + } + } + } + const query = new URLSearchParams({ + transactionID: req.oauth2.transactionID, + client: req.oauth2.client.name, + scope: req.oauth2.client.scopes, + redirect_uri: req.oauth2.client.redirectUris + }) + return res.redirect(`/authorize?${query.toString()}`) + } + ], + + decision: [ + bodyParser.urlencoded({ extended: true }), + oauthServer.decision() + ], + + async issueTokens(userId, clientId, done) { + const user = await User.findByPk(userId) + if (!user) { + return done(null, false) + } + + const refreshToken = helpers.randomString(32) + const accessToken = helpers.randomString(32) + + const token = { + refreshToken, + accessToken, + userId, + clientId + } + + await OAuthToken.create(token) + return done(null, accessToken, refreshToken, { username: user.email }) + }, + + // create client => http:///gancio.org/dev/oauth#create-client async createClient (req, res) { // only write scope is supported if (req.body.scopes && req.body.scopes !== 'event:write') { @@ -28,12 +359,12 @@ const oauthController = { } const client = { - id: await randomString(256), + id: helpers.randomString(32), name: req.body.client_name, redirectUris: req.body.redirect_uris, scopes: req.body.scopes || 'event:write', website: req.body.website, - client_secret: await randomString(256) + client_secret: helpers.randomString(32) } try { @@ -63,99 +394,11 @@ const oauthController = { async getClients (req, res) { const tokens = await OAuthToken.findAll({ - include: [{ model: User, where: { id: res.locals.user.id } }, { model: OAuthClient, as: 'client' }], + include: [{ model: User, where: { id: req.user.id } }, { model: OAuthClient, as: 'client' }], raw: true, nest: true }) res.json(tokens) - }, - - model: { - - /** - * Invoked to retrieve an existing access token previously saved through #saveToken(). - * https://oauth2-server.readthedocs.io/en/latest/model/spec.html#getaccesstoken-accesstoken-callback - * */ - async getAccessToken (accessToken) { - const oauth_token = await OAuthToken.findByPk(accessToken, - { include: [{ model: User, attributes: { exclude: ['password'] } }, { model: OAuthClient, as: 'client' }] }) - return oauth_token - }, - - /** - * Invoked to retrieve a client using a client id or a client id/client secret combination, depend on the grant type. - */ - async getClient (client_id, client_secret) { - const client = await OAuthClient.findByPk(client_id, { raw: true }) - if (client_secret && client_secret !== client.client_secret) { - return false - } - - if (client) { client.grants = ['authorization_code', 'password'] } - - return client - }, - - async getRefreshToken (refresh_token) { - const oauth_token = await OAuthToken.findOne({ where: { refresh_token }, raw: true }) - return oauth_token - }, - - async getAuthorizationCode (code) { - const oauth_code = await OAuthCode.findByPk(code, - { include: [User, { model: OAuthClient, as: 'client' }] }) - return oauth_code - }, - - async saveToken (token, client, user) { - token.userId = user.id - token.clientId = client.id - const oauth_token = await OAuthToken.create(token) - oauth_token.client = client - oauth_token.user = user - return oauth_token - }, - - async revokeAuthorizationCode (code) { - const oauth_code = await OAuthCode.findByPk(code.authorizationCode) - return oauth_code.destroy() - }, - - async getUser (username, password) { - const user = await User.findOne({ where: { email: username } }) - if (!user || !user.is_active) { - return false - } - // check if password matches - if (await user.comparePassword(password)) { - return user - } - return false - }, - - async saveAuthorizationCode (code, client, user) { - code.userId = user.id - code.clientId = client.id - code.expiresAt = dayjs(code.expiresAt).toDate() - return OAuthCode.create(code) - }, - - // TODO - verifyScope (token, scope) { - // const userScope = [ - // 'user:remove', - // 'user:update', - // 'event:write', - // 'event:remove' - // ] - log.debug(`VERIFY SCOPE ${scope} ${token.user.email}`) - if (token.user.is_admin && token.user.is_active) { - return true - } else { - return false - } - } - } } diff --git a/server/api/controller/place.js b/server/api/controller/place.js index 1c9b32ae..f84b0d76 100644 --- a/server/api/controller/place.js +++ b/server/api/controller/place.js @@ -3,8 +3,13 @@ const Event = require('../models/event') const eventController = require('./event') const exportController = require('./export') +const { version } = require('../../../package.json') + const log = require('../../log') const { Op, where, col, fn, cast } = require('sequelize') +const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search' +const PHOTON_URL = 'https://photon.komoot.io/api/' +const axios = require('axios') module.exports = { @@ -60,7 +65,7 @@ module.exports = { { address: where(fn('LOWER', col('address')), 'LIKE', '%' + search + '%')}, ] }, - attributes: ['name', 'address', 'id'], + attributes: ['name', 'address', 'latitude', 'longitude', 'id'], include: [{ model: Event, where: { is_visible: true }, required: true, attributes: [] }], group: ['place.id'], raw: true, @@ -70,6 +75,45 @@ module.exports = { // TOFIX: don't know why limit does not work return res.json(places.slice(0, 10)) - } + }, -} \ No newline at end of file + async _nominatim (req, res) { + const details = req.params.place_details + const countrycodes = res.locals.settings.geocoding_countrycodes || [] + const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL + // ?limit=3&format=json&namedetails=1&addressdetails=1&q= + + const ret = await axios.get(`${geocoding_provider}`, { + params: { + countrycodes: countrycodes.join(','), + q: details, + limit: 3, + format: 'json', + addressdetails: 1, + namedetails: 1, + }, + headers: { 'User-Agent': `gancio ${version}` } + }) + + return res.json(ret.data) + + }, + + async _photon (req, res) { + const details = req.params.place_details + const geocoding_provider = res.locals.settings.geocoding_provider || PHOTON_URL + + const ret = await axios.get(`${geocoding_provider}`, { + params: { + q: details, + limit: 3, + }, + headers: { 'User-Agent': `gancio ${version}` } + }) + + // console.log(ret) + return res.json(ret.data) + + }, + +} diff --git a/server/api/controller/plugins.js b/server/api/controller/plugins.js new file mode 100644 index 00000000..defcca40 --- /dev/null +++ b/server/api/controller/plugins.js @@ -0,0 +1,121 @@ +const path = require('path') +const fs = require('fs') +const log = require('../../log') +const config = require('../../config') + +const pluginController = { + plugins: [], + getAll(_req, res) { + const settingsController = require('./settings') + // return plugins and inner settings + const plugins = pluginController.plugins.map( ({ configuration }) => { + if (settingsController.settings['plugin_' + configuration.name]) { + configuration.settingsValue = settingsController.settings['plugin_' + configuration.name] + } + return configuration + }) + return res.json(plugins) + }, + + togglePlugin(req, res) { + const settingsController = require('./settings') + const pluginName = req.params.plugin + const pluginSettings = settingsController.settings['plugin_' + pluginName] + if (!pluginSettings) { return res.sendStatus(404) } + if (!pluginSettings.enable) { + pluginController.loadPlugin(pluginName) + } else { + pluginController.unloadPlugin(pluginName) + } + settingsController.set('plugin_' + pluginName, + { ...pluginSettings, enable: !pluginSettings.enable }) + res.json() + }, + + unloadPlugin(pluginName) { + const settingsController = require('./settings') + const plugin = pluginController.plugins.find(p => p.configuration.name === pluginName) + const settings = settingsController.settings['plugin_' + pluginName] + if (!plugin) { + log.warn(`Plugin ${pluginName} not found`) + return + } + const notifier = require('../../notifier') + log.info('Unload plugin ' + plugin) + if (typeof plugin.onEventCreate === 'function') { + notifier.emitter.off('Create', plugin.onEventCreate) + } + if (typeof plugin.onEventDelete === 'function') { + notifier.emitter.off('Delete', plugin.onEventDelete) + } + if (typeof plugin.onEventUpdate === 'function') { + notifier.emitter.off('Update', plugin.onEventUpdate) + } + + if (plugin.unload && typeof plugin.unload === 'function') { + plugin.unload({ settings: settingsController.settings }, settings) + } + + }, + + loadPlugin(pluginName) { + const settingsController = require('./settings') + const plugin = pluginController.plugins.find(p => p.configuration.name === pluginName) + const settings = settingsController.settings['plugin_' + pluginName] + if (!plugin) { + log.warn(`Plugin ${pluginName} not found`) + return + } + const notifier = require('../../notifier') + log.info('Load plugin ' + pluginName) + if (typeof plugin.onEventCreate === 'function') { + notifier.emitter.on('Create', plugin.onEventCreate) + } + if (typeof plugin.onEventDelete === 'function') { + notifier.emitter.on('Delete', plugin.onEventDelete) + } + if (typeof plugin.onEventUpdate === 'function') { + notifier.emitter.on('Update', plugin.onEventUpdate) + } + + if (plugin.load && typeof plugin.load === 'function') { + plugin.load({ + helpers: require('../../helpers'), + settings: settingsController.settings + }, + settings) + } + }, + + _load() { + const settingsController = require('./settings') + // load custom plugins + const plugins_path = config.plugins_path || path.resolve(process.env.cwd || '', 'plugins') + log.info(`Loading plugin ${plugins_path}`) + if (fs.existsSync(plugins_path)) { + const plugins = fs.readdirSync(plugins_path) + .map(e => path.resolve(plugins_path, e, 'index.js')) + .filter(index => fs.existsSync(index)) + plugins.forEach(pluginFile => { + try { + const plugin = require(pluginFile) + const name = plugin.configuration.name + console.log(`Found plugin '${name}'`) + pluginController.plugins.push(plugin) + if (settingsController.settings['plugin_' + name]) { + const pluginSetting = settingsController.settings['plugin_' + name] + if (pluginSetting.enable) { + pluginController.loadPlugin(name) + } + } else { + settingsController.set('plugin_' + name, { enable: false }) + } + } catch (e) { + log.warn(`Unable to load plugin ${pluginFile}: ${String(e)}`) + } + }) + } + } +} + +module.exports = pluginController diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js index db13d036..b3d1dfad 100644 --- a/server/api/controller/settings.js +++ b/server/api/controller/settings.js @@ -7,9 +7,9 @@ const sharp = require('sharp') const config = require('../../config') const generateKeyPair = promisify(crypto.generateKeyPair) const log = require('../../log') -const locales = require('../../../locales/index') +// const locales = require('../../../locales/index') const escape = require('lodash/escape') - +const pluginController = require('./plugins') let defaultHostname try { @@ -27,8 +27,15 @@ const defaultSettings = { instance_place: '', allow_registration: true, allow_anon_event: true, + allow_multidate_event: true, allow_recurrent_event: false, recurrent_event_visible: false, + allow_geolocation: true, + geocoding_provider_type: 'Nominatim', + geocoding_provider: 'https://nominatim.openstreetmap.org/search', + geocoding_countrycodes: [], + tilelayer_provider: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + tilelayer_provider_attribution: "OpenStreetMap contributors", enable_federation: true, enable_resources: false, hide_boosts: true, @@ -36,10 +43,14 @@ const defaultSettings = { trusted_instances: [], 'theme.is_dark': true, 'theme.primary': '#FF4500', + trusted_instances_label: '', + hide_thumbs: false, + hide_calendar: false, footerLinks: [ - { href: '/', label: 'home' }, - { href: '/about', label: 'about' } + { href: '/', label: 'common.home' }, + { href: '/about', label: 'common.about' } ], + plugins: [], admin_email: config.admin_email || '', smtp: config.smtp || {} } @@ -94,44 +105,20 @@ const settingsController = { } // initialize user_locale - if (config.user_locale && fs.existsSync(path.resolve(config.user_locale))) { - const user_locales_files = fs.readdirSync(path.resolve(config.user_locale)) - user_locales_files.forEach( f => { - const locale = path.basename(f ,'.json') - if (locales[locale]) { - log.info(`Adding custom locale ${locale}`) - settingsController.user_locale[locale] = require(path.resolve(config.user_locale, f)).default - } else { - log.warning(`Unknown custom user locale: ${locale} [valid locales are ${locales}]`) - } - }) - } + // if (config.user_locale && fs.existsSync(path.resolve(config.user_locale))) { + // const user_locales_files = fs.readdirSync(path.resolve(config.user_locale)) + // user_locales_files.forEach( f => { + // const locale = path.basename(f ,'.json') + // if (locales[locale]) { + // log.info(`Adding custom locale ${locale}`) + // settingsController.user_locale[locale] = require(path.resolve(config.user_locale, f)).default + // } else { + // log.warning(`Unknown custom user locale: ${locale} [valid locales are ${locales}]`) + // } + // }) + // } - // load custom plugins - const plugins_path = path.resolve(process.env.cwd || '', 'plugins') - if (process.env.NODE_ENV === 'production' && fs.existsSync(plugins_path)) { - const notifier = require('../../notifier') - const pluginsFile = fs.readdirSync(plugins_path).filter(e => path.extname(e).toLowerCase() === '.js') - pluginsFile.forEach( pluginFile => { - try { - const plugin = require(path.resolve(plugins_path, pluginFile)) - if (typeof plugin.load !== 'function') return - plugin.load({ settings: settingsController.settings }) - log.info(`Plugin ${pluginFile} loaded!`) - if (typeof plugin.onEventCreate === 'function') { - notifier.emitter.on('Create', plugin.onEventCreate) - } - if (typeof plugin.onEventDelete === 'function') { - notifier.emitter.on('Delete', plugin.onEventDelete) - } - if (typeof plugin.onEventUpdate === 'function') { - notifier.emitter.on('Update', plugin.onEventUpdate) - } - } catch (e) { - log.warn(`Unable to load plugin ${pluginFile}: ${String(e)}`) - } - }) - } + pluginController._load() }, async set (key, value, is_secret = false) { @@ -199,7 +186,52 @@ const settingsController = { settingsController.set('logo', baseImgPath) res.sendStatus(200) }) + }, + + setFallbackImage (req, res) { + if (!req.file) { + settingsController.set('fallback_image', false) + return res.status(200) + } + + const uploadedPath = path.join(req.file.destination, req.file.filename) + const baseImgPath = path.resolve(config.upload_path, 'fallbackImage.png') + + // convert and resize to png + return sharp(uploadedPath) + .resize(600) + .png({ quality: 99 }) + .toFile(baseImgPath, (err) => { + if (err) { + log.error('[FALLBACK IMAGE] ' + err) + } + settingsController.set('fallback_image', baseImgPath) + res.sendStatus(200) + }) + }, + + setHeaderImage (req, res) { + if (!req.file) { + settingsController.set('header_image', false) + return res.status(200) + } + + const uploadedPath = path.join(req.file.destination, req.file.filename) + const baseImgPath = path.resolve(config.upload_path, 'headerImage.png') + + // convert and resize to png + return sharp(uploadedPath) + .resize(600) + .png({ quality: 99 }) + .toFile(baseImgPath, (err) => { + if (err) { + log.error('[HEADER IMAGE] ' + err) + } + settingsController.set('header_image', baseImgPath) + res.sendStatus(200) + }) } + } module.exports = settingsController diff --git a/server/api/controller/tag.js b/server/api/controller/tag.js index 1f2f882b..d581179b 100644 --- a/server/api/controller/tag.js +++ b/server/api/controller/tag.js @@ -1,6 +1,8 @@ const Tag = require('../models/tag') const Event = require('../models/event') const uniq = require('lodash/uniq') +const log = require('../../log') + const { where, fn, col, Op } = require('sequelize') const exportController = require('./export') @@ -45,6 +47,20 @@ module.exports = { } }, + + + async getAll (_req, res) { + const tags = await Tag.findAll({ + order: [[fn('COUNT', col('tag.tag')), 'DESC']], + attributes: ['tag', [fn('COUNT', col('tag.tag')), 'count']], + include: [{ model: Event, where: { is_visible: true }, attributes: [], through: { attributes: [] }, required: true }], + group: ['tag.tag'], + raw: true, + }) + return res.json(tags) + }, + + /** * search for tags by query string * sorted by usage @@ -60,9 +76,48 @@ module.exports = { include: [{ model: Event, where: { is_visible: true }, attributes: [], through: { attributes: [] }, required: true }], group: ['tag.tag'], limit: 10, - subQuery:false + subQuery: false }) return res.json(tags.map(t => t.tag)) + }, + + async updateTag (req, res) { + const tag = await Tag.findByPk(req.body.tag) + await tag.update(req.body) + res.json(place) + }, + + async updateTag (req, res) { + const oldtag = await Tag.findByPk(req.body.tag) + const newtag = await Tag.findByPk(req.body.newTag) + + // if the new tag does not exists, just rename the old one + if (!newtag) { + oldtag.tag = req.body.newTag + await oldtag.update({ tag: req.body.newTag }) + } else { + // in case it exists: + // - search for events with old tag + const events = await oldtag.getEvents() + // - substitute it with the new one + await oldtag.removeEvents(events) + await newtag.addEvents(events) + } + res.sendStatus(200) + }, + + async remove (req, res) { + log.info('Remove tag', req.params.tag) + const tagName = req.params.tag + try { + const tag = await Tag.findByPk(tagName) + await tag.destroy() + res.sendStatus(200) + } catch (e) { + log.error('Tag removal failed:', e) + res.sendStatus(404) + } } + } \ No newline at end of file diff --git a/server/api/controller/user.js b/server/api/controller/user.js index 7affed42..c1e482ee 100644 --- a/server/api/controller/user.js +++ b/server/api/controller/user.js @@ -44,13 +44,13 @@ const userController = { }, async current (req, res) { - if (!res.locals.user) { return res.status(400).send('Not logged') } - const user = await User.scope('withoutPassword').findByPk(res.locals.user.id) + if (!req.user) { return res.status(400).send('Not logged') } + const user = await User.scope('withoutPassword').findByPk(req.user.id) res.json(user) }, async getAll (req, res) { - const users = await User.scope(res.locals.user.is_admin ? 'withRecover' : 'withoutPassword').findAll({ + const users = await User.scope(req.user.is_admin ? 'withRecover' : 'withoutPassword').findAll({ order: [['is_admin', 'DESC'], ['createdAt', 'DESC']] }) res.json(users) @@ -62,7 +62,7 @@ const userController = { if (!user) { return res.status(404).json({ success: false, message: 'User not found!' }) } - if (req.body.id !== res.locals.user.id && !res.locals.user.is_admin) { + if (req.body.id !== req.user.id && !req.user.is_admin) { return res.status(400).json({ succes: false, message: 'Not allowed' }) } @@ -123,10 +123,10 @@ const userController = { async remove (req, res) { try { let user - if (res.locals.user.is_admin && req.params.id) { + if (req.user.is_admin && req.params.id) { user = await User.findByPk(req.params.id) } else { - user = await User.findByPk(res.locals.user.id) + user = await User.findByPk(req.user.id) } await user.destroy() log.warn(`User ${user.email} removed!`) diff --git a/server/api/index.js b/server/api/index.js index 8a014cf6..4fbed0a9 100644 --- a/server/api/index.js +++ b/server/api/index.js @@ -34,6 +34,7 @@ if (config.status !== 'READY') { const oauthController = require('./controller/oauth') const announceController = require('./controller/announce') const collectionController = require('./controller/collection') + const pluginController = require('./controller/plugins') const helpers = require('../helpers') const storage = require('./storage') const upload = multer({ storage }) @@ -59,7 +60,7 @@ if (config.status !== 'READY') { ``` */ api.get('/ping', (_req, res) => res.sendStatus(200)) - api.get('/user', isAuth, (_req, res) => res.json(res.locals.user)) + api.get('/user', isAuth, (req, res) => res.json(req.user)) api.post('/user/recover', userController.forgotPassword) @@ -89,16 +90,16 @@ if (config.status !== 'READY') { * @param {integer} [end] - end timestamp (optional) * @param {array} [tags] - List of tags * @param {array} [places] - List of places id - * @param {integer} [max] - Limit events + * @param {integer} [max] - Limit events * @param {boolean} [show_recurrent] - Show also recurrent events (default: as choosen in admin settings) * @param {integer} [page] - Pagination * @param {boolean} [older] - select <= start instead of >= - * @example ***Example*** - * [https://demo.gancio.org/api/events](https://demo.gancio.org/api/events) + * @example ***Example*** + * [https://demo.gancio.org/api/events](https://demo.gancio.org/api/events) * [usage example](https://framagit.org/les/gancio/-/blob/master/webcomponents/src/GancioEvents.svelte#L18-42) */ - api.get('/events', cors, eventController.select) + api.get('/events', cors, eventController.select) /** * Add a new event @@ -110,6 +111,8 @@ if (config.status !== 'READY') { * @param {string} description - event's description (html accepted and sanitized) * @param {string} place_name - the name of the place * @param {string} [place_address] - the address of the place + * @param {float} [place_latitude] - the latitude of the place + * @param {float} [place_longitude] - the longitude of the place * @param {integer} start_datetime - start timestamp * @param {integer} multidate - is a multidate event? * @param {array} tags - List of tags @@ -140,6 +143,8 @@ if (config.status !== 'READY') { api.post('/settings', isAdmin, settingsController.setRequest) api.get('/settings', isAdmin, settingsController.getAll) api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo) + api.post('/settings/fallbackImage', isAdmin, multer({ dest: config.upload_path }).single('fallbackImage'), settingsController.setFallbackImage) + api.post('/settings/headerImage', isAdmin, multer({ dest: config.upload_path }).single('headerImage'), settingsController.setHeaderImage) api.post('/settings/smtp', isAdmin, settingsController.testSMTP) api.get('/settings/smtp', isAdmin, settingsController.getSMTPSettings) @@ -157,13 +162,21 @@ if (config.status !== 'READY') { api.get('/export/:type', cors, exportController.export) - api.get('/place/all', isAdmin, placeController.getAll) + // - PLACES + api.get('/places', isAdmin, placeController.getAll) api.get('/place/:placeName', cors, placeController.getEvents) api.get('/place', cors, placeController.search) + api.get('/placeOSM/Nominatim/:place_details', cors, placeController._nominatim) + api.get('/placeOSM/Photon/:place_details', cors, placeController._photon) api.put('/place', isAdmin, placeController.updatePlace) + // - TAGS + api.get('/tags', isAdmin, tagController.getAll) api.get('/tag', cors, tagController.search) api.get('/tag/:tag', cors, tagController.getEvents) + api.delete('/tag/:tag', isAdmin, tagController.remove) + api.put('/tag', isAdmin, tagController.updateTag) + // - FEDIVERSE INSTANCES, MODERATION, RESOURCES api.get('/instances', isAdmin, instanceController.getAll) @@ -189,6 +202,10 @@ if (config.status !== 'READY') { api.post('/filter', isAdmin, collectionController.addFilter) api.delete('/filter/:id', isAdmin, collectionController.removeFilter) + // - PLUGINS + api.get('/plugins', isAdmin, pluginController.getAll) + api.put('/plugin/:plugin', isAdmin, pluginController.togglePlugin) + // OAUTH api.get('/clients', isAuth, oauthController.getClients) api.get('/client/:client_id', isAuth, oauthController.getClient) diff --git a/server/api/models/event.js b/server/api/models/event.js index 659287e1..75d2067f 100644 --- a/server/api/models/event.js +++ b/server/api/models/event.js @@ -105,7 +105,9 @@ Event.prototype.toAP = function (username, locale, to = []) { endTime: this.end_datetime ? dayjs.unix(this.end_datetime).tz().locale(locale).format() : null, location: { name: this.place.name, - address: this.place.address + address: this.place.address, + latitude: this.place.latitude, + longitude: this.place.longitude }, attachment, tag: tags && tags.map(tag => ({ diff --git a/server/api/models/place.js b/server/api/models/place.js index e8ef6e90..0294599b 100644 --- a/server/api/models/place.js +++ b/server/api/models/place.js @@ -10,7 +10,9 @@ Place.init({ index: true, allowNull: false }, - address: DataTypes.STRING + address: DataTypes.STRING, + latitude: DataTypes.FLOAT, + longitude: DataTypes.FLOAT, }, { sequelize, modelName: 'place' }) module.exports = Place diff --git a/server/api/oauth.js b/server/api/oauth.js deleted file mode 100644 index be4ade64..00000000 --- a/server/api/oauth.js +++ /dev/null @@ -1,41 +0,0 @@ -const express = require('express') -const OAuthServer = require('express-oauth-server') -const oauth = express.Router() -const oauthController = require('./controller/oauth') -const log = require('../log') - -const oauthServer = new OAuthServer({ - model: oauthController.model, - allowEmptyState: true, - useErrorHandler: true, - continueMiddleware: false, - debug: true, - requireClientAuthentication: { password: false }, - authenticateHandler: { - handle (_req, res) { - if (!res.locals.user) { - throw new Error('Not authenticated!') - } - return res.locals.user - } - } -}) - -oauth.oauthServer = oauthServer -oauth.use(express.json()) -oauth.use(express.urlencoded({ extended: false })) - -oauth.post('/token', oauthServer.token()) -oauth.post('/login', oauthServer.token()) - -oauth.get('/authorize', oauthServer.authorize()) - -oauth.use((req, res) => res.sendStatus(404)) - -oauth.use((err, req, res, next) => { - const error_msg = err.toString() - log.warn('[OAUTH USE] ' + error_msg) - res.status(500).send(error_msg) -}) - -module.exports = oauth diff --git a/server/helpers.js b/server/helpers.js index 9479b5a8..5fa385f5 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -22,7 +22,6 @@ const { JSDOM } = require('jsdom') const { window } = new JSDOM('') const domPurify = DOMPurify(window) const url = require('url') -const locales = require('../locales') domPurify.addHook('beforeSanitizeElements', node => { if (node.hasAttribute && node.hasAttribute('href')) { @@ -49,7 +48,7 @@ domPurify.addHook('beforeSanitizeElements', node => { module.exports = { randomString(length = 12) { - const wishlist = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' + const wishlist = '0123456789abcdefghijklmnopqrstuvwxyz' return Array.from(crypto.randomFillSync(new Uint32Array(length))) .map(x => wishlist[x % wishlist.length]) .join('') @@ -63,26 +62,47 @@ module.exports = { }) }, - async setUserLocale(req, res, next) { - // select locale based on cookie? and accept-language header - acceptLanguage.languages(Object.keys(locales)) - res.locals.acceptedLocale = acceptLanguage.get(req.headers['accept-language']) - dayjs.locale(res.locals.acceptedLocale) - next() - }, async initSettings(_req, res, next) { // initialize settings - res.locals.settings = cloneDeep(settingsController.settings) - delete res.locals.settings.smtp - delete res.locals.settings.publicKey - res.locals.settings.baseurl = config.baseurl - res.locals.settings.hostname = config.hostname - res.locals.settings.title = res.locals.settings.title || config.title - res.locals.settings.description = res.locals.settings.description || config.description - res.locals.settings.version = pkg.version + // res.locals.settings = cloneDeep(settingsController.settings) + const settings = settingsController.settings + res.locals.settings = { + title: settings.title || config.title, + description: settings.description || config.description, + baseurl: config.baseurl, + hostname: config.hostname, + version: pkg.version, + instance_timezone: settings.instance_timezone, + instance_locale: settings.instance_locale, + instance_name: settings.instance_name, + instance_place: settings.instance_place, + allow_registration: settings.allow_registration, + allow_anon_event: settings.allow_anon_event, + allow_recurrent_event: settings.allow_recurrent_event, + allow_multidate_event: settings.allow_multidate_event, + recurrent_event_visible: settings.recurrent_event_visible, + enable_federation: settings.enable_federation, + enable_resources: settings.enable_resources, + hide_boosts: settings.hide_boosts, + enable_trusted_instances: settings.enable_trusted_instances, + trusted_instances: settings.trusted_instances, + trusted_instances_label: settings.trusted_instances_label, + 'theme.is_dark': settings['theme.is_dark'], + 'theme.primary': settings['theme.primary'], + hide_thumbs: settings.hide_thumbs, + hide_calendar: settings.hide_calendar, + allow_geolocation: settings.allow_geolocation, + geocoding_provider_type: settings.geocoding_provider_type, + geocoding_provider: settings.geocoding_provider, + geocoding_countrycodes: settings.geocoding_countrycodes, + tilelayer_provider: settings.tilelayer_provider, + tilelayer_provider_attribution: settings.tilelayer_provider_attribution, + footerLinks: settings.footerLinks, + about: settings.about + } // set user locale - res.locals.user_locale = settingsController.user_locale[res.locals.acceptedLocale] + // res.locals.user_locale = settingsController.user_locale[res.locals.acceptedLocale] dayjs.tz.setDefault(res.locals.settings.instance_timezone) next() }, @@ -92,16 +112,30 @@ module.exports = { // serve images/thumb router.use('/media/', express.static(config.upload_path, { immutable: true, maxAge: '1y' }), (_req, res) => res.sendStatus(404)) router.use('/download/:filename', (req, res) => { - return res.download(req.params.filename, undefined, { root: config.upload_path }, err => { + res.download(req.params.filename, undefined, { root: config.upload_path }, err => { if (err) { - res.status(404).send('Not found (but nice try 😊)') + // Check if headers have been sent + if(res.headersSent) { + log.warn(err) + } else { + res.status(404).send('Not found (but nice try 😊)') + // } } - }) + }}) + }) + + router.use('/fallbackimage.png', (req, res, next) => { + const fallbackImagePath = settingsController.settings.fallback_image || './static/noimg.svg' + return express.static(fallbackImagePath)(req, res, next) + }) + + router.use('/headerimage.png', (req, res, next) => { + const headerImagePath = settingsController.settings.header_image || './static/noimg.svg' + return express.static(headerImagePath)(req, res, next) }) - router.use('/noimg.svg', express.static('./static/noimg.svg')) router.use('/logo.png', (req, res, next) => { - const logoPath = res.locals.settings.logo || './static/gancio' + const logoPath = settingsController.settings.logo || './static/gancio' return express.static(logoPath + '.png')(req, res, next) }) diff --git a/server/helpers/geolocation.js b/server/helpers/geolocation.js new file mode 100644 index 00000000..e1edaa88 --- /dev/null +++ b/server/helpers/geolocation.js @@ -0,0 +1,987 @@ +// Iso conversions + +var isoCountries = [ + { + "code": "af", + "name": "Afghanistan" + }, + { + "code": "ax", + "name": "Aland Islands" + }, + { + "code": "al", + "name": "Albania" + }, + { + "code": "dz", + "name": "Algeria" + }, + { + "code": "as", + "name": "American Samoa" + }, + { + "code": "ad", + "name": "Andorra" + }, + { + "code": "ao", + "name": "Angola" + }, + { + "code": "ai", + "name": "Anguilla" + }, + { + "code": "aq", + "name": "Antarctica" + }, + { + "code": "ag", + "name": "Antigua And Barbuda" + }, + { + "code": "ar", + "name": "Argentina" + }, + { + "code": "am", + "name": "Armenia" + }, + { + "code": "aw", + "name": "Aruba" + }, + { + "code": "au", + "name": "Australia" + }, + { + "code": "at", + "name": "Austria" + }, + { + "code": "az", + "name": "Azerbaijan" + }, + { + "code": "bs", + "name": "Bahamas" + }, + { + "code": "bh", + "name": "Bahrain" + }, + { + "code": "bd", + "name": "Bangladesh" + }, + { + "code": "bb", + "name": "Barbados" + }, + { + "code": "by", + "name": "Belarus" + }, + { + "code": "be", + "name": "Belgium" + }, + { + "code": "bz", + "name": "Belize" + }, + { + "code": "bj", + "name": "Benin" + }, + { + "code": "bm", + "name": "Bermuda" + }, + { + "code": "bt", + "name": "Bhutan" + }, + { + "code": "bo", + "name": "Bolivia" + }, + { + "code": "ba", + "name": "Bosnia And Herzegovina" + }, + { + "code": "bw", + "name": "Botswana" + }, + { + "code": "bv", + "name": "Bouvet Island" + }, + { + "code": "br", + "name": "Brazil" + }, + { + "code": "io", + "name": "British Indian Ocean Territory" + }, + { + "code": "bn", + "name": "Brunei Darussalam" + }, + { + "code": "bg", + "name": "Bulgaria" + }, + { + "code": "bf", + "name": "Burkina Faso" + }, + { + "code": "bi", + "name": "Burundi" + }, + { + "code": "kh", + "name": "Cambodia" + }, + { + "code": "cm", + "name": "Cameroon" + }, + { + "code": "ca", + "name": "Canada" + }, + { + "code": "cv", + "name": "Cape Verde" + }, + { + "code": "ky", + "name": "Cayman Islands" + }, + { + "code": "cf", + "name": "Central African Republic" + }, + { + "code": "td", + "name": "Chad" + }, + { + "code": "cl", + "name": "Chile" + }, + { + "code": "cn", + "name": "China" + }, + { + "code": "cx", + "name": "Christmas Island" + }, + { + "code": "cc", + "name": "Cocos (Keeling) Islands" + }, + { + "code": "co", + "name": "Colombia" + }, + { + "code": "km", + "name": "Comoros" + }, + { + "code": "cg", + "name": "Congo" + }, + { + "code": "cd", + "name": "Congo, Democratic Republic" + }, + { + "code": "ck", + "name": "Cook Islands" + }, + { + "code": "cr", + "name": "Costa Rica" + }, + { + "code": "ci", + "name": "Cote D'Ivoire" + }, + { + "code": "hr", + "name": "Croatia" + }, + { + "code": "cu", + "name": "Cuba" + }, + { + "code": "cy", + "name": "Cyprus" + }, + { + "code": "cz", + "name": "Czech Republic" + }, + { + "code": "dk", + "name": "Denmark" + }, + { + "code": "dj", + "name": "Djibouti" + }, + { + "code": "dm", + "name": "Dominica" + }, + { + "code": "do", + "name": "Dominican Republic" + }, + { + "code": "ec", + "name": "Ecuador" + }, + { + "code": "eg", + "name": "Egypt" + }, + { + "code": "sv", + "name": "El Salvador" + }, + { + "code": "gq", + "name": "Equatorial Guinea" + }, + { + "code": "er", + "name": "Eritrea" + }, + { + "code": "ee", + "name": "Estonia" + }, + { + "code": "et", + "name": "Ethiopia" + }, + { + "code": "fk", + "name": "Falkland Islands (Malvinas)" + }, + { + "code": "fo", + "name": "Faroe Islands" + }, + { + "code": "fj", + "name": "Fiji" + }, + { + "code": "fi", + "name": "Finland" + }, + { + "code": "fr", + "name": "France" + }, + { + "code": "gf", + "name": "French Guiana" + }, + { + "code": "pf", + "name": "French Polynesia" + }, + { + "code": "tf", + "name": "French Southern Territories" + }, + { + "code": "ga", + "name": "Gabon" + }, + { + "code": "gm", + "name": "Gambia" + }, + { + "code": "ge", + "name": "Georgia" + }, + { + "code": "de", + "name": "Germany" + }, + { + "code": "gh", + "name": "Ghana" + }, + { + "code": "gi", + "name": "Gibraltar" + }, + { + "code": "gr", + "name": "Greece" + }, + { + "code": "gl", + "name": "Greenland" + }, + { + "code": "gd", + "name": "Grenada" + }, + { + "code": "gp", + "name": "Guadeloupe" + }, + { + "code": "gu", + "name": "Guam" + }, + { + "code": "gt", + "name": "Guatemala" + }, + { + "code": "gg", + "name": "Guernsey" + }, + { + "code": "gn", + "name": "Guinea" + }, + { + "code": "gw", + "name": "Guinea-Bissau" + }, + { + "code": "gy", + "name": "Guyana" + }, + { + "code": "ht", + "name": "Haiti" + }, + { + "code": "hm", + "name": "Heard Island & Mcdonald Islands" + }, + { + "code": "va", + "name": "Holy See (Vatican City State)" + }, + { + "code": "hn", + "name": "Honduras" + }, + { + "code": "hk", + "name": "Hong Kong" + }, + { + "code": "hu", + "name": "Hungary" + }, + { + "code": "is", + "name": "Iceland" + }, + { + "code": "in", + "name": "India" + }, + { + "code": "id", + "name": "Indonesia" + }, + { + "code": "ir", + "name": "Iran, Islamic Republic Of" + }, + { + "code": "iq", + "name": "Iraq" + }, + { + "code": "ie", + "name": "Ireland" + }, + { + "code": "im", + "name": "Isle Of Man" + }, + { + "code": "il", + "name": "Israel" + }, + { + "code": "it", + "name": "Italy" + }, + { + "code": "jm", + "name": "Jamaica" + }, + { + "code": "jp", + "name": "Japan" + }, + { + "code": "je", + "name": "Jersey" + }, + { + "code": "jo", + "name": "Jordan" + }, + { + "code": "kz", + "name": "Kazakhstan" + }, + { + "code": "ke", + "name": "Kenya" + }, + { + "code": "ki", + "name": "Kiribati" + }, + { + "code": "kr", + "name": "Korea" + }, + { + "code": "kw", + "name": "Kuwait" + }, + { + "code": "kg", + "name": "Kyrgyzstan" + }, + { + "code": "la", + "name": "Lao People's Democratic Republic" + }, + { + "code": "lv", + "name": "Latvia" + }, + { + "code": "lb", + "name": "Lebanon" + }, + { + "code": "ls", + "name": "Lesotho" + }, + { + "code": "lr", + "name": "Liberia" + }, + { + "code": "ly", + "name": "Libyan Arab Jamahiriya" + }, + { + "code": "li", + "name": "Liechtenstein" + }, + { + "code": "lt", + "name": "Lithuania" + }, + { + "code": "lu", + "name": "Luxembourg" + }, + { + "code": "mo", + "name": "Macao" + }, + { + "code": "mk", + "name": "Macedonia" + }, + { + "code": "mg", + "name": "Madagascar" + }, + { + "code": "mw", + "name": "Malawi" + }, + { + "code": "my", + "name": "Malaysia" + }, + { + "code": "mv", + "name": "Maldives" + }, + { + "code": "ml", + "name": "Mali" + }, + { + "code": "mt", + "name": "Malta" + }, + { + "code": "mh", + "name": "Marshall Islands" + }, + { + "code": "mq", + "name": "Martinique" + }, + { + "code": "mr", + "name": "Mauritania" + }, + { + "code": "mu", + "name": "Mauritius" + }, + { + "code": "yt", + "name": "Mayotte" + }, + { + "code": "mx", + "name": "Mexico" + }, + { + "code": "fm", + "name": "Micronesia, Federated States Of" + }, + { + "code": "md", + "name": "Moldova" + }, + { + "code": "mc", + "name": "Monaco" + }, + { + "code": "mn", + "name": "Mongolia" + }, + { + "code": "me", + "name": "Montenegro" + }, + { + "code": "ms", + "name": "Montserrat" + }, + { + "code": "ma", + "name": "Morocco" + }, + { + "code": "mz", + "name": "Mozambique" + }, + { + "code": "mm", + "name": "Myanmar" + }, + { + "code": "na", + "name": "Namibia" + }, + { + "code": "nr", + "name": "Nauru" + }, + { + "code": "np", + "name": "Nepal" + }, + { + "code": "nl", + "name": "Netherlands" + }, + { + "code": "an", + "name": "Netherlands Antilles" + }, + { + "code": "nc", + "name": "New Caledonia" + }, + { + "code": "nz", + "name": "New Zealand" + }, + { + "code": "ni", + "name": "Nicaragua" + }, + { + "code": "ne", + "name": "Niger" + }, + { + "code": "ng", + "name": "Nigeria" + }, + { + "code": "nu", + "name": "Niue" + }, + { + "code": "nf", + "name": "Norfolk Island" + }, + { + "code": "mp", + "name": "Northern Mariana Islands" + }, + { + "code": "no", + "name": "Norway" + }, + { + "code": "om", + "name": "Oman" + }, + { + "code": "pk", + "name": "Pakistan" + }, + { + "code": "pw", + "name": "Palau" + }, + { + "code": "ps", + "name": "Palestinian Territory, Occupied" + }, + { + "code": "pa", + "name": "Panama" + }, + { + "code": "pg", + "name": "Papua New Guinea" + }, + { + "code": "py", + "name": "Paraguay" + }, + { + "code": "pe", + "name": "Peru" + }, + { + "code": "ph", + "name": "Philippines" + }, + { + "code": "pn", + "name": "Pitcairn" + }, + { + "code": "pl", + "name": "Poland" + }, + { + "code": "pt", + "name": "Portugal" + }, + { + "code": "pr", + "name": "Puerto Rico" + }, + { + "code": "qa", + "name": "Qatar" + }, + { + "code": "re", + "name": "Reunion" + }, + { + "code": "ro", + "name": "Romania" + }, + { + "code": "ru", + "name": "Russian Federation" + }, + { + "code": "rw", + "name": "Rwanda" + }, + { + "code": "bl", + "name": "Saint Barthelemy" + }, + { + "code": "sh", + "name": "Saint Helena" + }, + { + "code": "kn", + "name": "Saint Kitts And Nevis" + }, + { + "code": "lc", + "name": "Saint Lucia" + }, + { + "code": "mf", + "name": "Saint Martin" + }, + { + "code": "pm", + "name": "Saint Pierre And Miquelon" + }, + { + "code": "vc", + "name": "Saint Vincent And Grenadines" + }, + { + "code": "ws", + "name": "Samoa" + }, + { + "code": "sm", + "name": "San Marino" + }, + { + "code": "st", + "name": "Sao Tome And Principe" + }, + { + "code": "sa", + "name": "Saudi Arabia" + }, + { + "code": "sn", + "name": "Senegal" + }, + { + "code": "rs", + "name": "Serbia" + }, + { + "code": "sc", + "name": "Seychelles" + }, + { + "code": "sl", + "name": "Sierra Leone" + }, + { + "code": "sg", + "name": "Singapore" + }, + { + "code": "sk", + "name": "Slovakia" + }, + { + "code": "si", + "name": "Slovenia" + }, + { + "code": "sb", + "name": "Solomon Islands" + }, + { + "code": "so", + "name": "Somalia" + }, + { + "code": "za", + "name": "South Africa" + }, + { + "code": "gs", + "name": "South Georgia And Sandwich Isl." + }, + { + "code": "es", + "name": "Spain" + }, + { + "code": "lk", + "name": "Sri Lanka" + }, + { + "code": "sd", + "name": "Sudan" + }, + { + "code": "sr", + "name": "Suriname" + }, + { + "code": "sj", + "name": "Svalbard And Jan Mayen" + }, + { + "code": "sz", + "name": "Swaziland" + }, + { + "code": "se", + "name": "Sweden" + }, + { + "code": "ch", + "name": "Switzerland" + }, + { + "code": "sy", + "name": "Syrian Arab Republic" + }, + { + "code": "tw", + "name": "Taiwan" + }, + { + "code": "tj", + "name": "Tajikistan" + }, + { + "code": "tz", + "name": "Tanzania" + }, + { + "code": "th", + "name": "Thailand" + }, + { + "code": "tl", + "name": "Timor-Leste" + }, + { + "code": "tg", + "name": "Togo" + }, + { + "code": "tk", + "name": "Tokelau" + }, + { + "code": "to", + "name": "Tonga" + }, + { + "code": "tt", + "name": "Trinidad And Tobago" + }, + { + "code": "tn", + "name": "Tunisia" + }, + { + "code": "tr", + "name": "Turkey" + }, + { + "code": "tm", + "name": "Turkmenistan" + }, + { + "code": "tc", + "name": "Turks And Caicos Islands" + }, + { + "code": "tv", + "name": "Tuvalu" + }, + { + "code": "ug", + "name": "Uganda" + }, + { + "code": "ua", + "name": "Ukraine" + }, + { + "code": "ae", + "name": "United Arab Emirates" + }, + { + "code": "gb", + "name": "United Kingdom" + }, + { + "code": "us", + "name": "United States" + }, + { + "code": "um", + "name": "United States Outlying Islands" + }, + { + "code": "uy", + "name": "Uruguay" + }, + { + "code": "uz", + "name": "Uzbekistan" + }, + { + "code": "vu", + "name": "Vanuatu" + }, + { + "code": "ve", + "name": "Venezuela" + }, + { + "code": "vn", + "name": "Viet Nam" + }, + { + "code": "vg", + "name": "Virgin Islands, British" + }, + { + "code": "vi", + "name": "Virgin Islands, U.S." + }, + { + "code": "wf", + "name": "Wallis And Futuna" + }, + { + "code": "eh", + "name": "Western Sahara" + }, + { + "code": "ye", + "name": "Yemen" + }, + { + "code": "zm", + "name": "Zambia" + }, + { + "code": "zw", + "name": "Zimbabwe" + } + ] + + +module.exports = { isoCountries } diff --git a/server/migrations/20220706090946-place-details.js b/server/migrations/20220706090946-place-details.js new file mode 100644 index 00000000..c4c4374e --- /dev/null +++ b/server/migrations/20220706090946-place-details.js @@ -0,0 +1,31 @@ +'use strict'; + +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add altering commands here. + * + * Example: + * await queryInterface.createTable('users', { id: Sequelize.INTEGER }); + */ + return Promise.all( + [ + await queryInterface.addColumn('places', 'latitude', { type: Sequelize.FLOAT }), + await queryInterface.addColumn('places', 'longitude', { type: Sequelize.FLOAT }) + ]) + }, + + async down (queryInterface, Sequelize) { + /** + * Add reverting commands here. + * + * Example: + * await queryInterface.dropTable('users'); + */ + return Promise.all( + [ + await queryInterface.removeColumn('places', 'latitude'), + await queryInterface.removeColumn('places', 'longitude') + ]) + } +}; diff --git a/server/routes.js b/server/routes.js index 0c0bf5d7..c61e6d27 100644 --- a/server/routes.js +++ b/server/routes.js @@ -1,15 +1,15 @@ const express = require('express') -const cookieParser = require('cookie-parser') const app = express() const initialize = require('./initialize.server') const config = require('./config') const helpers = require('./helpers') -app.use(helpers.setUserLocale) -app.use(helpers.initSettings) -app.use(helpers.logRequest) -app.use(helpers.serveStatic()) -app.use(cookieParser()) + +app.use([ + helpers.initSettings, + helpers.logRequest, + helpers.serveStatic() +]) async function main () { @@ -19,7 +19,6 @@ async function main () { // const promBundle = require('express-prom-bundle') // const metricsMiddleware = promBundle({ includeMethod: true }) - const log = require('./log') const api = require('./api') @@ -29,14 +28,13 @@ async function main () { if (config.status === 'READY') { const cors = require('cors') const { spamFilter } = require('./federation/helpers') - const oauth = require('./api/oauth') - const auth = require('./api/auth') const federation = require('./federation') const webfinger = require('./federation/webfinger') const exportController = require('./api/controller/export') const tagController = require('./api/controller/tag') const placeController = require('./api/controller/place') const collectionController = require('./api/controller/collection') + const authController = require('./api/controller/oauth') // rss / ics feed app.use(helpers.feedRedirect) @@ -44,7 +42,6 @@ async function main () { app.get('/feed/:format/place/:placeName', cors(), placeController.getEvents) app.get('/feed/:format/collection/:name', cors(), collectionController.getEvents) app.get('/feed/:format', cors(), exportController.export) - app.use('/event/:slug', helpers.APRedirect) @@ -55,11 +52,11 @@ async function main () { // ignore unimplemented ping url from fediverse app.use(spamFilter) - // fill res.locals.user if request is authenticated - app.use(auth.fillUser) - - app.use('/oauth', oauth) - // app.use(metricsMiddleware) + app.use(authController.authenticate) + app.post('/oauth/token', authController.token) + app.post('/oauth/login', authController.login) + app.get('/oauth/authorize', authController.authorization) + app.post('/oauth/authorize', authController.decision) } // api! @@ -73,10 +70,9 @@ async function main () { // remaining request goes to nuxt // first nuxt component is ./pages/index.vue (with ./layouts/default.vue) - // prefill current events, tags, places and announcements (used in every path) app.use(async (_req, res, next) => { if (config.status === 'READY') { - + // TODO: fetch into layout! const announceController = require('./api/controller/announce') res.locals.announcements = await announceController._getVisible() } @@ -91,6 +87,8 @@ if (process.env.NODE_ENV !== 'test') { main() } +// app.listen(13120) + module.exports = { main, handler: app, diff --git a/static/gancio-events.es.js b/static/gancio-events.es.js index 35d91346..a0a2adee 100644 --- a/static/gancio-events.es.js +++ b/static/gancio-events.es.js @@ -313,13 +313,13 @@ function Le(t) { let e, i, n; return { c() { - e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/noimg.svg") || a(e, "src", n), a(e, "loading", "lazy"); + e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy"); }, m(l, o) { v(l, e, o); }, p(l, o) { - o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/noimg.svg") && a(e, "src", n); + o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n); }, d(l) { l && x(e); @@ -454,7 +454,7 @@ function Re(t, e, i) { }), t.$$set = (d) => { "baseurl" in d && i(0, n = d.baseurl), "title" in d && i(1, l = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style); }, t.$$.update = () => { - t.$$.dirty & 974 && w(); + t.$$.dirty & 975 && w(); }, [ n, l, diff --git a/store/index.js b/store/index.js index c8b75b4d..090ac2ca 100644 --- a/store/index.js +++ b/store/index.js @@ -1,21 +1,30 @@ +import dayjs from 'dayjs' + export const state = () => ({ - locale: '', - user_locale: {}, settings: { instance_timezone: 'Europe/Rome', instance_name: '', allow_registration: true, allow_anon_event: true, + allow_multidate_event: true, allow_recurrent_event: true, recurrent_event_visible: false, + allow_geolocation: false, + geocoding_provider_type: '', + geocoding_provider: '', + geocoding_countrycodes: [], + tilelayer_provider: '', + tilelayer_provider_attribution: '', enable_federation: false, enable_resources: false, hide_boosts: true, enable_trusted_instances: true, trusted_instances: [], + trusted_instances_label: '', footerLinks: [] }, - announcements: [] + announcements: [], + events: [] }) export const mutations = { @@ -25,14 +34,11 @@ export const mutations = { setSetting (state, setting) { state.settings[setting.key] = setting.value }, - setLocale (state, locale) { - state.locale = locale - }, - setUserlocale (state, messages) { - state.user_locale = messages - }, setAnnouncements (state, announcements) { state.announcements = announcements + }, + setEvents (state, events) { + state.events = events } } @@ -55,5 +61,14 @@ export const actions = { async setSetting ({ commit }, setting) { await this.$axios.$post('/settings', setting) commit('setSetting', setting) + }, + async getEvents ({ commit, state }, params = {}) { + const events = await this.$api.getEvents({ + start: params.start || dayjs().startOf('month').unix(), + end: params.end || null, + show_recurrent: params.show_recurrent || state.settings.recurrent_event_visible + }) + commit('setEvents', events) + return events } } diff --git a/tests/app.test.js b/tests/app.test.js index b4dcfd6c..8411c6c2 100644 --- a/tests/app.test.js +++ b/tests/app.test.js @@ -9,6 +9,7 @@ let app let places = [] beforeAll(async () => { + switch (process.env.DB) { case 'mariadb': process.env.config_path = path.resolve(__dirname, './seeds/config.mariadb.json') @@ -54,7 +55,8 @@ describe('Authentication / Authorization', () => { test('should not authenticate with wrong user/password', () => { return request(app).post('/oauth/login') .set('Content-Type', 'application/x-www-form-urlencoded') - .expect(500) + .send({ email: 'admin', password: 'wrong'}) + .expect(401) }) test('should register an admin as first user', async () => { @@ -155,7 +157,7 @@ describe('Events', () => { const required_fields = { 'title': {}, 'start_datetime': { title: 'test title' }, - 'place_id or place_name and place_address': { title: 'test title', start_datetime: dayjs().unix() + 1000, place_name: 'test place name' }, + 'place_id or place_name and place_address are': { title: 'test title', start_datetime: dayjs().unix() + 1000, place_name: 'test place name' }, } const promises = Object.keys(required_fields).map(async field => { @@ -200,9 +202,9 @@ describe('Events', () => { }) - test('should trim tags', async () => { + test('should trim tags and title', async () => { const event = { - title: 'test title 4', + title: ' test title 4 ', place_id: places[0], start_datetime: dayjs().unix() + 1000, tags: [' test tag '] @@ -213,6 +215,7 @@ describe('Events', () => { .expect(200) .expect('Content-Type', /json/) + expect(response.body.title).toBe('test title 4') expect(response.body.tags[0]).toBe('test tag') }) }) @@ -282,10 +285,10 @@ describe('Place', () => { }) test('admin should get all places', async () => { - await request(app).get('/api/place/all') + await request(app).get('/api/places') .expect(403) - const response = await request(app).get('/api/place/all') + const response = await request(app).get('/api/places') .auth(token.access_token, { type: 'bearer' }) .expect(200) @@ -300,6 +303,17 @@ describe('Place', () => { expect(response.body.length).toBe(2) }) + test('should trim place\'s name and address', async () => { + const ret = await request(app).post('/api/event') + .send({ title: 'test trimming', place_name: ' test place with white Space ', + place_address: ' address with Space ', start_datetime: dayjs().unix() + 1000 }) + .auth(token.access_token, { type: 'bearer' }) + .expect(200) + + expect(ret.body.place.name).toBe('test place with white Space') + expect(ret.body.place.address).toBe('address with Space') + }) + }) let collections = [] @@ -382,20 +396,14 @@ describe('Collection', () => { }) test('shoud filter for tags', async () => { - let response = await request(app) + await request(app) .post('/api/filter') .send({ collectionId: collections[0], tags: ['test'] }) .auth(token.access_token, { type: 'bearer' }) .expect(200) - // response = await request(app) - // .get(`/api/filter/${response.body.id}`) - // .auth(token.access_token, { type: 'bearer' }) - // .expect(200) - // expect(response.body.length).toBe(1) - - response = await request(app) + const response = await request(app) .get(`/api/collections/test collection`) .expect(200) diff --git a/webcomponents/src/GancioEvents.svelte b/webcomponents/src/GancioEvents.svelte index 240ca5d9..58a3e60c 100644 --- a/webcomponents/src/GancioEvents.svelte +++ b/webcomponents/src/GancioEvents.svelte @@ -57,7 +57,7 @@ update() }) $: update( - maxlength && title && places && tags && theme && show_recurrent && sidebar + maxlength && title && places && tags && theme && show_recurrent && sidebar && baseurl ) @@ -98,7 +98,7 @@ {event.title} {/if} diff --git a/wp-plugin/gancio.php b/wp-plugin/gancio.php index 9a5e79d3..2b117932 100644 --- a/wp-plugin/gancio.php +++ b/wp-plugin/gancio.php @@ -3,7 +3,7 @@ Plugin Name: WPGancio Plugin URI: https://gancio.org Description: Connects an user of a gancio instance to a Wordpress user so that published events are automatically pushed with Gancio API. -Version: 1.0 +Version: 1.5 Author: Gancio License: AGPL 3.0 @@ -19,10 +19,13 @@ You should have received a copy of the GNU Affero General Public License along with (WPGancio). If not, see (https://www.gnu.org/licenses/agpl-3.0.html). */ -defined( 'ABSPATH' ) or die( 'Nope, not accessing this' ); -require_once('settings.php'); -require_once('wc.php'); -require_once('oauth.php'); +defined('ABSPATH') or die('Nope, not accessing this'); +define('WPGANCIO_DIR', plugin_dir_path(__FILE__)); +require_once(WPGANCIO_DIR . 'settings.php'); + +require_once(WPGANCIO_DIR . 'wc.php'); +require_once(WPGANCIO_DIR . 'oauth.php'); + /** @@ -38,4 +41,3 @@ require_once('oauth.php'); * - start an OAuth 2.0 authentication flow with the selected instance * - Send each new / updated events to the selected instance via Gancio API */ - diff --git a/wp-plugin/js/gancio-events.es.js b/wp-plugin/js/gancio-events.es.js index 35d91346..a0a2adee 100644 --- a/wp-plugin/js/gancio-events.es.js +++ b/wp-plugin/js/gancio-events.es.js @@ -313,13 +313,13 @@ function Le(t) { let e, i, n; return { c() { - e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/noimg.svg") || a(e, "src", n), a(e, "loading", "lazy"); + e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy"); }, m(l, o) { v(l, e, o); }, p(l, o) { - o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/noimg.svg") && a(e, "src", n); + o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n); }, d(l) { l && x(e); @@ -454,7 +454,7 @@ function Re(t, e, i) { }), t.$$set = (d) => { "baseurl" in d && i(0, n = d.baseurl), "title" in d && i(1, l = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style); }, t.$$.update = () => { - t.$$.dirty & 974 && w(); + t.$$.dirty & 975 && w(); }, [ n, l, diff --git a/wp-plugin/oauth.php b/wp-plugin/oauth.php index e312fee6..41fe35c1 100644 --- a/wp-plugin/oauth.php +++ b/wp-plugin/oauth.php @@ -8,16 +8,16 @@ add_action('wp_trash_post', 'wpgancio_delete_post', 15); function wpgancio_delete_post ($post_id) { $post = get_post($post_id); - $instance_url = get_option('wpgancio_instance_url'); - + if ($post->post_type == 'event') { + $instance_url = get_option('wpgancio_instance_url') ?: get_site_option('wpgancio_instance_url'); $gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE); if ($gancio_id) { $http = _wp_http_get_object(); $http->request( "${instance_url}/api/event/${gancio_id}", array( 'method' => 'DELETE', 'headers' => array ( - 'Authorization' => 'Bearer ' . get_option('wpgancio_token') + 'Authorization' => 'Bearer ' . (get_option('wpgancio_token') ?: get_site_option('wpgancio_token')) ))); } } @@ -26,6 +26,11 @@ function wpgancio_delete_post ($post_id) { function wpgancio_save_event ($post_id) { $event = get_post( $post_id ); + // do not save if it's a draft + if ($event->post_status != 'publish') { + return; + } + function tagName ($tag) { return sanitize_title($tag->name); } @@ -34,29 +39,25 @@ function wpgancio_save_event ($post_id) { $tmp_tags = get_the_terms( $event, 'event-tag' ); $tags = array_map('tagName', $tmp_tags); - // do not save if it's a draft - if ($event->post_status != 'publish') { - return; - } $gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE); - // when - $date = eo_get_schedule_start( 'U', $post_id ); + $start_datetime = eo_get_schedule_start( 'U', $post_id ); // get place details $venue_id = eo_get_venue($post_id); $place_name = eo_get_venue_name($venue_id); $place_address = eo_get_venue_address($venue_id); - $instance_url = get_option('wpgancio_instance_url'); + $instance_url = get_option('wpgancio_instance_url') ?: get_site_option('wpgancio_instance_url'); $body = array ( 'title' => $event->post_title, 'tags' => $tags, 'description' => $event->post_content, - 'start_datetime' => intval($date), + 'start_datetime' => intval($start_datetime), + 'end_datetime' => intval($end_datetime), 'place_name' => $place_name, - 'place_address' => "${place_address['address']}${place_address['city']}" + 'place_address' => "${place_address['address']}, ${place_address['city']}" ); // add image if specified @@ -72,22 +73,52 @@ function wpgancio_save_event ($post_id) { $response = $http->request( $instance_url . '/api/event', array( 'method' => 'PUT', 'headers' => array ( - 'Authorization' => 'Bearer ' . get_option('wpgancio_token'), + 'Authorization' => 'Bearer ' . (get_option('wpgancio_token') ?: get_site_option('wpgancio_token')), 'Content-Type' => 'application/json' ), 'body' => wp_json_encode($body) )); } else { // or create $response = wp_remote_post($instance_url . '/api/event', array( 'headers' => array ( - 'Authorization' => 'Bearer ' . get_option('wpgancio_token'), + 'Authorization' => 'Bearer ' . (get_option('wpgancio_token') ?: get_site_option('wpgancio_token')), 'Content-Type' => 'application/json' ), 'body' => wp_json_encode($body) )); } - if ( is_wp_error( $response ) ) { + if (is_wp_error($response)) { $error_message = $response->get_error_message(); - echo "

    " . esc_html($error_message) . "

    "; + set_transient("wpgancio_error_", esc_html($error_message), 45); return; } + + if (wp_remote_retrieve_response_code($response) != 200) { + set_transient("wpgancio_error_{$post_id}", wp_remote_retrieve_body($response), 45); + return; + } + $data = json_decode(wp_remote_retrieve_body($response)); + + $event_url = $instance_url . '/event/' . ($data->slug ? $data->slug : $data->id); + set_transient("wpgancio_message_{$post_id}", "Event updated. {$event_url}"); update_post_meta($post_id, 'wpgancio_gancio_id', intval($data->id)); } + +add_action( 'admin_notices', 'wpgancio_error_message' ); +function wpgancio_error_message () { + global $post_id; + if ( $error = get_transient( "wpgancio_error_{$post_id}" ) ) { ?> +
    +

    [WPGancio]

    +
    +
    +

    [WPGancio]

    +
    "code", + "redirect_uri" => $redirect_uri, + "scope" => "event:write", + "client_id" => $client_id ), "${instance_url}/oauth/authorize")); + // return $instance_url; exit; } + +add_action( 'network_admin_edit_wpgancio_instance_url', 'wpgancio_instance_url_save_settings' ); + +function wpgancio_instance_url_save_settings(){ + + // check_admin_referer( 'misha-validate' ); // Nonce security check + + if (isset($_POST['wpgancio_instance_url'])) { + update_site_option( 'wpgancio_instance_url', $_POST['wpgancio_instance_url'] ); + } else { + delete_site_option( 'wpgancio_instance_url'); + } + + + wp_redirect( add_query_arg( array( + 'page' => 'wpgancio', + 'updated' => true ), network_admin_url('settings.php?page=wpgancio') + )); + + exit; + +} + + + // Fires before the administration menu loads in the admin, add our options page -add_action( 'admin_menu', 'wpgancio_options_page' ); function wpgancio_instance_url_validate ($instance_url) { - $redirect_uri = get_site_url(null, '/wp-admin/options-general.php?page=wpgancio' ); + + + if (!is_network_admin()) { + $old_instance_url = get_option('wpgancio_instance_url'); + if ($instance_url === $old_instance_url) { + return $instance_url; + } + } else { + $old_instance_url = get_site_option('wpgancio_instance_url'); + if ($instance_url === $old_instance_url) { + return $instance_url; + } + } + + if (!is_network_admin()) { + $redirect_uri = get_site_url(null, '/wp-admin/options-general.php?page=wpgancio'); + } else { + $redirect_uri = get_site_url(null, '/wp-admin/network/settings.php?page=wpgancio'); + } // create this WP instance as a new client in selected gancio instance - $response = wp_remote_post( "$instance_url/api/client", array( + $response = wp_remote_post("$instance_url/api/client", array( 'method' => 'POST', 'body' => array( 'client_name' => 'WPGancio', @@ -48,27 +127,23 @@ function wpgancio_instance_url_validate ($instance_url) { ) )); - if ( is_wp_error( $response ) ) { + if (is_wp_error($response)) { add_settings_error('wpgancio_messages', 'wpgancio_messages', $response->get_error_message()); } else { $data = json_decode( wp_remote_retrieve_body($response), true); - update_option('wpgancio_client_secret', sanitize_key($data['client_secret'])); - update_option('wpgancio_client_id', sanitize_key($data['client_id'])); + if (!is_network_admin()) { + update_option('wpgancio_client_secret', sanitize_key($data['client_secret'])); + update_option('wpgancio_client_id', sanitize_key($data['client_id'])); + } else { + update_site_option('wpgancio_client_secret', sanitize_key($data['client_secret'])); + update_site_option('wpgancio_client_id', sanitize_key($data['client_id'])); + } return $instance_url; } } -function wpgancio_options_page() { - // add top level menu page - add_options_page( - 'Gancio', - 'Gancio', - 'manage_options', - 'wpgancio', - 'wpgancio_options_page_html' - ); -} + // instance url field cb // field callbacks can accept an $args parameter, which is an array. @@ -79,20 +154,20 @@ function wpgancio_options_page() { // you can add custom key value pairs to be used inside your callbacks. function wpgancio_instance_url_cb( $args ) { // get the value of the setting we've registered with register_setting() - $instance_url = get_option( 'wpgancio_instance_url' ); - if (empty($instance_url)) { - $instance_url = WP_GANCIO_DEFAULT_INSTANCEURL; + if (is_network_admin()) { + $instance_url = get_site_option( 'wpgancio_instance_url' ); + } else { + $instance_url = get_option( 'wpgancio_instance_url' ); } - // output the field - ?> + +// output the field +?> -

    - -

    +

    Instance URL you want to publish events to.

    array( @@ -120,38 +195,80 @@ function wpgancio_options_page_html() { 'grant_type' => 'authorization_code', 'code' => $code ))); - if ( is_wp_error( $response ) ) { + if (is_wp_error($response)) { add_settings_error('wpgancio_messages', 'wpgancio_messages', $response->get_error_message()); - settings_errors( 'wpgancio_messages' ); - } else if ( $response['response']['code'] == 500 ) { + settings_errors('wpgancio_messages'); + } elseif ($response['response']['code'] != 200) { add_settings_error('wpgancio_messages', 'wpgancio_messages', wp_remote_retrieve_body($response)); - settings_errors( 'wpgancio_messages' ); + settings_errors('wpgancio_messages'); } else { - $data = json_decode( wp_remote_retrieve_body($response), true); + $data = json_decode(wp_remote_retrieve_body($response), true); update_option('wpgancio_token', sanitize_key($data['access_token'])); update_option('wpgancio_refresh', sanitize_key($data['refresh_token'])); add_settings_error('wpgancio_messages', 'wpgancio_messages', 'Association completed!', 'success'); - settings_errors( 'wpgancio_messages' ); + settings_errors('wpgancio_messages'); } } + wpgancio_general_options_page_html(); +} +function wpgancio_network_options_page_html() { + // check user capabilities + if (! current_user_can('manage_site_options')) { return; } + + // show error/update messages + $code = sanitize_key(isset($_GET['code']) ? $_GET['code'] : ''); + if ( $code ) { + update_site_option('wpgancio_code', $code); + $instance_url = get_site_option('wpgancio_instance_url'); + + $response = wp_remote_post($instance_url . "/oauth/token", array( + 'body' => array( + 'client_id' => get_site_option('wpgancio_client_id'), + 'client_secret' => get_site_option('wpgancio_client_secret'), + 'scope' => 'event:write', + 'grant_type' => 'authorization_code', + 'code' => $code + ))); + + if (is_wp_error($response)) { + add_settings_error('wpgancio_messages', 'wpgancio_messages', $response->get_error_message()); + settings_errors('wpgancio_messages'); + } elseif (wp_remote_retrieve_response_code($response) != 200) { + add_settings_error('wpgancio_messages', 'wpgancio_messages', wp_remote_retrieve_body($response)); + settings_errors('wpgancio_messages'); + } else { + $data = json_decode(wp_remote_retrieve_body($response), true); + update_site_option('wpgancio_token', sanitize_key($data['access_token'])); + update_site_option('wpgancio_refresh', sanitize_key($data['refresh_token'])); + add_settings_error('wpgancio_messages', 'wpgancio_messages', 'Association completed!', 'success'); + settings_errors('wpgancio_messages'); + } + } + wpgancio_general_options_page_html(); +} + +function wpgancio_general_options_page_html () { ?> -
    -

    -
    - + + + + +
    diff --git a/wp-plugin/wc.php b/wp-plugin/wc.php index d58f2fba..7b679921 100644 --- a/wp-plugin/wc.php +++ b/wp-plugin/wc.php @@ -31,7 +31,7 @@ function gancio_event_handler_function( $atts, $content, $tag) { 'id' => 0 ), $atts); return ''; -}; +} function gancio_events_handler_function( $atts, $content, $tag) { $a = shortcode_atts( array( @@ -39,10 +39,10 @@ function gancio_events_handler_function( $atts, $content, $tag) { 'places' => '', 'tags' => '', 'theme' => 'dark', - 'max' => NULL + 'max' => null ), $atts); return ''; -}; +} add_action( 'init', function () { global $allowedposttags; diff --git a/yarn.lock b/yarn.lock index f08e1f1b..195be9a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@alloc/quick-lru@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" - integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== - "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -22,38 +17,38 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.13", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151" - integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw== +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.13", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" + integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.13": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c" - integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ== + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92" + integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.3" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helpers" "^7.19.0" - "@babel/parser" "^7.19.3" + "@babel/generator" "^7.20.2" + "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-module-transforms" "^7.20.2" + "@babel/helpers" "^7.20.1" + "@babel/parser" "^7.20.2" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.3" - "@babel/types" "^7.19.3" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.2" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.19.3", "@babel/generator@^7.7.2": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59" - integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ== +"@babel/generator@^7.20.1", "@babel/generator@^7.20.2", "@babel/generator@^7.7.2": + version "7.20.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8" + integrity sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA== dependencies: - "@babel/types" "^7.19.3" + "@babel/types" "^7.20.2" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -72,27 +67,27 @@ "@babel/helper-explode-assignable-expression" "^7.18.6" "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca" - integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" + integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== dependencies: - "@babel/compat-data" "^7.19.3" + "@babel/compat-data" "^7.20.0" "@babel/helper-validator-option" "^7.18.6" browserslist "^4.21.3" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" - integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz#3c08a5b5417c7f07b5cf3dfb6dc79cbec682e8c2" + integrity sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-member-expression-to-functions" "^7.18.9" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-replace-supers" "^7.19.1" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0": @@ -156,19 +151,19 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" - integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" + integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.2" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -177,10 +172,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" - integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" @@ -192,7 +187,7 @@ "@babel/helper-wrap-function" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9", "@babel/helper-replace-supers@^7.19.1": +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78" integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw== @@ -203,19 +198,19 @@ "@babel/traverse" "^7.19.1" "@babel/types" "^7.19.0" -"@babel/helper-simple-access@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" - integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== +"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: - "@babel/types" "^7.18.6" + "@babel/types" "^7.20.2" "@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== dependencies: - "@babel/types" "^7.18.9" + "@babel/types" "^7.20.0" "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -224,10 +219,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" - integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" @@ -249,14 +244,14 @@ "@babel/traverse" "^7.19.0" "@babel/types" "^7.19.0" -"@babel/helpers@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18" - integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg== +"@babel/helpers@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9" + integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg== dependencies: "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/traverse" "^7.20.1" + "@babel/types" "^7.20.0" "@babel/highlight@^7.18.6": version "7.18.6" @@ -267,10 +262,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.19.3", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a" - integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": + version "7.20.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2" + integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -288,10 +283,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" "@babel/plugin-proposal-optional-chaining" "^7.18.9" -"@babel/plugin-proposal-async-generator-functions@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7" - integrity sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q== +"@babel/plugin-proposal-async-generator-functions@^7.20.1": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9" + integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-plugin-utils" "^7.19.0" @@ -316,12 +311,12 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@^7.18.10": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.3.tgz#c1977e4902a18cdf9051bf7bf08d97db2fd8b110" - integrity sha512-MbgXtNXqo7RTKYIXVchVJGPvaVufQH3pxvQyfbGvNw1DObIhph+PesYXJTcd8J4DdWibvf6Z2eanOyItX8WnJg== + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.2.tgz#1c6c32b2a44b154ebeec2bb534f9eaebdb541fb6" + integrity sha512-nkBH96IBmgKnbHQ5gXFrcmez+Z9S2EIDKDQGp005ROqBigc88Tky4rzCnlP/lnlj245dCEQl4/YyV0V1kYh5dw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-create-class-features-plugin" "^7.20.2" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-replace-supers" "^7.19.1" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/plugin-syntax-decorators" "^7.19.0" @@ -374,16 +369,16 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" - integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q== +"@babel/plugin-proposal-object-rest-spread@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d" + integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ== dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/compat-data" "^7.20.1" + "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.18.8" + "@babel/plugin-transform-parameters" "^7.20.1" "@babel/plugin-proposal-optional-catch-binding@^7.18.6": version "7.18.6" @@ -477,12 +472,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4" - integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ== +"@babel/plugin-syntax-import-assertions@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" + integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -562,11 +557,11 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285" - integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" + integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-transform-arrow-functions@^7.18.6": version "7.18.6" @@ -591,25 +586,25 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" - integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw== +"@babel/plugin-transform-block-scoping@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz#f59b1767e6385c663fd0bce655db6ca9c8b236ed" + integrity sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-classes@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" - integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A== +"@babel/plugin-transform-classes@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2" + integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.19.0" + "@babel/helper-compilation-targets" "^7.20.0" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-replace-supers" "^7.19.1" "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" @@ -620,12 +615,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-destructuring@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" - integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow== +"@babel/plugin-transform-destructuring@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792" + integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.18.6" @@ -680,35 +675,32 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-modules-amd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21" - integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg== +"@babel/plugin-transform-modules-amd@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd" + integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg== dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helper-plugin-utils" "^7.19.0" -"@babel/plugin-transform-modules-commonjs@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883" - integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q== +"@babel/plugin-transform-modules-commonjs@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c" + integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ== dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-simple-access" "^7.19.4" -"@babel/plugin-transform-modules-systemjs@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f" - integrity sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A== +"@babel/plugin-transform-modules-systemjs@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d" + integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ== dependencies: "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.19.0" + "@babel/helper-module-transforms" "^7.19.6" "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-validator-identifier" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-validator-identifier" "^7.19.1" "@babel/plugin-transform-modules-umd@^7.18.6": version "7.18.6" @@ -741,12 +733,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" - integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg== +"@babel/plugin-transform-parameters@^7.20.1": + version "7.20.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz#7b3468d70c3c5b62e46be0a47b6045d8590fb748" + integrity sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-property-literals@^7.18.6": version "7.18.6" @@ -771,9 +763,9 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-runtime@^7.18.10": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz#a3df2d7312eea624c7889a2dcd37fd1dfd25b2c6" - integrity sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA== + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194" + integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw== dependencies: "@babel/helper-module-imports" "^7.18.6" "@babel/helper-plugin-utils" "^7.19.0" @@ -834,17 +826,17 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/preset-env@^7.18.10": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.3.tgz#52cd19abaecb3f176a4ff9cc5e15b7bf06bec754" - integrity sha512-ziye1OTc9dGFOAXSWKUqQblYHNlBOaDl8wzqf2iKXJAltYiR3hKHUKmkt+S9PppW7RQpq4fFCrwwpIDj/f5P4w== + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506" + integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg== dependencies: - "@babel/compat-data" "^7.19.3" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/compat-data" "^7.20.1" + "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-validator-option" "^7.18.6" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.19.1" + "@babel/plugin-proposal-async-generator-functions" "^7.20.1" "@babel/plugin-proposal-class-properties" "^7.18.6" "@babel/plugin-proposal-class-static-block" "^7.18.6" "@babel/plugin-proposal-dynamic-import" "^7.18.6" @@ -853,7 +845,7 @@ "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.18.9" + "@babel/plugin-proposal-object-rest-spread" "^7.20.2" "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" "@babel/plugin-proposal-optional-chaining" "^7.18.9" "@babel/plugin-proposal-private-methods" "^7.18.6" @@ -864,7 +856,7 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.18.6" + "@babel/plugin-syntax-import-assertions" "^7.20.0" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -877,10 +869,10 @@ "@babel/plugin-transform-arrow-functions" "^7.18.6" "@babel/plugin-transform-async-to-generator" "^7.18.6" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.18.9" - "@babel/plugin-transform-classes" "^7.19.0" + "@babel/plugin-transform-block-scoping" "^7.20.2" + "@babel/plugin-transform-classes" "^7.20.2" "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.18.13" + "@babel/plugin-transform-destructuring" "^7.20.2" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" @@ -888,14 +880,14 @@ "@babel/plugin-transform-function-name" "^7.18.9" "@babel/plugin-transform-literals" "^7.18.9" "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.18.6" - "@babel/plugin-transform-modules-commonjs" "^7.18.6" - "@babel/plugin-transform-modules-systemjs" "^7.19.0" + "@babel/plugin-transform-modules-amd" "^7.19.6" + "@babel/plugin-transform-modules-commonjs" "^7.19.6" + "@babel/plugin-transform-modules-systemjs" "^7.19.6" "@babel/plugin-transform-modules-umd" "^7.18.6" "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" "@babel/plugin-transform-new-target" "^7.18.6" "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.18.8" + "@babel/plugin-transform-parameters" "^7.20.1" "@babel/plugin-transform-property-literals" "^7.18.6" "@babel/plugin-transform-regenerator" "^7.18.6" "@babel/plugin-transform-reserved-words" "^7.18.6" @@ -907,7 +899,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.18.10" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.19.3" + "@babel/types" "^7.20.2" babel-plugin-polyfill-corejs2 "^0.3.3" babel-plugin-polyfill-corejs3 "^0.6.0" babel-plugin-polyfill-regenerator "^0.4.1" @@ -926,11 +918,11 @@ esutils "^2.0.2" "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.9", "@babel/runtime@^7.8.4": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" - integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9" + integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg== dependencies: - regenerator-runtime "^0.13.4" + regenerator-runtime "^0.13.10" "@babel/template@^7.18.10", "@babel/template@^7.3.3": version "7.18.10" @@ -941,28 +933,28 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.3", "@babel/traverse@^7.7.2": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4" - integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ== +"@babel/traverse@^7.18.10", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.2": + version "7.20.1" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8" + integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.3" + "@babel/generator" "^7.20.1" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.3" - "@babel/types" "^7.19.3" + "@babel/parser" "^7.20.1" + "@babel/types" "^7.20.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624" - integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw== +"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842" + integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog== dependencies: - "@babel/helper-string-parser" "^7.18.10" + "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" @@ -1012,6 +1004,27 @@ resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-10.0.1.tgz#ee9da297fabc557e1c040a0f44ee89c266ccc306" integrity sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw== +"@intlify/shared@^9.0.0": + version "9.2.2" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.2.tgz#5011be9ca2b4ab86f8660739286e2707f9abb4a5" + integrity sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q== + +"@intlify/vue-i18n-extensions@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@intlify/vue-i18n-extensions/-/vue-i18n-extensions-1.0.2.tgz#ab7f8507f7d423c368e44fa21d6dece700261fca" + integrity sha512-rnfA0ScyBXyp9xsSD4EAMGeOh1yv/AE7fhqdAdSOr5X8N39azz257umfRtzNT9sHXAKSSzpCVhIbMAkp5c/gjQ== + dependencies: + "@babel/parser" "^7.9.6" + +"@intlify/vue-i18n-loader@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@intlify/vue-i18n-loader/-/vue-i18n-loader-1.1.0.tgz#eecc6460823676f533784b3641665c5a609eccf0" + integrity sha512-9LXiztMtYKTE8t/hRwwGUp+ofrwU0sxLQLzFEOZ38zvn0DonUIQmZUj1cfz5p1Lu8BllxKbCrn6HnsRJ+LYA6g== + dependencies: + "@intlify/shared" "^9.0.0" + js-yaml "^3.13.1" + json5 "^2.1.1" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1028,109 +1041,109 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.1.0.tgz#3b8e9e86aef28af15fcadfd8df7321ed1327c3e7" - integrity sha512-yNoFMuAsXTP8OyweaMaIoa6Px6rJkbbG7HtgYKGP3CY7lE7ADRA0Fn5ad9O+KefKcaf6W9rywKpCWOw21WMsAw== +"@jest/console@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583" + integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^29.1.0" - jest-util "^29.1.0" + jest-message-util "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" -"@jest/core@^29.1.1": - version "29.1.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.1.1.tgz#a7e5f86dd29fa9da1ca84752237735dc7bcda3d8" - integrity sha512-ppym+PLiuSmvU9ufXVb/8OtHUPcjW+bBlb8CLh6oMATgJtCE3fjDYrzJi5u1uX8q9jbmtQ7VADKJKIlp68zi3A== +"@jest/core@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1" + integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw== dependencies: - "@jest/console" "^29.1.0" - "@jest/reporters" "^29.1.0" - "@jest/test-result" "^29.1.0" - "@jest/transform" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/console" "^29.3.1" + "@jest/reporters" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" ci-info "^3.2.0" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^29.0.0" - jest-config "^29.1.1" - jest-haste-map "^29.1.0" - jest-message-util "^29.1.0" - jest-regex-util "^29.0.0" - jest-resolve "^29.1.0" - jest-resolve-dependencies "^29.1.1" - jest-runner "^29.1.1" - jest-runtime "^29.1.1" - jest-snapshot "^29.1.0" - jest-util "^29.1.0" - jest-validate "^29.1.0" - jest-watcher "^29.1.0" + jest-changed-files "^29.2.0" + jest-config "^29.3.1" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-resolve-dependencies "^29.3.1" + jest-runner "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" + jest-watcher "^29.3.1" micromatch "^4.0.4" - pretty-format "^29.1.0" + pretty-format "^29.3.1" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^29.1.1": - version "29.1.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.1.1.tgz#afeb66563d8d366a329908087b6697c3bfaed3cb" - integrity sha512-69WULhTD38UcjvLGRAnnwC5hDt35ZC91ZwnvWipNOAOSaQNT32uKYL/TVCT3tncB9L1D++LOmBbYhTYP4TLuuQ== +"@jest/environment@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6" + integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag== dependencies: - "@jest/fake-timers" "^29.1.1" - "@jest/types" "^29.1.0" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^29.1.1" + jest-mock "^29.3.1" -"@jest/expect-utils@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.1.0.tgz#598cc7fea83b1bf84249b3b98683575cee888894" - integrity sha512-YcD5CF2beqfoB07WqejPzWq1/l+zT3SgGwcqqIaPPG1DHFn/ea8MWWXeqV3KKMhTaOM1rZjlYplj1GQxR0XxKA== +"@jest/expect-utils@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6" + integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g== dependencies: - jest-get-type "^29.0.0" + jest-get-type "^29.2.0" -"@jest/expect@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.1.0.tgz#58956d38c22f42a2ec7ecf7adb9e0ddd9a9082a3" - integrity sha512-qWQttxE5rEwzvDW9G3f0o8chu1EKvIfsMQDeRlXMLCtsDS94ckcqEMNgbKKz0NYlZ45xrIoy+/pngt3ZFr/2zw== +"@jest/expect@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd" + integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg== dependencies: - expect "^29.1.0" - jest-snapshot "^29.1.0" + expect "^29.3.1" + jest-snapshot "^29.3.1" -"@jest/fake-timers@^29.1.1": - version "29.1.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.1.1.tgz#ae345e5ca51e9f72e0d861e17c65d9cb558f407b" - integrity sha512-5wTGObRfL/OjzEz0v2ShXlzeJFJw8mO6ByMBwmPLd6+vkdPcmIpCvASG/PR/g8DpchSIEeDXCxQADojHxuhX8g== +"@jest/fake-timers@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67" + integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@sinonjs/fake-timers" "^9.1.2" "@types/node" "*" - jest-message-util "^29.1.0" - jest-mock "^29.1.1" - jest-util "^29.1.0" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-util "^29.3.1" -"@jest/globals@^29.1.1": - version "29.1.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.1.1.tgz#017cffa0e79b35e7197b229d852c9ad35ed4be5c" - integrity sha512-yTiusxeEHjXwmo3guWlN31a1harU8zekLBMlZpOZ+84rfO3HDrkNZLTfd/YaHF8CrwlNCFpDGNSQCH8WkklH/Q== +"@jest/globals@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6" + integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q== dependencies: - "@jest/environment" "^29.1.1" - "@jest/expect" "^29.1.0" - "@jest/types" "^29.1.0" - jest-mock "^29.1.1" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/types" "^29.3.1" + jest-mock "^29.3.1" -"@jest/reporters@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.1.0.tgz#da488ddfb39a4cfb86abdc29fd94f84031acfd02" - integrity sha512-szSjHjVuBQ7aZUdBzTicCoQAAQsQFLk+/PtMfO0RQxL5mQ1iw+PSKOpyvMZcA5T6bH9pIapue5U9UCrxfOtL3w== +"@jest/reporters@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310" + integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^29.1.0" - "@jest/test-result" "^29.1.0" - "@jest/transform" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/console" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@jridgewell/trace-mapping" "^0.3.15" "@types/node" "*" chalk "^4.0.0" @@ -1143,13 +1156,12 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-message-util "^29.1.0" - jest-util "^29.1.0" - jest-worker "^29.1.0" + jest-message-util "^29.3.1" + jest-util "^29.3.1" + jest-worker "^29.3.1" slash "^3.0.0" string-length "^4.0.1" strip-ansi "^6.0.0" - terminal-link "^2.0.0" v8-to-istanbul "^9.0.1" "@jest/schemas@^29.0.0": @@ -1159,60 +1171,60 @@ dependencies: "@sinclair/typebox" "^0.24.1" -"@jest/source-map@^29.0.0": - version "29.0.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.0.0.tgz#f8d1518298089f8ae624e442bbb6eb870ee7783c" - integrity sha512-nOr+0EM8GiHf34mq2GcJyz/gYFyLQ2INDhAylrZJ9mMWoW21mLBfZa0BUVPPMxVYrLjeiRe2Z7kWXOGnS0TFhQ== +"@jest/source-map@^29.2.0": + version "29.2.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744" + integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ== dependencies: "@jridgewell/trace-mapping" "^0.3.15" callsites "^3.0.0" graceful-fs "^4.2.9" -"@jest/test-result@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.1.0.tgz#da6b0062325a780c9e3c7262b6b89da57fba2dca" - integrity sha512-RMBhPlw1Qfc2bKSf3RFPCyFSN7cfWVSTxRD8JrnvqdqgaDgrq4aGJT1A/V2+5Vq9bqBd187FpaxGTQ4zLrt08g== +"@jest/test-result@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50" + integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw== dependencies: - "@jest/console" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/console" "^29.3.1" + "@jest/types" "^29.3.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.1.0.tgz#d3d34497e860a44f3f80e94958651f58d3ce64f8" - integrity sha512-1diQfwNhBAte+x3TmyfWloxT1C8GcPEPEZ4BZjmELBK2j3cdqi0DofoJUxBDDUBBnakbv8ce0B7CIzprsupPSA== +"@jest/test-sequencer@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d" + integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA== dependencies: - "@jest/test-result" "^29.1.0" + "@jest/test-result" "^29.3.1" graceful-fs "^4.2.9" - jest-haste-map "^29.1.0" + jest-haste-map "^29.3.1" slash "^3.0.0" -"@jest/transform@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.1.0.tgz#1b3e597681362f6164e786e6bc2826c34ecbf74f" - integrity sha512-NI1zd62KgM0lW6rWMIZDx52dfTIDd+cnLQNahH0YhH7TVmQVigumJ6jszuhAzvKHGm55P2Fozcglb5sGMfFp3Q== +"@jest/transform@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d" + integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug== dependencies: "@babel/core" "^7.11.6" - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@jridgewell/trace-mapping" "^0.3.15" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" - convert-source-map "^1.4.0" + convert-source-map "^2.0.0" fast-json-stable-stringify "^2.1.0" graceful-fs "^4.2.9" - jest-haste-map "^29.1.0" - jest-regex-util "^29.0.0" - jest-util "^29.1.0" + jest-haste-map "^29.3.1" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" write-file-atomic "^4.0.1" -"@jest/types@^29.1.0": - version "29.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.1.0.tgz#db23d727ce0a95500749551d8724fb3526d1e903" - integrity sha512-lE30u3z4lbTOqf5D7fDdoco3Qd8H6F/t73nLOswU4x+7VhgDQMX5y007IMqrKjFHdnpslaYymVFhWX+ttXNARQ== +"@jest/types@^29.3.1": + version "29.3.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3" + integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA== dependencies: "@jest/schemas" "^29.0.0" "@types/istanbul-lib-coverage" "^2.0.0" @@ -1238,7 +1250,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/resolve-uri@3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== @@ -1256,18 +1268,18 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.15" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" - integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g== + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" "@ladjs/country-language@^0.2.1": version "0.2.1" @@ -1314,10 +1326,10 @@ semver "^7.3.5" tar "^6.1.11" -"@mdi/js@^7.0.96": - version "7.0.96" - resolved "https://registry.yarnpkg.com/@mdi/js/-/js-7.0.96.tgz#8e7a54d5cb38831e3150632cc19e380f54d9edd6" - integrity sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ== +"@mdi/js@^7.1.96": + version "7.1.96" + resolved "https://registry.yarnpkg.com/@mdi/js/-/js-7.1.96.tgz#9c5a7f8a20ea63c03b09a0dba1768fe8b70eeaf9" + integrity sha512-wlrJs6Ryhaa5CqhK3FjTfMRnb/s7HeLkKMFqwQySkK86cdN1TGdzpSM3O4tsmzCA1dYBeTbXvOwSE/Y42cUrvA== "@messageformat/core@^3.0.0": version "3.0.1" @@ -1582,22 +1594,21 @@ ufo "^0.8.5" "@nuxt/telemetry@^1.3.6": - version "1.3.6" - resolved "https://registry.yarnpkg.com/@nuxt/telemetry/-/telemetry-1.3.6.tgz#a27a27b2f56a2ad4ef2c1bef82e12f0bc0dc40ac" - integrity sha512-sZpLf/rU3cvN8/alR1HpJIl3mHPA1GOg41GKdOOrtw7Gi/lCEVk4hK+lpXgYInZ2n6i1JyknpKhM9YzX2RU33w== + version "1.3.9" + resolved "https://registry.yarnpkg.com/@nuxt/telemetry/-/telemetry-1.3.9.tgz#634e53658c2ebf562e4638611362174f018e946c" + integrity sha512-QR+UjZ1VXBsLwNjxe5cFqy5yhU+0x13/+dyjSLfC2vwRRQLPlCCPIAhtB1pvnE6Qxn7hh8psxRYu/efWS7laDA== dependencies: - arg "^5.0.0" + arg "^5.0.2" chalk "^4.1.1" - ci-info "^3.1.1" + ci-info "^3.6.1" consola "^2.15.3" create-require "^1.1.1" defu "^5.0.0" destr "^1.1.0" dotenv "^9.0.2" fs-extra "^8.1.0" - git-url-parse "^11.4.4" + git-url-parse "^13.1.0" inquirer "^7.3.3" - is-docker "^2.2.1" jiti "^1.9.2" nanoid "^3.1.23" node-fetch "^2.6.1" @@ -1733,6 +1744,24 @@ consola "^2.15.3" defu "^5.0.0" +"@nuxtjs/i18n@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@nuxtjs/i18n/-/i18n-7.3.0.tgz#49ddaaf5c39a0eb60e59515bbdebb0a94845cc06" + integrity sha512-KBmFzgHjaJ/b+I/nISWUkAxcigjc5FiR1ScRzq/eC8Ahxi5zIulfF8vRROmYbW1gP6B2yYBblOuWemW/T/YM0A== + dependencies: + "@babel/parser" "^7.18.10" + "@babel/traverse" "^7.18.10" + "@intlify/vue-i18n-extensions" "^1.0.2" + "@intlify/vue-i18n-loader" "^1.1.0" + cookie "^0.5.0" + devalue "^2.0.1" + is-https "^4.0.0" + js-cookie "^3.0.1" + klona "^2.0.5" + lodash.merge "^4.6.2" + ufo "^0.8.5" + vue-i18n "^8.27.2" + "@nuxtjs/proxy@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@nuxtjs/proxy/-/proxy-2.1.0.tgz#fa7715a11d237fa1273503c4e9e137dd1bf5575b" @@ -1789,14 +1818,14 @@ selderee "^0.6.0" "@sinclair/typebox@^0.24.1": - version "0.24.43" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.43.tgz#2e2bce0e5e493aaf639beed0cd6c88cfde7dd3d7" - integrity sha512-1orQTvtazZmsPeBroJjysvsOQCYV2yjWlebkSY38pl5vr2tdLjEJ+LoxITlGNZaH2RE19WlAwQMkH/7C14wLfw== + version "0.24.51" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" + integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA== "@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + version "1.8.5" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.5.tgz#e280c94c95f206dcfd5aca00a43f2156b758c764" + integrity sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA== dependencies: type-detect "4.0.8" @@ -1818,9 +1847,9 @@ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/babel__core@^7.1.14": - version "7.1.19" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" - integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== + version "7.1.20" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359" + integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1857,7 +1886,7 @@ dependencies: "@types/ms" "*" -"@types/geojson@^7946.0.8": +"@types/geojson@^7946.0.10": version "7946.0.10" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== @@ -1906,9 +1935,9 @@ integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/lodash@^4.14.175": - version "4.14.185" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.185.tgz#c9843f5a40703a8f5edfd53358a58ae729816908" - integrity sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA== + version "4.14.189" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.189.tgz#975ff8c38da5ae58b751127b19ad5e44b5b7f6d2" + integrity sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA== "@types/minimatch@^3.0.3": version "3.0.5" @@ -1921,16 +1950,16 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.7.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.23.tgz#75c580983846181ebe5f4abc40fe9dfb2d65665f" - integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg== + version "18.11.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" + integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== "@types/node@^12.0.2": version "12.20.55" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^17.0.10": +"@types/node@^17.0.45": version "17.0.45" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== @@ -1968,16 +1997,16 @@ integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== "@types/uglify-js@*": - version "3.17.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.0.tgz#95271e7abe0bf7094c60284f76ee43232aef43b9" - integrity sha512-3HO6rm0y+/cqvOyA8xcYLweF0TKXlAxmQASjbOi49Co51A1N4nR4bEwBgRoD9kNM+rqFGArjKr654SLp2CoGmQ== + version "3.17.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.1.tgz#e0ffcef756476410e5bce2cb01384ed878a195b5" + integrity sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g== dependencies: source-map "^0.6.1" "@types/validator@^13.7.1": - version "13.7.7" - resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.7.tgz#e87cf34dd08522d21acf30130fd8941f433b81b5" - integrity sha512-jiEw2kTUJ8Jsh4A1K4b5Pkjj9Xz6FktLLOQ36ZVLRkmxFbpTvAV2VRoKMojz8UlZxNg/2dZqzpigH4JYn1bkQg== + version "13.7.10" + resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.10.tgz#f9763dc0933f8324920afa9c0790308eedf55ca7" + integrity sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ== "@types/webpack-sources@*": version "3.2.0" @@ -1989,9 +2018,9 @@ source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.32" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212" - integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg== + version "4.41.33" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.33.tgz#16164845a5be6a306bcbe554a8e67f9cac215ffc" + integrity sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g== dependencies: "@types/node" "*" "@types/tapable" "^1" @@ -2092,10 +2121,10 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.4.0" camelcase "^5.0.0" -"@vue/compiler-sfc@2.7.10": - version "2.7.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206" - integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q== +"@vue/compiler-sfc@2.7.14": + version "2.7.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd" + integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA== dependencies: "@babel/parser" "^7.18.4" postcss "^8.4.14" @@ -2299,6 +2328,13 @@ abbrev@1, abbrev@^1.0.0: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + accept-language@^3.0.18: version "3.0.18" resolved "https://registry.yarnpkg.com/accept-language/-/accept-language-3.0.18.tgz#f5025f17bf65a466a845838ccf98cdb877d83384" @@ -2315,20 +2351,15 @@ accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-globals@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" - integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" + acorn "^8.1.0" + acorn-walk "^8.0.2" -acorn-walk@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn-walk@^8.0.0, acorn-walk@^8.2.0: +acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2343,10 +2374,10 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== +acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.1: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== agent-base@6, agent-base@^6.0.2: version "6.0.2" @@ -2407,9 +2438,9 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + version "8.11.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78" + integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2534,7 +2565,7 @@ arg@^4.1.1: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -arg@^5.0.0: +arg@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== @@ -2586,14 +2617,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.reduce@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" - integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw== +array.prototype.reduce@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" + integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" @@ -2715,36 +2746,29 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -babel-jest@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.1.0.tgz#945e45eb8a33e8ad8cb334f2b0f040d7306cffbf" - integrity sha512-0XiBgPRhMSng+ThuXz0M/WpOeml/q5S4BFIaDS5uQb+lCjOzd0OfYEN4hWte5fDy7SZ6rNmEi16UpWGurSg2nQ== +babel-jest@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44" + integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA== dependencies: - "@jest/transform" "^29.1.0" + "@jest/transform" "^29.3.1" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^29.0.2" + babel-preset-jest "^29.2.0" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" babel-loader@^8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== + version "8.3.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" + integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== dependencies: find-cache-dir "^3.3.1" loader-utils "^2.0.0" make-dir "^3.1.0" schema-utils "^2.6.5" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" @@ -2756,10 +2780,10 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.0.2.tgz#ae61483a829a021b146c016c6ad39b8bcc37c2c8" - integrity sha512-eBr2ynAEFjcebVvu8Ktx580BD1QKCrBG1XwEUTXJe285p9HA/4hOhfWCFRQhTKSyBV0VzjhG7H91Eifz9s29hg== +babel-plugin-jest-hoist@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094" + integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -2808,12 +2832,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^29.0.2: - version "29.0.2" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.0.2.tgz#e14a7124e22b161551818d89e5bdcfb3b2b0eac7" - integrity sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA== +babel-preset-jest@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc" + integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA== dependencies: - babel-plugin-jest-hoist "^29.0.2" + babel-plugin-jest-hoist "^29.2.0" babel-preset-current-node-syntax "^1.0.0" babel-walk@3.0.0-canary-5: @@ -2846,11 +2870,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -basic-auth@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884" - integrity sha512-CtGuTyWf3ig+sgRyC7uP6DM3N+5ur/p8L+FPfsd+BbIfIs74TFfCajZTHnCw6K5dqM0bZEbRIqRy1fAdiUJhTA== - bcp47@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/bcp47/-/bcp47-1.1.2.tgz#354be3307ffd08433a78f5e1e2095845f89fc7fe" @@ -2904,16 +2923,6 @@ bluebird@3.4.x: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA== -bluebird@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" - integrity sha512-3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ== - -bluebird@^2.10.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" - integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ== - bluebird@^3.1.1, bluebird@^3.5.5, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -2929,10 +2938,10 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.20.0, body-parser@^1.19.0, body-parser@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" - integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== +body-parser@1.20.1, body-parser@^1.19.0, body-parser@^1.20.0: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" content-type "~1.0.4" @@ -2942,7 +2951,7 @@ body-parser@1.20.0, body-parser@^1.19.0, body-parser@^1.20.0: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.10.3" + qs "6.11.0" raw-body "2.5.1" type-is "~1.6.18" unpipe "1.0.0" @@ -3014,11 +3023,6 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browser-process-hrtime@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" - integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -3097,11 +3101,29 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA== +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -3307,9 +3329,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001390, caniuse-lite@^1.0.30001400: - version "1.0.30001412" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz#30f67d55a865da43e0aeec003f073ea8764d5d7c" - integrity sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA== + version "1.0.30001431" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795" + integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ== chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1: version "2.4.2" @@ -3440,10 +3462,10 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@^3.1.1, ci-info@^3.2.0, ci-info@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251" - integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug== +ci-info@^3.1.1, ci-info@^3.2.0, ci-info@^3.3.2, ci-info@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.6.1.tgz#7594f1c95cb7fdfddee7af95a13af7dbc67afdcf" + integrity sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w== cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -3517,6 +3539,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -3526,19 +3557,6 @@ clone-deep@^4.0.1: kind-of "^6.0.2" shallow-clone "^3.0.0" -co-bluebird@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/co-bluebird/-/co-bluebird-1.1.0.tgz#c8b9f3a9320a7ed30987dcca1a5c3cff59655c7c" - integrity sha512-JuoemMXxQjYAxbfRrNpOsLyiwDiY8mXvGqJyYLM7jMySDJtnMklW3V2o8uyubpc1eN2YoRsAdfZ1lfKCd3lsrA== - dependencies: - bluebird "^2.10.0" - co-use "^1.1.0" - -co-use@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/co-use/-/co-use-1.1.0.tgz#c6bb3cdf10cb735ecaa9daeeda46d725c94a4e62" - integrity sha512-1lVRtdywv41zQO/xvI2wU8w6oFcUYT6T84YKSxN25KN4N4Kld3scLovt8FjDmD63Cm7HtyRWHjezt+IanXmkyA== - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -3773,12 +3791,15 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" +convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== cookie-parser@^1.4.6: version "1.4.6" @@ -3788,6 +3809,16 @@ cookie-parser@^1.4.6: cookie "0.4.1" cookie-signature "1.0.6" +cookie-session@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0.tgz#d07aa27822f43619e4342df1342268c849833089" + integrity sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg== + dependencies: + cookies "0.8.0" + debug "3.2.7" + on-headers "~1.0.2" + safe-buffer "5.2.1" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -3798,7 +3829,7 @@ cookie@0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -cookie@0.5.0: +cookie@0.5.0, cookie@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== @@ -3818,6 +3849,14 @@ cookiejar@^2.1.3: resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== +cookies@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" + integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== + dependencies: + depd "~2.0.0" + keygrip "~1.1.0" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -3836,16 +3875,16 @@ copy-descriptor@^0.1.0: integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== core-js-compat@^3.25.0, core-js-compat@^3.25.1: - version "3.25.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.3.tgz#d6a442a03f4eade4555d4e640e6a06151dd95d38" - integrity sha512-xVtYpJQ5grszDHEUU9O7XbjjcZ0ccX3LgQsyqSvTnjX97ZqEgn9F5srmrwwwMtbKzDllyFPL+O+2OFMl1lU4TQ== + version "3.26.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df" + integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A== dependencies: browserslist "^4.21.4" core-js@^3.15.2, core-js@^3.19.0: - version "3.25.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.3.tgz#cbc2be50b5ddfa7981837bd8c41639f27b166593" - integrity sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ== + version "3.26.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e" + integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA== core-util-is@1.0.2: version "1.0.2" @@ -4236,23 +4275,30 @@ date-fns@^2.22.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== -dayjs@^1.11.5: - version "1.11.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93" - integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA== +dayjs@^1.11.7: + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +debug@2.6.9, debug@2.x.x, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" +debug@3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -4267,10 +4313,10 @@ decache@^4.6.0: dependencies: callsite "^1.0.0" -decimal.js@^10.3.1: - version "10.4.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.1.tgz#be75eeac4a2281aace80c1a8753587c27ef053e7" - integrity sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw== +decimal.js@^10.4.2: + version "10.4.2" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" + integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== decode-uri-component@^0.2.0: version "0.2.0" @@ -4347,9 +4393,9 @@ defu@^5.0.0: integrity sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ== defu@^6.0.0, defu@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.0.tgz#7a5411655da73335c7d933256911f17c74443e2d" - integrity sha512-pOFYRTIhoKujrmbTRhcW5lYQLBXw/dlTwfI8IguF1QCDJOcJzNH1w+YFjxqy6BAuJrClTy6MUE8q+oKJ2FLsIw== + version "6.1.1" + resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.1.tgz#a12c712349197c545dc61d3cd3b607b4cc7ef0c1" + integrity sha512-aA964RUCsBt0FGoNIlA3uFgo2hO+WWC0fiC6DBps/0SFzkKcYoM/3CzVLIa5xSsrFjdioMdYgAIbwo80qp2MoA== delayed-stream@~1.0.0: version "1.0.0" @@ -4361,12 +4407,12 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -denque@^2.0.1: +denque@^2.0.1, denque@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== -depd@2.0.0: +depd@2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -4385,9 +4431,9 @@ des.js@^1.0.0: minimalistic-assert "^1.0.0" destr@^1.1.0, destr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/destr/-/destr-1.1.1.tgz#910457d10a2f2f247add4ca4fdb4a03adcc49079" - integrity sha512-QqkneF8LrYmwATMdnuD2MLI3GHQIcBnG6qFC2q9bSH430VTCDAVjcspPmUaKhPGtAtPAftIUFqY1obQYQuwmbg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.1.tgz#03f2e7cbcd01f9190938d05718948de9d7dfb71a" + integrity sha512-ud8w0qMLlci6iFG7CNgeRr8OcbUWMsbfjtWft1eJ5Luqrz/M8Ebqk/KCzne8rKUlIQWWfLv0wD6QHrqOf4GshA== destroy@1.2.0, destroy@^1.0.4: version "1.2.0" @@ -4419,18 +4465,18 @@ devalue@^2.0.1: resolved "https://registry.yarnpkg.com/devalue/-/devalue-2.0.1.tgz#5d368f9adc0928e47b77eea53ca60d2f346f9762" integrity sha512-I2TiqT5iWBEyB8GRfTDP0hiLZ0YeDJZ+upDxjBfOC2lebO5LezQMv7QvIUTzdb64jQyAKLf1AHADtGN+jw6v8Q== -dezalgo@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" - integrity sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ== +dezalgo@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" + integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig== dependencies: asap "^2.0.0" wrappy "1" -diff-sequences@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.0.0.tgz#bae49972ef3933556bcb0800b72e8579d19d9e4f" - integrity sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA== +diff-sequences@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" + integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== diffie-hellman@^5.0.0: version "5.0.3" @@ -4541,10 +4587,10 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" -dompurify@^2.3.10: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz#c9c88390f024c2823332615c9e20a453cf3825dd" - integrity sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA== +dompurify@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631" + integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA== domutils@1.5.1: version "1.5.1" @@ -4647,9 +4693,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.251: - version "1.4.266" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.266.tgz#b2ce973eedbff309e2b98d1ed348e447bd4681fe" - integrity sha512-saJTYECxUSv7eSpnXw0XIEvUkP9x4s/x2mm3TVX7k4rIFS6f5TjBih1B5h437WzIhHQjid+d8ouQzPQskMervQ== + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== elliptic@^6.5.3: version "6.5.4" @@ -4678,10 +4724,10 @@ email-templates@^10.0.1: nodemailer "^6.7.7" preview-email "^3.0.7" -emittery@^0.10.2: - version "0.10.2" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" - integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== emoji-regex@^8.0.0: version "8.0.0" @@ -4787,10 +4833,10 @@ error-stack-parser@^2.0.0: dependencies: stackframe "^1.3.4" -es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1: - version "1.20.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.3.tgz#90b143ff7aedc8b3d189bcfac7f1e3e3f81e9da1" - integrity sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw== +es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4: + version "1.20.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" + integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4802,7 +4848,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19 has-property-descriptors "^1.0.0" has-symbols "^1.0.3" internal-slot "^1.0.3" - is-callable "^1.2.6" + is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" @@ -4957,6 +5003,11 @@ event-emitter@^0.3.5: d "1" es5-ext "~0.10.14" +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -5031,31 +5082,25 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== -expect@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.1.0.tgz#0e20a72cf4b2cfb8ca5e2ab138c23c5078c37460" - integrity sha512-1NCfR0FEArn9Vq1KEjhPd1rggRLiWgo87gfMK4iKn6DcVzJBRMyDNX22hyND5KiSRPIPQ5KtsY6HLxsQ0MU86w== +expect@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6" + integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA== dependencies: - "@jest/expect-utils" "^29.1.0" - jest-get-type "^29.0.0" - jest-matcher-utils "^29.1.0" - jest-message-util "^29.1.0" - jest-util "^29.1.0" - -express-oauth-server@lesion/express-oauth-server#master: - version "2.0.0" - resolved "https://codeload.github.com/lesion/express-oauth-server/tar.gz/711002b355e1a7e7e016ff1ed616ecdb184a2fe0" - dependencies: - oauth2-server "3.0.0" + "@jest/expect-utils" "^29.3.1" + jest-get-type "^29.2.0" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" express@^4.18.1: - version "4.18.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" - integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.0" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.5.0" @@ -5074,7 +5119,7 @@ express@^4.18.1: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.10.3" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.18.0" @@ -5268,11 +5313,6 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== - finalhandler@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -5379,15 +5419,15 @@ format@^0.2.0: resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww== -formidable@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff" - integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ== +formidable@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f" + integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ== dependencies: - dezalgo "1.0.3" - hexoid "1.0.0" - once "1.4.0" - qs "6.9.3" + dezalgo "^1.0.4" + hexoid "^1.0.0" + once "^1.4.0" + qs "^6.11.0" forwarded@0.2.0: version "0.2.0" @@ -5640,20 +5680,20 @@ git-config-path@^2.0.0: resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-2.0.0.tgz#62633d61af63af4405a5024efd325762f58a181b" integrity sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA== -git-up@^4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.5.tgz#e7bb70981a37ea2fb8fe049669800a1f9a01d759" - integrity sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA== +git-up@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467" + integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ== dependencies: - is-ssh "^1.3.0" - parse-url "^6.0.0" + is-ssh "^1.4.0" + parse-url "^8.1.0" -git-url-parse@^11.4.4: - version "11.6.0" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605" - integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g== +git-url-parse@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4" + integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA== dependencies: - git-up "^4.0.0" + git-up "^7.0.0" github-from-package@0.0.0: version "0.0.0" @@ -5862,7 +5902,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hexoid@1.0.0: +hexoid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== @@ -6137,9 +6177,9 @@ iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3: safer-buffer ">= 2.1.2 < 3.0.0" ics@^2.40.0: - version "2.40.0" - resolved "https://registry.yarnpkg.com/ics/-/ics-2.40.0.tgz#eadc74cfdbbd4a72921db37d783657ae351d96ec" - integrity sha512-PPkE9ij60sGhqdTxZZzsXQPB/TCXAB/dD3NqUf1I/GkbJzPeJHHMzaoMQiYAsm1pFaHRp2OIhFDgUBihkk8s/w== + version "2.41.0" + resolved "https://registry.yarnpkg.com/ics/-/ics-2.41.0.tgz#cd73e12e36bb8711f2d883a40b096203af26f450" + integrity sha512-6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA== dependencies: nanoid "^3.1.23" yup "^0.32.9" @@ -6365,7 +6405,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.6: +is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -6383,9 +6423,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.9.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" @@ -6433,7 +6473,7 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw== -is-docker@^2.0.0, is-docker@^2.2.1: +is-docker@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -6480,11 +6520,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-generator@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-generator/-/is-generator-1.0.3.tgz#c14c21057ed36e328db80347966c693f886389f3" - integrity sha512-G56jBpbJeg7ds83HW1LuShNs8J73Fv3CPz/bmROHOHlnKkN8sWb9ujiagjmxxMUywftgq48HlBZELKKqFLk0oA== - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -6502,6 +6537,11 @@ is-https@^2.0.2: resolved "https://registry.yarnpkg.com/is-https/-/is-https-2.0.2.tgz#7009d303c72580f15897d5c063d6b6bc1f838fef" integrity sha512-UfUCKVQH/6PQRCh5Qk9vNu4feLZiFmV/gr8DjbtJD0IrCRIDTA6E+d/AVFGPulI5tqK5W45fYbn1Nir1O99rFw== +is-https@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-https/-/is-https-4.0.0.tgz#9ee725a334fb517b988278d2674efc96e4f348ed" + integrity sha512-FeMLiqf8E5g6SdiVJsPcNZX8k4h2fBs1wp5Bb6uaNxn58ufK1axBqQZdmAQsqh0t9BuwFObybrdVJh6MKyPlyg== + is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" @@ -6593,7 +6633,7 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" -is-ssh@^1.3.0: +is-ssh@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2" integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ== @@ -6676,9 +6716,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" - integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -6712,283 +6752,283 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.0.0.tgz#aa238eae42d9372a413dd9a8dadc91ca1806dce0" - integrity sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ== +jest-changed-files@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289" + integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA== dependencies: execa "^5.0.0" p-limit "^3.1.0" -jest-circus@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.1.1.tgz#696e0b58351316f5fdb39d3480b4fffe8dbf0100" - integrity sha512-Ii+3JIeLF3z8j2E7fPSjPjXJLBdbAcZyfEiALRQ1Fk+FWTIfuEfZrZcjSaBdz/k/waoq+bPf9x/vBCXIAyLLEQ== +jest-circus@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a" + integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg== dependencies: - "@jest/environment" "^29.1.1" - "@jest/expect" "^29.1.0" - "@jest/test-result" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/environment" "^29.3.1" + "@jest/expect" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" is-generator-fn "^2.0.0" - jest-each "^29.1.0" - jest-matcher-utils "^29.1.0" - jest-message-util "^29.1.0" - jest-runtime "^29.1.1" - jest-snapshot "^29.1.0" - jest-util "^29.1.0" + jest-each "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-runtime "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" p-limit "^3.1.0" - pretty-format "^29.1.0" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-cli@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.1.1.tgz#6ff79c0b2d1d062f24216d2bcbf6c01a1e41db21" - integrity sha512-nz/JNtqDFf49R2KgeZ9+6Zl1uxSuRsg/tICC+DHMh+bQ0co6QqBPWKg3FtW4534bs8/J2YqFC2Lct9DZR24z0Q== +jest-cli@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d" + integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ== dependencies: - "@jest/core" "^29.1.1" - "@jest/test-result" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/core" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^29.1.1" - jest-util "^29.1.0" - jest-validate "^29.1.0" + jest-config "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" prompts "^2.0.1" yargs "^17.3.1" -jest-config@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.1.1.tgz#52aaa6237a7b3eea5c640aad6a53b390dc76f49f" - integrity sha512-o2iZrQMOiF54zOw1kOcJGmfKzAW+V2ajZVWxbt+Ex+g0fVaTkk215BD/GFhrviuic+Xk7DpzUmdTT9c1QfsPqg== +jest-config@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6" + integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg== dependencies: "@babel/core" "^7.11.6" - "@jest/test-sequencer" "^29.1.0" - "@jest/types" "^29.1.0" - babel-jest "^29.1.0" + "@jest/test-sequencer" "^29.3.1" + "@jest/types" "^29.3.1" + babel-jest "^29.3.1" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^29.1.1" - jest-environment-node "^29.1.1" - jest-get-type "^29.0.0" - jest-regex-util "^29.0.0" - jest-resolve "^29.1.0" - jest-runner "^29.1.1" - jest-util "^29.1.0" - jest-validate "^29.1.0" + jest-circus "^29.3.1" + jest-environment-node "^29.3.1" + jest-get-type "^29.2.0" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-runner "^29.3.1" + jest-util "^29.3.1" + jest-validate "^29.3.1" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^29.1.0" + pretty-format "^29.3.1" slash "^3.0.0" strip-json-comments "^3.1.1" -jest-diff@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.1.0.tgz#952639cd73fcf4d34173e2d98a0cd1c20c71ba88" - integrity sha512-ZJyWG30jpVHwxLs8xxR1so4tz6lFARNztnFlxssFpQdakaW0isSx9rAKs/6aQUKQDZ/DgSpY6HjUGLO9xkNdRw== +jest-diff@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527" + integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw== dependencies: chalk "^4.0.0" - diff-sequences "^29.0.0" - jest-get-type "^29.0.0" - pretty-format "^29.1.0" + diff-sequences "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-docblock@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.0.0.tgz#3151bcc45ed7f5a8af4884dcc049aee699b4ceae" - integrity sha512-s5Kpra/kLzbqu9dEjov30kj1n4tfu3e7Pl8v+f8jOkeWNqM6Ds8jRaJfZow3ducoQUrf2Z4rs2N5S3zXnb83gw== +jest-docblock@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82" + integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A== dependencies: detect-newline "^3.0.0" -jest-each@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.1.0.tgz#d0962d04f4a28f5f048c2ff50965cab9ae2f524d" - integrity sha512-ELSZV/L4yjqKU2O0bnDTNHlizD4IRS9DX94iAB6QpiPIJsR453dJW7Ka7TXSmxQdc66HNNOhUcQ5utIeVCKGyA== +jest-each@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132" + integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" chalk "^4.0.0" - jest-get-type "^29.0.0" - jest-util "^29.1.0" - pretty-format "^29.1.0" + jest-get-type "^29.2.0" + jest-util "^29.3.1" + pretty-format "^29.3.1" -jest-environment-node@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.1.1.tgz#10f1782b74e17fcf782ff51df79f2b0cee135851" - integrity sha512-0nwTca4L2N8iM33A+JMfBdygR6B3N/bcPoLe1hEd9o87KLxDZwKGvpTGSfXpjtyqNQXiaL/3G+YOcSoeq/syPw== +jest-environment-node@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74" + integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag== dependencies: - "@jest/environment" "^29.1.1" - "@jest/fake-timers" "^29.1.1" - "@jest/types" "^29.1.0" + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-mock "^29.1.1" - jest-util "^29.1.0" + jest-mock "^29.3.1" + jest-util "^29.3.1" -jest-get-type@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.0.0.tgz#843f6c50a1b778f7325df1129a0fd7aa713aef80" - integrity sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw== +jest-get-type@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" + integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== -jest-haste-map@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.1.0.tgz#1cbdd30528b7b215523166cec3718600a3328ad1" - integrity sha512-qn+QVZ6JHzzx6g8XrMrNNvvIWrgVT6FzOoxTP5hQ1vEu6r9use2gOb0sSeC3Xle7eaDLN4DdAazSKnWskK3B/g== +jest-haste-map@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843" + integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" - jest-regex-util "^29.0.0" - jest-util "^29.1.0" - jest-worker "^29.1.0" + jest-regex-util "^29.2.0" + jest-util "^29.3.1" + jest-worker "^29.3.1" micromatch "^4.0.4" walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -jest-leak-detector@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.1.0.tgz#6b7067d383dbf0804f21e16426d8562d84f19340" - integrity sha512-7ZdlIA2UXBIzXBNadta7pohrrvbD/Jp5T55Ux2DE1BSGul4RglIPHt7cZ0V3ll+ppBC1pGaBiWPBfLcQ2dDc3Q== +jest-leak-detector@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518" + integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA== dependencies: - jest-get-type "^29.0.0" - pretty-format "^29.1.0" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-matcher-utils@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.1.0.tgz#60f53cc199921ece9170d3d20500ae0b93294928" - integrity sha512-pfthsLu27kZg+T1XTUGvox0r3gP3KtqdMPliVd/bs6iDrZ9Z6yJgLbw6zNc4DHtCcyzq9UW0jmszCX8DdFU/wA== +jest-matcher-utils@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572" + integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ== dependencies: chalk "^4.0.0" - jest-diff "^29.1.0" - jest-get-type "^29.0.0" - pretty-format "^29.1.0" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.3.1" -jest-message-util@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.1.0.tgz#0bb50a8064aa49999a6c313827e43bf51bd71dd1" - integrity sha512-NzGXD9wgCxUy20sIvyOsSA/KzQmkmagOVGE5LnT2juWn+hB88gCQr8N/jpu34CXRIXmV7INwrQVVwhnh72pY5A== +jest-message-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb" + integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^29.1.0" + pretty-format "^29.3.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.1.1.tgz#b5475d07a8db6d39fe73e960ca94a3ac761afe0d" - integrity sha512-vDe56JmImqt3j8pHcEIkahQbSCnBS49wda0spIl0bkrIM7VDZXjKaes6W28vKZye0atNAcFaj3dxXh0XWjBW4Q== +jest-mock@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e" + integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@types/node" "*" - jest-util "^29.1.0" + jest-util "^29.3.1" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== -jest-regex-util@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.0.0.tgz#b442987f688289df8eb6c16fa8df488b4cd007de" - integrity sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug== +jest-regex-util@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b" + integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA== -jest-resolve-dependencies@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.1.1.tgz#03104a866fb133cffd8a6fe7fc198b0de9a17232" - integrity sha512-AMRTJyiK8caRXq3pa9i4oXX6yH+am5v0HwCUq1yk9lxI3ARihyT2OfEySJJo3ER7xpxf3b6isfp1sO6PQY3N0Q== +jest-resolve-dependencies@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf" + integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA== dependencies: - jest-regex-util "^29.0.0" - jest-snapshot "^29.1.0" + jest-regex-util "^29.2.0" + jest-snapshot "^29.3.1" -jest-resolve@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.1.0.tgz#114d2a86f6ff07e1cc56dbe84deb9d6e058b4399" - integrity sha512-0IETuMI58nbAWwCrtX1QQmenstlWOEdwNS5FXxpEMAs6S5tttFiEoXUwGTAiI152nqoWRUckAgt21FP4wqeZWA== +jest-resolve@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7" + integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw== dependencies: chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^29.1.0" + jest-haste-map "^29.3.1" jest-pnp-resolver "^1.2.2" - jest-util "^29.1.0" - jest-validate "^29.1.0" + jest-util "^29.3.1" + jest-validate "^29.3.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.1.1.tgz#4ababc79ec3ec654de33db093ca2ec78599fa7ad" - integrity sha512-HqazsMPXB62Zi2oJEl+Ta9aUWAaR4WdT7ow25pcS99PkOsWQoYH+yyaKbAHBUf8NOqPbZ8T4Q8gt8ZBFEJJdVQ== +jest-runner@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d" + integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA== dependencies: - "@jest/console" "^29.1.0" - "@jest/environment" "^29.1.1" - "@jest/test-result" "^29.1.0" - "@jest/transform" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/console" "^29.3.1" + "@jest/environment" "^29.3.1" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" - emittery "^0.10.2" + emittery "^0.13.1" graceful-fs "^4.2.9" - jest-docblock "^29.0.0" - jest-environment-node "^29.1.1" - jest-haste-map "^29.1.0" - jest-leak-detector "^29.1.0" - jest-message-util "^29.1.0" - jest-resolve "^29.1.0" - jest-runtime "^29.1.1" - jest-util "^29.1.0" - jest-watcher "^29.1.0" - jest-worker "^29.1.0" + jest-docblock "^29.2.0" + jest-environment-node "^29.3.1" + jest-haste-map "^29.3.1" + jest-leak-detector "^29.3.1" + jest-message-util "^29.3.1" + jest-resolve "^29.3.1" + jest-runtime "^29.3.1" + jest-util "^29.3.1" + jest-watcher "^29.3.1" + jest-worker "^29.3.1" p-limit "^3.1.0" source-map-support "0.5.13" -jest-runtime@^29.1.1: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.1.1.tgz#54a4cc4665d5c86f072f3f8fe3f9ec83d3802c8b" - integrity sha512-DA2nW5GUAEFUOFztVqX6BOHbb1tUO1iDzlx+bOVdw870UIkv09u3P5nTfK3N+xtqy/fGlLsg7UCzhpEJnwKilg== +jest-runtime@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a" + integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A== dependencies: - "@jest/environment" "^29.1.1" - "@jest/fake-timers" "^29.1.1" - "@jest/globals" "^29.1.1" - "@jest/source-map" "^29.0.0" - "@jest/test-result" "^29.1.0" - "@jest/transform" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/environment" "^29.3.1" + "@jest/fake-timers" "^29.3.1" + "@jest/globals" "^29.3.1" + "@jest/source-map" "^29.2.0" + "@jest/test-result" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^29.1.0" - jest-message-util "^29.1.0" - jest-mock "^29.1.1" - jest-regex-util "^29.0.0" - jest-resolve "^29.1.0" - jest-snapshot "^29.1.0" - jest-util "^29.1.0" + jest-haste-map "^29.3.1" + jest-message-util "^29.3.1" + jest-mock "^29.3.1" + jest-regex-util "^29.2.0" + jest-resolve "^29.3.1" + jest-snapshot "^29.3.1" + jest-util "^29.3.1" slash "^3.0.0" strip-bom "^4.0.0" -jest-snapshot@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.1.0.tgz#9da20c1c504a41e79abcbfecced090325b3cdba1" - integrity sha512-nHZoA+hpbFlkyV8uLoLJQ/80DLi3c6a5zeELgfSZ5bZj+eljqULr79KBQakp5xyH3onezf4k+K+2/Blk5/1O+g== +jest-snapshot@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e" + integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA== dependencies: "@babel/core" "^7.11.6" "@babel/generator" "^7.7.2" @@ -6996,61 +7036,61 @@ jest-snapshot@^29.1.0: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.3.3" - "@jest/expect-utils" "^29.1.0" - "@jest/transform" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/expect-utils" "^29.3.1" + "@jest/transform" "^29.3.1" + "@jest/types" "^29.3.1" "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^29.1.0" + expect "^29.3.1" graceful-fs "^4.2.9" - jest-diff "^29.1.0" - jest-get-type "^29.0.0" - jest-haste-map "^29.1.0" - jest-matcher-utils "^29.1.0" - jest-message-util "^29.1.0" - jest-util "^29.1.0" + jest-diff "^29.3.1" + jest-get-type "^29.2.0" + jest-haste-map "^29.3.1" + jest-matcher-utils "^29.3.1" + jest-message-util "^29.3.1" + jest-util "^29.3.1" natural-compare "^1.4.0" - pretty-format "^29.1.0" + pretty-format "^29.3.1" semver "^7.3.5" -jest-util@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.1.0.tgz#e8a971dfb900bb85f090c752aa321b6912e81002" - integrity sha512-5haD8egMAEAq/e8ritN2Gr1WjLYtXi4udAIZB22GnKlv/2MHkbCjcyjgDBmyezAMMeQKGfoaaDsWCmVlnHZ1WQ== +jest-util@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1" + integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.1.0.tgz#5e2ba89d7d6b3e4d3ece34024f317e956a5c85c0" - integrity sha512-EQKRweSxmIJelCdirpuVkeCS1rSNXJFtSGEeSRFwH39QGioy7qKRSY8XBB4qFiappbsvgHnH0V6Iq5ASs11knA== +jest-validate@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a" + integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g== dependencies: - "@jest/types" "^29.1.0" + "@jest/types" "^29.3.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^29.0.0" + jest-get-type "^29.2.0" leven "^3.1.0" - pretty-format "^29.1.0" + pretty-format "^29.3.1" -jest-watcher@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.1.0.tgz#4a9f9d2c9bb9115f7b543c26f468d2c0c0202506" - integrity sha512-JXw7+VpLSf+2yfXlux1/xR65fMn//0pmiXd6EtQWySS9233aA+eGS+8Y5o2imiJ25JBKdG8T45+s78CNQ71Fbg== +jest-watcher@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a" + integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg== dependencies: - "@jest/test-result" "^29.1.0" - "@jest/types" "^29.1.0" + "@jest/test-result" "^29.3.1" + "@jest/types" "^29.3.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.10.2" - jest-util "^29.1.0" + emittery "^0.13.1" + jest-util "^29.3.1" string-length "^4.0.1" jest-worker@^26.5.0: @@ -7062,24 +7102,25 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest-worker@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.1.0.tgz#374d741b976a868e39141d63fb401abacc07a8c9" - integrity sha512-yr7RFRAxI+vhL/cGB9B0FhD+QfaWh1qSxurx7gLP16dfmqhG8w75D/CQFU8ZetvhiQqLZh8X0C4rxwsZy6HITQ== +jest-worker@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b" + integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw== dependencies: "@types/node" "*" + jest-util "^29.3.1" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^29.0.3: - version "29.1.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-29.1.1.tgz#22d9d828f01335ec17225bcb267fe669319983be" - integrity sha512-Doe41PZ8MvGLtOZIW2RIVu94wa7jm/N775BBloVXk/G/vV6VYnDCOxBwrqekEgrd3Pn/bv8b5UdB2x0pAoQpwQ== +jest@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122" + integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA== dependencies: - "@jest/core" "^29.1.1" - "@jest/types" "^29.1.0" + "@jest/core" "^29.3.1" + "@jest/types" "^29.3.1" import-local "^3.0.2" - jest-cli "^29.1.1" + jest-cli "^29.3.1" jiti@^1.14.0, jiti@^1.9.2: version "1.16.0" @@ -7087,9 +7128,9 @@ jiti@^1.14.0, jiti@^1.9.2: integrity sha512-L3BJStEf5NAqNuzrpfbN71dp43mYIcBUlCRea/vdyv5dW/AYa1d4bpelko4SHdY3I6eN9Wzyasxirj1/vv5kmg== js-beautify@^1.14.5: - version "1.14.6" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507" - integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw== + version "1.14.7" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.7.tgz#9206296de33f86dc106d3e50a35b7cf8729703b2" + integrity sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A== dependencies: config-chain "^1.1.13" editorconfig "^0.15.3" @@ -7101,6 +7142,11 @@ js-cookie@^2.2.1: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== +js-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414" + integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== + js-stringify@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db" @@ -7124,18 +7170,18 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== -jsdom@^20.0.0: - version "20.0.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz#882825ac9cc5e5bbee704ba16143e1fa78361ebf" - integrity sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA== +jsdom@^20.0.2: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" + integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== dependencies: abab "^2.0.6" - acorn "^8.7.1" - acorn-globals "^6.0.0" + acorn "^8.8.1" + acorn-globals "^7.0.0" cssom "^0.5.0" cssstyle "^2.3.0" data-urls "^3.0.2" - decimal.js "^10.3.1" + decimal.js "^10.4.2" domexception "^4.0.0" escodegen "^2.0.0" form-data "^4.0.0" @@ -7143,18 +7189,17 @@ jsdom@^20.0.0: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.0" - parse5 "^7.0.0" + nwsapi "^2.2.2" + parse5 "^7.1.1" saxes "^6.0.0" symbol-tree "^3.2.4" - tough-cookie "^4.0.0" - w3c-hr-time "^1.0.2" - w3c-xmlserializer "^3.0.0" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" webidl-conversions "^7.0.0" whatwg-encoding "^2.0.0" whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" - ws "^8.8.0" + ws "^8.11.0" xml-name-validator "^4.0.0" jsesc@^2.5.1: @@ -7199,7 +7244,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.1: +json5@^2.1.1, json5@^2.1.2, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== @@ -7282,6 +7327,13 @@ jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" +keygrip@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226" + integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ== + dependencies: + tsscmp "1.0.6" + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -7311,7 +7363,7 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -klona@^2.0.4: +klona@^2.0.4, klona@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== @@ -7344,6 +7396,11 @@ launch-editor@^2.6.0: picocolors "^1.0.0" shell-quote "^1.7.3" +leaflet@^1.9.2: + version "1.9.3" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" + integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -7382,10 +7439,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -linkify-html@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-4.0.0.tgz#884d14fd6e6e8cc4f112fa3681145cafce13bc97" - integrity sha512-I8W8rhaExwKDEWoqIa6UGyLQK5nrLyXIX1poMZq0CNpsBPDSYNqkVyDNiSpXs7pRmQYIOg2zDGcVHBWj+GuYLA== +linkify-html@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-4.0.2.tgz#f55e58ee27b4e34793f03a0bf81910c8a92151e5" + integrity sha512-YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw== linkify-it@4.0.0: version "4.0.0" @@ -7394,10 +7451,10 @@ linkify-it@4.0.0: dependencies: uc.micro "^1.0.1" -linkifyjs@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.0.0.tgz#765d5283ddf94373357af34655557b3761b42233" - integrity sha512-RJuSqTcPSE7lHqZzVaZbg5w231QhIHkytiCjM6lxVHhodkt2rCBNDONCYVBYRXXIBvUl/Z+xOhRwOJnVrZB4Wg== +linkifyjs@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.0.2.tgz#5844ea70f4427004e50036d983b66da50fe13389" + integrity sha512-/VSoCZiglX0VMsXmL5PN3lRg45M86lrD9PskdkA2abWaTKap1bIcJ11LS4EE55bcUl9ZOR4eZ792UtQ9E/5xLA== loader-runner@^2.4.0: version "2.4.0" @@ -7410,18 +7467,18 @@ loader-runner@^4.1.0: integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" + integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -7532,7 +7589,7 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== -lodash.merge@^4.4.0: +lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== @@ -7587,7 +7644,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@4.17.4, lodash@^4.15.0, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5: +lodash@^4.15.0, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -7650,6 +7707,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.0: + version "7.14.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" + integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== + lru-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -7726,9 +7788,9 @@ make-fetch-happen@^9.1.0: ssri "^8.0.0" make-plural@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.1.0.tgz#8a0381ff8c9be4f074e0acdc42ec97639c2344f9" - integrity sha512-PKkwVlAxYVo98NrbclaQIT4F5Oy+X58PZM5r2IwUSCe3syya6PXkIRCn2XCdz7p58Scgpp50PBeHmepXVDG3hg== + version "7.2.0" + resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.2.0.tgz#93174b1419672a48a2340db6c1d3fb217530c684" + integrity sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg== makeerror@1.0.12: version "1.0.12" @@ -7750,17 +7812,16 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.1.tgz#af9aa0aeffd549be171b4b41bdd04315fca13817" - integrity sha512-orYg4JojWszNWlI1a+We2TUe4h+S5WIkjUa0U4DF0jjrOtxBVtCsQtioXxURWCxVfxwQ5wZVZkBoa53lqRuQeQ== + version "3.0.2" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.0.2.tgz#427ae286b8fb35f4046b3457f4df729a5019d6c3" + integrity sha512-dVjiQZ6RW0IXFnX+T/ZEmnqs724DgkQsXqfCyInXn0XxVfO2Px6KbS4M3Ny6UiBg0zJ93SHHvfVBgYO4ZnFvvw== dependencies: - "@alloc/quick-lru" "^5.2.0" - "@types/geojson" "^7946.0.8" - "@types/node" "^17.0.10" - denque "^2.0.1" + "@types/geojson" "^7946.0.10" + "@types/node" "^17.0.45" + denque "^2.1.0" iconv-lite "^0.6.3" - moment-timezone "^0.5.34" - please-upgrade-node "^3.2.0" + lru-cache "^7.14.0" + moment-timezone "^0.5.38" math-interval-parser@^2.0.1: version "2.0.1" @@ -7792,9 +7853,9 @@ media-typer@0.3.0: integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.4.3: - version "3.4.7" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" - integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== + version "3.4.11" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.11.tgz#3a34837ade675825d805a2c135e88cefe5e53aaf" + integrity sha512-GvsCITGAyDCxxsJ+X6prJexFQEhOCJaIlUbsAvjzSI5o5O7j2dle3jWvz5Z5aOdpOxW6ol3vI1+0ut+641F1+w== dependencies: fs-monkey "^1.0.3" @@ -7915,7 +7976,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.15, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -7977,9 +8038,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass-collect@^1.0.2: version "1.0.2" @@ -8076,10 +8137,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment-timezone@^0.5.34: - version "0.5.37" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz#adf97f719c4e458fdb12e2b4e87b8bec9f4eef1e" - integrity sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg== +moment-timezone@^0.5.34, moment-timezone@^0.5.38: + version "0.5.39" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b" + integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w== dependencies: moment ">= 2.9.0" @@ -8089,9 +8150,9 @@ moment-timezone@^0.5.34: integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== moo@^0.5.0, moo@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4" - integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w== + version "0.5.2" + resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" + integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== move-concurrently@^1.0.1: version "1.0.1" @@ -8105,6 +8166,11 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" +mri@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" + integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== + mrmime@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" @@ -8186,9 +8252,9 @@ named-placeholders@^1.1.2: lru-cache "^4.1.3" nan@^2.12.1: - version "2.16.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" - integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nanoclone@^0.2.1: version "0.2.1" @@ -8295,9 +8361,9 @@ node-addon-api@^4.2.0: integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== node-fetch-native@^0.1.4: - version "0.1.7" - resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-0.1.7.tgz#8a8ed0d5d1d1b89d34c6731a9d69d407c09df067" - integrity sha512-hps7dFJM0IEF056JftDSSjWDAwW9v2clwHoUJiHyYgl+ojoqjKyWybljMlpTmlC1O+864qovNlRLyAIjRxu9Ag== + version "0.1.8" + resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-0.1.8.tgz#19e2eaf6d86ac14e711ebd2612f40517c3468f2a" + integrity sha512-ZNaury9r0NxaT2oL65GvdGDy+5PlSaHTovT6JV5tOW07k1TQmgC0olZETa4C9KZg0+6zBr99ctTYa3Utqj9P/Q== node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" @@ -8391,9 +8457,9 @@ nodemailer@6.7.3: integrity sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g== nodemailer@^6.7.7: - version "6.7.8" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.8.tgz#9f1af9911314960c0b889079e1754e8d9e3f740a" - integrity sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g== + version "6.8.0" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.8.0.tgz#804bcc5256ee5523bc914506ee59f8de8f0b1cd5" + integrity sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ== nopt@^5.0.0: version "5.0.0" @@ -8441,11 +8507,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -normalize-url@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -8528,22 +8589,19 @@ nuxt-edge@2.16.0-27720022.54e852f: "@nuxt/vue-renderer-edge" "2.16.0-27720022.54e852f" "@nuxt/webpack-edge" "2.16.0-27720022.54e852f" -nwsapi@^2.2.0: +nwsapi@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== -oauth2-server@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/oauth2-server/-/oauth2-server-3.0.0.tgz#c46276b74c3d28634d59ee981f76b58a6459cc28" - integrity sha512-TlDDkKECOTjQQ9pQobw/EESLbd7YVY1i0Ebos996Au88FqiLUbQ+X/cRBCq6gvpkoA0ByrDsF8c97SyRygfE6Q== +oauth2orize@^1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/oauth2orize/-/oauth2orize-1.11.1.tgz#00b6cafe2036a0a3aab0380627dc7cfd5b5e9a9c" + integrity sha512-9dSx/Gwm0J2Rvj4RH9+h7iXVnRXZ6biwWRgb2dCeQhCosODS0nYdM9I/G7BUGsjbgn0pHjGcn1zcCRtzj2SlRA== dependencies: - basic-auth "1.1.0" - bluebird "3.5.0" - lodash "4.17.4" - promisify-any "2.0.1" - statuses "1.3.1" - type-is "1.6.15" + debug "2.x.x" + uid2 "0.0.x" + utils-merge "1.x.x" object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" @@ -8581,7 +8639,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.4: +object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -8592,14 +8650,14 @@ object.assign@^4.1.0, object.assign@^4.1.4: object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.4" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" - integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ== + version "2.1.5" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3" + integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw== dependencies: - array.prototype.reduce "^1.0.4" + array.prototype.reduce "^1.0.5" call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.20.1" + es-abstract "^1.20.4" object.pick@^1.3.0: version "1.3.0" @@ -8609,13 +8667,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" - integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + version "1.1.6" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" + integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" on-finished@2.4.1, on-finished@^2.3.0: version "2.4.1" @@ -8636,7 +8694,7 @@ on-headers@^1.0.2, on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@1.4.0, once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -8759,6 +8817,11 @@ p-timeout@^3.0.0, p-timeout@^3.1.0: dependencies: p-finally "^1.0.0" +p-timeout@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-4.1.0.tgz#788253c0452ab0ffecf18a62dff94ff1bd09ca0a" + integrity sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw== + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -8842,25 +8905,19 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-path@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea" - integrity sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw== +parse-path@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b" + integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog== dependencies: - is-ssh "^1.3.0" - protocols "^1.4.0" - qs "^6.9.4" - query-string "^6.13.8" + protocols "^2.0.0" -parse-url@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-6.0.5.tgz#4acab8982cef1846a0f8675fa686cef24b2f6f9b" - integrity sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA== +parse-url@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d" + integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w== dependencies: - is-ssh "^1.3.0" - normalize-url "^6.1.0" - parse-path "^4.0.0" - protocols "^1.4.0" + parse-path "^7.0.0" parse5-htmlparser2-tree-adapter@^6.0.1: version "6.0.1" @@ -8874,10 +8931,10 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parse5@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" - integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== +parse5@^7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== dependencies: entities "^4.4.0" @@ -8907,6 +8964,62 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== +passport-anonymous@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/passport-anonymous/-/passport-anonymous-1.0.1.tgz#241e37274ec44dfb7f6cad234b41c438386bc117" + integrity sha512-Mk2dls97nLTzHpsWCYQ54IVGucWaiWSHHr3+IhWYAebg4dRgRQIfyoeYrixoxB2z2z4+EM7p9yjC+a3yMB5z5A== + dependencies: + passport-strategy "1.x.x" + +passport-custom@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/passport-custom/-/passport-custom-1.1.1.tgz#71db3d7ec1d7d0085e8768507f61b26d88051c0a" + integrity sha512-/2m7jUGxmCYvoqenLB9UrmkCgPt64h8ZtV+UtuQklZ/Tn1NpKBeOorCYkB/8lMRoiZ5hUrCoMmDtxCS/d38mlg== + dependencies: + passport-strategy "1.x.x" + +passport-http-bearer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz#147469ea3669e2a84c6167ef99dbb77e1f0098a8" + integrity sha512-SELQM+dOTuMigr9yu8Wo4Fm3ciFfkMq5h/ZQ8ffi4ELgZrX1xh9PlglqZdcUZ1upzJD/whVyt+YWF62s3U6Ipw== + dependencies: + passport-strategy "1.x.x" + +passport-http@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/passport-http/-/passport-http-0.3.0.tgz#8ee53d4380be9c60df2151925029826f77115603" + integrity sha512-OwK9DkqGVlJfO8oD0Bz1VDIo+ijD3c1ZbGGozIZw+joIP0U60pXY7goB+8wiDWtNqHpkTaQiJ9Ux1jE3Ykmpuw== + dependencies: + passport-strategy "1.x.x" + +passport-oauth2-client-password@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz#4f378b678b92d16dbbd233a6c706520093e561ba" + integrity sha512-GHQH4UtaEZvCLulAxGKHYoSsPRoPRmGsdmaZtMh5nmz80yMLQbdMA9Bg2sp4/UW3PIxJH/143hVjPTiXaNngTQ== + dependencies: + passport-strategy "1.x.x" + +passport-oauth2-client-public@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/passport-oauth2-client-public/-/passport-oauth2-client-public-0.0.1.tgz#f193d55b5eb4c6080f9465992046c31255e3a0eb" + integrity sha512-VN7R+QX7XT5ZZQutOxwzxPIwaANb+T1mdKHtexQnDN8MsrhRVYS9bqN9bcmXGA4QsDR8isCjsfBATfM9L5maZw== + dependencies: + passport-strategy "^1.0.0" + +passport-strategy@1.x.x, passport-strategy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" + integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== + +passport@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/passport/-/passport-0.6.0.tgz#e869579fab465b5c0b291e841e6cc95c005fac9d" + integrity sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug== + dependencies: + passport-strategy "1.x.x" + pause "0.0.1" + utils-merge "^1.0.1" + path-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" @@ -8952,6 +9065,11 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +pause@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d" + integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== + pbkdf2@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" @@ -9068,13 +9186,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - pnp-webpack-plugin@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9" @@ -9732,9 +9843,9 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2 source-map "^0.6.1" postcss@^8.4.14: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== + version "8.4.19" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc" + integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -9791,11 +9902,16 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== -"prettier@^1.18.2 || ^2.0.0", prettier@^2.7.1: +"prettier@^1.18.2 || ^2.0.0": version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== +prettier@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" + integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== + pretty-bytes@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" @@ -9809,10 +9925,10 @@ pretty-error@^2.1.1: lodash "^4.17.20" renderkid "^2.0.4" -pretty-format@^29.1.0: - version "29.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.1.0.tgz#ea3de2feed5b8d19c537a12fe478ddc8b45da6b8" - integrity sha512-dZ21z0UjKVSiEkrPAt2nJnGfrtYMFBlNW4wTkJsIp9oB5A8SUQ8DuJ9EUgAvYyNfMeoGmKiDnpJvM489jkzdSQ== +pretty-format@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da" + integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg== dependencies: "@jest/schemas" "^29.0.0" ansi-styles "^5.0.0" @@ -9870,15 +9986,6 @@ promise@^7.0.1: dependencies: asap "~2.0.3" -promisify-any@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promisify-any/-/promisify-any-2.0.1.tgz#403e00a8813f175242ab50fe33a69f8eece47305" - integrity sha512-pVaGouFbTVxqpVJ+T5A15olNJDASAZHYq5cXz6mWdr6/X34mVWiG9MSdzHTcVBCv4aqBP7wGspi7BUSRbEmhsw== - dependencies: - bluebird "^2.10.0" - co-bluebird "^1.1.0" - is-generator "^1.0.2" - prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -9918,9 +10025,9 @@ prosemirror-commands@^1.1.4: prosemirror-transform "^1.0.0" prosemirror-dropcursor@^1.3.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.6.0.tgz#35b891224f79319755cadbec0e075bba8e95a0a3" - integrity sha512-2vj5tYDXADpd6Acg5iuZV2/3dEBy9s3tRUju6lQPOlKYSvJd7Tsz9c4uLS+L9ZCJndyW0EBrT+PadarHa1G30Q== + version "1.6.1" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.6.1.tgz#31f696172105f232bd17543ccf305e0f33e59d1d" + integrity sha512-LtyqQpkIknaT7NnZl3vDr3TpkNcG4ABvGRXx37XJ8tJNUGtcrZBh40A0344rDwlRTfUEmynQS/grUsoSWz+HgA== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" @@ -9962,9 +10069,9 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.4: w3c-keyname "^2.2.0" prosemirror-model@^1.0.0, prosemirror-model@^1.13.1, prosemirror-model@^1.16.0, prosemirror-model@^1.8.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd" - integrity sha512-IxSVBKAEMjD7s3n8cgtwMlxAXZrC7Mlag7zYsAKDndAqnDScvSmp/UdnRTV/B33lTCVU3CCm7dyAn/rVVD0mcw== + version "1.18.2" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.2.tgz#a85c2dbf66ccc114ab35d8dac39228ed294b9b7a" + integrity sha512-uOQorJr20qVvqp2hs2RdWtWoidQxJ1ceE11bSmkf57XS989mdg1zKPJIp5HOHfY8/KjXPn3cLZqUYYwRrfBBPw== dependencies: orderedmap "^2.0.0" @@ -9978,12 +10085,13 @@ prosemirror-schema-list@^1.1.4: prosemirror-transform "^1.0.0" prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.3.3: - version "1.4.1" - resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.1.tgz#f6e26c7b6a7e11206176689eb6ebbf91870953e1" - integrity sha512-U/LBDW2gNmVa07sz/D229XigSdDQ5CLFwVB1Vb32MJbAHHhWe/6pOc721faI17tqw4pZ49i1xfY/jEZ9tbIhPg== + version "1.4.2" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.2.tgz#f93bd8a33a4454efab917ba9b738259d828db7e5" + integrity sha512-puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ== dependencies: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" + prosemirror-view "^1.27.0" prosemirror-tables@^1.1.1: version "1.2.5" @@ -10003,10 +10111,10 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor dependencies: prosemirror-model "^1.0.0" -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.16.5: - version "1.28.2" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.28.2.tgz#e997ef9dc623d01afd170e328fc924e6f4382003" - integrity sha512-uK28mJbu0GI8Oz7Aclt6BKL4g+C59EBShBXDB0Y9Y71H25p4bQgmLQLfDWjsT1J9XOw0bR8QQajZmdK8RvXI9g== +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.16.5, prosemirror-view@^1.27.0: + version "1.29.1" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.29.1.tgz#9a4938d1a863ca76e23c6573d30e3ece2b17d9a0" + integrity sha512-OhujVZSDsh0l0PyHNdfaBj6DBkbhYaCfbaxmTeFrMKd/eWS+G6IC+OAbmR9IsLC8Se1HSbphMaXnsXjupHL3UQ== dependencies: prosemirror-model "^1.16.0" prosemirror-state "^1.0.0" @@ -10017,12 +10125,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -protocols@^1.4.0: - version "1.4.8" - resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8" - integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg== - -protocols@^2.0.1: +protocols@^2.0.0, protocols@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86" integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q== @@ -10217,19 +10320,7 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== - dependencies: - side-channel "^1.0.4" - -qs@6.9.3: - version "6.9.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e" - integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw== - -qs@^6.10.3, qs@^6.11.0, qs@^6.9.4: +qs@6.11.0, qs@^6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== @@ -10244,16 +10335,6 @@ query-string@^4.1.0: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^6.13.8: - version "6.14.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a" - integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw== - dependencies: - decode-uri-component "^0.2.0" - filter-obj "^1.1.0" - split-on-first "^1.0.0" - strict-uri-encode "^2.0.0" - querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -10318,9 +10399,9 @@ raw-body@2.5.1: unpipe "1.0.0" rc9@^1.2.0, rc9@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/rc9/-/rc9-1.2.2.tgz#0d79202e088dd80e2e0f77ac36f520247d2d3964" - integrity sha512-zbe8+HR2X28eZepAwohuKkebbEsA67h0DO9I7g12QrHa2CQopR9gztOLPIPXXGTvcxeUjAN4wZ+b29t3m/u05g== + version "1.2.4" + resolved "https://registry.yarnpkg.com/rc9/-/rc9-1.2.4.tgz#a625f5ec63a54eebd66114eb9c6ce9a6c54dfac8" + integrity sha512-YD1oJO9LUzMdmr2sAsVlwQVtEoDCmvuyDwmSWrg2GKFprl3BckP5cmw9rHPunei0lV6Xl4E5t2esT+0trY1xfQ== dependencies: defu "^6.0.0" destr "^1.1.1" @@ -10405,15 +10486,15 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.9: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== + version "0.15.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" + integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== dependencies: "@babel/runtime" "^7.8.4" @@ -10435,16 +10516,16 @@ regexp.prototype.flags@^1.4.3: functions-have-names "^1.2.2" regexpu-core@^5.1.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139" - integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ== + version "5.2.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" + integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw== dependencies: regenerate "^1.4.2" regenerate-unicode-properties "^10.1.0" regjsgen "^0.7.1" regjsparser "^0.9.1" unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" regjsgen@^0.7.1: version "0.7.1" @@ -10648,6 +10729,13 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-compare@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/safe-compare/-/safe-compare-1.1.4.tgz#5e0128538a82820e2e9250cd78e45da6786ba593" + integrity sha512-b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ== + dependencies: + buffer-alloc "^1.2.0" + safe-identifier@^0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb" @@ -10670,19 +10758,24 @@ safe-regex@^1.1.0: ret "~0.1.10" safe-stable-stringify@^2.3.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz#95fadb1bcf8057a1363e11052122f5da36a69215" - integrity sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz#34694bd8a30575b7f94792aa51527551bd733d61" + integrity sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sandwich-stream@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/sandwich-stream/-/sandwich-stream-2.0.2.tgz#6d1feb6cf7e9fe9fadb41513459a72c2e84000fa" + integrity sha512-jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ== + sass-loader@^10.2.0: - version "10.3.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.3.1.tgz#a45f0d1dd7ea90de7eb099239a18c83dea6e6341" - integrity sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA== + version "10.4.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf" + integrity sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10690,10 +10783,10 @@ sass-loader@^10.2.0: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.53.0: - version "1.55.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c" - integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A== +sass@^1.56.2: + version "1.56.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.2.tgz#9433b345ab3872996c82a53a58c014fd244fd095" + integrity sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -10767,11 +10860,6 @@ selderee@^0.6.0: dependencies: parseley "^0.7.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -10782,10 +10870,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" @@ -10814,9 +10902,9 @@ seq-queue@^0.0.5: integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q== sequelize-cli@^6.3.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.5.1.tgz#e084c82b11e86ed9bd7e47fde4e44cfbc6e81e2c" - integrity sha512-36hfZKNeZkIshp6L0jPVQ27xNLzgDPpiZokQsvo0M882AtAm+KhGOIViR0BecWb0Xz8+uSq03xxcl7RfMgyIRA== + version "6.5.2" + resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.5.2.tgz#8c0b061a213a550ba812029c0fabeb5a38843d2c" + integrity sha512-ltXvQOxFFb9pVuDqPJYOS3/X32OVni9zK1S0d0JfloSjmCKZmMDFBWndZbcbJH0QBfyxTt7FLt/kSmKwTRlbsQ== dependencies: cli-color "^2.0.3" fs-extra "^9.1.0" @@ -10838,10 +10926,10 @@ sequelize-slugify@^1.6.2: dependencies: sluglife "^0.9.8" -sequelize@^6.23.0: - version "6.23.2" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.23.2.tgz#bd343ac8326725845e071b1dd782bbf6c02be476" - integrity sha512-0jy5pkRV7LZlBArIrYKfpKa+DowC+fIcI6LrWDfvdqFmuXZfmS4qq8gzFmIu0C210ts2Mmw/dghzRhX73xPoMg== +sequelize@^6.27.0: + version "6.27.0" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.27.0.tgz#b267e76997df57842cc1e2c1c1d7e02405bcdb9c" + integrity sha512-Rm7BM8HQekeABup0KdtSHriu8ppJuHj2TJWCxvZtzU6j8V1LVnBk2rs38P8r4gMWgdLKs5NYoLC4il95KLsv0w== dependencies: "@types/debug" "^4.1.7" "@types/validator" "^13.7.1" @@ -10984,9 +11072,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== + version "1.7.4" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8" + integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw== side-channel@^1.0.4: version "1.0.4" @@ -11125,9 +11213,9 @@ socks-proxy-agent@^6.0.0: socks "^2.6.2" socks@^2.6.2: - version "2.7.0" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" - integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: ip "^2.0.0" smart-buffer "^4.2.0" @@ -11208,11 +11296,6 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== -split-on-first@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" - integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== - split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -11230,10 +11313,10 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sqlite3@^5.0.11: - version "5.1.1" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.1.tgz#c6561220fd875fd88eb2ef717631e0a11af1ec38" - integrity sha512-mMinkrQr/LKJqFiFF+AF7imPSzRCCpTCreusZO3D/ssJHVjZOrbu2Caz+zPH5KTmGGXBxXMGSRDssL+44CLxvg== +sqlite3@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" + integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" node-addon-api "^4.2.0" @@ -11286,9 +11369,9 @@ stack-trace@0.0.10, stack-trace@0.0.x: integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== stack-utils@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" @@ -11305,11 +11388,6 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -statuses@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg== - statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -11328,9 +11406,9 @@ std-env@^2.3.0: ci-info "^3.1.1" std-env@^3.0.1, std-env@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.2.1.tgz#00e260ec3901333537125f81282b9296b00d7304" - integrity sha512-D/uYFWkI/31OrnKmXZqGAGK5GbQRPp/BWA1nuITcc6ICblhhuQUPHS5E2GSCVS7Hwhf4ciq8qsATwBUxv+lI6w== + version "3.3.1" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.1.tgz#93a81835815e618c8aa75e7c8a4dc04f7c314e29" + integrity sha512-3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q== stream-browserify@^2.0.1: version "2.0.2" @@ -11374,11 +11452,6 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== - string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" @@ -11406,22 +11479,22 @@ string-width@^1.0.1: strip-ansi "^6.0.1" string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" + integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -11495,30 +11568,29 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -superagent@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.0.tgz#2ea4587df4b81ef023ec01ebc6e1bcb9e2344cb6" - integrity sha512-iudipXEel+SzlP9y29UBWGDjB+Zzag+eeA1iLosaR2YHBRr1Q1kC29iBrF2zIVD9fqVbpZnXkN/VJmwFMVyNWg== +superagent@^8.0.5: + version "8.0.6" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.6.tgz#e3fb0b3112b79b12acd605c08846253197765bf6" + integrity sha512-HqSe6DSIh3hEn6cJvCkaM1BLi466f1LHi4yubR0tpewlMpk4RUFFy35bKz8SsPBwYfIIJy5eclp+3tCYAuX0bw== dependencies: component-emitter "^1.3.0" cookiejar "^2.1.3" debug "^4.3.4" fast-safe-stringify "^2.1.1" form-data "^4.0.0" - formidable "^2.0.1" + formidable "^2.1.1" methods "^1.1.2" mime "2.6.0" - qs "^6.10.3" - readable-stream "^3.6.0" - semver "^7.3.7" + qs "^6.11.0" + semver "^7.3.8" -supertest@^6.2.4: - version "6.2.4" - resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.2.4.tgz#3dcebe42f7fd6f28dd7ac74c6cba881f7101b2f0" - integrity sha512-M8xVnCNv+q2T2WXVzxDECvL2695Uv2uUj2O0utxsld/HRyJvOU8W9f1gvsYxSNU4wmIe0/L/ItnpU4iKq0emDA== +supertest@^6.3.3: + version "6.3.3" + resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.3.3.tgz#42f4da199fee656106fd422c094cf6c9578141db" + integrity sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA== dependencies: methods "^1.1.2" - superagent "^8.0.0" + superagent "^8.0.5" supports-color@^5.3.0: version "5.5.0" @@ -11541,14 +11613,6 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" - integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -11610,9 +11674,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.1.12" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" + integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -11621,13 +11685,19 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== +telegraf@^4.9.1: + version "4.11.2" + resolved "https://registry.yarnpkg.com/telegraf/-/telegraf-4.11.2.tgz#1cf4e74418b4fb6eaddd11a74cc50b0971c06c35" + integrity sha512-RGEh+NXkHbq1KcSSbJeVYhHMrEN4rymd9DSe3SoIV0886bJPBHLzYCNrOqnk9aeZE2Idwh5uK0X/xbR6jScQKQ== dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" + abort-controller "^3.0.0" + debug "^4.3.4" + mri "^1.2.0" + node-fetch "^2.6.7" + p-timeout "^4.1.0" + safe-compare "^1.1.4" + sandwich-stream "^2.0.2" + typegram "^4.1.0" terser-webpack-plugin@^1.4.3: version "1.4.5" @@ -11669,9 +11739,9 @@ terser@^4.1.2, terser@^4.6.3: source-map-support "~0.5.12" terser@^5.3.4: - version "5.15.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.0.tgz#e16967894eeba6e1091509ec83f0c60e179f2425" - integrity sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA== + version "5.15.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c" + integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" @@ -11801,11 +11871,16 @@ titleize@2: resolved "https://registry.yarnpkg.com/titleize/-/titleize-2.1.0.tgz#5530de07c22147a0488887172b5bd94f5b30a48f" integrity sha512-m+apkYlfiQTKLW+sI4vqUkwMEzfgEUEYSqljx1voUE3Wz/z1ZsxyzSxvH2X8uKVrOp7QkByWt0rA6+gvhCKy6g== -tlds@1.231.0, tlds@^1.231.0: +tlds@1.231.0: version "1.231.0" resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.231.0.tgz#93880175cd0a06fdf7b5b5b9bcadff9d94813e39" integrity sha512-L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw== +tlds@^1.231.0: + version "1.233.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.233.0.tgz#decfed234c293a20548bdb5e468909766e5e1c15" + integrity sha512-K05dY1r4lkXk+eE/j2UqHhGWp1bFn+17eYcJP7OepkmI3obLOgan3ZIpmml++wZ4LTIx4r9var373ztO2xb27A== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -11885,7 +11960,7 @@ totalist@^1.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== -tough-cookie@^4.0.0: +tough-cookie@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== @@ -11923,9 +11998,14 @@ tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + +tsscmp@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" + integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA== tty-browserify@0.0.0: version "0.0.0" @@ -11971,14 +12051,6 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@1.6.15: - version "1.6.15" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" - integrity sha512-0uqZYZDiBICTVXEsNcDLueZLPgZ8FgGe8lmVDQ0FcVFUeaxsPbFWiz60ZChVw8VELIt7iGuCehOrZSYjYteWKQ== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.15" - type-is@^1.6.4, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -12002,10 +12074,15 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== +typegram@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/typegram/-/typegram-4.1.0.tgz#fb1c8f59d387c5b4966be9aac745aa9fcedc0a2d" + integrity sha512-OejXXNRh3bb6TQKbUM0k1p1wnEYCrZd66TNLeZeV2S6s4XWkCmVHONXqBTPtWpaq+IUxSyQwKJ1XXyN17Lr0+w== + ua-parser-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775" - integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg== + version "1.0.32" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.32.tgz#786bf17df97de159d5b1c9d5e8e9e89806f8a030" + integrity sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA== uc.micro@^1.0.1: version "1.0.6" @@ -12013,14 +12090,19 @@ uc.micro@^1.0.1: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== ufo@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.5.tgz#e367b4205ece9d9723f2fa54f887d43ed1bce5d0" - integrity sha512-e4+UtA5IRO+ha6hYklwj6r7BjiGMxS0O+UaSg9HbaTefg4kMkzj4tXzEBajRR+wkxf+golgAWKzLbytCUDMJAA== + version "0.8.6" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.6.tgz#c0ec89bc0e0c9fa59a683680feb0f28b55ec323b" + integrity sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw== uglify-js@^3.5.1: - version "3.17.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.2.tgz#f55f668b9a64b213977ae688703b6bbb7ca861c6" - integrity sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg== + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + +uid2@0.0.x: + version "0.0.4" + resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" + integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== umzug@^2.3.0: version "2.3.0" @@ -12067,10 +12149,10 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== unicode-property-aliases-ecmascript@^2.0.0: version "2.1.0" @@ -12160,9 +12242,9 @@ upath@^2.0.1: integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== update-browserslist-db@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18" - integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg== + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -12256,7 +12338,7 @@ utila@~0.4: resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== -utils-merge@1.0.1: +utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== @@ -12334,15 +12416,15 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-i18n@^8.26.7: - version "8.27.2" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.2.tgz#b649a65ff42b7d1a482679b732902f889965a068" - integrity sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg== +vue-i18n@^8.27.2: + version "8.28.2" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840" + integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA== vue-loader@^15.10.0: - version "15.10.0" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.0.tgz#2a12695c421a2a2cc2138f05a949d04ed086e38b" - integrity sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg== + version "15.10.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.1.tgz#c451c4cd05a911aae7b5dbbbc09fb913fb3cca18" + integrity sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA== dependencies: "@vue/component-compiler-utils" "^3.1.0" hash-sum "^1.0.2" @@ -12368,9 +12450,9 @@ vue-router@^3.6.4: integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ== vue-server-renderer@^2.7.10: - version "2.7.10" - resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.7.10.tgz#e73241c879fcc81de91882ceff135a40f756377c" - integrity sha512-hvlnyTZmDmnI7IpQE5YwIwexPi6yJq8eeNTUgLycPX3uhuEobygAQklHoeVREvwNKcET/MnVOtjF4c7t7mw6CQ== + version "2.7.14" + resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.7.14.tgz#986f3fdca63fbb38bb6834698f11e0d6a81f182f" + integrity sha512-NlGFn24tnUrj7Sqb8njhIhWREuCJcM3140aMunLNcx951BHG8j3XOrPP7psSCaFA8z6L4IWEjudztdwTp1CBVw== dependencies: chalk "^4.1.2" hash-sum "^2.0.0" @@ -12390,9 +12472,9 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: loader-utils "^1.0.2" vue-template-compiler@^2.6.14, vue-template-compiler@^2.7.10: - version "2.7.10" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz#9e20f35b2fdccacacf732dd7dedb49bf65f4556b" - integrity sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ== + version "2.7.14" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1" + integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ== dependencies: de-indent "^1.0.2" he "^1.2.0" @@ -12402,12 +12484,17 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== +vue2-leaflet@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257" + integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ== + vue@^2.7.10: - version "2.7.10" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.10.tgz#ae516cc6c88e1c424754468844218fdd5e280f40" - integrity sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg== + version "2.7.14" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17" + integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ== dependencies: - "@vue/compiler-sfc" "2.7.10" + "@vue/compiler-sfc" "2.7.14" csstype "^3.1.0" vuetify-loader@^1.7.3: @@ -12421,32 +12508,30 @@ vuetify-loader@^1.7.3: file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@2.6.10, vuetify@^2.6: - version "2.6.10" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.10.tgz#b86cd7a97bf8cd3828a72c349795b5b3c539ebc2" - integrity sha512-fgUeRDDCwYkwu6WGEEKGe7IdfzOsXJCZGrqkn1pcS2ycuoDL8mR2/dejH5iFNnBY6MnsT365PAGn0J+9otjfQg== +vuetify@2.6.13: + version "2.6.13" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.13.tgz#6c7dd1a43b5cee0e474fbe840f0fe86439d54502" + integrity sha512-HhJi52IzhfrmWFwcYFUiA1GRIzz9smbR06Lj61Ml5HgD5PBcMiDywUnNPVid1VsXO4qWpBU6kO3O89uTxH1yzw== + +vuetify@^2.6: + version "2.6.12" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.12.tgz#ef1871c720834d53e00fef142b9841a3e8c1a4f9" + integrity sha512-qe3hcMpWmT1O15tp+p65lOS7UKZ/hQYQktCsw9iXx2u3RwVbX6GR82gY2iROrKsiAzYDvMgrYxWQwY/pUfkekw== vuex@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== -w3c-hr-time@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" - integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== - dependencies: - browser-process-hrtime "^1.0.0" - w3c-keyname@^2.2.0: version "2.2.6" resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.6.tgz#8412046116bc16c5d73d4e612053ea10a189c85f" integrity sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg== -w3c-xmlserializer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923" - integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg== +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== dependencies: xml-name-validator "^4.0.0" @@ -12508,9 +12593,9 @@ webidl-conversions@^7.0.0: integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== webpack-bundle-analyzer@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz#bee2ee05f4ba4ed430e4831a319126bb4ed9f5a6" - integrity sha512-oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw== + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#33c1c485a7fcae8627c547b5c3328b46de733c66" + integrity sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg== dependencies: acorn "^8.0.4" acorn-walk "^8.0.0" @@ -12552,9 +12637,9 @@ webpack-dev-middleware@^5.3.3: schema-utils "^4.0.0" webpack-hot-middleware@^2.25.2: - version "2.25.2" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.2.tgz#f7f936f3871d8c4eb95ecdf23a34e9cefe9806e8" - integrity sha512-CVgm3NAQyfdIonRvXisRwPTUYuSbyZ6BY7782tMeUzWOO7RmVI2NaBYuCp41qyD4gYCkJyTneAJdK69A13B0+A== + version "2.25.3" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#be343ce2848022cfd854dd82820cd730998c6794" + integrity sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA== dependencies: ansi-html-community "0.0.8" html-entities "^2.1.0" @@ -12805,10 +12890,10 @@ ws@^7.3.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^8.8.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" - integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== +ws@^8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== xml-name-validator@^4.0.0: version "4.0.0" @@ -12867,7 +12952,7 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.0: +yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== @@ -12886,17 +12971,17 @@ yargs@^16.2.0: yargs-parser "^20.2.2" yargs@^17.3.1, yargs@^17.5.0: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^21.0.0" + yargs-parser "^21.1.1" yocto-queue@^0.1.0: version "0.1.0"