From c30e26ba662a41762c6a751d6a9f513d02c1d231 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 9 Jul 2021 19:32:25 +0000 Subject: [PATCH 01/11] Translated using Weblate (English) Currently translated at 100.0% (231 of 231 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/en/ --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index dd51d655..cb0e4ec2 100644 --- a/locales/en.json +++ b/locales/en.json @@ -197,7 +197,7 @@ "resources": "Resources", "user_blocked": "User {user} blocked", "favicon": "Logo", - "user_block_confirm": "Are you sure you want block user {user}?", + "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", From 9400a1ec5c72748ac9e6cffb26a6121e00bb6b1e Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 9 Jul 2021 19:30:03 +0000 Subject: [PATCH 02/11] Translated using Weblate (Italian) Currently translated at 99.5% (230 of 231 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/it/ --- locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/it.json b/locales/it.json index 208da69f..77401f1a 100644 --- a/locales/it.json +++ b/locales/it.json @@ -200,7 +200,7 @@ "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": " Vuoieliminare questo l'annuncio?", + "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", From 2258717eae7e90eb0260bfbcf518937f3e9ad8db Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 16:16:25 +0200 Subject: [PATCH 03/11] cleaning --- CHANGELOG | 8 ++++++++ pages/add/DateInput.vue | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 93ccf2e6..a76150db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,13 @@ All notable changes to this project will be documented in this file. +### 1.0.2 (alpha) + - improve oauth flow UI + - [WordPress plugin](https://wordpress.org/plugins/wpgancio/) + - fix h-event import + - improve error logging (add stack trace to exception) + - choose start date for recurreing events (#120) + - fix user delete from admin + ### 1.0.1 (alpha) - fix AP resource removal diff --git a/pages/add/DateInput.vue b/pages/add/DateInput.vue index 9a47f8b3..4a0790d3 100644 --- a/pages/add/DateInput.vue +++ b/pages/add/DateInput.vue @@ -113,9 +113,6 @@ export default { } return hourList }, - isRecurrent () { - return !!this.value.recurrent - }, whenPatterns () { if (!this.value.from) { return } const date = dayjs(this.value.from) From 8602441e24f0b01e49828a54e0e6f1afe337857e Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 16:20:25 +0200 Subject: [PATCH 04/11] add termine.161.social to instances --- docs/instances.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/instances.md b/docs/instances.md index 0de24ac8..43cb5b28 100644 --- a/docs/instances.md +++ b/docs/instances.md @@ -8,7 +8,7 @@ nav_order: 7 - [gancio.cisti.org](https://gancio.cisti.org) (Turin, Italy) - [lapunta.org](https://lapunta.org) (Florence, Italy) -- [chesefa.org](https://chesefa.org) (Naples, Italy) +- [termine.161.social](https://termine.161.social) (Germany) -Do you want your instance to appear here? [Write us]({% link contact.md %}). \ No newline at end of file +Do you want your instance to appear here? [Write us]({% link contact.md %}). From e7de470d22ffe8aebe6c80d15024d1b4793c2a9a Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 16:54:57 +0200 Subject: [PATCH 05/11] update docs/changelog --- docs/changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index a4e2692b..e407ac99 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -8,6 +8,15 @@ nav_order: 10 All notable changes to this project will be documented in this file. + +### 1.0.2 (alpha) + - improve oauth flow UI + - [WordPress plugin](https://wordpress.org/plugins/wpgancio/) + - fix h-event import + - improve error logging (add stack trace to exception) + - choose start date for recurreing events (#120) + - fix user delete from admin + ### 1.0.1 (alpha) - fix AP resource removal From 137eec3098e2344b380466634e6aec7f8ab62532 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 17:30:58 +0200 Subject: [PATCH 06/11] v1.0.2-alpha --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1754bed5..29d21536 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gancio", - "version": "1.0.1-alpha", + "version": "1.0.2-alpha", "description": "A shared agenda for local communities", "author": "lesion", "scripts": { From 78df98c6466111a96f1132c8940ef3d60f0657c2 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 18:30:29 +0200 Subject: [PATCH 07/11] clean yarn cache in Dockerfile to force upgrade --- docs/docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index 7ea8472d..c7264727 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,5 +1,6 @@ FROM node:buster -RUN yarn global add --silent https://gancio.org/latest.tgz 2> /dev/null +RUN yarn cache clean +RUN yarn global add --latest --silent https://gancio.org/latest.tgz 2> /dev/null ADD entrypoint.sh / RUN chmod 755 /entrypoint.sh From aa58d3174dfbfd874ba15e7c2e05c59ab173b47c Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 19:20:44 +0200 Subject: [PATCH 08/11] yarn does not update package installed from the same url! --- docs/docker/Dockerfile | 2 +- docs/install/debian.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index c7264727..9ca1d1d2 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,5 +1,5 @@ FROM node:buster -RUN yarn cache clean +RUN yarn cache clean gancio RUN yarn global add --latest --silent https://gancio.org/latest.tgz 2> /dev/null ADD entrypoint.sh / diff --git a/docs/install/debian.md b/docs/install/debian.md index b61c84d8..3621a3c9 100644 --- a/docs/install/debian.md +++ b/docs/install/debian.md @@ -64,6 +64,7 @@ sudo pm2 startup -u gancio ## Upgrade ```bash +sudo yarn cache clean gancio sudo yarn global add --silent {{site.url}}/latest.tgz 2> /dev/null sudo service pm2 restart ``` From e2227010f5efb0e148c45078092c9f4d77955cee Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 23:24:50 +0200 Subject: [PATCH 09/11] 12 hour clock selection, fix #119 --- pages/add/DateInput.vue | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pages/add/DateInput.vue b/pages/add/DateInput.vue index 4a0790d3..62372407 100644 --- a/pages/add/DateInput.vue +++ b/pages/add/DateInput.vue @@ -7,8 +7,10 @@ v-col(cols=12) v-btn(v-if='settings.allow_recurrent_event' value='recurrent' label="recurrent") {{$t('event.recurrent')}} p {{$t(`event.${type}_description`)}} + v-btn-toggle.v-col-6.flex-column.flex-sm-row(v-if='type === "recurrent"' color='primary' :value='value.recurrent.frequency' @change='fq => change("frequency", fq)') v-btn(v-for='f in frequencies' :key='f.value' :value='f.value') {{f.text}} + client-only .datePicker.mt-3 v-input(:value='fromDate' @@ -43,11 +45,6 @@ v-col(cols=12) :value='dueHour' clearable :items='hourList' @change='hr => change("dueHour", hr)') - //- div.col-md-12(v-if='isRecurrent') - //- p(v-if='value.recurrent.frequency !== "1m" && value.recurrent.frequency !== "2m"') 🡲 {{whenPatterns}} - //- v-btn-toggle(v-else dense group v-model='value.recurrent.type' color='primary') - //- v-btn(text link v-for='whenPattern in whenPatterns' :value='whenPattern.key' :key='whenPatterns.key') {{whenPattern.label}} - List(v-if='type==="normal" && todayEvents.length' :events='todayEvents' :title='$t("event.same_day")') @@ -66,12 +63,7 @@ export default { data () { return { type: 'normal', - time: { start: null, end: null }, - fromDateMenu: null, - dueDateMenu: null, - date: null, page: null, - frequency: '', events: [], frequencies: [ { value: '1w', text: this.$t('event.each_week') }, @@ -108,9 +100,11 @@ export default { const hourList = [] const pad = '00' for (let h = 0; h < 24; h++) { - hourList.push(`${(pad + h).slice(-pad.length)}:00`) - hourList.push(`${(pad + h).slice(-pad.length)}:30`) + const paddedHour = (pad + h).slice(-2) + hourList.push({ text: paddedHour + ':00 ' + (h <= 12 ? 'AM' : 'PM'), value: paddedHour + ':00' }) + hourList.push({ text: paddedHour + ':30 ' + (h <= 12 ? 'AM' : 'PM'), value: paddedHour + ':30' }) } + return hourList }, whenPatterns () { @@ -178,7 +172,7 @@ export default { if (what === 'type') { if (typeof value === 'undefined') { this.type = 'normal' } if (value === 'recurrent') { - this.$emit('input', { ...this.value, recurrent: {}, multidate: false }) + this.$emit('input', { ...this.value, recurrent: { frequency: '1w' }, multidate: false }) } else if (value === 'multidate') { this.$emit('input', { ...this.value, recurrent: null, multidate: true }) } else { From e18b56447af838dcbd1e3382203c30f9b4fc7a8e Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 23:35:16 +0200 Subject: [PATCH 10/11] 12 hour clock selection, fix #119 --- pages/add/DateInput.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/add/DateInput.vue b/pages/add/DateInput.vue index 62372407..41cc5dc8 100644 --- a/pages/add/DateInput.vue +++ b/pages/add/DateInput.vue @@ -98,11 +98,11 @@ export default { }, hourList () { const hourList = [] - const pad = '00' + const leftPad = h => ('00' + h).slice(-2) for (let h = 0; h < 24; h++) { - const paddedHour = (pad + h).slice(-2) - hourList.push({ text: paddedHour + ':00 ' + (h <= 12 ? 'AM' : 'PM'), value: paddedHour + ':00' }) - hourList.push({ text: paddedHour + ':30 ' + (h <= 12 ? 'AM' : 'PM'), value: paddedHour + ':30' }) + const textHour = leftPad(h < 13 ? h : h - 12) + hourList.push({ text: textHour + ':00 ' + (h <= 12 ? 'AM' : 'PM'), value: leftPad(h) + ':00' }) + hourList.push({ text: textHour + ':30 ' + (h <= 12 ? 'AM' : 'PM'), value: leftPad(h) + ':30' }) } return hourList From 64e67eeba170b07ccea1d89299032807ed8b1d31 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 15 Jul 2021 23:40:58 +0200 Subject: [PATCH 11/11] improve a11y --- components/Calendar.vue | 1 + components/Footer.vue | 2 +- components/Nav.vue | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/Calendar.vue b/components/Calendar.vue index 4e49ebfa..327241ac 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -8,6 +8,7 @@ :locale='$i18n.locale' :attributes='attributes' transition='fade' + aria-label='Calendar' is-expanded is-inline @dayclick='click') diff --git a/components/Footer.vue b/components/Footer.vue index 86df34a3..a31c28fa 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -1,5 +1,5 @@