Compare commits
112
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
186e94505a | ||
|
|
cbbc4c0372 | ||
|
|
c7e708cf7d | ||
|
|
6d3a30c799 | ||
|
|
4c972e1bc4 | ||
|
|
144571e448 | ||
|
|
a24c64da8f | ||
|
|
2faa03757c | ||
|
|
9cef2c4c97 | ||
|
|
ea6b141d42 | ||
|
|
c0877dd0ab | ||
|
|
5c31ccaddd | ||
|
|
47538ca810 | ||
|
|
abae6f05e0 | ||
|
|
45ec1a4c47 | ||
|
|
77d1616fea | ||
|
|
b5cb98498a | ||
|
|
70e027a84e | ||
|
|
289bb73e9e | ||
|
|
8bada3e967 | ||
|
|
1863b06d0c | ||
|
|
d630586f63 | ||
|
|
13002d77f5 | ||
|
|
a61e2d064d | ||
|
|
e1f78462e5 | ||
|
|
8a6f3b34f9 | ||
|
|
e7b261f84e | ||
|
|
94fb88ed58 | ||
|
|
e70fec3ddb | ||
|
|
bb1456e1aa | ||
|
|
1f4d097beb | ||
|
|
e00ce92716 | ||
|
|
b7fc29327a | ||
|
|
abb4126bce | ||
|
|
e9a932e0f0 | ||
|
|
9d985f7e96 | ||
|
|
811a933cd3 | ||
|
|
c118e788b8 | ||
|
|
2522cffa61 | ||
|
|
33b9917c7d | ||
|
|
845fe8ea88 | ||
|
|
5a0cee956e | ||
|
|
173473fb5a | ||
|
|
79071a1909 | ||
|
|
140765ad20 | ||
|
|
000f1adb75 | ||
|
|
0c3ef89d1a | ||
|
|
1ad4ba10a7 | ||
|
|
8ba9ded3e2 | ||
|
|
68896c69cb | ||
|
|
e1bf797709 | ||
|
|
83732ec26d | ||
|
|
23a3f78337 | ||
|
|
d0059d0292 | ||
|
|
b41cf7241a | ||
|
|
f144a0f11e | ||
|
|
8bf6251a70 | ||
|
|
54f9c5c6d4 | ||
|
|
76cb5ff9a4 | ||
|
|
1db99dba47 | ||
|
|
017fa1b5af | ||
|
|
7e66f3ec6b | ||
|
|
748fa2b798 | ||
|
|
304de78c48 | ||
|
|
3d5d17336e | ||
|
|
b181fff729 | ||
|
|
cc4fd97dd8 | ||
|
|
c9a9781bc7 | ||
|
|
ae187d7a14 | ||
|
|
f428c8a017 | ||
|
|
f777a1dcd3 | ||
|
|
9e5994105a | ||
|
|
8cec9995e3 | ||
|
|
466d0a73a9 | ||
|
|
00441ee8b1 | ||
|
|
c92f6c5ee5 | ||
|
|
eab72d4594 | ||
|
|
91e4bad544 | ||
|
|
fbc48c43f5 | ||
|
|
a49c06d408 | ||
|
|
d308583b9e | ||
|
|
2ba9d1c9fe | ||
|
|
13aaece2e0 | ||
|
|
57cb9a3d19 | ||
|
|
746c3359a5 | ||
|
|
6dc2348fbe | ||
|
|
d88295f31f | ||
|
|
42f5cdf2d9 | ||
|
|
b8fd5dde3b | ||
|
|
3d727e6856 | ||
|
|
a6644d9c89 | ||
|
|
c4c8017605 | ||
|
|
6e417d92ae | ||
|
|
d22880b442 | ||
|
|
a8a746e302 | ||
|
|
6ee6b2ffee | ||
|
|
367530bf2d | ||
|
|
40e9b48564 | ||
|
|
af50145705 | ||
|
|
297817d3f8 | ||
|
|
0826d72e38 | ||
|
|
6e55330b6e | ||
|
|
f16cd8d813 | ||
|
|
70f1b4f28b | ||
|
|
2ab172cfeb | ||
|
|
ae87348882 | ||
|
|
ea2215a615 | ||
|
|
064aff56e3 | ||
|
|
63839805df | ||
|
|
aa43f4fa93 | ||
|
|
24e4284e3b | ||
|
|
c97fec9fed |
+12
-12
@@ -363,7 +363,7 @@ steps:
|
||||
- api-build
|
||||
|
||||
- name: frontend-dependencies
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -377,7 +377,7 @@ steps:
|
||||
# - restore-cache
|
||||
|
||||
- name: frontend-lint
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -389,7 +389,7 @@ steps:
|
||||
- frontend-dependencies
|
||||
|
||||
- name: frontend-build-prod
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -401,7 +401,7 @@ steps:
|
||||
- frontend-dependencies
|
||||
|
||||
- name: frontend-test-unit
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
commands:
|
||||
- cd frontend
|
||||
@@ -412,7 +412,7 @@ steps:
|
||||
|
||||
- name: frontend-typecheck
|
||||
failure: ignore
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -543,7 +543,7 @@ steps:
|
||||
- git fetch --tags
|
||||
|
||||
- name: frontend-dependencies
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -555,7 +555,7 @@ steps:
|
||||
- pnpm install --fetch-timeout 100000
|
||||
|
||||
- name: frontend-build
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -763,7 +763,7 @@ steps:
|
||||
|
||||
# Build os packages and push it to our bucket
|
||||
- name: build-os-packages-unstable
|
||||
image: goreleaser/nfpm:v2.41.0
|
||||
image: goreleaser/nfpm:v2.41.2
|
||||
pull: always
|
||||
commands:
|
||||
- apk add git go
|
||||
@@ -779,7 +779,7 @@ steps:
|
||||
depends_on: [ after-build-compress ]
|
||||
|
||||
- name: build-os-packages-version
|
||||
image: goreleaser/nfpm:v2.41.0
|
||||
image: goreleaser/nfpm:v2.41.2
|
||||
pull: always
|
||||
commands:
|
||||
- apk add git go
|
||||
@@ -946,7 +946,7 @@ steps:
|
||||
- git fetch --tags
|
||||
|
||||
- name: build
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -1007,7 +1007,7 @@ steps:
|
||||
- git fetch --tags
|
||||
|
||||
- name: build
|
||||
image: node:22.11.0-alpine
|
||||
image: node:22.13.0-alpine
|
||||
pull: always
|
||||
environment:
|
||||
PNPM_CACHE_FOLDER: .cache/pnpm
|
||||
@@ -1398,6 +1398,6 @@ steps:
|
||||
- failure
|
||||
---
|
||||
kind: signature
|
||||
hmac: 7fc1cb2b0cfdc84d7eda25ce75dd56446fc01060c03af89c91043f095e92a2b3
|
||||
hmac: 298674d9b9d8618eef47969038fd4d7516112ecbd8a4d899ec3751d997a34ce4
|
||||
|
||||
...
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: Bug Report
|
||||
description: Found something you weren't expecting? Report it here!
|
||||
labels: kind/bug
|
||||
type: Bug
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
@@ -49,4 +49,4 @@ body:
|
||||
id: screenshots
|
||||
attributes:
|
||||
label: Screenshots
|
||||
description: If this issue involves the Web Interface, please provide one or more screenshots
|
||||
description: If this issue involves the Web Interface, please provide one or more screenshots
|
||||
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
All releases can be found on https://code.vikunja.io/vikunja/releases.
|
||||
|
||||
## [0.24.6] - 2024-12-22
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* *(export)* Update only current user export file id
|
||||
|
||||
## [0.24.5] - 2024-11-21
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM --platform=$BUILDPLATFORM node:22.11.0-alpine AS frontendbuilder
|
||||
FROM --platform=$BUILDPLATFORM node:22.13.0-alpine AS frontendbuilder
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
[](https://drone.kolaente.de/vikunja/vikunja)
|
||||
[](LICENSE)
|
||||
[](https://vikunja.io/docs/installing)
|
||||
[](https://vikunja.io/docs/installing)
|
||||
[](https://hub.docker.com/r/vikunja/vikunja/)
|
||||
[](https://try.vikunja.io/api/v1/docs)
|
||||
[](https://goreportcard.com/report/kolaente.dev/vikunja/vikunja)
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"electron": "33.2.1",
|
||||
"electron": "34.0.0",
|
||||
"electron-builder": "25.1.8"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
Generated
+5
-5
@@ -16,8 +16,8 @@ importers:
|
||||
version: 4.21.2
|
||||
devDependencies:
|
||||
electron:
|
||||
specifier: 33.2.1
|
||||
version: 33.2.1
|
||||
specifier: 34.0.0
|
||||
version: 34.0.0
|
||||
electron-builder:
|
||||
specifier: 25.1.8
|
||||
version: 25.1.8(electron-builder-squirrel-windows@24.13.3)
|
||||
@@ -586,8 +586,8 @@ packages:
|
||||
electron-publish@25.1.7:
|
||||
resolution: {integrity: sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==}
|
||||
|
||||
electron@33.2.1:
|
||||
resolution: {integrity: sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==}
|
||||
electron@34.0.0:
|
||||
resolution: {integrity: sha512-fpaPb0lifoUJ6UJa4Lk8/0B2Ku/xDZWdc1Gkj67jbygTCrvSon0qquju6Ltx1Kz23GRqqlIHXiy9EvrjpY7/Wg==}
|
||||
engines: {node: '>= 12.20.55'}
|
||||
hasBin: true
|
||||
|
||||
@@ -2442,7 +2442,7 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
electron@33.2.1:
|
||||
electron@34.0.0:
|
||||
dependencies:
|
||||
'@electron/get': 2.0.3
|
||||
'@types/node': 20.12.7
|
||||
|
||||
@@ -11,6 +11,8 @@ stats.html
|
||||
node_modules
|
||||
.DS_Store
|
||||
dist
|
||||
dist-dev
|
||||
dist-test
|
||||
coverage
|
||||
*.zip
|
||||
.vite/
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
22.11.0
|
||||
22.13.0
|
||||
+2
-18
@@ -2,30 +2,14 @@
|
||||
|
||||
> The todo app to organize your life.
|
||||
|
||||
[](https://drone.kolaente.de/vikunja/vikunja)
|
||||
[](LICENSE)
|
||||
[](https://dl.vikunja.io)
|
||||
[](https://crowdin.com/project/vikunja)
|
||||
|
||||
This is the web frontend for Vikunja, written in Vue.js.
|
||||
|
||||
Take a look at [our roadmap](https://my.vikunja.cloud/share/UrdhKPqumxDXUbYpEGJLSIyNTwAnbBzVlwdDpRbv/auth) (hosted on Vikunja!) for a list of things we're currently working on!
|
||||
|
||||
## Security Reports
|
||||
|
||||
If you find any security-related issues you don't want to disclose publicly, please use [the contact information on our website](https://vikunja.io/contact/#security).
|
||||
|
||||
## Docker
|
||||
|
||||
There is a [docker image available](https://hub.docker.com/r/vikunja/vikunja) with support for http/2 and aggressive caching enabled.
|
||||
In order to build it from sources run the command below. (Docker >= v19.03)
|
||||
|
||||
```shell
|
||||
export DOCKER_BUILDKIT=1
|
||||
docker build -t vikunja/frontend .
|
||||
```
|
||||
|
||||
Refer to [multi-platform documentation](https://docs.docker.com/build/building/multi-platform/) in order to build for different platforms.
|
||||
For general information about the project, refer to the top-level readme of this repo.
|
||||
|
||||
## Project setup
|
||||
|
||||
@@ -36,7 +20,7 @@ pnpm install
|
||||
### Compiles and hot-reloads for development
|
||||
|
||||
```shell
|
||||
pnpm run serve
|
||||
pnpm run dev
|
||||
```
|
||||
|
||||
### Compiles and minifies for production
|
||||
|
||||
Vendored
+1
-4
@@ -1,4 +1 @@
|
||||
declare module 'postcss-easing-gradients' {
|
||||
import postcssEasingGradients from 'postcss-easing-gradients'
|
||||
export default postcssEasingGradients
|
||||
}
|
||||
declare module 'postcss-easing-gradients';
|
||||
|
||||
+54
-69
@@ -13,7 +13,7 @@
|
||||
},
|
||||
"homepage": "https://vikunja.io/",
|
||||
"funding": "https://opencollective.com/vikunja",
|
||||
"packageManager": "pnpm@9.15.0",
|
||||
"packageManager": "pnpm@9.15.4",
|
||||
"keywords": [
|
||||
"todo",
|
||||
"productivity",
|
||||
@@ -30,7 +30,7 @@
|
||||
"preview:dev": "vite preview --outDir dist-dev --mode development --port 4173",
|
||||
"preview:test": "vite preview --port 4173 --outDir dist-test",
|
||||
"build": "vite build && workbox copyLibraries dist/",
|
||||
"build:test": "vite build --outDir dist-test && workbox copyLibraries dist-dev/",
|
||||
"build:test": "vite build --outDir dist-test && workbox copyLibraries dist-test/",
|
||||
"build:dev": "vite build --mode development --outDir dist-dev/",
|
||||
"lint": "eslint 'src/**/*.{js,ts,vue}'",
|
||||
"lint:fix": "pnpm run lint --fix",
|
||||
@@ -55,46 +55,31 @@
|
||||
"@fortawesome/vue-fontawesome": "3.0.8",
|
||||
"@github/hotkey": "3.1.1",
|
||||
"@infectoone/vue-ganttastic": "2.3.2",
|
||||
"@intlify/unplugin-vue-i18n": "6.0.1",
|
||||
"@intlify/unplugin-vue-i18n": "6.0.3",
|
||||
"@kyvg/vue3-notification": "3.4.1",
|
||||
"@sentry/tracing": "7.114.0",
|
||||
"@sentry/vue": "8.47.0",
|
||||
"@tiptap/core": "2.10.4",
|
||||
"@tiptap/extension-blockquote": "2.10.4",
|
||||
"@tiptap/extension-bold": "2.10.4",
|
||||
"@tiptap/extension-bullet-list": "2.10.4",
|
||||
"@tiptap/extension-code": "2.10.4",
|
||||
"@tiptap/extension-code-block": "2.10.4",
|
||||
"@tiptap/extension-code-block-lowlight": "2.10.4",
|
||||
"@tiptap/extension-document": "2.10.4",
|
||||
"@tiptap/extension-dropcursor": "2.10.4",
|
||||
"@tiptap/extension-gapcursor": "2.10.4",
|
||||
"@tiptap/extension-hard-break": "2.10.4",
|
||||
"@tiptap/extension-heading": "2.10.4",
|
||||
"@tiptap/extension-history": "2.10.4",
|
||||
"@tiptap/extension-horizontal-rule": "2.10.4",
|
||||
"@tiptap/extension-image": "2.10.4",
|
||||
"@tiptap/extension-italic": "2.10.4",
|
||||
"@tiptap/extension-link": "2.10.4",
|
||||
"@tiptap/extension-list-item": "2.10.4",
|
||||
"@tiptap/extension-ordered-list": "2.10.4",
|
||||
"@tiptap/extension-paragraph": "2.10.4",
|
||||
"@tiptap/extension-placeholder": "2.10.4",
|
||||
"@tiptap/extension-strike": "2.10.4",
|
||||
"@tiptap/extension-table": "2.10.4",
|
||||
"@tiptap/extension-table-cell": "2.10.4",
|
||||
"@tiptap/extension-table-header": "2.10.4",
|
||||
"@tiptap/extension-table-row": "2.10.4",
|
||||
"@tiptap/extension-task-item": "2.10.4",
|
||||
"@tiptap/extension-task-list": "2.10.4",
|
||||
"@tiptap/extension-text": "2.10.4",
|
||||
"@tiptap/extension-typography": "2.10.4",
|
||||
"@tiptap/extension-underline": "2.10.4",
|
||||
"@tiptap/pm": "2.10.4",
|
||||
"@tiptap/suggestion": "2.10.4",
|
||||
"@tiptap/vue-3": "2.10.4",
|
||||
"@vueuse/core": "12.0.0",
|
||||
"@vueuse/router": "12.0.0",
|
||||
"@sentry/tracing": "7.120.3",
|
||||
"@sentry/vue": "8.50.0",
|
||||
"@tiptap/core": "2.11.2",
|
||||
"@tiptap/extension-code-block": "2.11.2",
|
||||
"@tiptap/extension-code-block-lowlight": "2.11.2",
|
||||
"@tiptap/extension-hard-break": "2.11.2",
|
||||
"@tiptap/extension-image": "2.11.2",
|
||||
"@tiptap/extension-link": "2.11.2",
|
||||
"@tiptap/extension-placeholder": "2.11.2",
|
||||
"@tiptap/extension-table": "2.11.2",
|
||||
"@tiptap/extension-table-cell": "2.11.2",
|
||||
"@tiptap/extension-table-header": "2.11.2",
|
||||
"@tiptap/extension-table-row": "2.11.2",
|
||||
"@tiptap/extension-task-item": "2.11.2",
|
||||
"@tiptap/extension-task-list": "2.11.2",
|
||||
"@tiptap/extension-typography": "2.11.2",
|
||||
"@tiptap/extension-underline": "2.11.2",
|
||||
"@tiptap/pm": "2.11.2",
|
||||
"@tiptap/starter-kit": "2.11.2",
|
||||
"@tiptap/suggestion": "2.11.2",
|
||||
"@tiptap/vue-3": "2.11.2",
|
||||
"@vueuse/core": "12.4.0",
|
||||
"@vueuse/router": "12.4.0",
|
||||
"axios": "1.7.9",
|
||||
"blurhash": "2.0.5",
|
||||
"bulma-css-variables": "0.9.33",
|
||||
@@ -108,7 +93,7 @@
|
||||
"floating-vue": "5.2.2",
|
||||
"is-touch-device": "1.0.1",
|
||||
"klona": "2.0.6",
|
||||
"lowlight": "2.9.0",
|
||||
"lowlight": "3.3.0",
|
||||
"pinia": "2.3.0",
|
||||
"register-service-worker": "1.7.2",
|
||||
"sortablejs": "1.15.6",
|
||||
@@ -118,7 +103,7 @@
|
||||
"vue": "3.5.13",
|
||||
"vue-advanced-cropper": "2.8.9",
|
||||
"vue-flatpickr-component": "11.0.5",
|
||||
"vue-i18n": "10.0.5",
|
||||
"vue-i18n": "11.0.1",
|
||||
"vue-router": "4.5.0",
|
||||
"vuemoji-picker": "0.3.2",
|
||||
"workbox-precaching": "7.3.0",
|
||||
@@ -126,50 +111,50 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@4tw/cypress-drag-drop": "2.2.5",
|
||||
"@cypress/vite-dev-server": "5.2.1",
|
||||
"@cypress/vue": "6.0.1",
|
||||
"@faker-js/faker": "9.3.0",
|
||||
"@cypress/vite-dev-server": "6.0.1",
|
||||
"@cypress/vue": "6.0.2",
|
||||
"@faker-js/faker": "9.4.0",
|
||||
"@histoire/plugin-screenshot": "0.17.17",
|
||||
"@histoire/plugin-vue": "0.17.17",
|
||||
"@tsconfig/node22": "22.0.0",
|
||||
"@tsconfig/node24": "24.0.0",
|
||||
"@types/codemirror": "5.60.15",
|
||||
"@types/flexsearch": "0.7.6",
|
||||
"@types/is-touch-device": "1.0.3",
|
||||
"@types/node": "22.10.2",
|
||||
"@types/node": "22.10.7",
|
||||
"@types/sortablejs": "1.15.8",
|
||||
"@typescript-eslint/eslint-plugin": "8.18.1",
|
||||
"@typescript-eslint/parser": "8.18.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.20.0",
|
||||
"@typescript-eslint/parser": "8.20.0",
|
||||
"@vitejs/plugin-vue": "5.2.1",
|
||||
"@vue/eslint-config-typescript": "14.1.4",
|
||||
"@vue/eslint-config-typescript": "14.3.0",
|
||||
"@vue/test-utils": "2.4.6",
|
||||
"@vue/tsconfig": "0.7.0",
|
||||
"autoprefixer": "10.4.20",
|
||||
"browserslist": "4.24.3",
|
||||
"caniuse-lite": "1.0.30001689",
|
||||
"browserslist": "4.24.4",
|
||||
"caniuse-lite": "1.0.30001695",
|
||||
"csstype": "3.1.3",
|
||||
"cypress": "13.17.0",
|
||||
"esbuild": "0.24.0",
|
||||
"eslint": "9.17.0",
|
||||
"cypress": "14.0.0",
|
||||
"esbuild": "0.24.2",
|
||||
"eslint": "9.18.0",
|
||||
"eslint-plugin-vue": "9.32.0",
|
||||
"happy-dom": "15.11.7",
|
||||
"happy-dom": "16.6.0",
|
||||
"histoire": "0.17.17",
|
||||
"postcss": "8.4.49",
|
||||
"postcss": "8.5.1",
|
||||
"postcss-easing-gradients": "3.0.1",
|
||||
"postcss-preset-env": "10.1.2",
|
||||
"rollup": "4.28.1",
|
||||
"rollup-plugin-visualizer": "5.12.0",
|
||||
"sass-embedded": "1.83.0",
|
||||
"start-server-and-test": "2.0.9",
|
||||
"typescript": "5.7.2",
|
||||
"postcss-preset-env": "10.1.3",
|
||||
"rollup": "4.30.1",
|
||||
"rollup-plugin-visualizer": "5.14.0",
|
||||
"sass-embedded": "1.83.4",
|
||||
"start-server-and-test": "2.0.10",
|
||||
"typescript": "5.7.3",
|
||||
"unplugin-inject-preload": "3.0.0",
|
||||
"vite": "6.0.3",
|
||||
"vite": "6.0.7",
|
||||
"vite-plugin-pwa": "0.21.1",
|
||||
"vite-plugin-sentry": "1.4.0",
|
||||
"vite-plugin-vue-devtools": "7.6.8",
|
||||
"vite-plugin-vue-devtools": "7.7.0",
|
||||
"vite-svg-loader": "5.1.0",
|
||||
"vitest": "2.1.8",
|
||||
"vue-tsc": "2.1.10",
|
||||
"wait-on": "8.0.1",
|
||||
"vitest": "3.0.2",
|
||||
"vue-tsc": "2.2.0",
|
||||
"wait-on": "8.0.2",
|
||||
"workbox-cli": "7.3.0"
|
||||
},
|
||||
"pnpm": {
|
||||
|
||||
Generated
+1532
-1670
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<Ready>
|
||||
<template v-if="authUser">
|
||||
<template v-if="authStore.authUser">
|
||||
<AppHeader />
|
||||
<ContentAuth />
|
||||
</template>
|
||||
<ContentLinkShare v-else-if="authLinkShare" />
|
||||
<ContentLinkShare v-else-if="authStore.authLinkShare" />
|
||||
<NoAuthWrapper v-else>
|
||||
<RouterView />
|
||||
</NoAuthWrapper>
|
||||
@@ -49,17 +49,15 @@ import DemoMode from '@/components/home/DemoMode.vue'
|
||||
const importAccountDeleteService = () => import('@/services/accountDelete')
|
||||
import {success} from '@/message'
|
||||
|
||||
const baseStore = useBaseStore()
|
||||
const authStore = useAuthStore()
|
||||
const baseStore = useBaseStore()
|
||||
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
|
||||
useBodyClass('is-touch', isTouchDevice())
|
||||
const keyboardShortcutsActive = computed(() => baseStore.keyboardShortcutsActive)
|
||||
|
||||
const authUser = computed(() => authStore.authUser)
|
||||
const authLinkShare = computed(() => authStore.authLinkShare)
|
||||
|
||||
const {t} = useI18n({useScope: 'global'})
|
||||
|
||||
// setup account deletion verification
|
||||
|
||||
@@ -112,7 +112,7 @@ import Popup from '@/components/misc/Popup.vue'
|
||||
import {DATE_RANGES} from '@/components/date/dateRanges'
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
import DatemathHelp from '@/components/date/DatemathHelp.vue'
|
||||
import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: {
|
||||
@@ -137,7 +137,7 @@ const flatPickerConfig = computed(() => ({
|
||||
enableTime: false,
|
||||
wrap: true,
|
||||
mode: 'range',
|
||||
locale: getFlatpickrLanguage(),
|
||||
locale: useFlatpickrLanguage().value,
|
||||
}))
|
||||
|
||||
const showHowItWorks = ref(false)
|
||||
|
||||
@@ -89,7 +89,7 @@ import Popup from '@/components/misc/Popup.vue'
|
||||
import {DATE_VALUES} from '@/components/date/dateRanges'
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
import DatemathHelp from '@/components/date/DatemathHelp.vue'
|
||||
import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: string | Date | null,
|
||||
@@ -112,7 +112,7 @@ const flatPickerConfig = computed(() => ({
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: false,
|
||||
wrap: true,
|
||||
locale: getFlatpickrLanguage(),
|
||||
locale: useFlatpickrLanguage().value,
|
||||
}))
|
||||
|
||||
const showHowItWorks = ref(false)
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
</h1>
|
||||
|
||||
<BaseButton
|
||||
v-if="!isEditorContentEmpty(currentProject.description)"
|
||||
:to="{ name: 'project.info', params: { projectId: currentProject.id } }"
|
||||
class="project-title-button"
|
||||
>
|
||||
@@ -124,6 +125,7 @@ import MenuButton from '@/components/home/MenuButton.vue'
|
||||
import OpenQuickActions from '@/components/misc/OpenQuickActions.vue'
|
||||
|
||||
import { getProjectTitle } from '@/helpers/getProjectTitle'
|
||||
import { isEditorContentEmpty } from '@/helpers/editorContentEmpty'
|
||||
|
||||
import { useBaseStore } from '@/stores/base'
|
||||
import { useConfigStore } from '@/stores/config'
|
||||
|
||||
@@ -82,7 +82,7 @@ import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
|
||||
import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
|
||||
import {createDateFromString} from '@/helpers/time/createDateFromString'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: Date | null | string
|
||||
@@ -114,7 +114,7 @@ const flatPickerConfig = computed(() => ({
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
inline: true,
|
||||
locale: getFlatpickrLanguage(),
|
||||
locale: useFlatpickrLanguage().value,
|
||||
}))
|
||||
|
||||
// Since flatpickr dates are strings, we need to convert them to native date objects.
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
<script setup lang="ts" generic="T extends { [id: string]: any }">
|
||||
import {computed, onBeforeUnmount, onMounted, ref, toRefs, watch, type ComponentPublicInstance} from 'vue'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
|
||||
@@ -134,15 +134,13 @@ import CustomTransition from '@/components/misc/CustomTransition.vue'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
/** The object with the value, updated every time an entry is selected */
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
modelValue: { [id: string]: any } | null
|
||||
modelValue: T | T[] | null,
|
||||
/** When true, shows a loading spinner */
|
||||
loading?: boolean
|
||||
/** The placeholder of the search input */
|
||||
placeholder?: string
|
||||
/** The search results where the @search listener needs to put the results into */
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
searchResults?: { [id: string]: any }[]
|
||||
searchResults?: T[]
|
||||
/** The name of the property of the searched object to show the user. If empty the component will show all raw data of an entry */
|
||||
label?: string
|
||||
/** The id attribute of the input element */
|
||||
@@ -188,8 +186,7 @@ const props = withDefaults(defineProps<{
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
'update:modelValue': [value: { [key: string]: any }[] | null],
|
||||
'update:modelValue': [value: T | T[] | null],
|
||||
/**
|
||||
* Triggered every time the search query input changes
|
||||
*/
|
||||
@@ -197,8 +194,7 @@ const emit = defineEmits<{
|
||||
/**
|
||||
* Triggered every time an option from the search results is selected. Also triggers a change in v-model.
|
||||
*/
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
'select': [value: { [key: string]: any }],
|
||||
'select': [value: T],
|
||||
/**
|
||||
* If nothing or no exact match was found and `creatable` is true, this event is triggered with the current value of the search query.
|
||||
*/
|
||||
@@ -206,8 +202,7 @@ const emit = defineEmits<{
|
||||
/**
|
||||
* If `multiple` is enabled, this will be fired every time an item is removed from the array of selected items.
|
||||
*/
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
'remove': [value: { [key: string]: any }],
|
||||
'remove': [value: T],
|
||||
}>()
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
@@ -220,13 +215,12 @@ function elementInResults(elem: string | any, label: string, query: string): boo
|
||||
return elem === query
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const query = ref<string | { [key: string]: any }>('')
|
||||
const query = ref<string | T>('')
|
||||
const searchTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
|
||||
const localLoading = ref(false)
|
||||
const showSearchResults = ref(false)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const internalValue = ref<string | { [key: string]: any } | any[] | null>(null)
|
||||
|
||||
const internalValue = ref<string | T | T[] | null>(null)
|
||||
|
||||
onMounted(() => document.addEventListener('click', hideSearchResultsHandler))
|
||||
onBeforeUnmount(() => document.removeEventListener('click', hideSearchResultsHandler))
|
||||
@@ -325,15 +319,13 @@ function handleFocus() {
|
||||
}, 10)
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
function select(object: { [key: string]: any } | null) {
|
||||
function select(object: T | null) {
|
||||
if (props.multiple) {
|
||||
if (internalValue.value === null) {
|
||||
internalValue.value = []
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(internalValue.value as any[]).push(object)
|
||||
internalValue.value.push(object)
|
||||
} else {
|
||||
internalValue.value = object
|
||||
}
|
||||
@@ -346,8 +338,7 @@ function select(object: { [key: string]: any } | null) {
|
||||
}
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
function setSelectedObject(object: string | { [id: string]: any } | null, resetOnly = false) {
|
||||
function setSelectedObject(object: string | T | null, resetOnly = false) {
|
||||
internalValue.value = object
|
||||
|
||||
// We assume we're getting an array when multiple is enabled and can therefore leave the query
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
v-tooltip="$t('input.editor.bold')"
|
||||
class="editor-bubble__button"
|
||||
:class="{ 'is-active': editor.isActive('bold') }"
|
||||
@click="editor.chain().focus().toggleBold().run()"
|
||||
@click="() => editor?.chain().focus().toggleBold().run()"
|
||||
>
|
||||
<Icon :icon="['fa', 'fa-bold']" />
|
||||
</BaseButton>
|
||||
@@ -25,7 +25,7 @@
|
||||
v-tooltip="$t('input.editor.italic')"
|
||||
class="editor-bubble__button"
|
||||
:class="{ 'is-active': editor.isActive('italic') }"
|
||||
@click="editor.chain().focus().toggleItalic().run()"
|
||||
@click="() => editor?.chain().focus().toggleItalic().run()"
|
||||
>
|
||||
<Icon :icon="['fa', 'fa-italic']" />
|
||||
</BaseButton>
|
||||
@@ -33,7 +33,7 @@
|
||||
v-tooltip="$t('input.editor.underline')"
|
||||
class="editor-bubble__button"
|
||||
:class="{ 'is-active': editor.isActive('underline') }"
|
||||
@click="editor.chain().focus().toggleUnderline().run()"
|
||||
@click="() => editor?.chain().focus().toggleUnderline().run()"
|
||||
>
|
||||
<Icon :icon="['fa', 'fa-underline']" />
|
||||
</BaseButton>
|
||||
@@ -41,7 +41,7 @@
|
||||
v-tooltip="$t('input.editor.strikethrough')"
|
||||
class="editor-bubble__button"
|
||||
:class="{ 'is-active': editor.isActive('strike') }"
|
||||
@click="editor.chain().focus().toggleStrike().run()"
|
||||
@click="() => editor?.chain().focus().toggleStrike().run()"
|
||||
>
|
||||
<Icon :icon="['fa', 'fa-strikethrough']" />
|
||||
</BaseButton>
|
||||
@@ -49,7 +49,7 @@
|
||||
v-tooltip="$t('input.editor.code')"
|
||||
class="editor-bubble__button"
|
||||
:class="{ 'is-active': editor.isActive('code') }"
|
||||
@click="editor.chain().focus().toggleCode().run()"
|
||||
@click="() => editor?.chain().focus().toggleCode().run()"
|
||||
>
|
||||
<Icon :icon="['fa', 'fa-code']" />
|
||||
</BaseButton>
|
||||
@@ -87,7 +87,7 @@
|
||||
<li>
|
||||
<BaseButton
|
||||
class="done-edit"
|
||||
@click="setEdit"
|
||||
@click="() => setEdit()"
|
||||
>
|
||||
{{ $t('input.editor.edit') }}
|
||||
</BaseButton>
|
||||
@@ -108,7 +108,7 @@
|
||||
<li v-if="!isEditing">
|
||||
<BaseButton
|
||||
class="done-edit"
|
||||
@click="setEdit"
|
||||
@click="() => setEdit()"
|
||||
>
|
||||
{{ $t('input.editor.edit') }}
|
||||
</BaseButton>
|
||||
@@ -138,11 +138,16 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, nextTick, onBeforeUnmount, onMounted, ref, watch} from 'vue'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import {eventToHotkeyString} from '@github/hotkey'
|
||||
|
||||
import EditorToolbar from './EditorToolbar.vue'
|
||||
|
||||
import Link from '@tiptap/extension-link'
|
||||
import StarterKit from '@tiptap/starter-kit'
|
||||
import {Extension, mergeAttributes} from '@tiptap/core'
|
||||
import {BubbleMenu, EditorContent, type Extensions, useEditor} from '@tiptap/vue-3'
|
||||
|
||||
import Link from '@tiptap/extension-link'
|
||||
import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
|
||||
import Table from '@tiptap/extension-table'
|
||||
import TableCell from '@tiptap/extension-table-cell'
|
||||
@@ -151,46 +156,27 @@ import TableRow from '@tiptap/extension-table-row'
|
||||
import Typography from '@tiptap/extension-typography'
|
||||
import Image from '@tiptap/extension-image'
|
||||
import Underline from '@tiptap/extension-underline'
|
||||
import {Placeholder} from '@tiptap/extension-placeholder'
|
||||
|
||||
import TaskItem from '@tiptap/extension-task-item'
|
||||
import TaskList from '@tiptap/extension-task-list'
|
||||
import HardBreak from '@tiptap/extension-hard-break'
|
||||
|
||||
import {Blockquote} from '@tiptap/extension-blockquote'
|
||||
import {Bold} from '@tiptap/extension-bold'
|
||||
import {BulletList} from '@tiptap/extension-bullet-list'
|
||||
import {Code} from '@tiptap/extension-code'
|
||||
import {Document} from '@tiptap/extension-document'
|
||||
import {Dropcursor} from '@tiptap/extension-dropcursor'
|
||||
import {Gapcursor} from '@tiptap/extension-gapcursor'
|
||||
import {HardBreak} from '@tiptap/extension-hard-break'
|
||||
import {Heading} from '@tiptap/extension-heading'
|
||||
import {History} from '@tiptap/extension-history'
|
||||
import {HorizontalRule} from '@tiptap/extension-horizontal-rule'
|
||||
import {Italic} from '@tiptap/extension-italic'
|
||||
import {ListItem} from '@tiptap/extension-list-item'
|
||||
import {OrderedList} from '@tiptap/extension-ordered-list'
|
||||
import {Paragraph} from '@tiptap/extension-paragraph'
|
||||
import {Strike} from '@tiptap/extension-strike'
|
||||
import {Text} from '@tiptap/extension-text'
|
||||
import {BubbleMenu, EditorContent, type Extensions, useEditor} from '@tiptap/vue-3'
|
||||
import {Node} from '@tiptap/pm/model'
|
||||
|
||||
import Commands from './commands'
|
||||
import suggestionSetup from './suggestion'
|
||||
|
||||
import {lowlight} from 'lowlight'
|
||||
import {common, createLowlight} from 'lowlight'
|
||||
|
||||
import type {BottomAction, UploadCallback} from './types'
|
||||
import type {ITask} from '@/modelTypes/ITask'
|
||||
import type {IAttachment} from '@/modelTypes/IAttachment'
|
||||
import AttachmentModel from '@/models/attachment'
|
||||
import AttachmentService from '@/services/attachment'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
import XButton from '@/components/input/Button.vue'
|
||||
import {Placeholder} from '@tiptap/extension-placeholder'
|
||||
import {eventToHotkeyString} from '@github/hotkey'
|
||||
import {Extension, mergeAttributes} from '@tiptap/core'
|
||||
|
||||
import {isEditorContentEmpty} from '@/helpers/editorContentEmpty'
|
||||
import inputPrompt from '@/helpers/inputPrompt'
|
||||
import {setLinkInEditor} from '@/components/input/editor/setLinkInEditor'
|
||||
@@ -351,16 +337,14 @@ const additionalLinkProtocols = [
|
||||
|
||||
const extensions : Extensions = [
|
||||
// Starterkit:
|
||||
Blockquote,
|
||||
Bold,
|
||||
BulletList,
|
||||
Code,
|
||||
StarterKit.configure({
|
||||
codeBlock: false,
|
||||
hardBreak: false,
|
||||
}),
|
||||
|
||||
CodeBlockLowlight.configure({
|
||||
lowlight,
|
||||
lowlight: createLowlight(common),
|
||||
}),
|
||||
Document,
|
||||
Dropcursor,
|
||||
Gapcursor,
|
||||
HardBreak.extend({
|
||||
addKeyboardShortcuts() {
|
||||
return {
|
||||
@@ -374,15 +358,6 @@ const extensions : Extensions = [
|
||||
}
|
||||
},
|
||||
}),
|
||||
Heading,
|
||||
History,
|
||||
HorizontalRule,
|
||||
Italic,
|
||||
ListItem,
|
||||
OrderedList,
|
||||
Paragraph,
|
||||
Strike,
|
||||
Text,
|
||||
|
||||
Placeholder.configure({
|
||||
placeholder: ({editor}) => {
|
||||
@@ -451,7 +426,6 @@ const extensions : Extensions = [
|
||||
Commands.configure({
|
||||
suggestion: suggestionSetup(t),
|
||||
}),
|
||||
BubbleMenu,
|
||||
]
|
||||
|
||||
// Add a custom extension for the Escape key
|
||||
|
||||
@@ -63,7 +63,7 @@ const motd = computed(() => configStore.motd)
|
||||
|
||||
const route = useRoute()
|
||||
const {t} = useI18n({useScope: 'global'})
|
||||
const title = computed(() => t(route.meta?.title as string || ''))
|
||||
const title = computed(() => route.meta?.title ? t(route.meta.title as string) : '')
|
||||
useTitle(() => title.value)
|
||||
|
||||
</script>
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
<p>{{ $t('offline.text') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<template v-else-if="ready">
|
||||
<template v-else-if="baseStore.ready">
|
||||
<slot />
|
||||
</template>
|
||||
<section v-else-if="error !== ''">
|
||||
<section v-else-if="baseStore.error !== ''">
|
||||
<NoAuthWrapper :show-api-config="false">
|
||||
<p v-if="error === ERROR_NO_API_URL">
|
||||
<p v-if="baseStore.error === ERROR_NO_API_URL">
|
||||
{{ $t('ready.noApiUrlConfigured') }}
|
||||
</p>
|
||||
<Message
|
||||
@@ -30,7 +30,7 @@
|
||||
>
|
||||
<p>
|
||||
{{ $t('ready.errorOccured') }}<br>
|
||||
{{ error }}
|
||||
{{ baseStore.error }}
|
||||
</p>
|
||||
<p>
|
||||
{{ $t('ready.checkApiUrl') }}
|
||||
@@ -38,13 +38,13 @@
|
||||
</Message>
|
||||
<ApiConfig
|
||||
:configure-open="true"
|
||||
@foundApi="load"
|
||||
@foundApi="baseStore.loadApp()"
|
||||
/>
|
||||
</NoAuthWrapper>
|
||||
</section>
|
||||
<CustomTransition name="fade">
|
||||
<section
|
||||
v-if="showLoading"
|
||||
v-if="baseStore.loading"
|
||||
class="vikunja-loading"
|
||||
>
|
||||
<Logo class="logo" />
|
||||
@@ -57,60 +57,19 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {ref, computed} from 'vue'
|
||||
import {useRouter, useRoute} from 'vue-router'
|
||||
|
||||
import Logo from '@/assets/logo.svg?component'
|
||||
import ApiConfig from '@/components/misc/ApiConfig.vue'
|
||||
import Message from '@/components/misc/Message.vue'
|
||||
import CustomTransition from '@/components/misc/CustomTransition.vue'
|
||||
import NoAuthWrapper from '@/components/misc/NoAuthWrapper.vue'
|
||||
|
||||
import {ERROR_NO_API_URL, InvalidApiUrlProvidedError, NoApiUrlProvidedError} from '@/helpers/checkAndSetApiUrl'
|
||||
import {ERROR_NO_API_URL} from '@/helpers/checkAndSetApiUrl'
|
||||
|
||||
import {useOnline} from '@/composables/useOnline'
|
||||
|
||||
import {getAuthForRoute} from '@/router'
|
||||
|
||||
import {useBaseStore} from '@/stores/base'
|
||||
import {useAuthStore} from '@/stores/auth'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
|
||||
const baseStore = useBaseStore()
|
||||
const authStore = useAuthStore()
|
||||
|
||||
const ready = computed(() => baseStore.ready)
|
||||
const online = useOnline()
|
||||
|
||||
const error = ref('')
|
||||
const showLoading = computed(() => !ready.value && error.value === '')
|
||||
|
||||
const {t} = useI18n()
|
||||
|
||||
async function load() {
|
||||
try {
|
||||
await baseStore.loadApp()
|
||||
baseStore.setReady(true)
|
||||
const redirectTo = await getAuthForRoute(route, authStore)
|
||||
if (typeof redirectTo !== 'undefined') {
|
||||
await router.push(redirectTo)
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
if (e instanceof NoApiUrlProvidedError) {
|
||||
error.value = ERROR_NO_API_URL
|
||||
return
|
||||
}
|
||||
if (e instanceof InvalidApiUrlProvidedError) {
|
||||
error.value = t('apiConfig.error')
|
||||
return
|
||||
}
|
||||
error.value = String(e.message)
|
||||
}
|
||||
}
|
||||
|
||||
load()
|
||||
const baseStore = useBaseStore()
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -62,29 +62,22 @@ export default {inheritAttrs: false}
|
||||
</script>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, onBeforeUnmount, onMounted, ref, toRefs, useAttrs, watch, watchEffect, type PropType} from 'vue'
|
||||
import {computed, onBeforeUnmount, onMounted, ref, toRefs, useAttrs, watch, watchEffect} from 'vue'
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
type: [String, Number, Date, Array] as PropType<DateOption | DateOption[] | null>,
|
||||
default: null,
|
||||
},
|
||||
// https://flatpickr.js.org/options/
|
||||
config: {
|
||||
type: Object as PropType<Options>,
|
||||
default: () => ({
|
||||
defaultDate: null,
|
||||
wrap: false,
|
||||
}),
|
||||
},
|
||||
events: {
|
||||
type: Array as PropType<HookKey[]>,
|
||||
default: () => includedEvents,
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: DateOption | DateOption[] | null,
|
||||
/** https://flatpickr.js.org/options/ */
|
||||
config: Options,
|
||||
events: HookKey[],
|
||||
disabled: boolean,
|
||||
}>(), {
|
||||
modelValue: null,
|
||||
config: () => ({
|
||||
defaultDate: undefined,
|
||||
wrap: false,
|
||||
}),
|
||||
events: () => includedEvents,
|
||||
disabled: false,
|
||||
})
|
||||
|
||||
const emit = defineEmits([
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
<template>
|
||||
<div
|
||||
:class="{ 'is-loading': projectService.loading, 'is-archived': currentProject?.isArchived}"
|
||||
class="loader-container"
|
||||
:class="{
|
||||
'is-loading': isLoadingProject,
|
||||
'is-archived': currentProject?.isArchived,
|
||||
}"
|
||||
>
|
||||
<h1 class="project-title-print">
|
||||
{{ getProjectTitle(currentProject) }}
|
||||
@@ -37,43 +40,37 @@
|
||||
</Message>
|
||||
</CustomTransition>
|
||||
|
||||
<slot v-if="loadedProjectId" />
|
||||
<slot v-if="!isLoadingProject" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, ref, watch} from 'vue'
|
||||
import {useRoute} from 'vue-router'
|
||||
import {computed} from 'vue'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
import Message from '@/components/misc/Message.vue'
|
||||
import CustomTransition from '@/components/misc/CustomTransition.vue'
|
||||
|
||||
import ProjectModel from '@/models/project'
|
||||
import ProjectService from '@/services/project'
|
||||
|
||||
import {getProjectTitle} from '@/helpers/getProjectTitle'
|
||||
import {saveProjectToHistory} from '@/modules/projectHistory'
|
||||
import {useTitle} from '@/composables/useTitle'
|
||||
|
||||
import {useBaseStore} from '@/stores/base'
|
||||
import {useProjectStore} from '@/stores/projects'
|
||||
|
||||
import type {IProject} from '@/modelTypes/IProject'
|
||||
import type {IProjectView} from '@/modelTypes/IProjectView'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
|
||||
const props = defineProps<{
|
||||
isLoadingProject: boolean,
|
||||
projectId: IProject['id'],
|
||||
viewId: IProjectView['id'],
|
||||
}>()
|
||||
|
||||
const route = useRoute()
|
||||
const {t} = useI18n()
|
||||
|
||||
const baseStore = useBaseStore()
|
||||
const projectStore = useProjectStore()
|
||||
const projectService = ref(new ProjectService())
|
||||
const loadedProjectId = ref(0)
|
||||
|
||||
const currentProject = computed<IProject>(() => {
|
||||
return typeof baseStore.currentProject === 'undefined' ? {
|
||||
@@ -87,61 +84,6 @@ useTitle(() => currentProject.value?.id ? getProjectTitle(currentProject.value)
|
||||
|
||||
const views = computed(() => projectStore.projects[props.projectId]?.views)
|
||||
|
||||
// watchEffect would be called every time the prop would get a value assigned, even if that value was the same as before.
|
||||
// This resulted in loading and setting the project multiple times, even when navigating away from it.
|
||||
// This caused wired bugs where the project background would be set on the home page but only right after setting a new
|
||||
// project background and then navigating to home. It also highlighted the project in the menu and didn't allow changing any
|
||||
// of it, most likely due to the rights not being properly populated.
|
||||
watch(
|
||||
() => props.projectId,
|
||||
// loadProject
|
||||
async (projectIdToLoad: number) => {
|
||||
const projectData = {id: projectIdToLoad}
|
||||
saveProjectToHistory(projectData)
|
||||
|
||||
// Don't load the project if we either already loaded it or aren't dealing with a project at all currently and
|
||||
// the currently loaded project has the right set.
|
||||
if (
|
||||
(
|
||||
projectIdToLoad === loadedProjectId.value ||
|
||||
typeof projectIdToLoad === 'undefined' ||
|
||||
projectIdToLoad === currentProject.value?.id
|
||||
)
|
||||
&& typeof currentProject.value !== 'undefined' && currentProject.value.maxRight !== null
|
||||
) {
|
||||
loadedProjectId.value = projectIdToLoad
|
||||
return
|
||||
}
|
||||
|
||||
console.debug('Loading project, $route.params =', route.params, `, loadedProjectId = ${loadedProjectId.value}, currentProject = `, currentProject.value)
|
||||
|
||||
// Set the current project to the one we're about to load so that the title is already shown at the top
|
||||
loadedProjectId.value = 0
|
||||
const projectFromStore = projectStore.projects[projectData.id]
|
||||
if (projectFromStore) {
|
||||
baseStore.handleSetCurrentProject({project: projectFromStore, currentProjectViewId: props.viewId})
|
||||
}
|
||||
|
||||
// We create an extra project object instead of creating it in project.value because that would trigger a ui update which would result in bad ux.
|
||||
const project = new ProjectModel(projectData)
|
||||
try {
|
||||
const loadedProject = await projectService.value.get(project)
|
||||
baseStore.handleSetCurrentProject({project: loadedProject, currentProjectViewId: props.viewId})
|
||||
} finally {
|
||||
loadedProjectId.value = projectIdToLoad
|
||||
}
|
||||
},
|
||||
{immediate: true},
|
||||
)
|
||||
|
||||
watch(
|
||||
() => props.viewId,
|
||||
() => {
|
||||
baseStore.setCurrentProjectViewId(props.viewId)
|
||||
},
|
||||
{immediate: true},
|
||||
)
|
||||
|
||||
function getViewTitle(view: IProjectView) {
|
||||
switch (view.title) {
|
||||
case 'List':
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<ProjectWrapper
|
||||
class="project-gantt"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:project-id="filters.projectId"
|
||||
:view-id
|
||||
>
|
||||
@@ -77,7 +78,7 @@ import {useI18n} from 'vue-i18n'
|
||||
import type {RouteLocationNormalized} from 'vue-router'
|
||||
|
||||
import {useBaseStore} from '@/stores/base'
|
||||
import {getFlatpickrLanguage} from '@/helpers/flatpickrLanguage'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
|
||||
import Foo from '@/components/misc/flatpickr/Flatpickr.vue'
|
||||
import ProjectWrapper from '@/components/project/ProjectWrapper.vue'
|
||||
@@ -95,6 +96,7 @@ import type {IProjectView} from '@/modelTypes/IProjectView'
|
||||
type Options = Flatpickr.Options.Options
|
||||
|
||||
const props = defineProps<{
|
||||
isLoadingProject: boolean,
|
||||
route: RouteLocationNormalized
|
||||
viewId: IProjectView['id']
|
||||
}>()
|
||||
@@ -153,14 +155,14 @@ const flatPickerDateRange = computed<Date[]>({
|
||||
const initialDateRange = [filters.value.dateFrom, filters.value.dateTo]
|
||||
|
||||
const {t} = useI18n({useScope: 'global'})
|
||||
const flatPickerConfig = computed<Options>(() => ({
|
||||
const flatPickerConfig = computed(() => ({
|
||||
altFormat: t('date.altFormatShort'),
|
||||
altInput: true,
|
||||
defaultDate: initialDateRange,
|
||||
enableTime: false,
|
||||
mode: 'range',
|
||||
locale: getFlatpickrLanguage(),
|
||||
}))
|
||||
locale: useFlatpickrLanguage().value,
|
||||
} as Options))
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<ProjectWrapper
|
||||
class="project-kanban"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:project-id="projectId"
|
||||
:view-id
|
||||
>
|
||||
@@ -315,6 +316,7 @@ import TaskBucketService from '@/services/taskBucket'
|
||||
import TaskBucketModel from '@/models/taskBucket'
|
||||
|
||||
const props = defineProps<{
|
||||
isLoadingProject: boolean,
|
||||
projectId: number,
|
||||
viewId: IProjectView['id'],
|
||||
}>()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<ProjectWrapper
|
||||
class="project-list"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:project-id="projectId"
|
||||
:view-id
|
||||
>
|
||||
@@ -123,6 +124,7 @@ import TaskPositionService from '@/services/taskPosition'
|
||||
import TaskPositionModel from '@/models/taskPosition'
|
||||
|
||||
const props = defineProps<{
|
||||
isLoadingProject: boolean,
|
||||
projectId: IProject['id'],
|
||||
viewId: IProjectView['id'],
|
||||
}>()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<ProjectWrapper
|
||||
class="project-table"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:project-id="projectId"
|
||||
:view-id
|
||||
>
|
||||
@@ -298,6 +299,7 @@ import { camelCase } from 'change-case'
|
||||
import {isSavedFilter} from '@/services/savedFilter'
|
||||
|
||||
const props = defineProps<{
|
||||
isLoadingProject: boolean,
|
||||
projectId: IProject['id'],
|
||||
viewId: IProjectView['id'],
|
||||
}>()
|
||||
|
||||
@@ -2,23 +2,23 @@
|
||||
import type {IUser} from '@/modelTypes/IUser'
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
import User from '@/components/misc/User.vue'
|
||||
import {computed} from 'vue'
|
||||
|
||||
const {
|
||||
assignees,
|
||||
remove,
|
||||
disabled,
|
||||
avatarSize = 30,
|
||||
inline = false,
|
||||
} = defineProps<{
|
||||
withDefaults(defineProps<{
|
||||
assignees: IUser[],
|
||||
remove?: (user: IUser) => void,
|
||||
disabled?: boolean,
|
||||
avatarSize?: number,
|
||||
inline?: boolean,
|
||||
}>()
|
||||
/** add this boolean prop to enable removal of assignees */
|
||||
canRemove?: boolean,
|
||||
}>(), {
|
||||
avatarSize: 30,
|
||||
inline: false,
|
||||
canRemove: false,
|
||||
})
|
||||
|
||||
const hasDelete = computed(() => typeof remove !== 'undefined' && !disabled)
|
||||
defineEmits<{
|
||||
remove: [user: IUser],
|
||||
}>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -36,13 +36,13 @@ const hasDelete = computed(() => typeof remove !== 'undefined' && !disabled)
|
||||
:avatar-size="avatarSize"
|
||||
:show-username="false"
|
||||
:user="user"
|
||||
:class="{'m-2': hasDelete}"
|
||||
:class="{'m-2': canRemove && !disabled}"
|
||||
/>
|
||||
<BaseButton
|
||||
v-if="hasDelete"
|
||||
v-if="canRemove && !disabled"
|
||||
:key="'delete'+user.id"
|
||||
class="remove-assignee"
|
||||
@click="remove(user)"
|
||||
@click="$emit('remove', user)"
|
||||
>
|
||||
<Icon icon="times" />
|
||||
</BaseButton>
|
||||
|
||||
@@ -44,7 +44,7 @@ import flatPickr from 'vue-flatpickr-component'
|
||||
|
||||
import TaskService from '@/services/task'
|
||||
import type {ITask} from '@/modelTypes/ITask'
|
||||
import { getFlatpickrLanguage } from '@/helpers/flatpickrLanguage'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: ITask,
|
||||
@@ -101,7 +101,7 @@ const flatPickerConfig = computed(() => ({
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
inline: true,
|
||||
locale: getFlatpickrLanguage(),
|
||||
locale: useFlatpickrLanguage().value,
|
||||
}))
|
||||
|
||||
function deferDays(days: number) {
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, computed, watch, onBeforeUnmount} from 'vue'
|
||||
import {ref, computed, watchEffect, onBeforeUnmount} from 'vue'
|
||||
|
||||
import CustomTransition from '@/components/misc/CustomTransition.vue'
|
||||
import Editor from '@/components/input/AsyncEditor'
|
||||
@@ -46,21 +46,25 @@ import Editor from '@/components/input/AsyncEditor'
|
||||
import type {ITask} from '@/modelTypes/ITask'
|
||||
import {useTaskStore} from '@/stores/tasks'
|
||||
|
||||
type AttachmentUploadFunction = (file: File, onSuccess: (attachmentUrl: string) => void) => Promise<string>
|
||||
export type AttachmentUploadFunction = (file: File, onSuccess: (attachmentUrl: string) => void) => Promise<string>
|
||||
|
||||
const {
|
||||
modelValue,
|
||||
attachmentUpload,
|
||||
canWrite,
|
||||
} = defineProps<{
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: ITask,
|
||||
attachmentUpload: AttachmentUploadFunction,
|
||||
canWrite: boolean,
|
||||
}>(), {
|
||||
canWrite: true,
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
'update:modelValue': [value: ITask]
|
||||
}>()
|
||||
|
||||
const emit = defineEmits(['update:modelValue'])
|
||||
|
||||
const description = ref<string>('')
|
||||
watchEffect(() => {
|
||||
description.value = props.modelValue.description
|
||||
})
|
||||
|
||||
const saved = ref(false)
|
||||
|
||||
// Since loading is global state, this variable ensures we're only showing the saving icon when saving the description.
|
||||
@@ -69,14 +73,6 @@ const saving = ref(false)
|
||||
const taskStore = useTaskStore()
|
||||
const loading = computed(() => taskStore.isLoading)
|
||||
|
||||
watch(
|
||||
() => modelValue.description,
|
||||
value => {
|
||||
description.value = value
|
||||
},
|
||||
{immediate: true},
|
||||
)
|
||||
|
||||
const changeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
|
||||
|
||||
async function saveWithDelay() {
|
||||
@@ -99,13 +95,12 @@ async function save() {
|
||||
if (changeTimeout.value !== null) {
|
||||
clearTimeout(changeTimeout.value)
|
||||
}
|
||||
|
||||
saved.value = false
|
||||
saving.value = true
|
||||
|
||||
try {
|
||||
// FIXME: don't update state from internal.
|
||||
const updated = await taskStore.update({
|
||||
...modelValue,
|
||||
...props.modelValue,
|
||||
description: description.value,
|
||||
})
|
||||
emit('update:modelValue', updated)
|
||||
@@ -119,13 +114,12 @@ async function save() {
|
||||
}
|
||||
}
|
||||
|
||||
async function uploadCallback(files: File[] | FileList): (Promise<string[]>) {
|
||||
|
||||
async function uploadCallback(files: File[] | FileList): Promise<string[]> {
|
||||
const uploadPromises: Promise<string>[] = []
|
||||
|
||||
files.forEach((file: File) => {
|
||||
const promise = new Promise<string>((resolve) => {
|
||||
attachmentUpload(file, (uploadedFileUrl: string) => resolve(uploadedFileUrl))
|
||||
props.attachmentUpload(file, (uploadedFileUrl: string) => resolve(uploadedFileUrl))
|
||||
})
|
||||
|
||||
uploadPromises.push(promise)
|
||||
|
||||
@@ -16,8 +16,9 @@
|
||||
<template #items="{items}">
|
||||
<AssigneeList
|
||||
:assignees="items"
|
||||
:remove="removeAssignee"
|
||||
:disabled="disabled"
|
||||
can-remove
|
||||
@remove="removeAssignee"
|
||||
/>
|
||||
</template>
|
||||
<template #searchResult="{option: user}">
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, reactive, shallowReactive, watch, computed, type PropType} from 'vue'
|
||||
import {ref, reactive, shallowReactive, watch, computed} from 'vue'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import {useRoute} from 'vue-router'
|
||||
|
||||
@@ -206,27 +206,17 @@ import {useTaskStore} from '@/stores/tasks'
|
||||
import {useProjectStore} from '@/stores/projects'
|
||||
import {playPopSound} from '@/helpers/playPop'
|
||||
|
||||
const props = defineProps({
|
||||
taskId: {
|
||||
type: Number,
|
||||
required: true,
|
||||
},
|
||||
initialRelatedTasks: {
|
||||
type: Object as PropType<ITask['relatedTasks']>,
|
||||
default: () => ({}),
|
||||
},
|
||||
showNoRelationsNotice: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
projectId: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
editEnabled: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
const props = withDefaults(defineProps<{
|
||||
taskId: number,
|
||||
initialRelatedTasks?: ITask['relatedTasks'],
|
||||
showNoRelationsNotice?: boolean,
|
||||
projectId: number,
|
||||
editEnabled: boolean,
|
||||
}>(), {
|
||||
initialRelatedTasks: () => ({}),
|
||||
showNoRelationsNotice: false,
|
||||
projectId: 0,
|
||||
editEnabled: true, // this seems like a mistake
|
||||
})
|
||||
|
||||
const taskStore = useTaskStore()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {computed} from 'vue'
|
||||
import {computed, toValue} from 'vue'
|
||||
|
||||
import {useTitle as useTitleVueUse, toValue, type UseTitleOptions, type ReadonlyRefOrGetter, type MaybeRef, type MaybeRefOrGetter} from '@vueuse/core'
|
||||
import {useTitle as useTitleVueUse, type UseTitleOptions, type ReadonlyRefOrGetter, type MaybeRef, type MaybeRefOrGetter} from '@vueuse/core'
|
||||
|
||||
export function useTitle(
|
||||
newTitle:
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
import {useAuthStore} from '@/stores/auth'
|
||||
import FlatpickrLanguages from 'flatpickr/dist/l10n'
|
||||
import type { CustomLocale, key } from 'flatpickr/dist/types/locale'
|
||||
|
||||
export function getFlatpickrLanguage(): CustomLocale {
|
||||
const authStore = useAuthStore()
|
||||
const lang = authStore.settings.language
|
||||
const langPair = lang.split('-')
|
||||
let language = FlatpickrLanguages[lang === 'vi-vn' ? 'vn' : 'en']
|
||||
if (langPair.length > 0 && FlatpickrLanguages[langPair[0] as key] !== undefined) {
|
||||
language = FlatpickrLanguages[langPair[0] as key]
|
||||
}
|
||||
language.firstDayOfWeek = authStore.settings.weekStart ?? language.firstDayOfWeek
|
||||
return language
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import {useAuthStore} from '@/stores/auth'
|
||||
// TODO: only import needed languages
|
||||
import FlatpickrLanguages from 'flatpickr/dist/l10n'
|
||||
import type { key } from 'flatpickr/dist/types/locale'
|
||||
import { computed } from 'vue'
|
||||
|
||||
export function useFlatpickrLanguage() {
|
||||
const authStore = useAuthStore()
|
||||
|
||||
return computed(() => {
|
||||
const userLanguage = authStore.settings.language
|
||||
if (!userLanguage) {
|
||||
return FlatpickrLanguages.en
|
||||
}
|
||||
|
||||
const langPair = userLanguage.split('-')
|
||||
const code = userLanguage === 'vi-VN' ? 'vn' : 'en'
|
||||
const language = FlatpickrLanguages?.[langPair?.[0] as key] || FlatpickrLanguages[code]
|
||||
language.firstDayOfWeek = authStore.settings.weekStart ?? language.firstDayOfWeek
|
||||
return language
|
||||
})
|
||||
}
|
||||
@@ -27,6 +27,7 @@ export const SUPPORTED_LOCALES = {
|
||||
'uk-UA': 'Українська',
|
||||
'lt-LT': 'Lietuvių Kalba',
|
||||
'bg-BG': 'Български',
|
||||
'ko-KR': '한국어',
|
||||
// IMPORTANT: Also add new languages to useDayjsLanguageSync
|
||||
} as const
|
||||
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "تم حذف الحافظة بنجاح.",
|
||||
"bucketTitleSavedSuccess": "تم حفظ عنوان الحافظة بنجاح.",
|
||||
"bucketLimitSavedSuccess": "تم حفظ الحد الأقصى للحافظة بنجاح.",
|
||||
"collapse": "طي هذه الحافظة"
|
||||
"collapse": "طي هذه الحافظة",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "نوع الاشتراك غير صالح.",
|
||||
"12002": "أنت مشترك بالفعل في العنصر نفسه أو في العنصر الرئيس.",
|
||||
"13001": "رابط المشاركة هذا يتطلب كلمة مرور للتوثيق، ولكن لم يتم توفير أي منها.",
|
||||
"13002": "كلمة مرور رابط المشاركة غير صالحة."
|
||||
"13002": "كلمة مرور رابط المشاركة غير صالحة.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "عن البرنامج",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "سنة|سنوات"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Колоната беше успешно изтрита.",
|
||||
"bucketTitleSavedSuccess": "Заглавието на колоната беше успешно запазено.",
|
||||
"bucketLimitSavedSuccess": "Лимитът на колоната беше успешно запазен.",
|
||||
"collapse": "Свий тази колона"
|
||||
"collapse": "Свий тази колона",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Типът на абонамента е невалиден.",
|
||||
"12002": "Вече сте абонирани за самия обект или за родителски обект.",
|
||||
"13001": "Тази споделена връзка изисква парола за удостоверяване, но такава не е предоставена.",
|
||||
"13002": "Предоставената парола за споделената връзка е невалидна."
|
||||
"13002": "Предоставената парола за споделената връзка е невалидна.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "За приложението",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "година|години"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Sloupec byl úspěšně smazán.",
|
||||
"bucketTitleSavedSuccess": "Název sloupce byl úspěšně uložen.",
|
||||
"bucketLimitSavedSuccess": "Limit sloupce byl úspěšně uložen.",
|
||||
"collapse": "Sbalit tento sloupec"
|
||||
"collapse": "Sbalit tento sloupec",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Typ předplatného je neplatný.",
|
||||
"12002": "Již jste přihlášeni k odběru samotného subjektu nebo nadřazeného subjektu.",
|
||||
"13001": "Tento sdílený odkaz vyžaduje heslo k ověření, ale žádné nebylo poskytnuto.",
|
||||
"13002": "Zadané heslo pro sdílený odkaz bylo neplatné."
|
||||
"13002": "Zadané heslo pro sdílený odkaz bylo neplatné.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "O aplikaci",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "rok|roky"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Enhedstypen for abonnementet er ugyldigt.",
|
||||
"12002": "Du er allerede abonneret på selve enheden eller en overordnet enhed.",
|
||||
"13001": "Dette delingslink kræver en adgangskode til godkendelse, men ingen blev angivet.",
|
||||
"13002": "Adgangskoden til delingslinket er ugyldig."
|
||||
"13002": "Adgangskoden til delingslinket er ugyldig.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Om",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@
|
||||
"title": "Liste",
|
||||
"add": "Hinzufügen",
|
||||
"addPlaceholder": "Aufgabe hinzufügen…",
|
||||
"empty": "Dieses Project ist derzeit leer.",
|
||||
"empty": "Dieses Projekt ist derzeit leer.",
|
||||
"newTaskCta": "Aufgabe erstellen.",
|
||||
"editTask": "Aufgabe bearbeiten"
|
||||
},
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Die Spalte wurde erfolgreich gelöscht.",
|
||||
"bucketTitleSavedSuccess": "Der Spaltenname wurde erfolgreich gespeichert.",
|
||||
"bucketLimitSavedSuccess": "Das Spaltenlimit wurde erfolgreich gespeichert.",
|
||||
"collapse": "Spalte einklappen"
|
||||
"collapse": "Spalte einklappen",
|
||||
"bucketLimitReached": "Du hast das Limit dieses Buckets erreicht. Entferne Aufgaben oder erhöhe das Limit, um neue Aufgaben hinzuzufügen."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Der Abonnement-Typ ist ungültig.",
|
||||
"12002": "Du bist bereits zu dieser oder einer übergeordneten Entität abonniert.",
|
||||
"13001": "Das Passwort für diese Linkfreigabe wurde nicht angegeben.",
|
||||
"13002": "Das Passwort für diese Linkfreigabe war ungültig."
|
||||
"13002": "Das Passwort für diese Linkfreigabe war ungültig.",
|
||||
"14001": "Die angegebene Datei ist keine gültige ZIP-Datei."
|
||||
},
|
||||
"about": {
|
||||
"title": "Über",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "Jahr|Jahre"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@
|
||||
"title": "Liste",
|
||||
"add": "Hinzufügen",
|
||||
"addPlaceholder": "Aufgabe hinzufügen…",
|
||||
"empty": "Dieses Project ist derzeit leer.",
|
||||
"empty": "Dieses Projekt ist derzeit leer.",
|
||||
"newTaskCta": "Aufgabe erstellen.",
|
||||
"editTask": "Aufgabe bearbeiten"
|
||||
},
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Die Spalte wurde erfolgreich gelöscht.",
|
||||
"bucketTitleSavedSuccess": "Der Spaltenname wurde erfolgreich gespeichert.",
|
||||
"bucketLimitSavedSuccess": "Das Spaltenlimit wurde erfolgreich gespeichert.",
|
||||
"collapse": "Spalte einklappen"
|
||||
"collapse": "Spalte einklappen",
|
||||
"bucketLimitReached": "Du hast das Limit dieses Buckets erreicht. Entferne Aufgaben oder erhöhe das Limit, um neue Aufgaben hinzuzufügen."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "De Abonnement Entitätstyp isch ungültig.",
|
||||
"12002": "Du bisch scho zu dere oder ere übergordnete Entität abonniert.",
|
||||
"13001": "De teilti Link bruucht es Passwort, aber du hesch keis aahgeh.",
|
||||
"13002": "Das Passwort wo du geh hesch isch ungültig."
|
||||
"13002": "Das Passwort wo du geh hesch isch ungültig.",
|
||||
"14001": "Die angegebene Datei ist keine gültige ZIP-Datei."
|
||||
},
|
||||
"about": {
|
||||
"title": "Über",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "Jahr|Jahre"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1203,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "El contenedor se ha eliminado con éxito.",
|
||||
"bucketTitleSavedSuccess": "El título del contenedor se ha guardado con éxito.",
|
||||
"bucketLimitSavedSuccess": "El límite del contenedor se ha guardado con éxito.",
|
||||
"collapse": "Contraer este contenedor"
|
||||
"collapse": "Contraer este contenedor",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "El tipo de entidad de suscripción es inválido.",
|
||||
"12002": "Ya está suscrito a la entidad en sí misma o a una entidad padre.",
|
||||
"13001": "Este enlace compartido requiere una contraseña para la autenticación, pero no se ha proporcionado ninguna.",
|
||||
"13002": "La contraseña proporcionada del enlace compartido no es válida."
|
||||
"13002": "La contraseña proporcionada del enlace compartido no es válida.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Acerca de",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "año|años"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "La colonne a bien été supprimée.",
|
||||
"bucketTitleSavedSuccess": "Le titre de la colonne a bien été enregistré.",
|
||||
"bucketLimitSavedSuccess": "La limite de la colonne a bien été enregistrée.",
|
||||
"collapse": "Réduire cette colonne"
|
||||
"collapse": "Réduire cette colonne",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Le type d’entité d’abonnement est invalide.",
|
||||
"12002": "Vous êtes déjà abonné·e à l’entité elle-même ou à une entité parente.",
|
||||
"13001": "Le mot de passe requis n’a pas été fourni pour ce partage de lien.",
|
||||
"13002": "Mot de passe de partage de lien invalide."
|
||||
"13002": "Mot de passe de partage de lien invalide.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "À propos",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "année|années"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "A vödör sikeresen törölve.",
|
||||
"bucketTitleSavedSuccess": "A vödör címe sikeresen elmentve.",
|
||||
"bucketLimitSavedSuccess": "A vödör limit sikeresen elmentve.",
|
||||
"collapse": "Zárd össze ezt a vödröt"
|
||||
"collapse": "Zárd össze ezt a vödröt",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "A feliratkozás típusa érvénytelen.",
|
||||
"12002": "Ön már feliratkozott magára az entitásra, vagy egy szülő entitásra.",
|
||||
"13001": "A linkmegosztáshoz jelszó szükséges a hitelesítéshez, de nem adták meg.",
|
||||
"13002": "A megadott linkmegosztási jelszó érvénytelen."
|
||||
"13002": "A megadott linkmegosztási jelszó érvénytelen.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Névjegy",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "év|évek"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+445
-443
File diff suppressed because it is too large
Load Diff
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "バケットは正常に削除されました。",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Vikunjaについて",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "年"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+765
-763
File diff suppressed because it is too large
Load Diff
+124
-122
@@ -4,85 +4,85 @@
|
||||
"welcomeMorning": "Labas rytas {username}!",
|
||||
"welcomeDay": "Labas {username}!",
|
||||
"welcomeEvening": "Labas vakaras {username}!",
|
||||
"lastViewed": "Last viewed",
|
||||
"addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
|
||||
"goToOverview": "Go to overview",
|
||||
"lastViewed": "Paskutinį kartą žiūrėta",
|
||||
"addToHomeScreen": "Pridėkite aplikaciją į darbalaukį, lengvesniam pasiekiamumui ir geresnei patirčiai.",
|
||||
"goToOverview": "Eiti į apžvalgą",
|
||||
"project": {
|
||||
"importText": "Import your projects and tasks from other services into Vikunja:",
|
||||
"import": "Import your data into Vikunja"
|
||||
"importText": "Importuokite savo projektus ir užduotis iš kitų tiekėjų į Vikunja:",
|
||||
"import": "Importuoti duomenis į Vikunja"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"title": "This instance is in demo mode. Do not use this for real data!",
|
||||
"everythingWillBeDeleted": "Everything will be deleted in regular intervals!",
|
||||
"accountWillBeDeleted": "Your account will be deleted, including all projects, tasks and attachments you might create."
|
||||
"title": "Ši aplinka yra demontracinės būsenos. Nenaudokite realių duomenų!",
|
||||
"everythingWillBeDeleted": "Viskas bus ištrinta numatomais intervalais!",
|
||||
"accountWillBeDeleted": "Tavo paskyra bus ištrinta, įskaitant visus projektus, užduotis ir prisegtukus su tuo susijusius."
|
||||
},
|
||||
"404": {
|
||||
"title": "Not found",
|
||||
"text": "The page you requested does not exist."
|
||||
"title": "Nerasta",
|
||||
"text": "Norimas puslapis nerastas."
|
||||
},
|
||||
"ready": {
|
||||
"loading": "Vikunja is loading…",
|
||||
"errorOccured": "An error occurred:",
|
||||
"checkApiUrl": "Please check if the api url is correct.",
|
||||
"noApiUrlConfigured": "No API url was configured. Please set one below:"
|
||||
"loading": "Vikunja kraunasi…",
|
||||
"errorOccured": "Įvyko klaida:",
|
||||
"checkApiUrl": "Prašau patikrinti ar Api nuoroda yra teisinga.",
|
||||
"noApiUrlConfigured": "Jokia Api nuoroda nebuvo sukonfiguruota. Prašau, tai padaryti žemiau:"
|
||||
},
|
||||
"offline": {
|
||||
"title": "You are offline.",
|
||||
"text": "Please check your network connection and try again."
|
||||
"title": "Esi atsijungęs(-usi).",
|
||||
"text": "Prašau patikrinti interneto ryšį ir bandyti dar kartą."
|
||||
},
|
||||
"user": {
|
||||
"auth": {
|
||||
"username": "Vartotojo vardas",
|
||||
"usernameEmail": "Vartotojo vardas arba el. pašto adresas",
|
||||
"usernamePlaceholder": "pvz.: frederick",
|
||||
"email": "Email address",
|
||||
"emailPlaceholder": "e.g. frederic{'@'}vikunja.io",
|
||||
"password": "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 email with instructions on how to reset your password.",
|
||||
"passwordsDontMatch": "Passwords don't match",
|
||||
"confirmEmailSuccess": "You successfully confirmed your email! You can log in now.",
|
||||
"totpTitle": "Two Factor Authentication Code",
|
||||
"totpPlaceholder": "e.g. 123456",
|
||||
"login": "Login",
|
||||
"createAccount": "Create account",
|
||||
"loginWith": "Log in with {provider}",
|
||||
"authenticating": "Authenticating…",
|
||||
"openIdStateError": "State does not match, refusing to continue!",
|
||||
"openIdGeneralError": "An error occurred while authenticating against the third party.",
|
||||
"logout": "Logout",
|
||||
"emailInvalid": "Please enter a valid email address.",
|
||||
"email": "El. pašto adresas",
|
||||
"emailPlaceholder": "pvz.: frederic{'@'}vikunja.io",
|
||||
"password": "Slaptažodis",
|
||||
"passwordPlaceholder": "pvz.: •••••••••••",
|
||||
"forgotPassword": "Pamiršote slaptažodį?",
|
||||
"resetPassword": "Pakeisti slaptažodį",
|
||||
"resetPasswordAction": "Atsiųskite man slaptažodžio atnaujinimo nuorodą",
|
||||
"resetPasswordSuccess": "Patikrink savo pašto dėžutę! Turėjai gauti laišką, kaip atnaujinti slaptažodį.",
|
||||
"passwordsDontMatch": "Slaptažodžiai nesutampa",
|
||||
"confirmEmailSuccess": "Sėkmingai patvirtinai savo el. paštą. Dabar gali prisijungti.",
|
||||
"totpTitle": "Dviejų faktorių identifikavimo kodas",
|
||||
"totpPlaceholder": "pvz.: 123456",
|
||||
"login": "Prisijungti",
|
||||
"createAccount": "Sukurti paskyrą",
|
||||
"loginWith": "Prisijungti su {provider}",
|
||||
"authenticating": "Identifikuojama…",
|
||||
"openIdStateError": "Būsena neatitinka, atsisakome toliau tęsti!",
|
||||
"openIdGeneralError": "Įvyko klaida bandant identifikuoti su trečiąja šalimi.",
|
||||
"logout": "Atsijungti",
|
||||
"emailInvalid": "Prašome įvesti galiojantį el. pašto adresą.",
|
||||
"usernameRequired": "Prašau nurodyti vartotojo vardą.",
|
||||
"usernameMustNotContainSpace": "Vartotojo vardas negali turėti tarpų.",
|
||||
"usernameMustNotLookLikeUrl": "Vartotojo vardas negali atrodyti kaip nuoroda.",
|
||||
"passwordRequired": "Please provide a password.",
|
||||
"passwordNotMin": "Password must have at least 8 characters.",
|
||||
"passwordRequired": "Prašome pateikti savo slaptažodį.",
|
||||
"passwordNotMin": "Slaptažodis turi būti bent 8 simbolių.",
|
||||
"passwordNotMax": "Slaptažodis gali būti daugiausiai 72 simbolių.",
|
||||
"showPassword": "Show the password",
|
||||
"hidePassword": "Hide the password",
|
||||
"noAccountYet": "Don't have an account yet?",
|
||||
"alreadyHaveAnAccount": "Already have an account?",
|
||||
"remember": "Stay logged in",
|
||||
"registrationDisabled": "Registration is disabled."
|
||||
"showPassword": "Rodyti slaptažodį",
|
||||
"hidePassword": "Paslėpti slaptažodį",
|
||||
"noAccountYet": "Dar neturi paskyros?",
|
||||
"alreadyHaveAnAccount": "Jau turi paskyrą?",
|
||||
"remember": "Likti prisijungus",
|
||||
"registrationDisabled": "Registracija yra išjungta."
|
||||
},
|
||||
"settings": {
|
||||
"title": "Settings",
|
||||
"newPasswordTitle": "Update Your Password",
|
||||
"newPassword": "New password",
|
||||
"newPasswordConfirm": "New password confirmation",
|
||||
"currentPassword": "Current password",
|
||||
"currentPasswordPlaceholder": "Your current password",
|
||||
"passwordsDontMatch": "The new password and its confirmation don't match.",
|
||||
"passwordUpdateSuccess": "The password was successfully updated.",
|
||||
"updateEmailTitle": "Update Your Email Address",
|
||||
"updateEmailNew": "New email address",
|
||||
"updateEmailSuccess": "Your email address was successfully updated. We've sent you a link to confirm it.",
|
||||
"title": "Nustatymai",
|
||||
"newPasswordTitle": "Atnaujinti savo slaptažodį",
|
||||
"newPassword": "Naujas slaptažodis",
|
||||
"newPasswordConfirm": "Naujo slaptažodžio patvirtinimas",
|
||||
"currentPassword": "Dabartinis slaptažodis",
|
||||
"currentPasswordPlaceholder": "Tavo dabartinis slaptažodis",
|
||||
"passwordsDontMatch": "Naujo slaptažodis ir patvirtinimas nesutampa.",
|
||||
"passwordUpdateSuccess": "Slaptažodis buvo sėkmingai atnaujintas.",
|
||||
"updateEmailTitle": "Atnaujink savo el. paštą",
|
||||
"updateEmailNew": "Naujas el. pašto adresas",
|
||||
"updateEmailSuccess": "El. paštas buvo sėkmingai atnaujintas. Nusiuntėme nuorodą patvirtinimui.",
|
||||
"general": {
|
||||
"title": "General Settings",
|
||||
"title": "Bendriniai nustatymai",
|
||||
"name": "Mano vardas",
|
||||
"newName": "Naujas vardas",
|
||||
"savedSuccess": "The settings were successfully updated.",
|
||||
@@ -185,15 +185,15 @@
|
||||
"title": "Delete your Vikunja Account",
|
||||
"text1": "Profilio ištrynimas yra neatšaukiamas. Visi projektai, užduotys ir kita susijusi informacijas bus pašalinta.",
|
||||
"text2": "Norėdama -s tęsti, įvesk savo slaptažodį. Gausi email'ą su tolimesnėmis instrukcijomis.",
|
||||
"text3": "To proceed, please press the button below. You will receive an email with further instructions.",
|
||||
"text3": "Norėdami tęsti, spauskite mygtuką žemiau. Gausite el. laišką su tolimesnėmis instrukcijomis.",
|
||||
"confirm": "Delete my account",
|
||||
"requestSuccess": "Tavo užklausa sėkminga. Gausi email'ą su tolimesnėmis instrukcijomis.",
|
||||
"passwordRequired": "Prašome įvesti savo slaptažodį.",
|
||||
"confirmSuccess": "You've successfully confirmed the deletion of your account. We will delete your account in three days.",
|
||||
"scheduled": "We will delete your Vikunja account at {date} ({dateSince}).",
|
||||
"confirmSuccess": "Sėkmingai patvirtinai paskyros ištrynimą. Ištrinsime tavo paskyrą per tris dienas.",
|
||||
"scheduled": "Ištrinsime tavo Vikunja paskyrą {date} ({dateSince}).",
|
||||
"scheduledCancel": "Norėdama -s nutraukti paskyros ištrynimą, spausk čia.",
|
||||
"scheduledCancelText": "Norėdama -s nutraukti paskyros ištrynimą, įveskite slaptažodį žemiau:",
|
||||
"scheduledCancelButton": "To cancel the deletion of your account, please press the button below:",
|
||||
"scheduledCancelButton": "Norint atšaukti paskyros ištynimą, prašome spausti mygtuką žemiau:",
|
||||
"scheduledCancelConfirm": "Atšaukti mano paskyros ištrynimą",
|
||||
"scheduledCancelSuccess": "We will not delete your account."
|
||||
},
|
||||
@@ -264,7 +264,7 @@
|
||||
"header": "Edit This Project",
|
||||
"title": "Edit \"{project}\"",
|
||||
"titlePlaceholder": "The project title goes here…",
|
||||
"identifierTooltip": "The project identifier can be used to uniquely identify a task across projects. You can set it to empty to disable it.",
|
||||
"identifierTooltip": "Projekto Id gali būti naudojamas unikaliai identifikuoti užduotį tarp projektų. Galima palikti tuščia, norint funkciją deaktyvuoti.",
|
||||
"identifier": "Projekto identifikatorius",
|
||||
"identifierPlaceholder": "Projekto identifikatorius bus čia…",
|
||||
"description": "Aprašymas",
|
||||
@@ -290,7 +290,7 @@
|
||||
"remove": "Pašalinti pasidalinimo nuorodą",
|
||||
"removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
|
||||
"createSuccess": "Pasidalinimo nuoroda buvo sėkmingai sukurta.",
|
||||
"deleteSuccess": "The link share was successfully deleted",
|
||||
"deleteSuccess": "Nuorodos dalinimas buvo sėkmingai ištrintas",
|
||||
"view": "Peržiūra",
|
||||
"sharedBy": "Pasidalino {0}"
|
||||
},
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "Pasiekėte buketo limitą. Ištrinkite užduotis arba padidinkite limitą norėdami pridėti naujas užduotis."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -462,11 +463,11 @@
|
||||
"labels": "Etiketės sietinos su užduotimi",
|
||||
"project": "The project the task belongs to (only available for saved filters, not on a project level)",
|
||||
"reminders": "The reminders of the task as a date field, will return all tasks with at least one reminder matching the query",
|
||||
"created": "The time and date when the task was created",
|
||||
"created": "Laikas ir data, kai užduotis buvo sukurta",
|
||||
"updated": "Data ir laikas, kada užduotis buvo pakeista"
|
||||
},
|
||||
"operators": {
|
||||
"intro": "The available operators for filtering include:",
|
||||
"intro": "Filtravimo operandai:",
|
||||
"notEqual": "Ne lygu",
|
||||
"equal": "Lygu",
|
||||
"greaterThan": "Daugiau už",
|
||||
@@ -479,8 +480,8 @@
|
||||
},
|
||||
"logicalOperators": {
|
||||
"intro": "To combine multiple conditions, you can use the following logical operators:",
|
||||
"and": "AND operator, matches if all conditions are true",
|
||||
"or": "OR operator, matches if any of the conditions are true",
|
||||
"and": "IR operatorius, sutampa jei visos sąlygos yra tiesa",
|
||||
"or": "ARBA operatorius, sutampa jei bet kuri sąlyga yra tiesa",
|
||||
"parentheses": "Skliausteliai sąlygų grupavimui"
|
||||
},
|
||||
"examples": {
|
||||
@@ -505,10 +506,10 @@
|
||||
"inProgress": "Importavimas progrese…",
|
||||
"alreadyMigrated1": "Atrodo, kad jau importavai savo info is {name} {date}.",
|
||||
"alreadyMigrated2": "Importing again is possible, but might create duplicates. Are you sure?",
|
||||
"confirm": "I am sure, please start migrating now!",
|
||||
"confirm": "Aš įsitikinęs, prašau pradėti migraciją dabar!",
|
||||
"importUpload": "Importuoti duomenis iš {name} į Vikunja, spausk mygtuką žemiau, norėdamas pasirinkti failą.",
|
||||
"upload": "Įkelti failą",
|
||||
"migrationStartedWillReciveEmail": "Vikunja will now import your lists/projects, tasks, notes, reminders and files from {service}. As this will take a while, we will send you an email once done. You can close this window now.",
|
||||
"migrationStartedWillReciveEmail": "Vikunja dabar importuos tavo sąrašus/projektus, užduotis, užrašus, priminimus ir dokumentus iš {service}. Kadangi tai užtruks, atsiųsime el. laišką, kai bus baigta. Gali uždaryti šį langą.",
|
||||
"migrationInProgress": "A migration is currently in progress. Please wait until it is done."
|
||||
},
|
||||
"label": {
|
||||
@@ -683,34 +684,34 @@
|
||||
"endOfToday": "Iki dienos pabaigos",
|
||||
"beginningOflastWeek": "Praeitos savaitės pradžios",
|
||||
"endOfLastWeek": "Praeitos savaitės pabaiga",
|
||||
"beginningOfThisWeek": "Beginning of this week",
|
||||
"beginningOfThisWeek": "Šios savaitės pradžia",
|
||||
"endOfThisWeek": "Šios savaaitės pabaaiga",
|
||||
"startOfNextWeek": "Start of next week",
|
||||
"startOfNextWeek": "Kitos savaitės pradžia",
|
||||
"endOfNextWeek": "Iki kitos savaitės pabaigos",
|
||||
"in7Days": "Už 7 dienų",
|
||||
"beginningOfLastMonth": "Beginning of last month",
|
||||
"beginningOfLastMonth": "Praeito mėnesio pradžia",
|
||||
"endOfLastMonth": "Kito mėnesio pabaaigos",
|
||||
"startOfThisMonth": "Start of this month",
|
||||
"startOfThisMonth": "Šio mėnesio pradžia",
|
||||
"endOfThisMonth": "End of this month",
|
||||
"startOfNextMonth": "Start of next month",
|
||||
"startOfNextMonth": "Kito mėnesio pradžia",
|
||||
"endOfNextMonth": "Kito mėnesio pabaiga",
|
||||
"in30Days": "In 30 days",
|
||||
"startOfThisYear": "Beginning of this year",
|
||||
"startOfThisYear": "Šių metų pradžia",
|
||||
"endOfThisYear": "Šių metų pabaiga"
|
||||
}
|
||||
},
|
||||
"datemathHelp": {
|
||||
"canuse": "You can use date math to filter for relative dates.",
|
||||
"learnhow": "Check out how it works",
|
||||
"title": "Date Math",
|
||||
"intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
|
||||
"canuse": "Galite naudoti datų matematiką norint filtruoti aktualias datas.",
|
||||
"learnhow": "Peržiūrėkite, kaip tai veikia",
|
||||
"title": "Datų matematika",
|
||||
"intro": "Nurodyti reliatyvias datas, kurios yra išpręstos eigoje Vikunjos kai pritaikomas filtras.",
|
||||
"expression": "Each Date Math expression starts with an anchor date, which can either be {0}, or a date string ending with {1}. This anchor date can optionally be followed by one or more maths expressions.",
|
||||
"similar": "These expressions are similar to the ones provided by {0} and {1}.",
|
||||
"add1Day": "Pridėti vieną dieną",
|
||||
"minus1Day": "Subtract one day",
|
||||
"roundDay": "Round down to the nearest day",
|
||||
"supportedUnits": "Supported time units",
|
||||
"someExamples": "Examples of time expressions",
|
||||
"minus1Day": "Atimti vieną dieną",
|
||||
"roundDay": "Suapvalinti iki artimiausios dienos",
|
||||
"supportedUnits": "Palaikomi laiko formatai",
|
||||
"someExamples": "Laiko išraiškų pavyzdžiai",
|
||||
"units": {
|
||||
"seconds": "Seconds",
|
||||
"minutes": "Minutes",
|
||||
@@ -724,10 +725,10 @@
|
||||
"now": "Dabar",
|
||||
"in24h": "24-ių valandų bėgyje",
|
||||
"today": "Šiandien 00:00",
|
||||
"beginningOfThisWeek": "The beginning of this week at 00:00",
|
||||
"endOfThisWeek": "The end of this week",
|
||||
"beginningOfThisWeek": "Šios savaitės pradžia 00:00 val.",
|
||||
"endOfThisWeek": "Šios savaitės pabaiga",
|
||||
"in30Days": "Už 30 dienų",
|
||||
"datePlusMonth": "{0} plus one month at 00:00 of that day"
|
||||
"datePlusMonth": "{0} plius veianas mėnuo nuo 00:00 tos dienos"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -735,14 +736,14 @@
|
||||
"task": "Užduotis",
|
||||
"new": "Sukurti užduotį",
|
||||
"delete": "Ištrinti šią užduotį",
|
||||
"createSuccess": "The task was successfully created.",
|
||||
"addReminder": "Add a reminder…",
|
||||
"doneSuccess": "The task was successfully marked as done.",
|
||||
"undoneSuccess": "The task was successfully un-marked as done.",
|
||||
"revertSuccess": "The task change was successfully undone.",
|
||||
"undo": "Undo",
|
||||
"createSuccess": "Užduotis buvo sėkmingai sukurta.",
|
||||
"addReminder": "Pridėti priminimą…",
|
||||
"doneSuccess": "Užduotis buvo sėkmingai pažymėta kaip baigta.",
|
||||
"undoneSuccess": "Užduotis buvo sėkmingai atžymėta kaip atlikta.",
|
||||
"revertSuccess": "Užduoties pakeitimai buvo sėkmingai pakeisti.",
|
||||
"undo": "Anuliuoti",
|
||||
"openDetail": "Atidaryti užduoties duomenų vaizdą",
|
||||
"checklistTotal": "{checked} of {total} tasks",
|
||||
"checklistTotal": "{checked} iš {total} užduočių",
|
||||
"checklistAllDone": "{total} užduotys",
|
||||
"show": {
|
||||
"titleCurrent": "Dabartinės Užduotys",
|
||||
@@ -751,17 +752,17 @@
|
||||
"overdue": "Rodyti neišpildytas užduotis",
|
||||
"fromuntil": "Užduotys nuo {from} iki {until}",
|
||||
"select": "Pasirinkti datos rėžį",
|
||||
"noTasks": "Nothing to do — Have a nice day!"
|
||||
"noTasks": "Nėra darbų - Gražios dienos!"
|
||||
},
|
||||
"detail": {
|
||||
"chooseDueDate": "Click here to set a due date",
|
||||
"chooseStartDate": "Click here to set a start date",
|
||||
"chooseEndDate": "Click here to set an end date",
|
||||
"move": "Move task to a different project",
|
||||
"done": "Mark task done!",
|
||||
"undone": "Mark as undone",
|
||||
"created": "Created {0} by {1}",
|
||||
"updated": "Updated {0}",
|
||||
"chooseDueDate": "Paspauskite čia norėdami pakeisti atlikimo datą",
|
||||
"chooseStartDate": "Paspauskite čia nustatyti pradžios datą",
|
||||
"chooseEndDate": "Spauskite čia norėdami nustatyti pabaigos datą",
|
||||
"move": "Perkelti užduotį į kitą projektą",
|
||||
"done": "Pažymėti užduotį kaip atliką!",
|
||||
"undone": "Pažymėti kaip neatliktą",
|
||||
"created": "Sukurta {0} {1}",
|
||||
"updated": "Atnaujinta {0}",
|
||||
"doneAt": "Done {0}",
|
||||
"updateSuccess": "The task was saved successfully.",
|
||||
"deleteSuccess": "The task has been deleted successfully.",
|
||||
@@ -899,23 +900,23 @@
|
||||
"new": "New Task Relation",
|
||||
"searchPlaceholder": "Type search for a task to add as related…",
|
||||
"createPlaceholder": "Pridėti kaip susijusią užduotį",
|
||||
"differentProject": "This task belongs to a different project.",
|
||||
"differentProject": "Ši užduotis priklauso kitam projektui.",
|
||||
"noneYet": "Kol kas užduoties ryšio nėra.",
|
||||
"delete": "Delete Task Relation",
|
||||
"deleteText1": "Are you sure you want to delete this task relation?",
|
||||
"select": "Pasirinkite ryšio tipą",
|
||||
"taskRequired": "Please select a task or enter a new task title.",
|
||||
"taskRequired": "Prašome pasirinkti užduotį arba įvesti užduoties pavadinimą.",
|
||||
"kinds": {
|
||||
"subtask": "Sub užduotis | Sub užduotys",
|
||||
"parenttask": "Parent Task | Parent Tasks",
|
||||
"related": "Related Task | Related Tasks",
|
||||
"parenttask": "Tėvinė Užduotis | Tėvinė Užduotis",
|
||||
"related": "Susijusi Užduotis | Susijusi Užduotis",
|
||||
"duplicateof": "Duplicate Of | Duplicates Of",
|
||||
"duplicates": "Duplicates | Duplicates",
|
||||
"blocking": "Blocking | Blocking",
|
||||
"blocked": "Blocked By | Blocked By",
|
||||
"precedes": "Precedes | Precedes",
|
||||
"follows": "Follows | Follows",
|
||||
"copiedfrom": "Copied From | Copied From",
|
||||
"copiedfrom": "Nukopijuota iš | Nukopijuota iš",
|
||||
"copiedto": "Copied To | Copied To"
|
||||
}
|
||||
},
|
||||
@@ -950,13 +951,13 @@
|
||||
"hint": "Use magic prefixes to define due dates, assignees and other task properties.",
|
||||
"title": "Quick Add Magic",
|
||||
"intro": "When creating a task, you can use special keywords to directly add attributes to the newly created task. This allows to add commonly used attributes to tasks much faster.",
|
||||
"multiple": "You can use this multiple times.",
|
||||
"multiple": "Galima tai naudoti kelis kartus.",
|
||||
"label1": "Norėdama -s pridėti etiketę, paprasčiausiai naudoti etiketės prefikso pavadinimą su {prefix}.",
|
||||
"label2": "Vikunja pirmiausiai patikrins ar etiketė egzistuoja, ir sukurs, jei neegzistuoja.",
|
||||
"label3": "Norint naudoti tarpus, paprasčiausiai pridėkite \" ar ' prieš etiketės pavadinimą.",
|
||||
"label4": "Pavyzdžiui: {prefix} \"Etiketė su tarpais\".",
|
||||
"priority1": "To set a task's priority, add a number 1-5, prefixed with a {prefix}.",
|
||||
"priority2": "The higher the number, the higher the priority.",
|
||||
"priority2": "Kuo didesnis skaičius, tuo aukštesnis prioritetas.",
|
||||
"assignees": "Norint tiesiogiai priskirti užduotį vartotojui, pridėkite vartotojo vardą kaip prefiksą su {prefix} prie užduoties.",
|
||||
"project1": "Nustatyti užduoties projektą, įveskite prefiksą su {prefix}.",
|
||||
"project2": "This will return an error if the project does not exist.",
|
||||
@@ -986,7 +987,7 @@
|
||||
"addUser": "Add to team",
|
||||
"makeMember": "Make Member",
|
||||
"makeAdmin": "Make Admin",
|
||||
"success": "The team was successfully updated.",
|
||||
"success": "Komanda buvo sėkmingai atnaujinta.",
|
||||
"userAddedSuccess": "The team member was successfully added.",
|
||||
"madeMember": "The team member was successfully made member.",
|
||||
"madeAdmin": "The team member was successfully made admin.",
|
||||
@@ -1006,7 +1007,7 @@
|
||||
"leave": {
|
||||
"title": "Leave team",
|
||||
"text1": "Are you sure you want to leave this team?",
|
||||
"text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
|
||||
"text2": "Prarasite visas teises, kurias turi ši komanda. Jei persigalvotum, reikės komandos administratoriaus pagalbos, kad pridėtų atgal.",
|
||||
"success": "Jūs sėkmingai palikote komandą."
|
||||
}
|
||||
},
|
||||
@@ -1026,10 +1027,10 @@
|
||||
"title": "Keyboard Shortcuts",
|
||||
"general": "General",
|
||||
"allPages": "These shortcuts work on all pages.",
|
||||
"currentPageOnly": "These shortcuts work only on the current page.",
|
||||
"somePagesOnly": "These shortcuts work only on some pages.",
|
||||
"currentPageOnly": "Esami trumpiniai veikia tik dabartiniame puslapyje.",
|
||||
"somePagesOnly": "Šie trumpiniai veikia tik kai kuriuose puslapiuose.",
|
||||
"toggleMenu": "Toggle The Menu",
|
||||
"quickSearch": "Open the search/quick action bar",
|
||||
"quickSearch": "Atidaryti paiešką/greitų veiksmų juostą",
|
||||
"then": "then",
|
||||
"task": {
|
||||
"title": "Task Page",
|
||||
@@ -1040,7 +1041,7 @@
|
||||
"attachment": "Add an attachment to this task",
|
||||
"related": "Modify related tasks of this task",
|
||||
"color": "Change the color of this task",
|
||||
"move": "Move this task to another project",
|
||||
"move": "Perkelti šią užduotį kitam projektui",
|
||||
"reminder": "Valdyti šios užduoties priminimus",
|
||||
"description": "Praskleisti redagavimą užduoties apraše",
|
||||
"delete": "Delete this task",
|
||||
@@ -1086,7 +1087,7 @@
|
||||
"url": "Vikunja URL",
|
||||
"urlPlaceholder": "eg. https://localhost:3456",
|
||||
"change": "change",
|
||||
"use": "Using Vikunja installation at {0}",
|
||||
"use": "Naudojama Vikunja instaliacija {0}",
|
||||
"error": "Could not find or use Vikunja installation at \"{domain}\". Please check if the url has the correct format and you can reach it when accessing it directly and try again.",
|
||||
"success": "Using Vikunja installation at \"{domain}\".",
|
||||
"urlRequired": "A url is required."
|
||||
@@ -1129,7 +1130,7 @@
|
||||
},
|
||||
"reaction": {
|
||||
"reactedWith": "{user} reacted with {value}",
|
||||
"reactedWithAnd": "{users} and {lastUser} reacted with {value}",
|
||||
"reactedWithAnd": "{users} ir {lastUser} sureagavo {value}",
|
||||
"reactedWithAndMany": "{users} and {num} more reacted reacted with {value}",
|
||||
"add": "Add your reaction"
|
||||
},
|
||||
@@ -1184,7 +1185,7 @@
|
||||
"6002": "The team does not exist.",
|
||||
"6004": "The team already has access to that project.",
|
||||
"6005": "The user is already a member of that team.",
|
||||
"6006": "Cannot delete the last team member.",
|
||||
"6006": "Negalime ištrinti paskutinio komandos nario.",
|
||||
"6007": "The team does not have access to the project to perform that action.",
|
||||
"7002": "Naudotojas jau turi prieigą prie šio projekto.",
|
||||
"7003": "You do not have access to that project.",
|
||||
@@ -1199,10 +1200,11 @@
|
||||
"10005": "There can be only one done bucket per project.",
|
||||
"11001": "Išsaugotas filtras neegzistuoja.",
|
||||
"11002": "Išsaugotu filtru negalima pasidalinti.",
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"12001": "Prenumeratos objekto tipas yra nevalidus.",
|
||||
"12002": "Esi prisiregistravęs prie visko ar prie tėvinio subjekto.",
|
||||
"13001": "Šis dalinimasis nuoroda reikalauja slaptažodžio identifikavimuisi, bet jis nebuvo pateiktas.",
|
||||
"13002": "Pateikta slaptažodžio dalinimosi nuoroda negalioja."
|
||||
"13002": "Pateikta slaptažodžio dalinimosi nuoroda negalioja.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Apie",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "metai|metai"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Over",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+459
-457
File diff suppressed because it is too large
Load Diff
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Kolumna została pomyślnie usunięta.",
|
||||
"bucketTitleSavedSuccess": "Tytuł kolumny został pomyślnie zapisany.",
|
||||
"bucketLimitSavedSuccess": "Limit kolumny został pomyślnie zapisany.",
|
||||
"collapse": "Zwiń tę kolumnę"
|
||||
"collapse": "Zwiń tę kolumnę",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Typ subskrypcji jest nieprawidłowy.",
|
||||
"12002": "Subskrybujesz już tę jednostkę lub jej jednostkę nadrzędną.",
|
||||
"13001": "Ten udostępniony link wymaga hasła do uwierzytelnienia, ale nie został podany.",
|
||||
"13002": "Podane hasło udostępnionego linku było nieprawidłowe."
|
||||
"13002": "Podane hasło udostępnionego linku było nieprawidłowe.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "O aplikacji",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "rok|lat"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "O bucket foi excluído com sucesso.",
|
||||
"bucketTitleSavedSuccess": "O título do bucket foi salvo com sucesso.",
|
||||
"bucketLimitSavedSuccess": "O limite do bucket foi salvo com sucesso.",
|
||||
"collapse": "Recolher este bucket"
|
||||
"collapse": "Recolher este bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "A entidade de subscrição é inválida.",
|
||||
"12002": "Você já assinou a entidade em si ou uma entidade pai.",
|
||||
"13001": "Este link compartilhado requer uma senha para autenticação, mas nenhum foi fornecido.",
|
||||
"13002": "A senha de compartilhamento do link fornecido é inválida."
|
||||
"13002": "A senha de compartilhamento do link fornecido é inválida.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Sobre",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "ano|anos"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "O conjunto foi eliminado com sucesso.",
|
||||
"bucketTitleSavedSuccess": "O título do conjunto foi salvo com sucesso.",
|
||||
"bucketLimitSavedSuccess": "O limite do conjunto foi salvo com sucesso.",
|
||||
"collapse": "Encolher este conjunto"
|
||||
"collapse": "Encolher este conjunto",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "O tipo de entidade da subscrição é inválido.",
|
||||
"12002": "Já estás subcrito na entidade ou numa entidade parente.",
|
||||
"13001": "Este link partilhado requer uma palavra-passe para autenticação, mas nenhuma foi fornecida.",
|
||||
"13002": "A palavra-passe fornecida para o link partilhado é inválida."
|
||||
"13002": "A palavra-passe fornecida para o link partilhado é inválida.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Sobre",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "ano|anos"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Колонка удалена.",
|
||||
"bucketTitleSavedSuccess": "Название колонки сохранено.",
|
||||
"bucketLimitSavedSuccess": "Лимит колонки сохранён.",
|
||||
"collapse": "Свернуть эту колонку"
|
||||
"collapse": "Свернуть эту колонку",
|
||||
"bucketLimitReached": "Вы достигли лимита колонки. Удалите какие-нибудь задачи или увеличьте лимит, чтобы добавить новые задачи."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Некорректный тип подписки.",
|
||||
"12002": "Вы уже подписаны на сам объект или родительский объект.",
|
||||
"13001": "Эта ссылка требует пароля, но он не был предоставлен.",
|
||||
"13002": "Неверный пароль ссылки для обмена."
|
||||
"13002": "Неверный пароль ссылки для обмена.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "О Vikunja",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "год|года|лет"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Vedro je bilo uspešno izbrisano.",
|
||||
"bucketTitleSavedSuccess": "Naslov vedra je bil uspešno shranjen.",
|
||||
"bucketLimitSavedSuccess": "Omejitev vedra je bila uspešno shranjena.",
|
||||
"collapse": "Zloži vedro"
|
||||
"collapse": "Zloži vedro",
|
||||
"bucketLimitReached": "Dosegli ste omejitev vedra. Odstranite opravila ali povečajte omejitev, da dodate nova opravila."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Tipa entitete naročnine je neveljaven.",
|
||||
"12002": "Ste že naročeni na samo entiteto ali nadrejeno entiteto.",
|
||||
"13001": "Ta skupna raba povezave zahteva geslo za preverjanje pristnosti, vendar ni bil podan.",
|
||||
"13002": "Navedeno geslo za skupno rabo povezave je bilo neveljavno."
|
||||
"13002": "Navedeno geslo za skupno rabo povezave je bilo neveljavno.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "O programu",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "leto|let"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Om",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "år|år"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "Стрічку вилучено.",
|
||||
"bucketTitleSavedSuccess": "Назву стрічки збережено.",
|
||||
"bucketLimitSavedSuccess": "Межу стрічки збережено.",
|
||||
"collapse": "Згорнути стрічку"
|
||||
"collapse": "Згорнути стрічку",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "Ви підписані на саму суть або головну частину.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "Хибний пароль для поширеного посилання."
|
||||
"13002": "Хибний пароль для поширеного посилання.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Про",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "рік|роки|років"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "Loại đăng ký không hợp lệ.",
|
||||
"12002": "Bạn đã đăng ký với tổ chức này hoặc tổ chức chính rồi.",
|
||||
"13001": "Chia sẻ liên kết này yêu cầu mật khẩu để xác thực, nhưng không có mật khẩu nào được cung cấp.",
|
||||
"13002": "Mật khẩu chia sẻ liên kết không hợp lệ."
|
||||
"13002": "Mật khẩu chia sẻ liên kết không hợp lệ.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "Về ứng dụng",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "存储桶已删除。",
|
||||
"bucketTitleSavedSuccess": "存储桶标题已保存。",
|
||||
"bucketLimitSavedSuccess": "存储桶限制已保存。",
|
||||
"collapse": "折叠此存储桶"
|
||||
"collapse": "折叠此存储桶",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "订阅实体类型无效。",
|
||||
"12002": "你已经订阅实体本身或上级实体。",
|
||||
"13001": "此链接共享需要密码进行身份验证,但没有提供密码。",
|
||||
"13002": "提供的链接共享密码无效。"
|
||||
"13002": "提供的链接共享密码无效。",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "关于",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "年|年"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,7 +365,8 @@
|
||||
"deleteBucketSuccess": "The bucket has been deleted successfully.",
|
||||
"bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
|
||||
"bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
|
||||
"collapse": "Collapse this bucket"
|
||||
"collapse": "Collapse this bucket",
|
||||
"bucketLimitReached": "You have reached the bucket limit. Remove tasks or increase the limit to add new tasks."
|
||||
},
|
||||
"pseudo": {
|
||||
"favorites": {
|
||||
@@ -1202,7 +1203,8 @@
|
||||
"12001": "The subscription entity type is invalid.",
|
||||
"12002": "You are already subscribed to the entity itself or a parent entity.",
|
||||
"13001": "This link share requires a password for authentication, but none was provided.",
|
||||
"13002": "The provided link share password was invalid."
|
||||
"13002": "The provided link share password was invalid.",
|
||||
"14001": "The provided file is not a valid zip file."
|
||||
},
|
||||
"about": {
|
||||
"title": "About",
|
||||
@@ -1219,4 +1221,4 @@
|
||||
"years": "year|years"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ export const DAYJS_LOCALE_MAPPING = {
|
||||
'uk-UA': 'uk',
|
||||
'lt-LT': 'lt',
|
||||
'bg-BG': 'bg',
|
||||
'ko-KR': 'ko',
|
||||
} as Record<SupportedLocale, ISOLanguage>
|
||||
|
||||
export const DAYJS_LANGUAGE_IMPORTS = {
|
||||
@@ -51,7 +52,8 @@ export const DAYJS_LANGUAGE_IMPORTS = {
|
||||
'pt-br': () => import('dayjs/locale/pt-br'),
|
||||
'uk-ua': () => import('dayjs/locale/uk'),
|
||||
'lt-lt': () => import('dayjs/locale/lt'),
|
||||
'bg-bg': () => import('dayjs/locale/bg'),
|
||||
'bg-bg': () => import('dayjs/locale/bg'),
|
||||
'ko-kr': () => import('dayjs/locale/ko'),
|
||||
} as Record<SupportedLocale, () => Promise<ILocale>>
|
||||
|
||||
export function useDayjsLanguageSync(dayjsGlobal: typeof dayjs) {
|
||||
|
||||
@@ -36,6 +36,18 @@ function redirectToProviderIfNothingElseIsEnabled() {
|
||||
}
|
||||
}
|
||||
|
||||
function getLoggedInVia(): string | null {
|
||||
return localStorage.getItem('loggedInViaProvider')
|
||||
}
|
||||
|
||||
function setLoggedInVia(provider: string | null): void {
|
||||
if (provider) {
|
||||
localStorage.setItem('loggedInViaProvider', provider)
|
||||
} else {
|
||||
localStorage.removeItem('loggedInViaProvider')
|
||||
}
|
||||
}
|
||||
|
||||
export const useAuthStore = defineStore('auth', () => {
|
||||
const configStore = useConfigStore()
|
||||
|
||||
@@ -186,6 +198,7 @@ export const useAuthStore = defineStore('auth', () => {
|
||||
async function openIdAuth({provider, code}) {
|
||||
const HTTP = HTTPFactory()
|
||||
setIsLoading(true)
|
||||
setLoggedInVia(null)
|
||||
|
||||
const fullProvider: IProvider = configStore.auth.openidConnect.providers.find((p: IProvider) => p.key === provider)
|
||||
|
||||
@@ -200,6 +213,7 @@ export const useAuthStore = defineStore('auth', () => {
|
||||
const response = await HTTP.post(`/auth/openid/${provider}/callback`, data)
|
||||
// Save the token to local storage for later use
|
||||
saveToken(response.data.token, true)
|
||||
setLoggedInVia(provider)
|
||||
|
||||
// Tell others the user is autheticated
|
||||
await checkAuth()
|
||||
@@ -406,17 +420,15 @@ export const useAuthStore = defineStore('auth', () => {
|
||||
|
||||
async function logout() {
|
||||
removeToken()
|
||||
const loggedInVia = getLoggedInVia()
|
||||
window.localStorage.clear() // Clear all settings and history we might have saved in local storage.
|
||||
await router.push({name: 'user.login'})
|
||||
await checkAuth()
|
||||
|
||||
// if configured, redirect to OIDC Provider on logout
|
||||
if (
|
||||
configStore.auth.local.enabled === false &&
|
||||
configStore.auth.openidConnect.enabled &&
|
||||
configStore.auth.openidConnect.providers?.length === 1)
|
||||
{
|
||||
redirectToProviderOnLogout(configStore.auth.openidConnect.providers[0])
|
||||
const fullProvider: IProvider = configStore.auth.openidConnect.providers.find((p: IProvider) => p.key === loggedInVia)
|
||||
if (fullProvider) {
|
||||
redirectToProviderOnLogout(fullProvider)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+39
-19
@@ -1,11 +1,14 @@
|
||||
import { readonly, ref} from 'vue'
|
||||
import {ref, computed, readonly} from 'vue'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import {useRouter, useRoute} from 'vue-router'
|
||||
import {defineStore, acceptHMRUpdate} from 'pinia'
|
||||
|
||||
import {getAuthForRoute} from '@/router'
|
||||
import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
|
||||
|
||||
import ProjectModel from '@/models/project'
|
||||
import ProjectService from '../services/project'
|
||||
import {checkAndSetApiUrl} from '@/helpers/checkAndSetApiUrl'
|
||||
import ProjectService from '@/services/project'
|
||||
import {checkAndSetApiUrl, ERROR_NO_API_URL, InvalidApiUrlProvidedError, NoApiUrlProvidedError} from '@/helpers/checkAndSetApiUrl'
|
||||
|
||||
import {useMenuActive} from '@/composables/useMenuActive'
|
||||
|
||||
@@ -15,8 +18,16 @@ import type {Right} from '@/constants/rights'
|
||||
import type {IProjectView} from '@/modelTypes/IProjectView'
|
||||
|
||||
export const useBaseStore = defineStore('base', () => {
|
||||
const loading = ref(false)
|
||||
const authStore = useAuthStore()
|
||||
|
||||
const {t} = useI18n()
|
||||
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
|
||||
const ready = ref(false)
|
||||
const error = ref('')
|
||||
const loading = computed(() => !ready.value && error.value === '')
|
||||
|
||||
// This is used to highlight the current project in menu for all project related views
|
||||
const currentProject = ref<IProject | null>(new ProjectModel({
|
||||
@@ -33,10 +44,6 @@ export const useBaseStore = defineStore('base', () => {
|
||||
const logoVisible = ref(true)
|
||||
const updateAvailable = ref(false)
|
||||
|
||||
function setLoading(newLoading: boolean) {
|
||||
loading.value = newLoading
|
||||
}
|
||||
|
||||
function setCurrentProject(newCurrentProject: IProject | null, currentViewId?: IProjectView['id']) {
|
||||
// Server updates don't return the right. Therefore, the right is reset after updating the project which is
|
||||
// confusing because all the buttons will disappear in that case. To prevent this, we're keeping the right
|
||||
@@ -91,10 +98,6 @@ export const useBaseStore = defineStore('base', () => {
|
||||
logoVisible.value = visible
|
||||
}
|
||||
|
||||
function setReady(value: boolean) {
|
||||
ready.value = value
|
||||
}
|
||||
|
||||
function setUpdateAvailable(value: boolean) {
|
||||
updateAvailable.value = value
|
||||
}
|
||||
@@ -139,16 +142,36 @@ export const useBaseStore = defineStore('base', () => {
|
||||
setCurrentProject(project, currentProjectViewId)
|
||||
}
|
||||
|
||||
const authStore = useAuthStore()
|
||||
async function loadApp() {
|
||||
await checkAndSetApiUrl(window.API_URL)
|
||||
await authStore.checkAuth()
|
||||
ready.value = true
|
||||
try {
|
||||
await checkAndSetApiUrl(window.API_URL)
|
||||
await authStore.checkAuth()
|
||||
ready.value = true
|
||||
const redirectTo = await getAuthForRoute(route, authStore)
|
||||
if (typeof redirectTo !== 'undefined') {
|
||||
await router.push(redirectTo)
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
if (e instanceof NoApiUrlProvidedError) {
|
||||
error.value = ERROR_NO_API_URL
|
||||
return
|
||||
}
|
||||
if (e instanceof InvalidApiUrlProvidedError) {
|
||||
error.value = t('apiConfig.error')
|
||||
return
|
||||
}
|
||||
error.value = String(e.message)
|
||||
}
|
||||
}
|
||||
|
||||
loadApp()
|
||||
|
||||
return {
|
||||
error: readonly(error),
|
||||
loading: readonly(loading),
|
||||
ready: readonly(ready),
|
||||
loadApp,
|
||||
|
||||
currentProject: readonly(currentProject),
|
||||
currentProjectViewId: readonly(currentProjectViewId),
|
||||
background: readonly(background),
|
||||
@@ -159,8 +182,6 @@ export const useBaseStore = defineStore('base', () => {
|
||||
logoVisible: readonly(logoVisible),
|
||||
updateAvailable: readonly(updateAvailable),
|
||||
|
||||
setLoading,
|
||||
setReady,
|
||||
setCurrentProject,
|
||||
setCurrentProjectViewId,
|
||||
setHasTasks,
|
||||
@@ -172,7 +193,6 @@ export const useBaseStore = defineStore('base', () => {
|
||||
setUpdateAvailable,
|
||||
|
||||
handleSetCurrentProject,
|
||||
loadApp,
|
||||
|
||||
...useMenuActive(),
|
||||
}
|
||||
|
||||
+2
-5
@@ -7,11 +7,8 @@ import type Modal from '@/components/misc/Modal.vue'
|
||||
import type Card from '@/components/misc/Card.vue'
|
||||
|
||||
// Here we define globally imported components
|
||||
// See:
|
||||
// https://github.com/johnsoncodehk/volar/blob/2ca8fd3434423c7bea1c8e08132df3b9ce84eea7/extensions/vscode-vue-language-features/README.md#usage
|
||||
// Under the hidden collapsible "Define Global Components"
|
||||
|
||||
declare module '@vue/runtime-core' {
|
||||
// See: https://github.com/vuejs/language-tools/wiki/Global-Component-Types
|
||||
declare module 'vue' {
|
||||
export interface GlobalComponents {
|
||||
Icon: FontAwesomeIconFixedTypes
|
||||
Notifications: FunctionalComponent<Notifications>
|
||||
|
||||
@@ -7,6 +7,13 @@
|
||||
<template v-if="isMigrating === false">
|
||||
<template v-if="migrator.isFileMigrator">
|
||||
<p>{{ $t('migrate.importUpload', {name: migrator.name}) }}</p>
|
||||
<Message
|
||||
v-if="migrationError"
|
||||
variant="danger"
|
||||
class="mb-4"
|
||||
>
|
||||
{{ migrationError }}
|
||||
</Message>
|
||||
<input
|
||||
ref="uploadInput"
|
||||
class="is-hidden"
|
||||
@@ -129,6 +136,7 @@ import {parseDateOrNull} from '@/helpers/parseDateOrNull'
|
||||
import {MIGRATORS, type Migrator} from './migrators'
|
||||
import {useTitle} from '@/composables/useTitle'
|
||||
import {useProjectStore} from '@/stores/projects'
|
||||
import {getErrorText} from '@/message'
|
||||
|
||||
const props = defineProps<{
|
||||
service: string,
|
||||
@@ -147,6 +155,7 @@ const lastMigrationStartedAt = ref<Date | null>(null)
|
||||
const message = ref('')
|
||||
const migratorAuthCode = ref('')
|
||||
const migrationJustStarted = ref(false)
|
||||
const migrationError = ref('')
|
||||
|
||||
const migrator = computed<Migrator>(() => MIGRATORS[props.service])
|
||||
|
||||
@@ -198,6 +207,7 @@ async function migrate() {
|
||||
isMigrating.value = true
|
||||
lastMigrationFinishedAt.value = null
|
||||
message.value = ''
|
||||
migrationError.value = ''
|
||||
|
||||
let migrationConfig: MigrationConfig | File = {code: migratorAuthCode.value}
|
||||
|
||||
@@ -219,7 +229,7 @@ async function migrate() {
|
||||
await migrationService.migrate(migrationConfig as MigrationConfig)
|
||||
migrationJustStarted.value = true
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
migrationError.value = getErrorText(e)
|
||||
} finally {
|
||||
isMigrating.value = false
|
||||
}
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
<script setup lang="ts">
|
||||
import {computed, watch} from 'vue'
|
||||
import {useProjectStore} from '@/stores/projects'
|
||||
import {computed, ref, shallowReactive, watch, watchEffect} from 'vue'
|
||||
import {useRoute, useRouter} from 'vue-router'
|
||||
|
||||
import {useBaseStore} from '@/stores/base'
|
||||
import {useProjectStore} from '@/stores/projects'
|
||||
import {useAuthStore} from '@/stores/auth'
|
||||
|
||||
import {saveProjectView} from '@/helpers/projectView'
|
||||
import ProjectService from '@/services/project'
|
||||
|
||||
import ProjectList from '@/components/project/views/ProjectList.vue'
|
||||
import ProjectGantt from '@/components/project/views/ProjectGantt.vue'
|
||||
import ProjectTable from '@/components/project/views/ProjectTable.vue'
|
||||
import ProjectKanban from '@/components/project/views/ProjectKanban.vue'
|
||||
import {useAuthStore} from '@/stores/auth'
|
||||
|
||||
import {DEFAULT_PROJECT_VIEW_SETTINGS} from '@/modelTypes/IProjectView'
|
||||
import {saveProjectToHistory} from '@/modules/projectHistory'
|
||||
|
||||
const props = defineProps<{
|
||||
projectId: number,
|
||||
@@ -17,8 +23,10 @@ const props = defineProps<{
|
||||
}>()
|
||||
|
||||
const router = useRouter()
|
||||
const baseStore = useBaseStore()
|
||||
const projectStore = useProjectStore()
|
||||
const authStore = useAuthStore()
|
||||
const route = useRoute()
|
||||
|
||||
const currentProject = computed(() => projectStore.projects[props.projectId])
|
||||
|
||||
@@ -26,19 +34,68 @@ const currentView = computed(() => {
|
||||
return currentProject.value?.views.find(v => v.id === props.viewId)
|
||||
})
|
||||
|
||||
const projectService = shallowReactive(new ProjectService())
|
||||
const isLoadingProject = computed(() => projectService.loading)
|
||||
const loadedProjectId = ref(0)
|
||||
|
||||
watch(
|
||||
() => props.projectId,
|
||||
// loadProject
|
||||
async (projectIdToLoad, oldProjectIdToLoad) => {
|
||||
|
||||
console.debug('Loading project, $route.params =', route.params, `, loadedProjectId = ${loadedProjectId.value}, currentProject = `, currentProject.value)
|
||||
|
||||
|
||||
if (projectIdToLoad !== oldProjectIdToLoad) {
|
||||
loadedProjectId.value = 0
|
||||
}
|
||||
|
||||
try {
|
||||
const loadedProject = await projectService.get({id: projectIdToLoad})
|
||||
|
||||
// Here, we only set the new project in the projectStore.
|
||||
// Setting that projet as the current one in the baseStore is handled by the watcher below.
|
||||
projectStore.setProject(loadedProject)
|
||||
} finally {
|
||||
loadedProjectId.value = projectIdToLoad
|
||||
}
|
||||
},
|
||||
{immediate: true},
|
||||
)
|
||||
|
||||
watch(
|
||||
() => [currentProject.value, props.viewId],
|
||||
([newCurrentProject, newViewId]) => {
|
||||
if (!newCurrentProject) {
|
||||
baseStore.handleSetCurrentProject({project: null})
|
||||
return
|
||||
}
|
||||
|
||||
baseStore.handleSetCurrentProject({
|
||||
project: newCurrentProject,
|
||||
currentProjectViewId: newViewId,
|
||||
})
|
||||
}, {
|
||||
deep: true,
|
||||
immediate: true,
|
||||
},
|
||||
)
|
||||
|
||||
function redirectToDefaultViewIfNecessary() {
|
||||
if (props.viewId === 0 || !projectStore.projects[props.projectId]?.views.find(v => v.id === props.viewId)) {
|
||||
if (props.viewId === 0 || !currentView.value) {
|
||||
// Ideally, we would do that in the router redirect, but the projects (and therefore, the views)
|
||||
// are not always loaded then.
|
||||
|
||||
const defaultView = authStore.settings.frontendSettings.defaultView
|
||||
|
||||
let view
|
||||
if (authStore.settings.frontendSettings.defaultView !== DEFAULT_PROJECT_VIEW_SETTINGS.FIRST) {
|
||||
view = projectStore.projects[props.projectId]?.views.find(v => v.viewKind === authStore.settings.frontendSettings.defaultView)
|
||||
if (defaultView !== DEFAULT_PROJECT_VIEW_SETTINGS.FIRST) {
|
||||
view = currentProject.value?.views.find(v => v.viewKind === defaultView)
|
||||
}
|
||||
|
||||
// Use the first view as fallback if the default view is not available
|
||||
if (view === undefined && projectStore.projects[props.projectId]?.views?.length > 0) {
|
||||
view = projectStore.projects[props.projectId]?.views[0]
|
||||
if (view === undefined && currentProject.value?.views?.length > 0) {
|
||||
view = currentProject.value?.views[0]
|
||||
}
|
||||
|
||||
if (view) {
|
||||
@@ -60,39 +117,39 @@ watch(
|
||||
)
|
||||
|
||||
watch(
|
||||
() => projectStore.projects[props.projectId],
|
||||
currentProject,
|
||||
redirectToDefaultViewIfNecessary,
|
||||
)
|
||||
|
||||
// using a watcher instead of beforeEnter because beforeEnter is not called when only the viewId changes
|
||||
watch(
|
||||
() => [props.projectId, props.viewId],
|
||||
() => saveProjectView(props.projectId, props.viewId),
|
||||
{immediate: true},
|
||||
)
|
||||
watchEffect(() => saveProjectToHistory({id: props.projectId}))
|
||||
watchEffect(() => saveProjectView(props.projectId, props.viewId))
|
||||
|
||||
const route = useRoute()
|
||||
watchEffect(() => baseStore.setCurrentProjectViewId(props.viewId))
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<ProjectList
|
||||
v-if="currentView?.viewKind === 'list'"
|
||||
:project-id="projectId"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:view-id
|
||||
/>
|
||||
<ProjectGantt
|
||||
v-if="currentView?.viewKind === 'gantt'"
|
||||
:route
|
||||
:is-loading-project="isLoadingProject"
|
||||
:view-id
|
||||
/>
|
||||
<ProjectTable
|
||||
v-if="currentView?.viewKind === 'table'"
|
||||
:project-id="projectId"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:view-id
|
||||
/>
|
||||
<ProjectKanban
|
||||
v-if="currentView?.viewKind === 'kanban'"
|
||||
:project-id="projectId"
|
||||
:is-loading-project="isLoadingProject"
|
||||
:view-id
|
||||
/>
|
||||
</template>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import ApiTokenService from '@/services/apiToken'
|
||||
import {computed, onMounted, ref} from 'vue'
|
||||
import {useFlatpickrLanguage} from '@/helpers/useFlatpickrLanguage'
|
||||
import {formatDateShort, formatDateSince} from '@/helpers/time/formatDate'
|
||||
import XButton from '@/components/input/Button.vue'
|
||||
import BaseButton from '@/components/base/BaseButton.vue'
|
||||
@@ -12,7 +13,6 @@ import 'flatpickr/dist/flatpickr.css'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import Message from '@/components/misc/Message.vue'
|
||||
import type {IApiToken} from '@/modelTypes/IApiToken'
|
||||
import { getFlatpickrLanguage } from '@/helpers/flatpickrLanguage'
|
||||
|
||||
const service = new ApiTokenService()
|
||||
const tokens = ref<IApiToken[]>([])
|
||||
@@ -42,7 +42,7 @@ const flatPickerConfig = computed(() => ({
|
||||
dateFormat: 'Y-m-d H:i',
|
||||
enableTime: true,
|
||||
time_24hr: true,
|
||||
locale: getFlatpickrLanguage(),
|
||||
locale: useFlatpickrLanguage().value,
|
||||
minDate: now,
|
||||
}))
|
||||
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
{
|
||||
"extends": [
|
||||
"@tsconfig/node22/tsconfig.json",
|
||||
"@tsconfig/node24/tsconfig.json",
|
||||
"@vue/tsconfig/tsconfig.json"
|
||||
],
|
||||
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*"],
|
||||
"include": [
|
||||
"env.config.d.ts",
|
||||
"vite.config.*",
|
||||
"vitest.config.*",
|
||||
"cypress.config.*"
|
||||
],
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"noEmit": true,
|
||||
|
||||
@@ -184,7 +184,7 @@ export default defineConfig(({mode}) => {
|
||||
},
|
||||
}),
|
||||
vueDevTools({
|
||||
launchEditor: env.VUE_DEVTOOLS_LAUNCH_EDITOR || 'code'
|
||||
launchEditor: env.VUE_DEVTOOLS_LAUNCH_EDITOR || 'code',
|
||||
}),
|
||||
viteSentry(getSentryConfig(env)),
|
||||
],
|
||||
|
||||
@@ -18,22 +18,23 @@ module code.vikunja.io/api
|
||||
|
||||
require (
|
||||
dario.cat/mergo v1.0.1
|
||||
github.com/ThreeDotsLabs/watermill v1.4.1
|
||||
github.com/ThreeDotsLabs/watermill v1.4.4
|
||||
github.com/adlio/trello v1.12.0
|
||||
github.com/arran4/golang-ical v0.3.1
|
||||
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
|
||||
github.com/bbrks/go-blurhash v1.1.1
|
||||
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
|
||||
github.com/coreos/go-oidc/v3 v3.11.0
|
||||
github.com/coreos/go-oidc/v3 v3.12.0
|
||||
github.com/cweill/gotests v1.6.0
|
||||
github.com/d4l3k/messagediff v1.2.1
|
||||
github.com/disintegration/imaging v1.6.2
|
||||
github.com/dustinkirkland/golang-petname v0.0.0-20240422154211-76c06c4bde6b
|
||||
github.com/gabriel-vasile/mimetype v1.4.7
|
||||
github.com/gabriel-vasile/mimetype v1.4.8
|
||||
github.com/ganigeorgiev/fexpr v0.4.1
|
||||
github.com/getsentry/sentry-go v0.30.0
|
||||
github.com/getsentry/sentry-go v0.31.1
|
||||
github.com/getsentry/sentry-go/echo v0.31.1
|
||||
github.com/go-sql-driver/mysql v1.8.1
|
||||
github.com/go-testfixtures/testfixtures/v3 v3.11.0
|
||||
github.com/go-testfixtures/testfixtures/v3 v3.14.0
|
||||
github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a
|
||||
github.com/golang-jwt/jwt/v5 v5.2.1
|
||||
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
|
||||
@@ -58,7 +59,7 @@ require (
|
||||
github.com/redis/go-redis/v9 v9.7.0
|
||||
github.com/robfig/cron/v3 v3.0.1
|
||||
github.com/samedi/caldav-go v3.0.0+incompatible
|
||||
github.com/spf13/afero v1.11.0
|
||||
github.com/spf13/afero v1.12.0
|
||||
github.com/spf13/cobra v1.8.1
|
||||
github.com/spf13/viper v1.19.0
|
||||
github.com/stretchr/testify v1.10.0
|
||||
@@ -66,17 +67,17 @@ require (
|
||||
github.com/tkuchiki/go-timezone v0.2.3
|
||||
github.com/typesense/typesense-go/v2 v2.0.0
|
||||
github.com/ulule/limiter/v3 v3.11.2
|
||||
github.com/wneessen/go-mail v0.5.2
|
||||
github.com/wneessen/go-mail v0.6.1
|
||||
github.com/yuin/goldmark v1.7.8
|
||||
golang.org/x/crypto v0.31.0
|
||||
golang.org/x/crypto v0.32.0
|
||||
golang.org/x/image v0.23.0
|
||||
golang.org/x/oauth2 v0.24.0
|
||||
golang.org/x/oauth2 v0.25.0
|
||||
golang.org/x/sync v0.10.0
|
||||
golang.org/x/sys v0.28.0
|
||||
golang.org/x/term v0.27.0
|
||||
golang.org/x/sys v0.29.0
|
||||
golang.org/x/term v0.28.0
|
||||
golang.org/x/text v0.21.0
|
||||
gopkg.in/d4l3k/messagediff.v1 v1.2.1
|
||||
mvdan.cc/xurls/v2 v2.5.0
|
||||
mvdan.cc/xurls/v2 v2.6.0
|
||||
src.techknowlogick.com/xgo v1.8.1-0.20241105013731-313dedef864f
|
||||
src.techknowlogick.com/xormigrate v1.7.1
|
||||
xorm.io/builder v0.3.13
|
||||
@@ -84,33 +85,56 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
cel.dev/expr v0.16.1 // indirect
|
||||
cloud.google.com/go v0.116.0 // indirect
|
||||
cloud.google.com/go/auth v0.13.0 // indirect
|
||||
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
|
||||
cloud.google.com/go/compute/metadata v0.6.0 // indirect
|
||||
cloud.google.com/go/iam v1.2.2 // indirect
|
||||
cloud.google.com/go/longrunning v0.6.2 // indirect
|
||||
cloud.google.com/go/monitoring v1.21.2 // indirect
|
||||
cloud.google.com/go/spanner v1.73.0 // indirect
|
||||
filippo.io/edwards25519 v1.1.0 // indirect
|
||||
github.com/ClickHouse/ch-go v0.61.5 // indirect
|
||||
github.com/ClickHouse/clickhouse-go/v2 v2.24.0 // indirect
|
||||
github.com/ClickHouse/clickhouse-go/v2 v2.30.0 // indirect
|
||||
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect
|
||||
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
|
||||
github.com/KyleBanks/depth v1.2.1 // indirect
|
||||
github.com/andybalholm/brotli v1.1.0 // indirect
|
||||
github.com/andybalholm/brotli v1.1.1 // indirect
|
||||
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
|
||||
github.com/aymerick/douceur v0.2.0 // indirect
|
||||
github.com/beevik/etree v1.1.0 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
|
||||
github.com/boombuler/barcode v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
|
||||
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
|
||||
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
|
||||
github.com/felixge/httpsnoop v1.0.4 // indirect
|
||||
github.com/fsnotify/fsnotify v1.7.0 // indirect
|
||||
github.com/go-chi/chi/v5 v5.1.0 // indirect
|
||||
github.com/go-faster/city v1.0.1 // indirect
|
||||
github.com/go-faster/errors v0.7.1 // indirect
|
||||
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
|
||||
github.com/go-logr/logr v1.4.2 // indirect
|
||||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
github.com/go-openapi/jsonpointer v0.20.2 // indirect
|
||||
github.com/go-openapi/jsonreference v0.20.3 // indirect
|
||||
github.com/go-openapi/spec v0.20.4 // indirect
|
||||
github.com/go-openapi/swag v0.22.8 // indirect
|
||||
github.com/goccy/go-json v0.10.2 // indirect
|
||||
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/golang/snappy v0.0.4 // indirect
|
||||
github.com/google/s2a-go v0.1.8 // indirect
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
|
||||
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
|
||||
github.com/googleapis/go-sql-spanner v1.7.4 // indirect
|
||||
github.com/gorilla/css v1.0.1 // indirect
|
||||
github.com/hashicorp/errwrap v1.1.0 // indirect
|
||||
github.com/hashicorp/go-multierror v1.1.1 // indirect
|
||||
@@ -139,6 +163,7 @@ require (
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
||||
github.com/pierrec/lz4/v4 v4.1.21 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
||||
github.com/prometheus/client_model v0.6.1 // indirect
|
||||
github.com/prometheus/common v0.55.0 // indirect
|
||||
@@ -160,15 +185,27 @@ require (
|
||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||
github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4 // indirect
|
||||
go.opentelemetry.io/otel v1.26.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.26.0 // indirect
|
||||
go.opencensus.io v0.24.0 // indirect
|
||||
go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
|
||||
go.opentelemetry.io/otel v1.29.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.29.0 // indirect
|
||||
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
|
||||
go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.29.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
|
||||
golang.org/x/mod v0.17.0 // indirect
|
||||
golang.org/x/mod v0.22.0 // indirect
|
||||
golang.org/x/net v0.33.0 // indirect
|
||||
golang.org/x/time v0.8.0 // indirect
|
||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
golang.org/x/tools v0.28.0 // indirect
|
||||
google.golang.org/api v0.215.0 // indirect
|
||||
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
|
||||
google.golang.org/grpc v1.67.3 // indirect
|
||||
google.golang.org/protobuf v1.36.1 // indirect
|
||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
@@ -177,6 +214,6 @@ require (
|
||||
|
||||
replace github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
|
||||
|
||||
go 1.22
|
||||
go 1.22.0
|
||||
|
||||
toolchain go1.23.4
|
||||
toolchain go1.23.5
|
||||
|
||||
@@ -100,6 +100,12 @@ func getRouteDetail(route echo.Route) (method string, detail *RouteDetail) {
|
||||
}
|
||||
}
|
||||
|
||||
func ensureAPITokenRoutesGroup(group string) {
|
||||
if _, has := apiTokenRoutes[group]; !has {
|
||||
apiTokenRoutes[group] = make(APITokenRoute)
|
||||
}
|
||||
}
|
||||
|
||||
// CollectRoutesForAPITokenUsage gets called for every added APITokenRoute and builds a list of all routes we can use for the api tokens.
|
||||
func CollectRoutesForAPITokenUsage(route echo.Route, middlewares []echo.MiddlewareFunc) {
|
||||
|
||||
@@ -139,10 +145,15 @@ func CollectRoutesForAPITokenUsage(route echo.Route, middlewares []echo.Middlewa
|
||||
// and if that's the case, add it to its parent instead.
|
||||
// Otherwise, we add it to the "other" key.
|
||||
if len(routeParts) == 1 {
|
||||
if _, has := apiTokenRoutes["other"]; !has {
|
||||
apiTokenRoutes["other"] = make(APITokenRoute)
|
||||
if routeGroupName == "notifications" && route.Method == http.MethodPost {
|
||||
ensureAPITokenRoutesGroup("notifications")
|
||||
|
||||
apiTokenRoutes["notifications"]["mark_all_as_read"] = routeDetail
|
||||
return
|
||||
}
|
||||
|
||||
ensureAPITokenRoutesGroup("other")
|
||||
|
||||
_, exists := apiTokenRoutes["other"][routeGroupName]
|
||||
if exists {
|
||||
routeGroupName += "_" + strings.ToLower(route.Method)
|
||||
@@ -168,10 +179,7 @@ func CollectRoutesForAPITokenUsage(route echo.Route, middlewares []echo.Middlewa
|
||||
|
||||
if strings.HasSuffix(routeGroupName, "_bulk") {
|
||||
parent := strings.TrimSuffix(routeGroupName, "_bulk")
|
||||
_, has := apiTokenRoutes[parent]
|
||||
if !has {
|
||||
apiTokenRoutes[parent] = make(APITokenRoute)
|
||||
}
|
||||
ensureAPITokenRoutesGroup(parent)
|
||||
|
||||
method, routeDetail := getRouteDetail(route)
|
||||
apiTokenRoutes[parent][method+"_bulk"] = routeDetail
|
||||
@@ -202,6 +210,7 @@ func CollectRoutesForAPITokenUsage(route echo.Route, middlewares []echo.Middlewa
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// GetAvailableAPIRoutesForToken returns a list of all API routes which are available for token usage.
|
||||
@@ -229,7 +238,9 @@ func CanDoAPIRoute(c echo.Context, token *APIToken) (can bool) {
|
||||
|
||||
routeGroupName = strings.TrimSuffix(routeGroupName, "_bulk")
|
||||
|
||||
if routeGroupName == "user" {
|
||||
if routeGroupName == "user" ||
|
||||
routeGroupName == "users" ||
|
||||
routeGroupName == "routes" {
|
||||
routeGroupName = "other"
|
||||
}
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ import (
|
||||
"code.vikunja.io/api/pkg/user"
|
||||
"code.vikunja.io/api/pkg/utils"
|
||||
"code.vikunja.io/api/pkg/version"
|
||||
|
||||
"xorm.io/xorm"
|
||||
)
|
||||
|
||||
@@ -106,7 +107,10 @@ func ExportUserData(s *xorm.Session, u *user.User) (err error) {
|
||||
|
||||
// Save the file id with the user
|
||||
u.ExportFileID = exportFile.ID
|
||||
_, err = s.Cols("export_file_id").Update(u)
|
||||
_, err = s.
|
||||
Where("id = ?", u.ID).
|
||||
Cols("export_file_id").
|
||||
Update(u)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ func (b *TaskBucket) Update(s *xorm.Session, a web.Auth) (err error) {
|
||||
// Check the bucket limit
|
||||
// Only check the bucket limit if the task is being moved between buckets, allow reordering the task within a bucket
|
||||
if b.BucketID != 0 && b.BucketID != oldTaskBucket.BucketID {
|
||||
err = checkBucketLimit(s, &task, bucket)
|
||||
err = checkBucketLimit(s, a, &task, bucket)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
+25
-5
@@ -656,19 +656,39 @@ func addMoreInfoToTasks(s *xorm.Session, taskMap map[int64]*Task, a web.Auth, vi
|
||||
}
|
||||
|
||||
// Checks if adding a new task would exceed the bucket limit
|
||||
func checkBucketLimit(s *xorm.Session, t *Task, bucket *Bucket) (err error) {
|
||||
func checkBucketLimit(s *xorm.Session, a web.Auth, t *Task, bucket *Bucket) (err error) {
|
||||
if bucket.Limit > 0 {
|
||||
taskCount, err := s.
|
||||
Where("bucket_id = ?", bucket.ID).
|
||||
GroupBy("task_id").
|
||||
Count(&TaskBucket{})
|
||||
var taskCount int64
|
||||
view, err := GetProjectViewByID(s, bucket.ProjectViewID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if view.ProjectID < 0 || (view.Filter != nil && view.Filter.Filter != "") {
|
||||
tc := &TaskCollection{
|
||||
ProjectID: view.ProjectID,
|
||||
ProjectViewID: bucket.ProjectViewID,
|
||||
}
|
||||
|
||||
_, _, taskCount, err = tc.ReadAll(s, a, "", 1, 1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
taskCount, err = s.
|
||||
Where("bucket_id = ?", bucket.ID).
|
||||
GroupBy("task_id").
|
||||
Count(&TaskBucket{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if taskCount >= bucket.Limit {
|
||||
return ErrBucketLimitExceeded{TaskID: t.ID, BucketID: bucket.ID, Limit: bucket.Limit}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -192,10 +192,20 @@ func Restore(filename string) error {
|
||||
|
||||
func restoreTableData(tables map[string]*zip.File) error {
|
||||
jsonFields := map[string][]string{
|
||||
"api_tokens": {"permissions"},
|
||||
"notifications": {"notification"},
|
||||
"project_views": {"filter", "bucket_configuration"},
|
||||
"saved_filters": {"filters"},
|
||||
"users": {"frontend_settings"},
|
||||
}
|
||||
|
||||
floatFields := map[string][]string{
|
||||
"buckets": {"position"},
|
||||
"project_views": {"position"},
|
||||
"projects": {"position"},
|
||||
"task_positions": {"position"},
|
||||
}
|
||||
|
||||
// Restore all db data
|
||||
for table, d := range tables {
|
||||
content, err := unmarshalFileToJSON(d)
|
||||
@@ -203,8 +213,7 @@ func restoreTableData(tables map[string]*zip.File) error {
|
||||
return fmt.Errorf("could not read table %s: %w", table, err)
|
||||
}
|
||||
|
||||
fields, hasJSONFields := jsonFields[table]
|
||||
if hasJSONFields {
|
||||
processFields := func(fields []string, isFloat bool) error {
|
||||
for i := range content {
|
||||
for _, f := range fields {
|
||||
|
||||
@@ -222,9 +231,32 @@ func restoreTableData(tables map[string]*zip.File) error {
|
||||
decoded = []byte(content[i][f].(string))
|
||||
}
|
||||
|
||||
content[i][f] = string(decoded)
|
||||
if isFloat {
|
||||
val, err := strconv.ParseFloat(string(decoded), 64)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not parse double value for field '%s': %w", f, err)
|
||||
}
|
||||
content[i][f] = val
|
||||
} else {
|
||||
content[i][f] = string(decoded)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Process JSON fields
|
||||
if fields, hasJSONFields := jsonFields[table]; hasJSONFields {
|
||||
if err := processFields(fields, false); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Process double fields
|
||||
if fields, hasDoubleFields := floatFields[table]; hasDoubleFields {
|
||||
if err := processFields(fields, true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if err := db.Restore(table, content); err != nil {
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
// Vikunja is a to-do list application to facilitate your life.
|
||||
// Copyright 2018-present Vikunja and contributors. All rights reserved.
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public Licensee as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public Licensee for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public Licensee
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
package migration
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"code.vikunja.io/api/pkg/web"
|
||||
)
|
||||
|
||||
// ErrNotAZipFile represents a "ErrNotAZipFile" kind of error.
|
||||
type ErrNotAZipFile struct{}
|
||||
|
||||
func (err *ErrNotAZipFile) Error() string {
|
||||
return "The provided file is not a valid zip file"
|
||||
}
|
||||
|
||||
// ErrCodeNotAZipFile holds the unique world-error code of this error
|
||||
const ErrCodeNotAZipFile = 14001
|
||||
|
||||
// HTTPError holds the http error description
|
||||
func (err *ErrNotAZipFile) HTTPError() web.HTTPError {
|
||||
return web.HTTPError{
|
||||
HTTPCode: http.StatusBadRequest,
|
||||
Code: ErrCodeNotAZipFile,
|
||||
Message: "The provided file is not a valid zip file.",
|
||||
}
|
||||
}
|
||||
@@ -67,6 +67,9 @@ func (v *FileMigrator) Name() string {
|
||||
func (v *FileMigrator) Migrate(user *user.User, file io.ReaderAt, size int64) error {
|
||||
r, err := zip.NewReader(file, size)
|
||||
if err != nil {
|
||||
if err.Error() == "zip: not a valid zip file" {
|
||||
return &migration.ErrNotAZipFile{}
|
||||
}
|
||||
return fmt.Errorf("could not open import file: %w", err)
|
||||
}
|
||||
|
||||
|
||||
+13
-13
@@ -64,7 +64,7 @@ const docTemplate = `{
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"500": {
|
||||
@@ -741,7 +741,7 @@ const docTemplate = `{
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -3923,7 +3923,7 @@ const docTemplate = `{
|
||||
"200": {
|
||||
"description": "The valid jwt auth token.",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -7360,7 +7360,7 @@ const docTemplate = `{
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -7696,15 +7696,6 @@ const docTemplate = `{
|
||||
}
|
||||
},
|
||||
"definitions": {
|
||||
"auth.Token": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"token": {
|
||||
"type": "string",
|
||||
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
|
||||
}
|
||||
}
|
||||
},
|
||||
"background.Image": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -7725,6 +7716,15 @@ const docTemplate = `{
|
||||
}
|
||||
}
|
||||
},
|
||||
"code_vikunja_io_api_pkg_modules_auth.Token": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"token": {
|
||||
"type": "string",
|
||||
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
|
||||
}
|
||||
}
|
||||
},
|
||||
"files.File": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
+13
-13
@@ -56,7 +56,7 @@
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"500": {
|
||||
@@ -733,7 +733,7 @@
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -3915,7 +3915,7 @@
|
||||
"200": {
|
||||
"description": "The valid jwt auth token.",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -7352,7 +7352,7 @@
|
||||
"200": {
|
||||
"description": "OK",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/auth.Token"
|
||||
"$ref": "#/definitions/code_vikunja_io_api_pkg_modules_auth.Token"
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
@@ -7688,15 +7688,6 @@
|
||||
}
|
||||
},
|
||||
"definitions": {
|
||||
"auth.Token": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"token": {
|
||||
"type": "string",
|
||||
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
|
||||
}
|
||||
}
|
||||
},
|
||||
"background.Image": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -7717,6 +7708,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"code_vikunja_io_api_pkg_modules_auth.Token": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"token": {
|
||||
"type": "string",
|
||||
"example": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"
|
||||
}
|
||||
}
|
||||
},
|
||||
"files.File": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
+10
-10
@@ -1,11 +1,5 @@
|
||||
basePath: /api/v1
|
||||
definitions:
|
||||
auth.Token:
|
||||
properties:
|
||||
token:
|
||||
example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
|
||||
type: string
|
||||
type: object
|
||||
background.Image:
|
||||
properties:
|
||||
blur_hash:
|
||||
@@ -20,6 +14,12 @@ definitions:
|
||||
url:
|
||||
type: string
|
||||
type: object
|
||||
code_vikunja_io_api_pkg_modules_auth.Token:
|
||||
properties:
|
||||
token:
|
||||
example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
|
||||
type: string
|
||||
type: object
|
||||
files.File:
|
||||
properties:
|
||||
created:
|
||||
@@ -1785,7 +1785,7 @@ paths:
|
||||
"200":
|
||||
description: OK
|
||||
schema:
|
||||
$ref: '#/definitions/auth.Token'
|
||||
$ref: '#/definitions/code_vikunja_io_api_pkg_modules_auth.Token'
|
||||
"500":
|
||||
description: Internal error
|
||||
schema:
|
||||
@@ -2226,7 +2226,7 @@ paths:
|
||||
"200":
|
||||
description: OK
|
||||
schema:
|
||||
$ref: '#/definitions/auth.Token'
|
||||
$ref: '#/definitions/code_vikunja_io_api_pkg_modules_auth.Token'
|
||||
"400":
|
||||
description: Invalid user password model.
|
||||
schema:
|
||||
@@ -4337,7 +4337,7 @@ paths:
|
||||
"200":
|
||||
description: The valid jwt auth token.
|
||||
schema:
|
||||
$ref: '#/definitions/auth.Token'
|
||||
$ref: '#/definitions/code_vikunja_io_api_pkg_modules_auth.Token'
|
||||
"400":
|
||||
description: Invalid link share object provided.
|
||||
schema:
|
||||
@@ -6607,7 +6607,7 @@ paths:
|
||||
"200":
|
||||
description: OK
|
||||
schema:
|
||||
$ref: '#/definitions/auth.Token'
|
||||
$ref: '#/definitions/code_vikunja_io_api_pkg_modules_auth.Token'
|
||||
"400":
|
||||
description: Only user token are available for renew.
|
||||
schema:
|
||||
|
||||
@@ -532,3 +532,56 @@ func (err *ErrUsernameMustNotContainSpaces) HTTPError() web.HTTPError {
|
||||
Message: "The username must not contain spaces.",
|
||||
}
|
||||
}
|
||||
|
||||
// ErrMustNotBeLinkShare represents a "MustNotBeLinkShare" kind of error.
|
||||
type ErrMustNotBeLinkShare struct{}
|
||||
|
||||
// IsErrMustNotBeLinkShare checks if an error is a ErrMustNotBeLinkShare.
|
||||
func IsErrMustNotBeLinkShare(err error) bool {
|
||||
_, ok := err.(*ErrMustNotBeLinkShare)
|
||||
return ok
|
||||
}
|
||||
|
||||
func (err *ErrMustNotBeLinkShare) Error() string {
|
||||
return "user must be a *User, not a *models.LinkSharing"
|
||||
}
|
||||
|
||||
// ErrCodeMustNotBeLinkShare holds the unique world-error code of this error
|
||||
const ErrCodeMustNotBeLinkShare = 1023
|
||||
|
||||
// HTTPError holds the http error description
|
||||
func (err *ErrMustNotBeLinkShare) HTTPError() web.HTTPError {
|
||||
return web.HTTPError{
|
||||
HTTPCode: http.StatusForbidden,
|
||||
Code: ErrCodeMustNotBeLinkShare,
|
||||
Message: "You can't do that as a link share.",
|
||||
}
|
||||
}
|
||||
|
||||
// ErrInvalidClaimData represents a "InvalidClaimData" kind of error.
|
||||
type ErrInvalidClaimData struct {
|
||||
Field string
|
||||
Type string
|
||||
}
|
||||
|
||||
// IsErrInvalidClaimData checks if an error is a ErrInvalidClaimData.
|
||||
func IsErrInvalidClaimData(err error) bool {
|
||||
_, ok := err.(*ErrInvalidClaimData)
|
||||
return ok
|
||||
}
|
||||
|
||||
func (err *ErrInvalidClaimData) Error() string {
|
||||
return fmt.Sprintf("invalid claim data for field %s of type %s", err.Field, err.Type)
|
||||
}
|
||||
|
||||
// ErrCodeInvalidClaimData holds the unique world-error code of this error
|
||||
const ErrCodeInvalidClaimData = 1024
|
||||
|
||||
// HTTPError holds the http error description
|
||||
func (err *ErrInvalidClaimData) HTTPError() web.HTTPError {
|
||||
return web.HTTPError{
|
||||
HTTPCode: http.StatusBadRequest,
|
||||
Code: ErrCodeInvalidClaimData,
|
||||
Message: fmt.Sprintf("Invalid claim data for field %s of type %s", err.Field, err.Type),
|
||||
}
|
||||
}
|
||||
|
||||
+35
-8
@@ -186,7 +186,11 @@ func (u *User) GetFailedPasswordAttemptsKey() string {
|
||||
func GetFromAuth(a web.Auth) (*User, error) {
|
||||
u, is := a.(*User)
|
||||
if !is {
|
||||
return &User{}, fmt.Errorf("user is not user element, is %s", reflect.TypeOf(a))
|
||||
typ := reflect.TypeOf(a)
|
||||
if typ.String() == "*models.LinkSharing" {
|
||||
return nil, &ErrMustNotBeLinkShare{}
|
||||
}
|
||||
return &User{}, fmt.Errorf("user is not user element, is %s", typ)
|
||||
}
|
||||
return u, nil
|
||||
}
|
||||
@@ -442,16 +446,39 @@ func GetCurrentUser(c echo.Context) (user *User, err error) {
|
||||
func GetUserFromClaims(claims jwt.MapClaims) (user *User, err error) {
|
||||
userID, ok := claims["id"].(float64)
|
||||
if !ok {
|
||||
return user, ErrCouldNotGetUserID{}
|
||||
return user, &ErrInvalidClaimData{
|
||||
Field: "id",
|
||||
Type: reflect.TypeOf(claims["id"]).String(),
|
||||
}
|
||||
}
|
||||
user = &User{
|
||||
ID: int64(userID),
|
||||
Email: claims["email"].(string),
|
||||
Username: claims["username"].(string),
|
||||
Name: claims["name"].(string),
|
||||
email, ok := claims["email"].(string)
|
||||
if !ok {
|
||||
return nil, &ErrInvalidClaimData{
|
||||
Field: "email",
|
||||
Type: reflect.TypeOf(claims["email"]).String(),
|
||||
}
|
||||
}
|
||||
username, ok := claims["username"].(string)
|
||||
if !ok {
|
||||
return nil, &ErrInvalidClaimData{
|
||||
Field: "username",
|
||||
Type: reflect.TypeOf(claims["username"]).String(),
|
||||
}
|
||||
}
|
||||
name, ok := claims["name"].(string)
|
||||
if !ok {
|
||||
return nil, &ErrInvalidClaimData{
|
||||
Field: "name",
|
||||
Type: reflect.TypeOf(claims["name"]).String(),
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
return &User{
|
||||
ID: int64(userID),
|
||||
Email: email,
|
||||
Username: username,
|
||||
Name: name,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// UpdateUser updates a user
|
||||
|
||||
Reference in New Issue
Block a user