diff --git a/.drone.yml b/.drone.yml index 27e99bade..8a7c18c02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -202,7 +202,6 @@ steps: YARN_CACHE_FOLDER: .cache/yarn/ commands: - yarn --frozen-lockfile --network-timeout 100000 - - npx browserslist@latest --update-db - yarn run lint - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json" - yarn run build diff --git a/package.json b/package.json index d41e8b0e0..2f1f65045 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,11 @@ "dependencies": { "@github/hotkey": "1.6.0", "@kyvg/vue3-notification": "2.3.4", - "@sentry/tracing": "6.16.0", - "@sentry/vue": "6.16.0", - "@vue/compat": "3.2.24", - "@vueuse/core": "7.2.2", + "@sentry/tracing": "6.16.1", + "@sentry/vue": "6.16.1", + "@vue/compat": "3.2.26", + "@vueuse/core": "7.3.0", + "@vueuse/router": "7.3.0", "bulma-css-variables": "0.9.33", "camel-case": "4.1.2", "codemirror": "5.64.0", @@ -36,12 +37,12 @@ "is-touch-device": "1.0.1", "lodash.clonedeep": "4.5.0", "lodash.debounce": "4.0.8", - "marked": "4.0.6", + "marked": "4.0.7", "register-service-worker": "1.7.2", "snake-case": "3.0.4", "ufo": "0.7.9", "v-tooltip": "4.0.0-beta.2", - "vue": "3.2.24", + "vue": "3.2.26", "vue-advanced-cropper": "2.7.0", "vue-drag-resize": "2.0.3", "vue-flatpickr-component": "9.0.5", @@ -59,34 +60,35 @@ "@fortawesome/vue-fontawesome": "3.0.0-5", "@types/flexsearch": "0.7.2", "@types/jest": "27.0.3", - "@typescript-eslint/eslint-plugin": "5.6.0", - "@typescript-eslint/parser": "5.6.0", + "@typescript-eslint/eslint-plugin": "5.7.0", + "@typescript-eslint/parser": "5.7.0", "@vitejs/plugin-legacy": "1.6.4", - "@vitejs/plugin-vue": "1.10.2", + "@vitejs/plugin-vue": "2.0.0", "@vue/eslint-config-typescript": "9.1.0", "autoprefixer": "10.4.0", "axios": "0.24.0", - "browserslist": "4.18.1", - "cypress": "8.7.0", + "browserslist": "4.19.0", + "caniuse-lite": "1.0.30001286", + "cypress": "9.1.1", "cypress-file-upload": "5.0.8", - "esbuild": "0.14.2", + "esbuild": "0.14.3", "eslint": "8.4.1", "eslint-plugin-vue": "8.2.0", "express": "4.17.1", "faker": "5.5.3", - "jest": "27.4.3", - "netlify-cli": "8.0.16", - "postcss": "8.4.4", + "jest": "27.4.5", + "netlify-cli": "8.1.1", + "postcss": "8.4.5", "postcss-preset-env": "7.0.1", - "rollup": "2.60.2", + "rollup": "2.61.1", "rollup-plugin-visualizer": "5.5.2", - "sass": "1.44.0", + "sass": "1.45.0", "slugify": "1.6.3", "ts-jest": "27.1.1", - "typescript": "4.5.2", - "vite": "2.7.1", - "vite-plugin-pwa": "0.11.10", - "vite-svg-loader": "3.1.0", + "typescript": "4.5.4", + "vite": "2.7.2", + "vite-plugin-pwa": "0.11.11", + "vite-svg-loader": "3.1.1", "vue-tsc": "0.29.8", "wait-on": "6.0.0", "workbox-cli": "6.4.2" diff --git a/src/App.vue b/src/App.vue index 5eacb532c..823fa284d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,116 +1,96 @@ - diff --git a/src/components/misc/pagination.vue b/src/components/misc/pagination.vue index e0a7362df..4379af395 100644 --- a/src/components/misc/pagination.vue +++ b/src/components/misc/pagination.vue @@ -21,11 +21,11 @@
  • {{ p.number }} @@ -98,13 +98,13 @@ const pages = computed(() => createPagination(props.totalPages, props.currentPag \ No newline at end of file diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue index 9dabce80c..f5011741e 100644 --- a/src/components/tasks/partials/listSearch.vue +++ b/src/components/tasks/partials/listSearch.vue @@ -16,60 +16,54 @@ - \ No newline at end of file diff --git a/src/i18n/lang/cs-CZ.json b/src/i18n/lang/cs-CZ.json index bdba5a2af..f58df4749 100644 --- a/src/i18n/lang/cs-CZ.json +++ b/src/i18n/lang/cs-CZ.json @@ -36,6 +36,7 @@ "password": "Heslo", "passwordRepeat": "Zopakovat heslo", "passwordPlaceholder": "např. • • • • • • • •", + "forgotPassword": "Forgot your password?", "resetPassword": "Obnovit heslo", "resetPasswordAction": "Poslat odkaz na obnovení hesla", "resetPasswordSuccess": "Zkontrolujte doručenou poštu! Měli byste mít e-mail s pokyny, jak obnovit své heslo.", @@ -473,7 +474,8 @@ "download": "Stáhnout", "showMenu": "Zobrazit nabídku", "hideMenu": "Skrýt nabídku", - "forExample": "Například:" + "forExample": "Například:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Obnovit barvu", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "např. https://localhost:3456", "change": "změnit", - "signInOn": "Přihlaste se ke svému účtu Vikunja na {0}", + "use": "Using Vikunja installation at {0}", "error": "Nelze najít nebo použít instalaci Vikunja na \"{domain}\". Zkuste prosím jinou url.", "success": "Pomocí instalace Vikunja na \"{domain}\".", "urlRequired": "Je vyžadována adresa URL." diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json index 631d14162..7f3d47322 100644 --- a/src/i18n/lang/de-DE.json +++ b/src/i18n/lang/de-DE.json @@ -36,6 +36,7 @@ "password": "Passwort", "passwordRepeat": "Gib dein Passwort erneut ein", "passwordPlaceholder": "z.B. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Setze dein Passwort zurück", "resetPasswordAction": "Sende mir einen Link zum Zurücksetzen des Passworts", "resetPasswordSuccess": "Prüfe deinen Posteingang! Du solltest eine E-Mail mit Anweisungen zum Zurücksetzen deines Passworts erhalten haben.", @@ -473,7 +474,8 @@ "download": "Herunterladen", "showMenu": "Menü anzeigen", "hideMenu": "Menü ausblenden", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Farbe zurücksetzen", @@ -811,7 +813,7 @@ "url": "Vikunja-URL", "urlPlaceholder": "z.B. https://localhost:3456", "change": "ändern", - "signInOn": "Melde dich bei deinem Vikunja-Account auf {0} an", + "use": "Using Vikunja installation at {0}", "error": "Konnte keine Vikunja-Installation unter „{domain}“ finden oder verwenden. Bitte probiere eine andere Url.", "success": "Verwende die Vikunja-Installation unter „{domain}“.", "urlRequired": "Eine Url ist erforderlich." diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json index e10df3b68..6c3bb1004 100644 --- a/src/i18n/lang/de-swiss.json +++ b/src/i18n/lang/de-swiss.json @@ -36,6 +36,7 @@ "password": "Passwort", "passwordRepeat": "Gib dis Passwort nomal iih", "passwordPlaceholder": "z.B. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Setz diis Passwort zrugg", "resetPasswordAction": "Schick mir en Passwort zruggsetz Link", "resetPasswordSuccess": "Prüfe deinen Posteingang! Du solltest eine E-Mail mit Anweisungen zum Zurücksetzen deines Passworts erhalten haben.", @@ -473,7 +474,8 @@ "download": "Herunterladen", "showMenu": "Menü anzeigen", "hideMenu": "Menü ausblenden", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Farb zruggsetze", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "z.B. https://localhost:3456", "change": "ändere", - "signInOn": "Dich i diin Vikunja-Account Iihloge uf {0}", + "use": "Using Vikunja installation at {0}", "error": "Konnte keine Vikunja-Installation unter „{domain}“ finden oder verwenden. Bitte probiere eine andere Url.", "success": "Benutze d'Vikunja Installation uf \"{domain}\".", "urlRequired": "Eine Url ist erforderlich." diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/es-ES.json +++ b/src/i18n/lang/es-ES.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json index 7a74847b5..961fd8ae3 100644 --- a/src/i18n/lang/fr-FR.json +++ b/src/i18n/lang/fr-FR.json @@ -36,6 +36,7 @@ "password": "Mot de passe", "passwordRepeat": "Retape ton mot de passe", "passwordPlaceholder": "p. ex. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Réinitialiser ton mot de passe", "resetPasswordAction": "M’envoyer un lien de réinitialisation du mot de passe", "resetPasswordSuccess": "Vérifie ta boîte de réception ! Tu devrais avoir un courriel contenant les instructions sur la manière de réinitialiser ton mot de passe.", @@ -473,7 +474,8 @@ "download": "Télécharger", "showMenu": "Afficher le menu", "hideMenu": "Masquer le menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Réinitialiser la couleur", @@ -811,7 +813,7 @@ "url": "URL Vikunja", "urlPlaceholder": "Par exemple : https://localhost:3456", "change": "changer", - "signInOn": "Se connecter à ton compte Vikunja sur {0}", + "use": "Using Vikunja installation at {0}", "error": "Impossible de trouver ou d'utiliser l'installation de Vikunja sur « {domain} ». Veuillez essayer une autre URL.", "success": "Utilisation de l’installation Vikunja à « {domain} ».", "urlRequired": "Une URL est requise." diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json index e80271390..f1ed1d16b 100644 --- a/src/i18n/lang/it-IT.json +++ b/src/i18n/lang/it-IT.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Digita di nuovo la tua password", "passwordPlaceholder": "es. ••••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reimposta la tua password", "resetPasswordAction": "Inviami il link per reimpostare la password", "resetPasswordSuccess": "Controlla la tua casella di posta! Dovresti avere un'e-mail con le istruzioni su come reimpostare la password.", @@ -473,7 +474,8 @@ "download": "Scarica", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Ripristina Colore", @@ -811,7 +813,7 @@ "url": "URL Vikunja", "urlPlaceholder": "es. http://localhost:8080", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/nl-NL.json +++ b/src/i18n/lang/nl-NL.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/pt-BR.json +++ b/src/i18n/lang/pt-BR.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/pt-PT.json +++ b/src/i18n/lang/pt-PT.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/ro-RO.json +++ b/src/i18n/lang/ro-RO.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json index 6d79047db..68df4df3d 100644 --- a/src/i18n/lang/ru-RU.json +++ b/src/i18n/lang/ru-RU.json @@ -36,6 +36,7 @@ "password": "Пароль", "passwordRepeat": "Пароль ещё раз", "passwordPlaceholder": "напр. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Сбросить пароль", "resetPasswordAction": "Отправить ссылку на сброс пароля", "resetPasswordSuccess": "Проверь свою почту! Там должно быть письмо с инструкциями, как сбросить пароль.", @@ -473,7 +474,8 @@ "download": "Скачать", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Сбросить цвет", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "напр. https://localhost:3456", "change": "изменить", - "signInOn": "Войди в свой аккаунт Vikunja на {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Используется Vikunja на \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/sv-SE.json b/src/i18n/lang/sv-SE.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/sv-SE.json +++ b/src/i18n/lang/sv-SE.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/tr-TR.json b/src/i18n/lang/tr-TR.json index 09714acd6..56a4bd113 100644 --- a/src/i18n/lang/tr-TR.json +++ b/src/i18n/lang/tr-TR.json @@ -36,6 +36,7 @@ "password": "Password", "passwordRepeat": "Retype your password", "passwordPlaceholder": "e.g. •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset your password", "resetPasswordAction": "Send me a password reset link", "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.", @@ -473,7 +474,8 @@ "download": "Download", "showMenu": "Show the menu", "hideMenu": "Hide the menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Reset Color", @@ -811,7 +813,7 @@ "url": "Vikunja URL", "urlPlaceholder": "eg. https://localhost:3456", "change": "change", - "signInOn": "Sign in to your Vikunja account on {0}", + "use": "Using Vikunja installation at {0}", "error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.", "success": "Using Vikunja installation at \"{domain}\".", "urlRequired": "A url is required." diff --git a/src/i18n/lang/vi-VN.json b/src/i18n/lang/vi-VN.json index 9453e1a28..d9609639e 100644 --- a/src/i18n/lang/vi-VN.json +++ b/src/i18n/lang/vi-VN.json @@ -36,6 +36,7 @@ "password": "Mật khẩu", "passwordRepeat": "Nhập lại mật khẩu", "passwordPlaceholder": "ví dụ: •••••••••••", + "forgotPassword": "Forgot your password?", "resetPassword": "Reset mật khẩu của bạn", "resetPasswordAction": "Gửi cho tôi liên kết reset mật khẩu", "resetPasswordSuccess": "Kiểm tra hộp thư của bạn! Bạn sẽ nhận một e-mail với hướng dẫn reset mật khẩu của mình.", @@ -473,7 +474,8 @@ "download": "Tải về", "showMenu": "Hiển thị menu", "hideMenu": "Ẩn menu", - "forExample": "For example:" + "forExample": "For example:", + "welcomeBack": "Welcome Back!" }, "input": { "resetColor": "Đặt lại màu", @@ -811,7 +813,7 @@ "url": "URL Vikunja", "urlPlaceholder": "ví dụ: https://localhost:3456", "change": "thay đổi", - "signInOn": "Đăng nhập vào tài khoản Vikunia tại {0}", + "use": "Using Vikunja installation at {0}", "error": "Không thể tìm thấy hoặc sử dụng cài đặt Vikunja tại \"{domain}\". Vui lòng thử một url khác.", "success": "Sử dụng cài đặt Vikunja tại \"{domain}\".", "urlRequired": "Cần có một url." diff --git a/src/router/index.js b/src/router/index.js index 1f876f880..cb049928b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -105,21 +105,33 @@ const router = createRouter({ path: '/login', name: 'user.login', component: LoginComponent, + meta: { + title: 'user.auth.login', + }, }, { path: '/get-password-reset', name: 'user.password-reset.request', component: GetPasswordResetComponent, + meta: { + title: 'user.auth.resetPassword', + }, }, { path: '/password-reset', name: 'user.password-reset.reset', component: PasswordResetComponent, + meta: { + title: 'user.auth.resetPassword', + }, }, { path: '/register', name: 'user.register', component: RegisterComponent, + meta: { + title: 'user.auth.register', + }, }, { path: '/user/settings', diff --git a/src/services/abstractService.js b/src/services/abstractService.js index 7ff84304e..a28334f3f 100644 --- a/src/services/abstractService.js +++ b/src/services/abstractService.js @@ -28,7 +28,7 @@ export default class AbstractService { /** * The abstract constructor. - * @param paths An object with all paths. Default values are specified above. + * @param [paths] An object with all paths. Default values are specified above. */ constructor(paths) { this.http = axios.create({ diff --git a/src/views/Home.vue b/src/views/Home.vue index 17eb6b317..7a8fce5eb 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -3,7 +3,7 @@

    {{ $t(`home.welcome${welcome}`, {username: userInfo.name !== '' ? userInfo.name : userInfo.username}) }}!

    - + {{ $t('user.deletion.scheduled', { date: formatDateShort(deletionScheduledAt), diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue index 165447d56..41a667394 100644 --- a/src/views/sharing/LinkSharingAuth.vue +++ b/src/views/sharing/LinkSharingAuth.vue @@ -16,83 +16,101 @@ :placeholder="$t('user.auth.passwordPlaceholder')" v-model="password" v-focus - @keyup.enter.prevent="auth" + @keyup.enter.prevent="authenticate()" /> - + {{ $t('user.auth.login') }} - + {{ errorMessage }} - + - diff --git a/src/views/tasks/ShowTasksInRange.vue b/src/views/tasks/ShowTasksInRange.vue index a8a518a52..54a2ced94 100644 --- a/src/views/tasks/ShowTasksInRange.vue +++ b/src/views/tasks/ShowTasksInRange.vue @@ -7,7 +7,7 @@ -