Compare commits

..

53 Commits

Author SHA1 Message Date
163885af81
fix: dynamically import project components again 2023-01-18 22:52:14 +01:00
f60e4dd89d
fix: remove unused css class 2023-01-18 22:48:23 +01:00
d4eda3784f
fix: rename link share list class 2023-01-18 22:43:04 +01:00
da75638b12
fix: use @ for imports of all views 2023-01-18 17:07:56 +01:00
3f82dbe0df
fix: revert a few navigation changes 2023-01-18 17:01:58 +01:00
31eee4c2f1
fix: change debug log 2023-01-18 16:52:09 +01:00
62262e5397
fix: animation class list name 2023-01-18 16:36:25 +01:00
d3d860d3bd
fix: result list class name 2023-01-18 16:21:17 +01:00
170f46581d
fix: list view component name 2023-01-18 16:20:33 +01:00
5e57458ffd
fix: list view class names 2023-01-18 16:20:21 +01:00
bbeab337e2
fix: project create route 2023-01-18 16:18:47 +01:00
45454060f5
fix: update comment 2023-01-18 16:17:48 +01:00
a734bad5e4
fix: name update tasks function correctly 2023-01-18 16:17:09 +01:00
f0c2692dac
fix: list item property name 2023-01-18 16:15:29 +01:00
170ac59395
fix: list view css class name 2023-01-18 16:13:20 +01:00
fbf88b2ea7
fix: list view variable name 2023-01-18 16:12:33 +01:00
1f1ce07ba0
fix: change comment 2023-01-18 16:11:51 +01:00
97f6135c57
fix: remove duplicate variables 2023-01-18 16:11:05 +01:00
7a392d1347
chore: remove debugging leftover 2023-01-18 16:08:26 +01:00
059e4643e6
fix: comment 2023-01-18 16:03:27 +01:00
e48dfca2d1
fix: router imports 2023-01-18 16:03:22 +01:00
4bcd94c70f
fix: i18n keys 2023-01-18 16:02:18 +01:00
8338cfbc8d
chore: clarify comment 2023-01-18 15:57:49 +01:00
b2884af81b
fix: list view variable name 2023-01-18 15:54:50 +01:00
0ae389f485
fix: notifications list class name 2023-01-18 15:53:00 +01:00
e090221ebd
fix: pagination list class name 2023-01-18 15:52:24 +01:00
68cf0e30ce
fix: shortcut list class name 2023-01-18 15:51:42 +01:00
2d50ea71ec
fix: editor list 2023-01-18 15:50:42 +01:00
9cf3f900c3
chore: rename unused variable 2023-01-18 15:47:30 +01:00
1d2d4a2363
fix: wrong projecten rename from lists 2023-01-18 15:45:49 +01:00
c8ceefe12e
chore: add const for project settings 2023-01-18 14:05:52 +01:00
ac0b4dcf36
feat: migrate old list settings 2023-01-18 14:04:16 +01:00
0e6c219800
fix: cypress tests 2023-01-17 23:34:49 +01:00
59448c1037
fix: color picker import 2023-01-17 23:02:17 +01:00
357f1cfc5c
fix: project store loading 2023-01-17 23:02:10 +01:00
ca4074fe01
fix: loading saved filter 2023-01-17 23:00:39 +01:00
7bb39ee088
fix: setLoading when updating a project 2023-01-17 22:52:48 +01:00
a058b39aba
fix: find project 2023-01-17 22:51:30 +01:00
25352e1b33
fix: list view spacing 2023-01-17 22:45:58 +01:00
b7ed70ff39
fix: task overview 2023-01-17 22:44:36 +01:00
15d1e636c4
fix: load project 2023-01-17 22:35:14 +01:00
fd22f42949
fix: i18n keys 2023-01-17 22:35:04 +01:00
a9cee4474f
fix: use correct class names 2023-01-17 22:31:30 +01:00
2cdfc65f1c
fix: use list card grid 2023-01-17 22:31:08 +01:00
ad169d7a72
fix: parse task text 2023-01-17 18:24:37 +01:00
a658201de8
fix: lint 2023-01-17 18:21:39 +01:00
f54aeb8e0b
fix: rename component imports 2023-01-17 18:19:04 +01:00
e9aa784739
fix: don't wait until background is loaded for list to show 2023-01-17 18:19:04 +01:00
d759741b20
fix: list view route 2023-01-17 18:19:04 +01:00
03040cbc12
fix: typo in readme 2023-01-17 18:19:04 +01:00
2f30ae2efa
fix: e2e tests 2023-01-17 18:19:03 +01:00
dd98a3d972
fix: project table view 2023-01-17 18:19:03 +01:00
6db913b205
feat: rename list to project everywhere 2023-01-17 18:19:02 +01:00
215 changed files with 5397 additions and 7028 deletions

View File

@ -149,10 +149,8 @@ steps:
# Override the default api url used for preview # Override the default api url used for preview
- sed -i 's|http://localhost:3456|https://try.vikunja.io|g' dist-preview/index.html - sed -i 's|http://localhost:3456|https://try.vikunja.io|g' dist-preview/index.html
- apk add --no-cache perl-utils - apk add --no-cache perl-utils
# create via: - shasum -a 384 -c ./scripts/deploy-preview-netlify.js.sha384
# `shasum -a 384 ./scripts/deploy-preview-netlify.mjs > ./scripts/deploy-preview-netlify.mjs.sha384` - node ./scripts/deploy-preview-netlify.js
- shasum -a 384 -c ./scripts/deploy-preview-netlify.mjs.sha384
- node ./scripts/deploy-preview-netlify.mjs
depends_on: depends_on:
- build-prod - build-prod
when: when:
@ -393,7 +391,6 @@ steps:
environment: environment:
DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
DOCKER_AUTOTAG_EXTRA_TAGS: latest DOCKER_AUTOTAG_EXTRA_TAGS: latest
DOCKER_AUTOTAG_OUTPUT_FILE: .tags
depends_on: [ fetch-tags ] depends_on: [ fetch-tags ]
when: when:
ref: ref:
@ -409,6 +406,7 @@ steps:
password: password:
from_secret: docker_password from_secret: docker_password
repo: vikunja/frontend repo: vikunja/frontend
auto_tag: true
build_args: build_args:
- USE_RELEASE=true - USE_RELEASE=true
- RELEASE_VERSION=${DRONE_TAG##v} - RELEASE_VERSION=${DRONE_TAG##v}
@ -521,6 +519,6 @@ steps:
from_secret: crowdin_key from_secret: crowdin_key
--- ---
kind: signature kind: signature
hmac: 971875b90c7bb1649d1b00d022d0b594ba9b68f927bf8f0dbe840190816d676b hmac: 0a65a032008f2d1911866dcb0d9536b26c1d6b105943ed5328ac13abc99c423f
... ...

View File

@ -1,13 +0,0 @@
# (1) Duplicate this file and remove the '.example' suffix.
# Naming this file '.env.local' is a Vite convention to prevent accidentally
# submitting to git.
# For more info see: https://vitejs.dev/guide/env-and-mode.html#env-files
# (2) Comment in and adjust the values as needed.
# VITE_IS_ONLINE=true
# VITE_WORKBOX_DEBUG=false
# SENTRY_AUTH_TOKEN=YOUR_TOKEN
# SENTRY_ORG=vikunja
# SENTRY_PROJECT=frontend-oss
# VIKUNJA_FRONTEND_BASE=/custom-subpath

3
.github/FUNDING.yml vendored
View File

@ -1,3 +1,2 @@
github: kolaente github: kolaente
open_collective: vikunja custom: https://www.buymeacoffee.com/kolaente
custom: ["https://vikunja.cloud", "https://www.buymeacoffee.com/kolaente"]

2
.nvmrc
View File

@ -1 +1 @@
18.14.1 v18

View File

@ -9,173 +9,6 @@ All releases can be found on https://code.vikunja.io/frontend/releases.
The releases aim at the api versions which is why there are missing versions. The releases aim at the api versions which is why there are missing versions.
## [0.20.3] - 2023-01-24
### Bug Fixes
* *(BaseButton)* Prop type
* *(ci)* Make sure the i18n sync cron job actually runs
* *(ci)* Sign drone config
* *(ci)* Sign drone config
* *(ci)* Tagging logic for release docker images
* *(ci)* Sign drone config
* *(cypress)* Use ts for updateUserSettings
* *(cypress)* Use env for API_URL (#2925)
* *(drone)* Use correct property value (#2920)
* *(drone)* Pnpm cache folder path (#2932)
* *(faker)* Remove mock types (#2921)
* *(i18n)* Incorrect translation string
* *(migration)* Actually pass migration oauth code from query param
* *(quick add magic)* Make sure assignees which don't exist are not removed from task title
* *(task)* Update task description when switching between related tasks
* *(task)* Don't show the list color on the task when only viewing the list (#2975)
* *(useOnline)* Only log if actually faking state (#2924)
* Close button hover for sidebar (#2981) ([9922fcb](9922fcba65c8dc2c46c4f085813c2fbc0d0a7df6))
### Dependencies
* *(deps)* Update dependency vite to v4.0.2 (#2861)
* *(deps)* Update dependency netlify-cli to v12.4.0 (#2862)
* *(deps)* Update typescript-eslint monorepo to v5.47.0 (#2864)
* *(deps)* Update dependency esbuild to v0.16.10 (#2865)
* *(deps)* Update dependency sass to v1.57.1 (#2866)
* *(deps)* Update dependency vue-tsc to v1.0.16 (#2867)
* *(deps)* Update dependency codemirror to v5.65.11
* *(deps)* Update dependency @vueuse/core to v9.8.0
* *(deps)* Update dependency vitest to v0.26.1
* *(deps)* Update dependency @vueuse/core to v9.8.1 (#2870)
* *(deps)* Update dependency @vueuse/core to v9.8.2
* *(deps)* Update sentry-javascript monorepo to v7.28.0
* *(deps)* Update dependency cypress to v12.2.0 (#2873)
* *(deps)* Update dependency vitest to v0.26.2 (#2874)
* *(deps)* Update dependency vite to v4.0.3 (#2876)
* *(deps)* Update pnpm to v7.19.0 (#2875)
* *(deps)* Update dependency rollup to v3.8.0 (#2877)
* *(deps)* Update sentry-javascript monorepo to v7.28.1 (#2878)
* *(deps)* Update dependency @vueuse/core to v9.9.0 (#2881)
* *(deps)* Update dependency rollup to v3.8.1 (#2879)
* *(deps)* Update dependency vite-svg-loader to v4 (#2882)
* *(deps)* Update dependency vue-tsc to v1.0.17 (#2883)
* *(deps)* Update dependency caniuse-lite to v1.0.30001441 (#2884)
* *(deps)* Update dependency netlify-cli to v12.5.0 (#2886)
* *(deps)* Update pnpm to v7.20.0 (#2887)
* *(deps)* Update dependency vue-tsc to v1.0.18 (#2888)
* *(deps)* Update dependency happy-dom to v8.1.1 (#2885)
* *(deps)* Update dependency @types/node to v18.11.18 (#2889)
* *(deps)* Update typescript-eslint monorepo to v5.47.1 (#2890)
* *(deps)* Update dependency esbuild to v0.16.11
* *(deps)* Update dependency esbuild to v0.16.12 (#2893)
* *(deps)* Update dependency rollup to v3.9.0 (#2894)
* *(deps)* Update dependency rollup-plugin-visualizer to v5.9.0 (#2896)
* *(deps)* Update dependency marked to v4.2.5 (#2880)
* *(deps)* Update pnpm to v7.21.0 (#2895)
* *(deps)* Update dependency eslint to v8.31.0
* *(deps)* Update dependency vue-tsc to v1.0.19
* *(deps)* Update dependency @types/codemirror to v5.60.6
* *(deps)* Update dependency rollup to v3.9.1
* *(deps)* Update dependency vitest to v0.26.3
* *(deps)* Update dependency vite-plugin-pwa to v0.14.1 (#2909)
* *(deps)* Update dependency esbuild to v0.16.13 (#2907)
* *(deps)* Update typescript-eslint monorepo to v5.48.0 (#2906)
* *(deps)* Update dependency vue-tsc to v1.0.20
* *(deps)* Update dependency cypress to v12.3.0
* *(deps)* Update dependency @vueuse/core to v9.10.0 (#2911)
* *(deps)* Update pnpm to v7.22.0 (#2910)
* *(deps)* Update dependency @vue/test-utils to v2.2.7 (#2914)
* *(deps)* Update dependency vite to v4.0.4 (#2908)
* *(deps)* Update sentry-javascript monorepo to v7.29.0 (#2915)
* *(deps)* Update dependency esbuild to v0.16.14
* *(deps)* Update dependency axios to v1
* *(deps)* Update dependency vue-tsc to v1.0.21
* *(deps)* Update dependency vue-tsc to v1.0.22
* *(deps)* Update dependency dompurify to v2.4.2
* *(deps)* Update dependency dompurify to v2.4.3 (#2931)
* *(deps)* Update dependency postcss to v8.4.21 (#2933)
* *(deps)* Update dependency esbuild to v0.16.15 (#2934)
* *(deps)* Update dependency vue-tsc to v1.0.24
* *(deps)* Update pnpm to v7.23.0 (#2940)
* *(deps)* Update dependency happy-dom to v8.1.3 (#2939)
* *(deps)* Update dependency esbuild to v0.16.16 (#2937)
* *(deps)* Update dependency caniuse-lite to v1.0.30001442 (#2938)
* *(deps)* Update dependency vitest to v0.27.0 (#2941)
* *(deps)* Update typescript-eslint monorepo to v5.48.1 (#2942)
* *(deps)* Update pnpm to v7.24.2 (#2944)
* *(deps)* Update sentry-javascript monorepo to v7.30.0 (#2945)
* *(deps)* Update pnpm to v7.24.3 (#2946)
* *(deps)* Update dependency vitest to v0.27.1 (#2947)
* *(deps)* Update dependency esbuild to v0.16.17 (#2948)
* *(deps)* Update dependency rollup to v3.10.0 (#2949)
* *(deps)* Update dependency eslint-plugin-vue to v9.9.0 (#2950)
* *(deps)* Update pnpm to v7.25.0 (#2951)
* *(deps)* Update dependency marked to v4.2.12 (#2952)
* *(deps)* Update dependency esbuild to v0.17.0 (#2953)
* *(deps)* Update dependency eslint to v8.32.0 (#2954)
* *(deps)* Update dependency vue-advanced-cropper to v2.8.8 (#2955)
* *(deps)* Update dependency pinia to v2.0.29 (#2956)
* *(deps)* Update dependency @kyvg/vue3-notification to v2.8.0 (#2957)
* *(deps)* Update dependency caniuse-lite to v1.0.30001445 (#2958)
* *(deps)* Update dependency happy-dom to v8.1.4 (#2959)
* *(deps)* Update dependency netlify-cli to v12.7.2 (#2960)
* *(deps)* Update sentry-javascript monorepo to v7.31.0
* *(deps)* Update dependency esbuild to v0.17.1 (#2963)
* *(deps)* Update typescript-eslint monorepo to v5.48.2 (#2962)
* *(deps)* Update dependency esbuild to v0.17.2 (#2965)
* *(deps)* Update dependency vitest to v0.27.2 (#2966)
* *(deps)* Update dependency @vueuse/core to v9.11.0 (#2967)
* *(deps)* Update sentry-javascript monorepo to v7.31.1 (#2973)
* *(deps)* Update dependency axios to v1.2.3 (#2974)
* *(deps)* Update dependency esbuild to v0.17.3 (#2976)
* *(deps)* Update pnpm to v7.25.1 (#2977)
* *(deps)* Update dependency @vueuse/core to v9.11.1
* *(deps)* Update dependency rollup to v3.10.1
* *(deps)* Update dependency vite-plugin-inject-preload to v1.2.0 (#2983)
* *(deps)* Update dependency vitest to v0.27.3 (#2984)
* *(deps)* Update dependency esbuild to v0.17.4 (#2985)
* *(deps)* Update dependency caniuse-lite to v1.0.30001447 (#2986)
* *(deps)* Update dependency happy-dom to v8.1.5 (#2987)
* *(deps)* Update dependency netlify-cli to v12.9.1 (#2988)
* *(deps)* Update sentry-javascript monorepo to v7.32.1 (#2991)
* *(deps)* Update dependency vitest to v0.28.1 (#2990)
* *(deps)* Update dependency @types/codemirror to v5.60.7 (#2993)
* *(deps)* Update typescript-eslint monorepo to v5.49.0 (#2994)
* *(deps)* Update dependency start-server-and-test to v1.15.3
* *(deps)* Update dependency @fortawesome/vue-fontawesome to v3.0.3 (#3003)
### Features
* *(cypress)* Remove getSettled
* *(cypress)* Use cy.session
* *(i18n)* Add Norwegian translation
* *(netlify)* Abstract createSlug helper function (#2923)
* *(postcss)* Mock plugin types (#2930)
* Enable ts for rollup-plugin-visualizer (#2897) ([09d1352](09d13520b060e47be18640865befde44f59332e3))
* Remove date-fns formatISO (#2899) ([1f25386](1f25386f54f376357722e1e589d3a8bd8288a033))
* Add-task usability improvements (#2767) ([4be53b0](4be53b098ca909194aefb464a93b6dae99f4b9ab))
* Remove formatISO from list-view-gantt.spec (#2922) ([a29131e](a29131e7d4be2c83c3e9046549924d1f7692c95e))
* Add histoire ([7be8e89](7be8e892e2480f17cb5de6a69d35287906151c0f))
* Add XButton story ([ccc85b9](ccc85b9a828488dc849758f1e89f3ba3f75967d1))
* Add card story ([35cfb2f](35cfb2f3ca42ac83a9b943fc59818c978ee95fcc))
* Add histoire (#2724) ([a4424e0](a4424e089cdfadb4ab3b753e6fdca818bbe82dc4))
* Add describe project better in package.json (#2971) ([14466bf](14466bf9b7b8a3fc455c0d601205abbaf8cba4f5))
* Add .env.local.example (#2972) ([e1b35ff](e1b35ff023679a7cb8448a06e9edeb8eccc2f727))
* Fix broken font preloading (#2980) ([4890149](489014944a1544846875910d7d5e17e3d71b7e2d))
### Miscellaneous Tasks
* *(config)* Remove unused URL_PREFIX const (#2926)
* *(package)* Use pnpm commands (#2919)
* *(tests)* Fix macos cypress and align with create vite (#2898)
* Improve migrate title (#2968) ([56fd25e](56fd25e888cae8343f64a4c14ac5a3a760bdc7be))
* Add has content="false" to gantt charts (#2969) ([903e9a9](903e9a9904c18ced59962fc03b4c36e5ac8cd688))
* Use es6 imports for deploy-preview-netlify (#2970) ([2a2c27a](2a2c27af9226f441ec80d9d4f560b55cd357126c))
### Other
* *(other)* [skip ci] Updated translations via Crowdin
* *(other)* Redirect to oidc provider if configured correctly (#2805)
## [0.20.2] - 2022-12-18 ## [0.20.2] - 2022-12-18
### Bug Fixes ### Bug Fixes

View File

@ -1,70 +1,49 @@
# syntax=docker/dockerfile:1 # Stage 1: Build application
# ┬─┐┬ ┐o┬ ┬─┐ FROM --platform=$BUILDPLATFORM node:18-alpine AS compile-image
# │─││ │││ │ │
# ┘─┘┘─┘┘┘─┘┘─┘
FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
WORKDIR /build WORKDIR /build
ARG USE_RELEASE=false ARG USE_RELEASE=false
ARG RELEASE_VERSION=main ARG RELEASE_VERSION=main
ENV PNPM_CACHE_FOLDER .cache/pnpm/ ENV PNPM_CACHE_FOLDER .cache/pnpm/
ADD . ./
COPY package.json ./ RUN \
COPY pnpm-lock.yaml ./ if [ $USE_RELEASE = true ]; then \
wget https://dl.vikunja.io/frontend/vikunja-frontend-$RELEASE_VERSION.zip -O frontend-release.zip && \
unzip frontend-release.zip -d dist/ && \
exit 0; \
fi && \
# https://pnpm.io/installation#using-corepack
corepack enable && \
# we don't use corepack prepare here by intend since
# we have renovate to keep our dependencies up to date
# Build the frontend
pnpm install && \
apk add --no-cache git && \
echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \
pnpm run build
RUN if [ "$USE_RELEASE" != true ]; then \ # Stage 2: copy
# https://pnpm.io/installation#using-corepack FROM nginx:alpine
corepack enable && \
pnpm install; \
fi
COPY . ./ COPY nginx.conf /etc/nginx/nginx.conf
COPY scripts/run.sh /run.sh
RUN if [ "$USE_RELEASE" != true ]; then \ # copy compiled files from stage 1
apk add --no-cache --virtual .build-deps git jq && \ COPY --from=compile-image /build/dist /usr/share/nginx/html
git describe --tags --always --abbrev=10 | sed 's/-/+/; s/^v//; s/-g/-/' | \
xargs -0 -I{} jq -Mcnr --arg version {} '{VERSION:$version}' | \
tee src/version.json && \
apk del .build-deps; \
fi
RUN if [ "$USE_RELEASE" = true ]; then \ # Unprivileged user
wget "https://dl.vikunja.io/frontend/vikunja-frontend-${RELEASE_VERSION}.zip" -O frontend-release.zip && \ ENV PUID 1000
unzip frontend-release.zip -d dist/; \ ENV PGID 1000
else \
# we don't use corepack prepare here by intend since
# we have renovate to keep our dependencies up to date
# Build the frontend
pnpm run build; \
fi
# ┌┐┐┌─┐o┌┐┐┐ │
# ││││ ┬││││┌┼┘
# ┘└┘┘─┘┘┘└┘┘ └
FROM nginx:stable-alpine AS runner
WORKDIR /usr/share/nginx/html
LABEL maintainer="maintainers@vikunja.io" LABEL maintainer="maintainers@vikunja.io"
ENV VIKUNJA_HTTP_PORT 80 RUN apk add --no-cache \
ENV VIKUNJA_HTTP2_PORT 81 # for sh file
ENV VIKUNJA_LOG_FORMAT main bash \
ENV VIKUNJA_API_URL /api/v1 # installs usermod and groupmod
ENV VIKUNJA_SENTRY_ENABLED false shadow
ENV VIKUNJA_SENTRY_DSN https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480
COPY docker/injector.sh /docker-entrypoint.d/50-injector.sh CMD "/run.sh"
COPY docker/ipv6-disable.sh /docker-entrypoint.d/60-ipv6-disable.sh
COPY docker/nginx.conf /etc/nginx/nginx.conf
COPY docker/templates/. /etc/nginx/templates/
# copy compiled files from stage 1
COPY --from=builder /build/dist ./
# manage permissions
RUN chmod 0755 /docker-entrypoint.d/*.sh /etc/nginx/templates && \
chmod -R 0644 /etc/nginx/nginx.conf && \
chown -R nginx:nginx ./ /etc/nginx/conf.d /etc/nginx/templates && \
rm -f /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
# unprivileged user
USER nginx

View File

@ -4,7 +4,7 @@
[![Build Status](https://drone.kolaente.de/api/badges/vikunja/frontend/status.svg)](https://drone.kolaente.de/vikunja/frontend) [![Build Status](https://drone.kolaente.de/api/badges/vikunja/frontend/status.svg)](https://drone.kolaente.de/vikunja/frontend)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
[![Download](https://img.shields.io/badge/download-v0.20.3-brightgreen.svg)](https://dl.vikunja.io) [![Download](https://img.shields.io/badge/download-v0.20.2-brightgreen.svg)](https://dl.vikunja.io)
[![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja) [![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja)
This is the web frontend for Vikunja, written in Vue.js. This is the web frontend for Vikunja, written in Vue.js.
@ -18,14 +18,6 @@ If you find any security-related issues you don't want to disclose publicly, ple
## Docker ## Docker
There is a [docker image available](https://hub.docker.com/r/vikunja/api) with support for http/2 and aggressive caching enabled. There is a [docker image available](https://hub.docker.com/r/vikunja/api) 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 Refer [to multi-platform documentation](https://docs.docker.com/build/building/multi-platform/) in order to build for the different platform.
## Project setup ## Project setup
@ -51,3 +43,6 @@ pnpm run build
pnpm run lint pnpm run lint
``` ```
## Sponsors
[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)

View File

@ -1,57 +0,0 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {ListFactory} from '../../factories/list'
import {prepareLists} from './prepareLists'
describe('List History', () => {
createFakeUserAndLogin()
prepareLists()
it('should show a list history on the home page', () => {
cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces')
cy.intercept(Cypress.env('API_URL') + '/lists/*').as('loadList')
const lists = ListFactory.create(6)
cy.visit('/')
cy.wait('@loadNamespaces')
cy.get('body')
.should('not.contain', 'Last viewed')
cy.visit(`/lists/${lists[0].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
cy.visit(`/lists/${lists[1].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
cy.visit(`/lists/${lists[2].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
cy.visit(`/lists/${lists[3].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
cy.visit(`/lists/${lists[4].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
cy.visit(`/lists/${lists[5].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadList')
// cy.visit('/')
// cy.wait('@loadNamespaces')
// Not using cy.visit here to work around the redirect issue fixed in #1337
cy.get('nav.menu.top-menu a')
.contains('Overview')
.click()
cy.get('body')
.should('contain', 'Last viewed')
cy.get('[data-cy="listCardGrid"]')
.should('not.contain', lists[0].title)
.should('contain', lists[1].title)
.should('contain', lists[2].title)
.should('contain', lists[3].title)
.should('contain', lists[4].title)
.should('contain', lists[5].title)
})
})

View File

@ -1,19 +0,0 @@
import {ListFactory} from '../../factories/list'
import {NamespaceFactory} from '../../factories/namespace'
import {TaskFactory} from '../../factories/task'
export function createLists() {
NamespaceFactory.create(1)
const lists = ListFactory.create(1, {
title: 'First List'
})
TaskFactory.truncate()
return lists
}
export function prepareLists(setLists = (...args: any[]) => {}) {
beforeEach(() => {
const lists = createLists()
setLists(lists)
})
}

View File

@ -1,18 +1,18 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
describe('Editor', () => { describe('Editor', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
beforeEach(() => { beforeEach(() => {
NamespaceFactory.create(1) NamespaceFactory.create(1)
ListFactory.create(1) ProjectFactory.create(1)
TaskFactory.truncate() TaskFactory.truncate()
UserListFactory.truncate() UserProjectFactory.truncate()
}) })
it('Has a preview with checkable checkboxes', () => { it('Has a preview with checkable checkboxes', () => {

View File

@ -1,6 +1,6 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
describe('Namepaces', () => { describe('Namepaces', () => {
@ -10,7 +10,7 @@ describe('Namepaces', () => {
beforeEach(() => { beforeEach(() => {
namespaces = NamespaceFactory.create(1) namespaces = NamespaceFactory.create(1)
ListFactory.create(1) ProjectFactory.create(1)
}) })
it('Should be all there', () => { it('Should be all there', () => {
@ -99,17 +99,17 @@ describe('Namepaces', () => {
.should('not.contain', newNamespaces[0].title) .should('not.contain', newNamespaces[0].title)
}) })
it('Should not show archived lists & namespaces if the filter is not checked', () => { it('Should not show archived projects & namespaces if the filter is not checked', () => {
const n = NamespaceFactory.create(1, { const n = NamespaceFactory.create(1, {
id: 2, id: 2,
is_archived: true, is_archived: true,
}, false) }, false)
ListFactory.create(1, { ProjectFactory.create(1, {
id: 2, id: 2,
namespace_id: n[0].id, namespace_id: n[0].id,
}, false) }, false)
ListFactory.create(1, { ProjectFactory.create(1, {
id: 3, id: 3,
is_archived: true, is_archived: true,
}, false) }, false)

View File

@ -0,0 +1,19 @@
import {ProjectFactory} from '../../factories/project'
import {NamespaceFactory} from '../../factories/namespace'
import {TaskFactory} from '../../factories/task'
export function createProjects() {
NamespaceFactory.create(1)
const projects = ProjectFactory.create(1, {
title: 'First Project'
})
TaskFactory.truncate()
return projects
}
export function prepareProjects(setProjects = () => {}) {
beforeEach(() => {
const projects = createProjects()
setProjects(projects)
})
}

View File

@ -0,0 +1,57 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {ProjectFactory} from '../../factories/project'
import {prepareProjects} from './prepareProjects'
describe('Project History', () => {
createFakeUserAndLogin()
prepareProjects()
it('should show a project history on the home page', () => {
cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces')
cy.intercept(Cypress.env('API_URL') + '/projects/*').as('loadProject')
const projects = ProjectFactory.create(6)
cy.visit('/')
cy.wait('@loadNamespaces')
cy.get('body')
.should('not.contain', 'Last viewed')
cy.visit(`/projects/${projects[0].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
cy.visit(`/projects/${projects[1].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
cy.visit(`/projects/${projects[2].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
cy.visit(`/projects/${projects[3].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
cy.visit(`/projects/${projects[4].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
cy.visit(`/projects/${projects[5].id}`)
cy.wait('@loadNamespaces')
cy.wait('@loadProject')
// cy.visit('/')
// cy.wait('@loadNamespaces')
// Not using cy.visit here to work around the redirect issue fixed in #1337
cy.get('nav.menu.top-menu a')
.contains('Overview')
.click()
cy.get('body')
.should('contain', 'Last viewed')
cy.get('[data-cy="projectCardGrid"]')
.should('not.contain', projects[0].title)
.should('contain', projects[1].title)
.should('contain', projects[2].title)
.should('contain', projects[3].title)
.should('contain', projects[4].title)
.should('contain', projects[5].title)
})
})

View File

@ -3,15 +3,15 @@ import {formatISO, format} from 'date-fns'
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
describe('List View Gantt', () => { describe('Project View Gantt', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
prepareLists() prepareProjects()
it('Hides tasks with no dates', () => { it('Hides tasks with no dates', () => {
const tasks = TaskFactory.create(1) const tasks = TaskFactory.create(1)
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container') cy.get('.g-gantt-rows-container')
.should('not.contain', tasks[0].title) .should('not.contain', tasks[0].title)
@ -25,7 +25,7 @@ describe('List View Gantt', () => {
nextMonth.setDate(1) nextMonth.setDate(1)
nextMonth.setMonth(9) nextMonth.setMonth(9)
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-timeunits-container') cy.get('.g-timeunits-container')
.should('contain', format(now, 'MMMM')) .should('contain', format(now, 'MMMM'))
@ -38,7 +38,7 @@ describe('List View Gantt', () => {
start_date: now.toISOString(), start_date: now.toISOString(),
end_date: new Date(new Date(now).setDate(now.getDate() + 4)).toISOString(), end_date: new Date(new Date(now).setDate(now.getDate() + 4)).toISOString(),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container') cy.get('.g-gantt-rows-container')
.should('not.be.empty') .should('not.be.empty')
@ -50,7 +50,7 @@ describe('List View Gantt', () => {
start_date: null, start_date: null,
end_date: null, end_date: null,
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.gantt-options .fancycheckbox') cy.get('.gantt-options .fancycheckbox')
.contains('Show tasks which don\'t have dates set') .contains('Show tasks which don\'t have dates set')
@ -69,7 +69,7 @@ describe('List View Gantt', () => {
start_date: now.toISOString(), start_date: now.toISOString(),
end_date: new Date(new Date(now).setDate(now.getDate() + 4)).toISOString(), end_date: new Date(new Date(now).setDate(now.getDate() + 4)).toISOString(),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.g-gantt-rows-container .g-gantt-row .g-gantt-row-bars-container div .g-gantt-bar') cy.get('.g-gantt-rows-container .g-gantt-row .g-gantt-row-bars-container div .g-gantt-bar')
.first() .first()
@ -83,9 +83,9 @@ describe('List View Gantt', () => {
const now = Date.UTC(2022, 10, 9) const now = Date.UTC(2022, 10, 9)
cy.clock(now, ['Date']) cy.clock(now, ['Date'])
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.list-gantt .gantt-options .field .control input.input.form-control') cy.get('.project-gantt .gantt-options .field .control input.input.form-control')
.click() .click()
cy.get('.flatpickr-calendar .flatpickr-innerContainer .dayContainer .flatpickr-day') cy.get('.flatpickr-calendar .flatpickr-innerContainer .dayContainer .flatpickr-day')
.first() .first()
@ -99,13 +99,13 @@ describe('List View Gantt', () => {
}) })
it('Should change the date range based on date query parameters', () => { it('Should change the date range based on date query parameters', () => {
cy.visit('/lists/1/gantt?dateFrom=2022-09-25&dateTo=2022-11-05') cy.visit('/projects/1/gantt?dateFrom=2022-09-25&dateTo=2022-11-05')
cy.get('.g-timeunits-container') cy.get('.g-timeunits-container')
.should('contain', 'September 2022') .should('contain', 'September 2022')
.should('contain', 'October 2022') .should('contain', 'October 2022')
.should('contain', 'November 2022') .should('contain', 'November 2022')
cy.get('.list-gantt .gantt-options .field .control input.input.form-control') cy.get('.project-gantt .gantt-options .field .control input.input.form-control')
.should('have.value', '25 Sep 2022 to 5 Nov 2022') .should('have.value', '25 Sep 2022 to 5 Nov 2022')
}) })
@ -115,7 +115,7 @@ describe('List View Gantt', () => {
start_date: formatISO(now), start_date: formatISO(now),
end_date: formatISO(now.setDate(now.getDate() + 4)), end_date: formatISO(now.setDate(now.getDate() + 4)),
}) })
cy.visit('/lists/1/gantt') cy.visit('/projects/1/gantt')
cy.get('.gantt-container .g-gantt-chart .g-gantt-row-bars-container .g-gantt-bar') cy.get('.gantt-container .g-gantt-chart .g-gantt-row-bars-container .g-gantt-bar')
.dblclick() .dblclick()

View File

@ -1,13 +1,13 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {BucketFactory} from '../../factories/bucket' import {BucketFactory} from '../../factories/bucket'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
describe('List View Kanban', () => { describe('Project View Kanban', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
prepareLists() prepareProjects()
let buckets let buckets
beforeEach(() => { beforeEach(() => {
@ -16,10 +16,10 @@ describe('List View Kanban', () => {
it('Shows all buckets with their tasks', () => { it('Shows all buckets with their tasks', () => {
const data = TaskFactory.create(10, { const data = TaskFactory.create(10, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .title') cy.get('.kanban .bucket .title')
.contains(buckets[0].title) .contains(buckets[0].title)
@ -34,10 +34,10 @@ describe('List View Kanban', () => {
it('Can add a new task to a bucket', () => { it('Can add a new task to a bucket', () => {
TaskFactory.create(2, { TaskFactory.create(2, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket') cy.get('.kanban .bucket')
.contains(buckets[0].title) .contains(buckets[0].title)
@ -55,7 +55,7 @@ describe('List View Kanban', () => {
}) })
it('Can create a new bucket', () => { it('Can create a new bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket.new-bucket .button') cy.get('.kanban .bucket.new-bucket .button')
.click() .click()
@ -69,7 +69,7 @@ describe('List View Kanban', () => {
}) })
it('Can set a bucket limit', () => { it('Can set a bucket limit', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger') cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
.first() .first()
@ -90,7 +90,7 @@ describe('List View Kanban', () => {
}) })
it('Can rename a bucket', () => { it('Can rename a bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .bucket-header .title') cy.get('.kanban .bucket .bucket-header .title')
.first() .first()
@ -101,7 +101,7 @@ describe('List View Kanban', () => {
}) })
it('Can delete a bucket', () => { it('Can delete a bucket', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger') cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
.first() .first()
@ -125,10 +125,10 @@ describe('List View Kanban', () => {
it('Can drag tasks around', () => { it('Can drag tasks around', () => {
const tasks = TaskFactory.create(2, { const tasks = TaskFactory.create(2, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .tasks .task') cy.get('.kanban .bucket .tasks .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -144,10 +144,10 @@ describe('List View Kanban', () => {
it('Should navigate to the task when the task card is clicked', () => { it('Should navigate to the task when the task card is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .tasks .task') cy.get('.kanban .bucket .tasks .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -158,18 +158,18 @@ describe('List View Kanban', () => {
.should('contain', `/tasks/${tasks[0].id}`, { timeout: 1000 }) .should('contain', `/tasks/${tasks[0].id}`, { timeout: 1000 })
}) })
it('Should remove a task from the kanban board when moving it to another list', () => { it('Should remove a task from the kanban board when moving it to another project', () => {
const lists = ListFactory.create(2) const projects = ProjectFactory.create(2)
BucketFactory.create(2, { BucketFactory.create(2, {
list_id: '{increment}', project_id: '{increment}',
}) })
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
const task = tasks[0] const task = tasks[0]
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .tasks .task') cy.get('.kanban .bucket .tasks .task')
.contains(task.title) .contains(task.title)
@ -180,7 +180,7 @@ describe('List View Kanban', () => {
.contains('Move') .contains('Move')
.click() .click()
cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input') cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
.type(`${lists[1].title}{enter}`) .type(`${projects[1].title}{enter}`)
// The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress // The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress
// presses enter and we can't simulate pressing on enter to select the item. // presses enter and we can't simulate pressing on enter to select the item.
cy.get('.task-view .content.details .field .multiselect.control .search-results') cy.get('.task-view .content.details .field .multiselect.control .search-results')
@ -197,26 +197,26 @@ describe('List View Kanban', () => {
it('Shows a button to filter the kanban board', () => { it('Shows a button to filter the kanban board', () => {
const data = TaskFactory.create(10, { const data = TaskFactory.create(10, {
list_id: 1, project_id: 1,
bucket_id: 1, bucket_id: 1,
}) })
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.list-kanban .filter-container .base-button') cy.get('.project-kanban .filter-container .base-button')
.should('exist') .should('exist')
}) })
it('Should remove a task from the board when deleting it', () => { it('Should remove a task from the board when deleting it', () => {
const lists = ListFactory.create(1) const projects = ProjectFactory.create(1)
const buckets = BucketFactory.create(2, { const buckets = BucketFactory.create(2, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
list_id: 1, project_id: 1,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const task = tasks[0] const task = tasks[0]
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.get('.kanban .bucket .tasks .task') cy.get('.kanban .bucket .tasks .task')
.contains(task.title) .contains(task.title)

View File

@ -1,32 +1,32 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
describe('List View List', () => { describe('Project View Project', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
prepareLists() prepareProjects()
it('Should be an empty list', () => { it('Should be an empty project', () => {
cy.visit('/lists/1') cy.visit('/projects/1')
cy.url() cy.url()
.should('contain', '/lists/1/list') .should('contain', '/projects/1/list')
cy.get('.list-title') cy.get('.project-title h1')
.should('contain', 'First List') .should('contain', 'First Project')
cy.get('.list-title-dropdown') cy.get('.project-title .dropdown')
.should('exist') .should('exist')
cy.get('p') cy.get('p')
.contains('This list is currently empty.') .contains('This project is currently empty.')
.should('exist') .should('exist')
}) })
it('Should create a new task', () => { it('Should create a new task', () => {
const newTaskTitle = 'New task' const newTaskTitle = 'New task'
cy.visit('/lists/1') cy.visit('/projects/1')
cy.get('.task-add textarea') cy.get('.task-add textarea')
.type(newTaskTitle+'{enter}') .type(newTaskTitle+'{enter}')
cy.get('.tasks') cy.get('.tasks')
@ -36,9 +36,9 @@ describe('List View List', () => {
it('Should navigate to the task when the title is clicked', () => { it('Should navigate to the task when the title is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.tasks .task .tasktext') cy.get('.tasks .task .tasktext')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -49,33 +49,33 @@ describe('List View List', () => {
.should('contain', `/tasks/${tasks[0].id}`) .should('contain', `/tasks/${tasks[0].id}`)
}) })
it('Should not see any elements for a list which is shared read only', () => { it('Should not see any elements for a project which is shared read only', () => {
UserFactory.create(2) UserFactory.create(2)
UserListFactory.create(1, { UserProjectFactory.create(1, {
list_id: 2, project_id: 2,
user_id: 1, user_id: 1,
right: 0, right: 0,
}) })
const lists = ListFactory.create(2, { const projects = ProjectFactory.create(2, {
owner_id: '{increment}', owner_id: '{increment}',
namespace_id: '{increment}', namespace_id: '{increment}',
}) })
cy.visit(`/lists/${lists[1].id}/`) cy.visit(`/projects/${projects[1].id}/`)
cy.get('.list-title-wrapper .icon') cy.get('.project-title .icon')
.should('not.exist') .should('not.exist')
cy.get('input.input[placeholder="Add a new task..."') cy.get('input.input[placeholder="Add a new task..."')
.should('not.exist') .should('not.exist')
}) })
it('Should only show the color of a list in the navigation and not in the list view', () => { it('Should only show the color of a project in the navigation and not in the project view', () => {
const lists = ListFactory.create(1, { const projects = ProjectFactory.create(1, {
hex_color: '00db60', hex_color: '00db60',
}) })
TaskFactory.create(10, { TaskFactory.create(10, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
cy.visit(`/lists/${lists[0].id}/`) cy.visit(`/projects/${projects[0].id}/`)
cy.get('.menu-list li .list-menu-link .color-bubble') cy.get('.menu-list li .list-menu-link .color-bubble')
.should('have.css', 'background-color', 'rgb(0, 219, 96)') .should('have.css', 'background-color', 'rgb(0, 219, 96)')
@ -87,9 +87,9 @@ describe('List View List', () => {
const tasks = TaskFactory.create(100, { const tasks = TaskFactory.create(100, {
id: '{increment}', id: '{increment}',
title: i => `task${i}`, title: i => `task${i}`,
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.tasks') cy.get('.tasks')
.should('contain', tasks[1].title) .should('contain', tasks[1].title)

View File

@ -2,37 +2,37 @@ import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
describe('List View Table', () => { describe('Project View Table', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
it('Should show a table with tasks', () => { it('Should show a table with tasks', () => {
const tasks = TaskFactory.create(1) const tasks = TaskFactory.create(1)
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.should('exist') .should('exist')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.should('contain', tasks[0].title) .should('contain', tasks[0].title)
}) })
it('Should have working column switches', () => { it('Should have working column switches', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table .filter-container .items .button') cy.get('.project-table .filter-container .items .button')
.contains('Columns') .contains('Columns')
.click() .click()
cy.get('.list-table .filter-container .card.columns-filter .card-content .fancycheckbox .check') cy.get('.project-table .filter-container .card.columns-filter .card-content .fancycheckbox .check')
.contains('Priority') .contains('Priority')
.click() .click()
cy.get('.list-table .filter-container .card.columns-filter .card-content .fancycheckbox .check') cy.get('.project-table .filter-container .card.columns-filter .card-content .fancycheckbox .check')
.contains('Done') .contains('Done')
.click() .click()
cy.get('.list-table table.table th') cy.get('.project-table table.table th')
.contains('Priority') .contains('Priority')
.should('exist') .should('exist')
cy.get('.list-table table.table th') cy.get('.project-table table.table th')
.contains('Done') .contains('Done')
.should('not.exist') .should('not.exist')
}) })
@ -40,11 +40,11 @@ describe('List View Table', () => {
it('Should navigate to the task when the title is clicked', () => { it('Should navigate to the task when the title is clicked', () => {
const tasks = TaskFactory.create(5, { const tasks = TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
cy.visit('/lists/1/table') cy.visit('/projects/1/table')
cy.get('.list-table table.table') cy.get('.project-table table.table')
.contains(tasks[0].title) .contains(tasks[0].title)
.click() .click()

View File

@ -1,58 +1,58 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {prepareLists} from './prepareLists' import {prepareProjects} from './prepareProjects'
describe('Lists', () => { describe('Projects', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
let lists let projects
prepareLists((newLists) => (lists = newLists)) prepareProjects((newProjects) => (projects = newProjects))
it('Should create a new list', () => { it('Should create a new project', () => {
cy.visit('/') cy.visit('/')
cy.get('.namespace-title .dropdown-trigger') cy.get('.namespace-title .dropdown-trigger')
.click() .click()
cy.get('.namespace-title .dropdown .dropdown-item') cy.get('.namespace-title .dropdown .dropdown-item')
.contains('New list') .contains('New project')
.click() .click()
cy.url() cy.url()
.should('contain', '/lists/new/1') .should('contain', '/projects/new/1')
cy.get('.card-header-title') cy.get('.card-header-title')
.contains('New list') .contains('New project')
cy.get('input.input') cy.get('input.input')
.type('New List') .type('New Project')
cy.get('.button') cy.get('.button')
.contains('Create') .contains('Create')
.click() .click()
cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new list is done cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new project is done
.should('contain', 'Success') .should('contain', 'Success')
cy.url() cy.url()
.should('contain', '/lists/') .should('contain', '/projects/')
cy.get('.list-title') cy.get('.project-title h1')
.should('contain', 'New List') .should('contain', 'New Project')
}) })
it('Should redirect to a specific list view after visited', () => { it('Should redirect to a specific project view after visited', () => {
cy.visit('/lists/1/kanban') cy.visit('/projects/1/kanban')
cy.url() cy.url()
.should('contain', '/lists/1/kanban') .should('contain', '/projects/1/kanban')
cy.visit('/lists/1') cy.visit('/projects/1')
cy.url() cy.url()
.should('contain', '/lists/1/kanban') .should('contain', '/projects/1/kanban')
}) })
it('Should rename the list in all places', () => { it('Should rename the project in all places', () => {
TaskFactory.create(5, { TaskFactory.create(5, {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
}) })
const newListName = 'New list name' const newProjectName = 'New project name'
cy.visit('/lists/1') cy.visit('/projects/1')
cy.get('.list-title') cy.get('.project-title h1')
.should('contain', 'First List') .should('contain', 'First Project')
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger') cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
.click() .click()
@ -60,27 +60,27 @@ describe('Lists', () => {
.contains('Edit') .contains('Edit')
.click() .click()
cy.get('#title') cy.get('#title')
.type(`{selectall}${newListName}`) .type(`{selectall}${newProjectName}`)
cy.get('footer.card-footer .button') cy.get('footer.card-footer .button')
.contains('Save') .contains('Save')
.click() .click()
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.list-title') cy.get('.project-title h1')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child') cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.visit('/') cy.visit('/')
cy.get('.card-content') cy.get('.card-content')
.should('contain', newListName) .should('contain', newProjectName)
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
}) })
it('Should remove a list', () => { it('Should remove a project', () => {
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger') cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
.click() .click()
@ -96,27 +96,27 @@ describe('Lists', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.namespace-container .menu.namespaces-lists .menu-list') cy.get('.namespace-container .menu.namespaces-lists .menu-list')
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.location('pathname') cy.location('pathname')
.should('equal', '/') .should('equal', '/')
}) })
it('Should archive a list', () => { it('Should archive a project', () => {
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
cy.get('.list-title-dropdown') cy.get('.project-title .dropdown')
.click() .click()
cy.get('.list-title-dropdown .dropdown-menu .dropdown-item') cy.get('.project-title .dropdown .dropdown-menu .dropdown-item')
.contains('Archive') .contains('Archive')
.click() .click()
cy.get('.modal-content') cy.get('.modal-content')
.should('contain.text', 'Archive this list') .should('contain.text', 'Archive this project')
cy.get('.modal-content [data-cy=modalPrimary]') cy.get('.modal-content [data-cy=modalPrimary]')
.click() .click()
cy.get('.namespace-container .menu.namespaces-lists .menu-list') cy.get('.namespace-container .menu.namespaces-lists .menu-list')
.should('not.contain', lists[0].title) .should('not.contain', projects[0].title)
cy.get('main.app-content') cy.get('main.app-content')
.should('contain.text', 'This list is archived. It is not possible to create new or edit tasks for it.') .should('contain.text', 'This project is archived. It is not possible to create new or edit tasks for it.')
}) })
}) })

View File

@ -1,22 +1,22 @@
import {LinkShareFactory} from '../../factories/link_sharing' import {LinkShareFactory} from '../../factories/link_sharing'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
describe('Link shares', () => { describe('Link shares', () => {
it('Can view a link share', () => { it('Can view a link share', () => {
const lists = ListFactory.create(1) const projects = ProjectFactory.create(1)
const tasks = TaskFactory.create(10, { const tasks = TaskFactory.create(10, {
list_id: lists[0].id project_id: projects[0].id
}) })
const linkShares = LinkShareFactory.create(1, { const linkShares = LinkShareFactory.create(1, {
list_id: lists[0].id, project_id: projects[0].id,
right: 0, right: 0,
}) })
cy.visit(`/share/${linkShares[0].hash}/auth`) cy.visit(`/share/${linkShares[0].hash}/auth`)
cy.get('h1.title') cy.get('h1.title')
.should('contain', lists[0].title) .should('contain', projects[0].title)
cy.get('input.input[placeholder="Add a new task..."') cy.get('input.input[placeholder="Add a new task..."')
.should('not.exist') .should('not.exist')
cy.get('.tasks') cy.get('.tasks')

View File

@ -1,6 +1,6 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {seed} from '../../support/seed' import {seed} from '../../support/seed'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
@ -9,9 +9,9 @@ import {updateUserSettings} from '../../support/updateUserSettings'
function seedTasks(numberOfTasks = 50, startDueDate = new Date()) { function seedTasks(numberOfTasks = 50, startDueDate = new Date()) {
NamespaceFactory.create(1) NamespaceFactory.create(1)
const list = ListFactory.create()[0] const project = ProjectFactory.create()[0]
BucketFactory.create(1, { BucketFactory.create(1, {
list_id: list.id, project_id: project.id,
}) })
const tasks = [] const tasks = []
let dueDate = startDueDate let dueDate = startDueDate
@ -20,7 +20,7 @@ function seedTasks(numberOfTasks = 50, startDueDate = new Date()) {
dueDate = new Date(new Date(dueDate).setDate(dueDate.getDate() + 2)) dueDate = new Date(new Date(dueDate).setDate(dueDate.getDate() + 2))
tasks.push({ tasks.push({
id: i + 1, id: i + 1,
list_id: list.id, project_id: project.id,
done: false, done: false,
created_by_id: 1, created_by_id: 1,
title: 'Test Task ' + i, title: 'Test Task ' + i,
@ -31,7 +31,7 @@ function seedTasks(numberOfTasks = 50, startDueDate = new Date()) {
}) })
} }
seed(TaskFactory.table, tasks) seed(TaskFactory.table, tasks)
return {tasks, list} return {tasks, project}
} }
describe('Home Page Task Overview', () => { describe('Home Page Task Overview', () => {
@ -73,7 +73,7 @@ describe('Home Page Task Overview', () => {
due_date: new Date().toISOString(), due_date: new Date().toISOString(),
}, false) }, false)
cy.visit(`/lists/${tasks[0].list_id}/list`) cy.visit(`/projects/${tasks[0].project_id}/list`)
cy.get('.tasks .task') cy.get('.tasks .task')
.first() .first()
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
@ -90,7 +90,7 @@ describe('Home Page Task Overview', () => {
cy.visit('/') cy.visit('/')
cy.visit(`/lists/${tasks[0].list_id}/list`) cy.visit(`/projects/${tasks[0].project_id}/list`)
cy.get('.task-add textarea') cy.get('.task-add textarea')
.type(newTaskTitle+'{enter}') .type(newTaskTitle+'{enter}')
cy.visit('/') cy.visit('/')
@ -113,10 +113,10 @@ describe('Home Page Task Overview', () => {
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
}) })
it('Should show a task without a due date added via default list at the bottom', () => { it('Should show a task without a due date added via default project at the bottom', () => {
const {list} = seedTasks(40) const {project} = seedTasks(40)
updateUserSettings({ updateUserSettings({
default_list_id: list.id, default_project_id: project.id,
overdue_tasks_reminders_time: '9:00', overdue_tasks_reminders_time: '9:00',
}) })
@ -131,23 +131,23 @@ describe('Home Page Task Overview', () => {
.should('contain.text', newTaskTitle) .should('contain.text', newTaskTitle)
}) })
it('Should show the cta buttons for new list when there are no tasks', () => { it('Should show the cta buttons for new project when there are no tasks', () => {
TaskFactory.truncate() TaskFactory.truncate()
cy.visit('/') cy.visit('/')
cy.get('.home.app-content .content') cy.get('.home.app-content .content')
.should('contain.text', 'You can create a new list for your new tasks:') .should('contain.text', 'You can create a new project for your new tasks:')
.should('contain.text', 'Or import your lists and tasks from other services into Vikunja:') .should('contain.text', 'Or import your projects and tasks from other services into Vikunja:')
}) })
it('Should not show the cta buttons for new list when there are tasks', () => { it('Should not show the cta buttons for new project when there are tasks', () => {
seedTasks() seedTasks()
cy.visit('/') cy.visit('/')
cy.get('.home.app-content .content') cy.get('.home.app-content .content')
.should('not.contain.text', 'You can create a new list for your new tasks:') .should('not.contain.text', 'You can create a new project for your new tasks:')
.should('not.contain.text', 'Or import your lists and tasks from other services into Vikunja:') .should('not.contain.text', 'Or import your projects and tasks from other services into Vikunja:')
}) })
}) })

View File

@ -1,11 +1,11 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {TaskFactory} from '../../factories/task' import {TaskFactory} from '../../factories/task'
import {ListFactory} from '../../factories/list' import {ProjectFactory} from '../../factories/project'
import {TaskCommentFactory} from '../../factories/task_comment' import {TaskCommentFactory} from '../../factories/task_comment'
import {UserFactory} from '../../factories/user' import {UserFactory} from '../../factories/user'
import {NamespaceFactory} from '../../factories/namespace' import {NamespaceFactory} from '../../factories/namespace'
import {UserListFactory} from '../../factories/users_list' import {UserProjectFactory} from '../../factories/users_project'
import {TaskAssigneeFactory} from '../../factories/task_assignee' import {TaskAssigneeFactory} from '../../factories/task_assignee'
import {LabelFactory} from '../../factories/labels' import {LabelFactory} from '../../factories/labels'
import {LabelTaskFactory} from '../../factories/label_task' import {LabelTaskFactory} from '../../factories/label_task'
@ -48,22 +48,22 @@ describe('Task', () => {
createFakeUserAndLogin() createFakeUserAndLogin()
let namespaces let namespaces
let lists let projects
let buckets let buckets
beforeEach(() => { beforeEach(() => {
// UserFactory.create(1) // UserFactory.create(1)
namespaces = NamespaceFactory.create(1) namespaces = NamespaceFactory.create(1)
lists = ListFactory.create(1) projects = ProjectFactory.create(1)
buckets = BucketFactory.create(1, { buckets = BucketFactory.create(1, {
list_id: lists[0].id, project_id: projects[0].id,
}) })
TaskFactory.truncate() TaskFactory.truncate()
UserListFactory.truncate() UserProjectFactory.truncate()
}) })
it('Should be created new', () => { it('Should be created new', () => {
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.input[placeholder="Add a new task…"') cy.get('.input[placeholder="Add a new task…"')
.type('New Task') .type('New Task')
cy.get('.button') cy.get('.button')
@ -74,11 +74,11 @@ describe('Task', () => {
.should('contain', 'New Task') .should('contain', 'New Task')
}) })
it('Inserts new tasks at the top of the list', () => { it('Inserts new tasks at the top of the project', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.list-is-empty-notice') cy.get('.project-is-empty-notice')
.should('not.exist') .should('not.exist')
cy.get('.input[placeholder="Add a new task…"') cy.get('.input[placeholder="Add a new task…"')
.type('New Task') .type('New Task')
@ -95,7 +95,7 @@ describe('Task', () => {
it('Marks a task as done', () => { it('Marks a task as done', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.tasks .task .fancycheckbox label.check') cy.get('.tasks .task .fancycheckbox label.check')
.first() .first()
.click() .click()
@ -106,7 +106,7 @@ describe('Task', () => {
it('Can add a task to favorites', () => { it('Can add a task to favorites', () => {
TaskFactory.create(1) TaskFactory.create(1)
cy.visit('/lists/1/list') cy.visit('/projects/1/list')
cy.get('.tasks .task .favorite') cy.get('.tasks .task .favorite')
.first() .first()
.click() .click()
@ -134,7 +134,7 @@ describe('Task', () => {
.should('contain', '#1') .should('contain', '#1')
cy.get('.task-view h6.subtitle') cy.get('.task-view h6.subtitle')
.should('contain', namespaces[0].title) .should('contain', namespaces[0].title)
.should('contain', lists[0].title) .should('contain', projects[0].title)
cy.get('.task-view .details.content.description') cy.get('.task-view .details.content.description')
.should('contain', tasks[0].description) .should('contain', tasks[0].description)
cy.get('.task-view .action-buttons p.created') cy.get('.task-view .action-buttons p.created')
@ -179,21 +179,21 @@ describe('Task', () => {
.should('contain', 'Mark as undone') .should('contain', 'Mark as undone')
}) })
it('Shows a task identifier since the list has one', () => { it('Shows a task identifier since the project has one', () => {
const lists = ListFactory.create(1, { const projects = ProjectFactory.create(1, {
id: 1, id: 1,
identifier: 'TEST', identifier: 'TEST',
}) })
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
index: 1, index: 1,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
cy.get('.task-view h1.title.task-id') cy.get('.task-view h1.title.task-id')
.should('contain', `${lists[0].identifier}-${tasks[0].index}`) .should('contain', `${projects[0].identifier}-${tasks[0].index}`)
}) })
it('Can edit the description', () => { it('Can edit the description', () => {
@ -236,14 +236,14 @@ describe('Task', () => {
.should('contain', 'Success') .should('contain', 'Success')
}) })
it('Can move a task to another list', () => { it('Can move a task to another project', () => {
const lists = ListFactory.create(2) const projects = ProjectFactory.create(2)
BucketFactory.create(2, { BucketFactory.create(2, {
list_id: '{increment}' project_id: '{increment}'
}) })
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
@ -251,7 +251,7 @@ describe('Task', () => {
.contains('Move') .contains('Move')
.click() .click()
cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input') cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
.type(`${lists[1].title}{enter}`) .type(`${projects[1].title}{enter}`)
// The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress // The requests happen with a 200ms timeout. Because of that, the results are not yet there when cypress
// presses enter and we can't simulate pressing on enter to select the item. // presses enter and we can't simulate pressing on enter to select the item.
cy.get('.task-view .content.details .field .multiselect.control .search-results') cy.get('.task-view .content.details .field .multiselect.control .search-results')
@ -261,7 +261,7 @@ describe('Task', () => {
cy.get('.task-view h6.subtitle') cy.get('.task-view h6.subtitle')
.should('contain', namespaces[0].title) .should('contain', namespaces[0].title)
.should('contain', lists[1].title) .should('contain', projects[1].title)
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
}) })
@ -269,7 +269,7 @@ describe('Task', () => {
it('Can delete a task', () => { it('Can delete a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
cy.visit(`/tasks/${tasks[0].id}`) cy.visit(`/tasks/${tasks[0].id}`)
@ -286,17 +286,17 @@ describe('Task', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.url() cy.url()
.should('contain', `/lists/${tasks[0].list_id}/`) .should('contain', `/projects/${tasks[0].project_id}/`)
}) })
it('Can add an assignee to a task', () => { it('Can add an assignee to a task', () => {
const users = UserFactory.create(5) const users = UserFactory.create(5)
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
UserListFactory.create(5, { UserProjectFactory.create(5, {
list_id: 1, project_id: 1,
user_id: '{increment}', user_id: '{increment}',
}) })
@ -321,10 +321,10 @@ describe('Task', () => {
const users = UserFactory.create(2) const users = UserFactory.create(2)
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
UserListFactory.create(5, { UserProjectFactory.create(5, {
list_id: 1, project_id: 1,
user_id: '{increment}', user_id: '{increment}',
}) })
TaskAssigneeFactory.create(1, { TaskAssigneeFactory.create(1, {
@ -347,7 +347,7 @@ describe('Task', () => {
it('Can add a new label to a task', () => { it('Can add a new label to a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
LabelFactory.truncate() LabelFactory.truncate()
const newLabelText = 'some new label' const newLabelText = 'some new label'
@ -375,7 +375,7 @@ describe('Task', () => {
it('Can add an existing label to a task', () => { it('Can add an existing label to a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
@ -388,13 +388,13 @@ describe('Task', () => {
it('Can add a label to a task and it shows up on the kanban board afterwards', () => { it('Can add a label to a task and it shows up on the kanban board afterwards', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
cy.visit(`/lists/${lists[0].id}/kanban`) cy.visit(`/projects/${projects[0].id}/kanban`)
cy.get('.bucket .task') cy.get('.bucket .task')
.contains(tasks[0].title) .contains(tasks[0].title)
@ -412,7 +412,7 @@ describe('Task', () => {
it('Can remove a label from a task', () => { it('Can remove a label from a task', () => {
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: 1, project_id: 1,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.create(1, { LabelTaskFactory.create(1, {
@ -527,13 +527,13 @@ describe('Task', () => {
TaskAttachmentFactory.truncate() TaskAttachmentFactory.truncate()
const tasks = TaskFactory.create(1, { const tasks = TaskFactory.create(1, {
id: 1, id: 1,
list_id: lists[0].id, project_id: projects[0].id,
bucket_id: buckets[0].id, bucket_id: buckets[0].id,
}) })
const labels = LabelFactory.create(1) const labels = LabelFactory.create(1)
LabelTaskFactory.truncate() LabelTaskFactory.truncate()
cy.visit(`/lists/${lists[0].id}/kanban`) cy.visit(`/projects/${projects[0].id}/kanban`)
cy.get('.bucket .task') cy.get('.bucket .task')
.contains(tasks[0].title) .contains(tasks[0].title)

View File

@ -1,10 +1,10 @@
import {createFakeUserAndLogin} from '../../support/authenticateUser' import {createFakeUserAndLogin} from '../../support/authenticateUser'
import {createLists} from '../list/prepareLists' import {createProjects} from '../project/prepareProjects'
function logout() { function logout() {
cy.get('.navbar .username-dropdown-trigger') cy.get('.navbar .user .username')
.click() .click()
cy.get('.navbar .dropdown-item') cy.get('.navbar .user .dropdown-menu .dropdown-item')
.contains('Logout') .contains('Logout')
.click() .click()
} }
@ -26,21 +26,21 @@ describe('Log out', () => {
}) })
}) })
it.skip('Should clear the list history after logging the user out', () => { it.skip('Should clear the project history after logging the user out', () => {
const lists = createLists() const projects = createProjects()
cy.visit(`/lists/${lists[0].id}`) cy.visit(`/projects/${projects[0].id}`)
.then(() => { .then(() => {
expect(localStorage.getItem('listHistory')).to.not.eq(null) expect(localStorage.getItem('projectHistory')).to.not.eq(null)
}) })
logout() logout()
cy.wait(1000) // This makes re-loading of the list and associated entities (and the resulting error) visible cy.wait(1000) // This makes re-loading of the project and associated entities (and the resulting error) visible
cy.url() cy.url()
.should('contain', '/login') .should('contain', '/login')
.then(() => { .then(() => {
expect(localStorage.getItem('listHistory')).to.eq(null) expect(localStorage.getItem('projectHistory')).to.eq(null)
}) })
}) })
}) })

View File

@ -37,7 +37,7 @@ describe('User Settings', () => {
cy.get('.global-notification') cy.get('.global-notification')
.should('contain', 'Success') .should('contain', 'Success')
cy.get('.navbar .username-dropdown-trigger .username') cy.get('.navbar .user .username')
.should('contain', 'Lorem Ipsum') .should('contain', 'Lorem Ipsum')
}) })
}) })

View File

@ -10,7 +10,7 @@ export class BucketFactory extends Factory {
return { return {
id: '{increment}', id: '{increment}',
title: faker.lorem.words(3), title: faker.lorem.words(3),
list_id: 1, project_id: 1,
created_by_id: 1, created_by_id: 1,
created: now.toISOString(), created: now.toISOString(),
updated: now.toISOString(), updated: now.toISOString(),

View File

@ -10,7 +10,7 @@ export class LinkShareFactory extends Factory {
return { return {
id: '{increment}', id: '{increment}',
hash: faker.random.word(32), hash: faker.random.word(32),
list_id: 1, project_id: 1,
right: 0, right: 0,
sharing_type: 0, sharing_type: 0,
shared_by_id: 1, shared_by_id: 1,

View File

@ -1,8 +1,8 @@
import {Factory} from '../support/factory' import {Factory} from '../support/factory'
import {faker} from '@faker-js/faker' import {faker} from '@faker-js/faker'
export class ListFactory extends Factory { export class ProjectFactory extends Factory {
static table = 'lists' static table = 'projects'
static factory() { static factory() {
const now = new Date() const now = new Date()

View File

@ -11,7 +11,7 @@ export class TaskFactory extends Factory {
id: '{increment}', id: '{increment}',
title: faker.lorem.words(3), title: faker.lorem.words(3),
done: false, done: false,
list_id: 1, project_id: 1,
created_by_id: 1, created_by_id: 1,
index: '{increment}', index: '{increment}',
position: '{increment}', position: '{increment}',

View File

@ -1,14 +1,14 @@
import {Factory} from '../support/factory' import {Factory} from '../support/factory'
export class UserListFactory extends Factory { export class UserProjectFactory extends Factory {
static table = 'users_lists' static table = 'users_projects'
static factory() { static factory() {
const now = new Date() const now = new Date()
return { return {
id: '{increment}', id: '{increment}',
list_id: 1, project_id: 1,
user_id: 1, user_id: 1,
right: 0, right: 0,
created: now.toISOString(), created: now.toISOString(),

View File

@ -1,15 +0,0 @@
#!/usr/bin/env sh
set -e
echo "info: API URL is $VIKUNJA_API_URL"
echo "info: Sentry enabled: $VIKUNJA_SENTRY_ENABLED"
# Escape the variable to prevent sed from complaining
VIKUNJA_API_URL="$(echo "$VIKUNJA_API_URL" | sed -r 's/([:;])/\\\1/g')"
VIKUNJA_SENTRY_DSN="$(echo "$VIKUNJA_SENTRY_DSN" | sed -r 's/([:;])/\\\1/g')"
sed -ri "s:^(\s*window.API_URL\s*=)\s*.+:\1 '${VIKUNJA_API_URL}':g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.SENTRY_ENABLED\s*=)\s*.+:\1 ${VIKUNJA_SENTRY_ENABLED}:g" /usr/share/nginx/html/index.html
sed -ri "s:^(\s*window.SENTRY_DSN\s*=)\s*.+:\1 '${VIKUNJA_SENTRY_DSN}':g" /usr/share/nginx/html/index.html
date -uIseconds | xargs echo 'info: started at'

View File

@ -1,19 +0,0 @@
#!/usr/bin/env sh
set -e
if [ ! -f "/proc/net/if_inet6" ]; then
echo "info: IPv6 is not available! Removing IPv6 listen configuration"
find /etc/nginx/conf.d -name '*.conf' -type f | \
while IFS= read -r CONFIG; do
sed -r '/^\s*listen\s*\[::\]:.+$/d' "$CONFIG" > "$CONFIG.temp"
if ! diff -U 5 "$CONFIG" "$CONFIG.temp" > "$CONFIG.diff"; then
echo "info: Removing IPv6 lines from $CONFIG" | \
cat - "$CONFIG.diff"
echo "# IPv6 is disabled because /proc/net/if_inet6 was not found" | \
cat - "$CONFIG.temp" > "$CONFIG"
else
echo "info: Skipping $CONFIG because it does not have IPv6 listen"
fi
rm -f "$CONFIG.temp" "$CONFIG.diff"
done
fi

View File

@ -1,112 +0,0 @@
# Generated by nginxconfig.io
# https://www.digitalocean.com/community/tools/nginx?domains.0.server.domain=localhost&domains.0.server.documentRoot=%2Fusr%2Fshare%2Fnginx%2Fhtml&domains.0.server.cdnSubdomain=true&domains.0.https.https=false&domains.0.php.php=false&domains.0.routing.index=index.html&domains.0.routing.fallbackHtml=true&domains.0.routing.fallbackPhp=false&global.performance.assetsExpiration=1d&global.performance.mediaExpiration=1d&global.performance.svgExpiration=1d&global.performance.fontsExpiration=1d&global.logging.accessLog=%2Fdev%2Fstdout&global.logging.errorLog=%2Fdev%2Fstderr%20warn&global.logging.logNotFound=true&global.nginx.user=nginx&global.nginx.pid=%2Fvar%2Frun%2Fnginx.pid&global.nginx.clientMaxBodySize=50&global.docker.dockerfile=true&global.tools.modularizedStructure=false&global.tools.symlinkVhost=false
# and then edited manually ;)
pid /tmp/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 65535;
events {
multi_accept on;
worker_connections 1024;
}
http {
charset utf-8;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
server_tokens off;
types_hash_max_size 2048;
types_hash_bucket_size 64;
# rootless
client_body_temp_path /tmp/client_temp;
proxy_temp_path /tmp/proxy_temp_path;
fastcgi_temp_path /tmp/fastcgi_temp;
uwsgi_temp_path /tmp/uwsgi_temp;
scgi_temp_path /tmp/scgi_temp;
# MIME
include mime.types;
default_type application/octet-stream;
types {
application/manifest+json webmanifest;
}
# Logging
log_format json escape=json
'{'
'"bytes_sent": "$bytes_sent",'
'"http_user_agent": "$http_user_agent",'
'"nginx_version": "$nginx_version",'
'"query_string": "$query_string",'
'"realip_remote_addr": "$realip_remote_addr",'
'"remote_addr": "$remote_addr",'
'"remote_user": "$remote_user",'
'"request_length": "$request_length",'
'"request_method": "$request_method",'
'"request_time": "$request_time",'
'"server_addr": "$server_addr",'
'"server_port": "$server_port",'
'"server_protocol": "$server_protocol",'
'"status": "$status",'
'"time_local": "$time_local",'
'"uri": "$uri"'
'}';
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/stdout main;
error_log /dev/stderr warn;
keepalive_timeout 65;
# compression
gzip on;
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_min_length 256;
gzip_types
text/plain
text/css
application/json
application/x-javascript
application/javascript
text/xml
application/xml
application/xml+rss
text/javascript
application/vnd.ms-fontobject
application/x-font-ttf
font/opentype
image/svg+xml
image/x-icon
audio/wav;
map_hash_max_size 128;
map_hash_bucket_size 128;
map $sent_http_content_type $expires {
default off;
text/css max;
application/javascript max;
text/javascript max;
application/vnd.ms-fontobject max;
application/x-font-ttf max;
font/opentype max;
font/woff2 max;
image/svg+xml max;
image/x-icon max;
audio/wav max;
~images/ max;
~font/ max;
}
include /etc/nginx/conf.d/*.conf;
}

View File

@ -1,71 +0,0 @@
server {
listen ${VIKUNJA_HTTP_PORT};
listen [::]:${VIKUNJA_HTTP_PORT};
## Needed when behind HAProxy with SSL termination + HTTP/2 support
listen ${VIKUNJA_HTTP2_PORT} default_server http2 proxy_protocol;
listen [::]:${VIKUNJA_HTTP2_PORT} default_server http2 proxy_protocol;
server_name _;
expires $expires;
root /usr/share/nginx/html;
access_log /dev/stdout ${VIKUNJA_LOG_FORMAT};
# security headers
add_header X-XSS-Protection "1; mode=block" always;
add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "no-referrer-when-downgrade" always;
add_header Content-Security-Policy "default-src 'self' http: https: ws: wss: data: blob: 'unsafe-inline'; frame-ancestors 'self';" always;
add_header Permissions-Policy "interest-cohort=()" always;
# . files
location ~ /\.(?!well-known) {
deny all;
}
# assume that everything else is handled by the application router, by injecting the index.html.
location / {
autoindex off;
expires off;
add_header Cache-Control "public, max-age=0, s-maxage=0, must-revalidate" always;
try_files $uri /index.html =404;
}
# favicon.ico
location = /favicon.ico {
log_not_found off;
access_log off;
}
# robots.txt
location = /robots.txt {
log_not_found off;
access_log off;
expires -1; # no-cache
}
location = /ready {
return 200 "";
access_log off;
expires -1; # no-cache
}
# all assets contain hash in filename, cache forever
location ^~ /assets/ {
add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable";
try_files $uri =404;
}
# all workbox scripts are compiled with hash in filename, cache forever3
location ^~ /workbox- {
add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable";
try_files $uri =404;
}
# assets, media
location ~* .(txt|webmanifest|css|js|mjs|map|svg|jpg|jpeg|png|ico|ttf|woff|woff2|wav)$ {
try_files $uri $uri/ =404;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html { }
}

View File

@ -30,21 +30,21 @@ A basic service can look like this:
```javascript ```javascript
import AbstractService from './abstractService' import AbstractService from './abstractService'
import ListModel from '../models/list' import ProjectModel from '../models/project'
export default class ListService extends AbstractService { export default class ProjectService extends AbstractService {
constructor() { constructor() {
super({ super({
getAll: '/lists', getAll: '/projects',
get: '/lists/{id}', get: '/projects/{id}',
create: '/namespaces/{namespaceID}/lists', create: '/namespaces/{namespaceID}/projects',
update: '/lists/{id}', update: '/projects/{id}',
delete: '/lists/{id}', delete: '/projects/{id}',
}) })
} }
modelFactory(data) { modelFactory(data) {
return new ListModel(data) return new ProjectModel(data)
} }
} }
``` ```
@ -132,7 +132,7 @@ import AbstractModel from './abstractModel'
import TaskModel from './task' import TaskModel from './task'
import UserModel from './user' import UserModel from './user'
export default class ListModel extends AbstractModel { export default class ProjectModel extends AbstractModel {
constructor(data) { constructor(data) {
// The constructor of AbstractModel handles all the default parsing. // The constructor of AbstractModel handles all the default parsing.

View File

@ -9,7 +9,9 @@
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<link rel="apple-touch-icon" href="/images/icons/apple-touch-icon-180x180.png"/> <link rel="apple-touch-icon" href="/images/icons/apple-touch-icon-180x180.png"/>
<!--__vite-plugin-inject-preload__--> <link rel="preload" crossorigin="anonymous" href="/src/assets/fonts/OpenSans[wght].woff2" as="font">
<link rel="preload" crossorigin="anonymous" href="/src/assets/fonts/OpenSans-Italic[wght].woff2" as="font">
<link rel="preload" crossorigin="anonymous" href="/src/assets/fonts/Quicksand[wght].woff2" as="font">
</head> </head>
<body> <body>
<noscript> <noscript>

115
nginx.conf Normal file
View File

@ -0,0 +1,115 @@
user nginx;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
types {
application/manifest+json webmanifest;
}
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
gzip on;
gzip_vary on;
gzip_proxied any;
gzip_comp_level 6;
gzip_buffers 16 8k;
gzip_http_version 1.1;
gzip_min_length 256;
gzip_types
text/plain
text/css
application/json
application/x-javascript
application/javascript
text/xml
application/xml
application/xml+rss
text/javascript
application/vnd.ms-fontobject
application/x-font-ttf
font/opentype
image/svg+xml
image/x-icon
audio/wav;
map_hash_max_size 128;
map_hash_bucket_size 128;
# Expires map
map $sent_http_content_type $expires {
default off;
text/css max;
application/javascript max;
text/javascript max;
application/vnd.ms-fontobject max;
application/x-font-ttf max;
font/opentype max;
font/woff2 max;
image/svg+xml max;
image/x-icon max;
audio/wav max;
~images/ max;
~font/ max;
}
server {
listen 80;
listen 81 default_server http2 proxy_protocol; ## Needed when behind HAProxy with SSL termination + HTTP/2 support
server_name _;
expires $expires;
root /usr/share/nginx/html;
# all assets contain hash in filename, cache forever
location ^~ /assets/ {
add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable";
try_files $uri =404;
}
# all workbox scripts are compiled with hash in filename, cache forever3
location ^~ /workbox- {
add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable";
try_files $uri =404;
}
# assume that everything else is handled by the application router, by injecting the index.html.
location / {
autoindex off;
expires off;
add_header Cache-Control "public, max-age=0, s-maxage=0, must-revalidate" always;
try_files $uri /index.html =404;
}
location ~* .(txt|webmanifest|css|js|mjs|map|svg|jpg|jpeg|png|ico|ttf|woff|woff2|wav)$ {
try_files $uri $uri/ =404;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
}
}
}

View File

@ -13,7 +13,7 @@
}, },
"homepage": "https://vikunja.io/", "homepage": "https://vikunja.io/",
"funding": "https://opencollective.com/vikunja", "funding": "https://opencollective.com/vikunja",
"packageManager": "pnpm@7.27.1", "packageManager": "pnpm@7.25.0",
"keywords": [ "keywords": [
"todo", "todo",
"productivity", "productivity",
@ -34,7 +34,7 @@
"test:e2e-record": "start-server-and-test preview http://127.0.0.1:4173 'cypress run --e2e --browser chrome --record'", "test:e2e-record": "start-server-and-test preview http://127.0.0.1:4173 'cypress run --e2e --browser chrome --record'",
"test:e2e-dev-dev": "start-server-and-test preview:dev http://127.0.0.1:4173 'cypress open --e2e'", "test:e2e-dev-dev": "start-server-and-test preview:dev http://127.0.0.1:4173 'cypress open --e2e'",
"test:e2e-dev": "start-server-and-test preview http://127.0.0.1:4173 'cypress open --e2e'", "test:e2e-dev": "start-server-and-test preview http://127.0.0.1:4173 'cypress open --e2e'",
"test:unit": "vitest --dir ./src", "test:unit": "vitest",
"typecheck": "vue-tsc --noEmit && vue-tsc --noEmit -p tsconfig.vitest.json --composite false", "typecheck": "vue-tsc --noEmit && vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
"browserslist:update": "pnpm dlx browserslist@latest --update-db", "browserslist:update": "pnpm dlx browserslist@latest --update-db",
"fonts:update": "pnpm fonts:download && pnpm fonts:subset", "fonts:update": "pnpm fonts:download && pnpm fonts:subset",
@ -45,28 +45,28 @@
"story:preview": "histoire preview" "story:preview": "histoire preview"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-svg-core": "6.3.0", "@fortawesome/fontawesome-svg-core": "6.2.1",
"@fortawesome/free-regular-svg-icons": "6.3.0", "@fortawesome/free-regular-svg-icons": "6.2.1",
"@fortawesome/free-solid-svg-icons": "6.3.0", "@fortawesome/free-solid-svg-icons": "6.2.1",
"@fortawesome/vue-fontawesome": "3.0.3", "@fortawesome/vue-fontawesome": "3.0.2",
"@github/hotkey": "2.0.1", "@github/hotkey": "2.0.1",
"@infectoone/vue-ganttastic": "2.1.4", "@infectoone/vue-ganttastic": "2.1.3",
"@intlify/unplugin-vue-i18n": "0.8.2", "@intlify/unplugin-vue-i18n": "0.8.1",
"@kyvg/vue3-notification": "2.9.0", "@kyvg/vue3-notification": "2.8.0",
"@sentry/tracing": "7.38.0", "@sentry/tracing": "7.31.1",
"@sentry/vue": "7.38.0", "@sentry/vue": "7.31.1",
"@types/is-touch-device": "1.0.0", "@types/is-touch-device": "1.0.0",
"@types/lodash.clonedeep": "4.5.7", "@types/lodash.clonedeep": "4.5.7",
"@types/sortablejs": "1.15.0", "@types/sortablejs": "1.15.0",
"@vueuse/core": "9.13.0", "@vueuse/core": "9.11.0",
"axios": "1.3.3", "axios": "1.2.2",
"blurhash": "2.0.5", "blurhash": "2.0.4",
"bulma-css-variables": "0.9.33", "bulma-css-variables": "0.9.33",
"camel-case": "4.1.2", "camel-case": "4.1.2",
"codemirror": "5.65.12", "codemirror": "5.65.11",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"dayjs": "1.11.7", "dayjs": "1.11.7",
"dompurify": "3.0.0", "dompurify": "2.4.3",
"easymde": "2.18.0", "easymde": "2.18.0",
"fast-deep-equal": "3.1.3", "fast-deep-equal": "3.1.3",
"flatpickr": "4.6.13", "flatpickr": "4.6.13",
@ -75,17 +75,18 @@
"focus-within": "3.0.2", "focus-within": "3.0.2",
"highlight.js": "11.7.0", "highlight.js": "11.7.0",
"is-touch-device": "1.0.1", "is-touch-device": "1.0.1",
"klona": "2.0.6", "lodash.clonedeep": "4.5.0",
"lodash.debounce": "4.0.8", "lodash.debounce": "4.0.8",
"marked": "4.2.12", "marked": "4.2.12",
"pinia": "2.0.32", "minimist": "1.2.7",
"pinia": "2.0.29",
"register-service-worker": "1.7.2", "register-service-worker": "1.7.2",
"snake-case": "3.0.4", "snake-case": "3.0.4",
"sortablejs": "1.15.0", "sortablejs": "1.15.0",
"ufo": "1.1.0", "ufo": "1.0.1",
"vue": "3.2.47", "vue": "3.2.45",
"vue-advanced-cropper": "2.8.8", "vue-advanced-cropper": "2.8.8",
"vue-flatpickr-component": "11.0.2", "vue-flatpickr-component": "11.0.1",
"vue-i18n": "9.2.2", "vue-i18n": "9.2.2",
"vue-router": "4.1.6", "vue-router": "4.1.6",
"workbox-precaching": "6.5.4", "workbox-precaching": "6.5.4",
@ -93,53 +94,52 @@
}, },
"devDependencies": { "devDependencies": {
"@4tw/cypress-drag-drop": "2.2.3", "@4tw/cypress-drag-drop": "2.2.3",
"@cypress/vite-dev-server": "5.0.3", "@cypress/vite-dev-server": "5.0.2",
"@cypress/vue": "5.0.4", "@cypress/vue": "5.0.3",
"@faker-js/faker": "7.6.0", "@faker-js/faker": "7.6.0",
"@histoire/plugin-screenshot": "0.15.8", "@histoire/plugin-screenshot": "0.12.4",
"@histoire/plugin-vue": "0.15.8", "@histoire/plugin-vue": "0.12.4",
"@rushstack/eslint-patch": "1.2.0", "@rushstack/eslint-patch": "1.2.0",
"@types/codemirror": "5.60.7", "@types/codemirror": "5.60.6",
"@types/dompurify": "2.4.0", "@types/dompurify": "2.4.0",
"@types/flexsearch": "0.7.3", "@types/flexsearch": "0.7.3",
"@types/focus-within": "1.0.1", "@types/focus-within": "1.0.1",
"@types/lodash.debounce": "4.0.7", "@types/lodash.debounce": "4.0.7",
"@types/marked": "4.0.8", "@types/marked": "4.0.8",
"@types/node": "18.14.0", "@types/node": "18.11.18",
"@types/postcss-preset-env": "7.7.0", "@types/postcss-preset-env": "7.7.0",
"@typescript-eslint/eslint-plugin": "5.53.0", "@typescript-eslint/eslint-plugin": "5.48.2",
"@typescript-eslint/parser": "5.53.0", "@typescript-eslint/parser": "5.48.2",
"@vitejs/plugin-legacy": "4.0.1", "@vitejs/plugin-legacy": "3.0.1",
"@vitejs/plugin-vue": "4.0.0", "@vitejs/plugin-vue": "4.0.0",
"@vue/eslint-config-typescript": "11.0.2", "@vue/eslint-config-typescript": "11.0.2",
"@vue/test-utils": "2.3.0", "@vue/test-utils": "2.2.7",
"@vue/tsconfig": "0.1.3", "@vue/tsconfig": "0.1.3",
"autoprefixer": "10.4.13", "autoprefixer": "10.4.13",
"browserslist": "4.21.5", "browserslist": "4.21.4",
"caniuse-lite": "1.0.30001457", "caniuse-lite": "1.0.30001445",
"csstype": "3.1.1", "csstype": "3.1.1",
"cypress": "12.6.0", "cypress": "12.3.0",
"esbuild": "0.17.10", "esbuild": "0.17.2",
"eslint": "8.34.0", "eslint": "8.32.0",
"eslint-plugin-vue": "9.9.0", "eslint-plugin-vue": "9.9.0",
"happy-dom": "8.6.0", "happy-dom": "8.1.4",
"histoire": "0.15.8", "histoire": "0.12.4",
"netlify-cli": "12.13.2", "netlify-cli": "12.7.2",
"postcss": "8.4.21", "postcss": "8.4.21",
"postcss-easing-gradients": "3.0.1", "postcss-easing-gradients": "3.0.1",
"postcss-easings": "3.0.1", "postcss-easings": "3.0.1",
"postcss-preset-env": "8.0.1", "postcss-preset-env": "7.8.3",
"rollup": "3.17.2", "rollup": "3.10.0",
"rollup-plugin-visualizer": "5.9.0", "rollup-plugin-visualizer": "5.9.0",
"sass": "1.58.3", "sass": "1.57.1",
"start-server-and-test": "1.15.4", "start-server-and-test": "1.15.2",
"typescript": "4.9.5", "typescript": "4.9.4",
"vite": "4.1.3", "vite": "4.0.4",
"vite-plugin-inject-preload": "1.3.0", "vite-plugin-pwa": "0.14.1",
"vite-plugin-pwa": "0.14.4",
"vite-svg-loader": "4.0.0", "vite-svg-loader": "4.0.0",
"vitest": "0.28.5", "vitest": "0.27.2",
"vue-tsc": "1.1.5", "vue-tsc": "1.0.24",
"wait-on": "7.0.1", "wait-on": "7.0.1",
"workbox-cli": "6.5.4" "workbox-cli": "6.5.4"
} }

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"labels": ["dependencies"], "labels": ["dependencies"],
"extends": [ "extends": [
"config:js-app" "config:base"
], ],
"packageRules": [ "packageRules": [
{ {
@ -20,13 +20,6 @@
"@vueuse/" "@vueuse/"
] ]
}, },
{
"groupName": "histoire",
"matchPackagePrefixes": [
"@histoire/",
"histoire"
]
},
{ {
"matchDepTypes": ["devDependencies"], "matchDepTypes": ["devDependencies"],
"automerge": true, "automerge": true,

View File

@ -1,4 +1,4 @@
import { exec } from 'node:child_process' const { exec } = require('child_process')
function createSlug(string) { function createSlug(string) {
return String(string) return String(string)

View File

@ -0,0 +1 @@
24df869e7a9282c76c9e1883071a39c0b11a53a57da68b37f2b918df25b1ae0f1b403e38a29c9cb694575bb9a7b52b6e ./scripts/deploy-preview-netlify.js

View File

@ -1 +0,0 @@
57af69409e66bc87f4f2fc5822dd8d3c2eb47c601f81af1ac4a56f3e2d80837b1a2de06f4ff57695ec379b7c15b881e3 ./scripts/deploy-preview-netlify.mjs

28
scripts/run.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
# This shell script sets the api url based on an environment variable and starts nginx in foreground.
VIKUNJA_API_URL="${VIKUNJA_API_URL:-"/api/v1"}"
VIKUNJA_SENTRY_ENABLED="${VIKUNJA_SENTRY_ENABLED:-"false"}"
VIKUNJA_SENTRY_DSN="${VIKUNJA_SENTRY_DSN:-"https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480"}"
VIKUNJA_HTTP_PORT="${VIKUNJA_HTTP_PORT:-80}"
VIKUNJA_HTTPS_PORT="${VIKUNJA_HTTPS_PORT:-443}"
echo "Using $VIKUNJA_API_URL as default api url"
# Escape the variable to prevent sed from complaining
VIKUNJA_API_URL=$(echo $VIKUNJA_API_URL |sed 's/\//\\\//g')
sed -i "s/http\:\/\/localhost\:3456//g" /usr/share/nginx/html/index.html # replacing in two steps to make sure api urls from releases are properly replaced as well
sed -i "s/'\/api\/v1/'$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html
sed -i "s/\.SENTRY_ENABLED = false/\.SENTRY_ENABLED = $VIKUNJA_SENTRY_ENABLED/g" /usr/share/nginx/html/index.html
sed -i "s|\.SENTRY_DSN = '.*'|\.SENTRY_DSN = '$VIKUNJA_SENTRY_DSN'|g" /usr/share/nginx/html/index.html
sed -i "s/listen 80/listen $VIKUNJA_HTTP_PORT/g" /etc/nginx/nginx.conf
sed -i "s/listen 443/listen $VIKUNJA_HTTPS_PORT/g" /etc/nginx/nginx.conf
# Set the uid and gid of the nginx run user
usermod --non-unique --uid ${PUID} nginx
groupmod --non-unique --gid ${PGID} nginx
nginx -g "daemon off;"

View File

@ -8,13 +8,9 @@
<no-auth-wrapper v-else> <no-auth-wrapper v-else>
<router-view/> <router-view/>
</no-auth-wrapper> </no-auth-wrapper>
<Notification/>
<keyboard-shortcuts v-if="keyboardShortcutsActive"/> <keyboard-shortcuts v-if="keyboardShortcutsActive"/>
<Teleport to="body">
<UpdateNotification/>
<Notification/>
</Teleport>
</ready> </ready>
</template> </template>
@ -23,26 +19,23 @@ import {computed, watch} from 'vue'
import {useRoute, useRouter} from 'vue-router' import {useRoute, useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import isTouchDevice from 'is-touch-device' import isTouchDevice from 'is-touch-device'
import {success} from '@/message'
import Notification from '@/components/misc/notification.vue' import Notification from '@/components/misc/notification.vue'
import UpdateNotification from '@/components/home/UpdateNotification.vue' import KeyboardShortcuts from './components/misc/keyboard-shortcuts/index.vue'
import KeyboardShortcuts from '@/components/misc/keyboard-shortcuts/index.vue'
import TheNavigation from '@/components/home/TheNavigation.vue' import TheNavigation from '@/components/home/TheNavigation.vue'
import ContentAuth from '@/components/home/contentAuth.vue' import ContentAuth from './components/home/contentAuth.vue'
import ContentLinkShare from '@/components/home/contentLinkShare.vue' import ContentLinkShare from './components/home/contentLinkShare.vue'
import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue' import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue'
import Ready from '@/components/misc/ready.vue' import Ready from '@/components/misc/ready.vue'
import {setLanguage} from '@/i18n' import {setLanguage} from './i18n'
import AccountDeleteService from '@/services/accountDelete' import AccountDeleteService from '@/services/accountDelete'
import {success} from '@/message'
import {useAuthStore} from '@/stores/auth'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useColorScheme} from '@/composables/useColorScheme' import {useColorScheme} from '@/composables/useColorScheme'
import {useBodyClass} from '@/composables/useBodyClass' import {useBodyClass} from '@/composables/useBodyClass'
import {useAuthStore} from './stores/auth'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const authStore = useAuthStore() const authStore = useAuthStore()

View File

@ -2,94 +2,101 @@
<header <header
:class="{'has-background': background, 'menu-active': menuActive}" :class="{'has-background': background, 'menu-active': menuActive}"
aria-label="main navigation" aria-label="main navigation"
class="navbar d-print-none" class="navbar main-theme is-fixed-top d-print-none"
> >
<router-link :to="{name: 'home'}" class="logo-link"> <router-link :to="{name: 'home'}" class="logo-link">
<Logo width="164" height="48"/> <Logo width="164" height="48"/>
</router-link> </router-link>
<MenuButton class="menu-button"/> <MenuButton class="menu-button"/>
<div class="project-title" ref="projectTitle" v-show="currentProject.id">
<template v-if="currentProject.id">
<h1
:style="{ 'opacity': currentProject.title === '' ? '0': '1' }"
class="title">
{{ currentProject.title === '' ? $t('misc.loading') : getProjectTitle(currentProject) }}
</h1>
<div <BaseButton :to="{name: 'project.info', params: {projectId: currentProject.id}}" class="info-button">
v-if="currentList.id" <icon icon="circle-info"/>
class="list-title-wrapper" </BaseButton>
>
<h1 class="list-title">{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }}</h1>
<BaseButton :to="{name: 'list.info', params: {listId: currentList.id}}" class="list-title-button">
<icon icon="circle-info"/>
</BaseButton>
<list-settings-dropdown <project-settings-dropdown v-if="canWriteCurrentProject && currentProject.id !== -1" :project="currentProject"/>
v-if="canWriteCurrentList && currentList.id !== -1" </template>
class="list-title-dropdown"
:list="currentList"
>
<template #trigger="{toggleOpen}">
<BaseButton class="list-title-button" @click="toggleOpen">
<icon icon="ellipsis-h" class="icon"/>
</BaseButton>
</template>
</list-settings-dropdown>
</div> </div>
<div class="navbar-end"> <div class="navbar-end">
<update/>
<BaseButton <BaseButton
@click="openQuickActions" @click="openQuickActions"
class="trigger-button" class="trigger-button pr-0"
v-shortcut="'Control+k'" v-shortcut="'Control+k'"
:title="$t('keyboardShortcuts.quickSearch')" :title="$t('keyboardShortcuts.quickSearch')"
> >
<icon icon="search"/> <icon icon="search"/>
</BaseButton> </BaseButton>
<Notifications /> <notifications/>
<dropdown> <div class="user">
<template #trigger="{toggleOpen, open}"> <dropdown class="is-right" ref="usernameDropdown">
<BaseButton <template #trigger="{toggleOpen}">
class="username-dropdown-trigger" <x-button
@click="toggleOpen" class="username-dropdown-trigger"
variant="secondary" @click="toggleOpen()"
:shadow="false" variant="secondary"
> :shadow="false"
<img :src="authStore.avatarUrl" alt="" class="avatar" width="40" height="40"/> >
<span class="username">{{ authStore.userDisplayName }}</span> <img :src="authStore.avatarUrl" alt="" class="avatar" width="40" height="40"/>
<span class="icon is-small" :style="{ <span class="username">{{ authStore.userDisplayName }}</span>
transform: open ? 'rotate(180deg)' : 'rotate(0)', <span class="icon is-small">
}"> <icon icon="chevron-down"/>
<icon icon="chevron-down"/> </span>
</span> </x-button>
</BaseButton> </template>
</template>
<dropdown-item :to="{name: 'user.settings'}"> <dropdown-item
{{ $t('user.settings.title') }} :to="{name: 'user.settings'}"
</dropdown-item> >
<dropdown-item v-if="imprintUrl" :href="imprintUrl"> {{ $t('user.settings.title') }}
{{ $t('navigation.imprint') }} </dropdown-item>
</dropdown-item> <dropdown-item
<dropdown-item v-if="privacyPolicyUrl" :href="privacyPolicyUrl"> v-if="imprintUrl"
{{ $t('navigation.privacy') }} :href="imprintUrl"
</dropdown-item> >
<dropdown-item @click="baseStore.setKeyboardShortcutsActive(true)"> {{ $t('navigation.imprint') }}
{{ $t('keyboardShortcuts.title') }} </dropdown-item>
</dropdown-item> <dropdown-item
<dropdown-item :to="{name: 'about'}"> v-if="privacyPolicyUrl"
{{ $t('about.title') }} :href="privacyPolicyUrl"
</dropdown-item> >
<dropdown-item @click="authStore.logout()"> {{ $t('navigation.privacy') }}
{{ $t('user.auth.logout') }} </dropdown-item>
</dropdown-item> <dropdown-item
</dropdown> @click="baseStore.setKeyboardShortcutsActive(true)"
>
{{ $t('keyboardShortcuts.title') }}
</dropdown-item>
<dropdown-item
:to="{name: 'about'}"
>
{{ $t('about.title') }}
</dropdown-item>
<dropdown-item
@click="authStore.logout()"
>
{{ $t('user.auth.logout') }}
</dropdown-item>
</dropdown>
</div>
</div> </div>
</header> </header>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {computed} from 'vue' import {ref, computed, onMounted, nextTick} from 'vue'
import {RIGHTS as Rights} from '@/constants/rights' import {RIGHTS as Rights} from '@/constants/rights'
import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue' import Update from '@/components/home/update.vue'
import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
import Dropdown from '@/components/misc/dropdown.vue' import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.vue' import DropdownItem from '@/components/misc/dropdown-item.vue'
import Notifications from '@/components/notifications/notifications.vue' import Notifications from '@/components/notifications/notifications.vue'
@ -97,16 +104,16 @@ import Logo from '@/components/home/Logo.vue'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import MenuButton from '@/components/home/MenuButton.vue' import MenuButton from '@/components/home/MenuButton.vue'
import {getListTitle} from '@/helpers/getListTitle' import {getProjectTitle} from '@/helpers/getProjectTitle'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
import {useAuthStore} from '@/stores/auth' import {useAuthStore} from '@/stores/auth'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const background = computed(() => baseStore.background) const background = computed(() => baseStore.background)
const canWriteCurrentList = computed(() => baseStore.currentList.maxRight > Rights.READ) const canWriteCurrentProject = computed(() => baseStore.currentProject.maxRight > Rights.READ)
const menuActive = computed(() => baseStore.menuActive) const menuActive = computed(() => baseStore.menuActive)
const authStore = useAuthStore() const authStore = useAuthStore()
@ -115,152 +122,182 @@ const configStore = useConfigStore()
const imprintUrl = computed(() => configStore.legal.imprintUrl) const imprintUrl = computed(() => configStore.legal.imprintUrl)
const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl) const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl)
const usernameDropdown = ref()
const projectTitle = ref()
onMounted(async () => {
await nextTick()
if (typeof usernameDropdown.value === 'undefined' || typeof projectTitle.value === 'undefined') {
return
}
const usernameWidth = usernameDropdown.value.$el.clientWidth
projectTitle.value.style.setProperty('--nav-username-width', `${usernameWidth}px`)
})
function openQuickActions() { function openQuickActions() {
baseStore.setQuickActionsActive(true) baseStore.setQuickActionsActive(true)
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
$vikunja-nav-logo-full-width: 164px;
$user-dropdown-width-mobile: 5rem; $user-dropdown-width-mobile: 5rem;
.navbar { $hamburger-menu-icon-spacing: 1rem;
--navbar-button-min-width: 40px; $hamburger-menu-icon-width: 28px;
--navbar-gap-width: 1rem;
--navbar-icon-size: 1.25rem;
position: fixed;
top: 0;
left: 0;
right: 0;
display: flex;
justify-content: space-between;
gap: var(--navbar-gap-width);
background: var(--site-background);
@media screen and (max-width: $tablet) {
padding-right: .5rem;
}
@media screen and (min-width: $tablet) {
padding-left: 2rem;
padding-right: 1rem;
align-items: stretch;
}
&.menu-active {
@media screen and (max-width: $tablet) {
z-index: 0;
}
}
// FIXME: notifications should provide a slot for the icon instead, so that we can style it as we want
:deep() {
.trigger-button {
color: var(--grey-400);
font-size: var(--navbar-icon-size);
}
}
}
.logo-link { .logo-link {
display: none; display: none;
padding: 0.5rem 0.75rem;
@media screen and (min-width: $tablet) { @media screen and (min-width: $tablet) {
align-self: stretch; align-self: stretch;
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: .5rem; padding-left: 2rem;
margin-right: 1.5rem;
} }
} }
.menu-button { .menu-button {
align-self: stretch;
margin-right: auto; margin-right: auto;
align-self: stretch;
flex: 0 0 auto;
@media screen and (max-width: $tablet) { @media screen and (max-width: $tablet) {
margin-left: 1rem; margin-left: $hamburger-menu-icon-spacing;
} }
} }
.list-title-wrapper { .navbar.main-theme {
margin-inline: auto; background: var(--site-background);
display: flex; justify-content: space-between;
align-items: center; align-items: center;
// this makes the truncated text of the list title work @media screen and (max-width: $desktop) {
// inside the flexbox parent display: flex;
min-width: 0; justify-content: space-between;
@media screen and (min-width: $tablet) {
padding-inline: var(--navbar-gap-width);
} }
}
.list-title { .title {
font-size: 1rem; margin: 0;
// We need the following for overflowing ellipsis to work
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@media screen and (min-width: $tablet) {
font-size: 1.75rem; font-size: 1.75rem;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
} }
}
.list-title-dropdown { .navbar-end {
align-self: stretch; margin-left: 0;
align-items: center;
.list-title-button { display: flex;
flex-grow: 1;
} }
}
.list-title-button {
align-self: stretch;
min-width: var(--navbar-button-min-width);
display: flex;
place-items: center;
justify-content: center;
font-size: var(--navbar-icon-size);
color: var(--grey-400);
}
.navbar-end {
margin-left: auto;
flex: 0 0 auto;
display: flex;
align-items: stretch;
> * {
min-width: var(--navbar-button-min-width);
}
}
.username-dropdown-trigger {
padding-left: 1rem;
display: inline-flex;
align-items: center;
text-transform: uppercase;
font-size: .85rem;
font-weight: 700;
}
.username {
font-family: $vikunja-font;
@media screen and (max-width: $tablet) { @media screen and (max-width: $tablet) {
display: none; &.menu-active {
z-index: 0;
}
.user {
width: $user-dropdown-width-mobile;
.username-dropdown-trigger {
line-height: 1;
padding: 0 0.25rem;
height: 1rem;
.icon {
width: .5rem;
}
}
.username {
display: none;
}
}
} }
} }
.avatar { .navbar {
border-radius: 100%; // FIXME: notifications should provide a slot for the icon instead, so that we can style it as we want
vertical-align: middle; :deep() {
height: 40px; .trigger-button {
margin-right: .5rem; cursor: pointer;
color: var(--grey-400);
padding: .5rem;
font-size: 1.25rem;
position: relative;
}
> * > .trigger-button {
width: $navbar-icon-width;
}
}
.user {
display: flex;
align-items: center;
span {
font-family: $vikunja-font;
}
.avatar {
border-radius: 100%;
vertical-align: middle;
height: 40px;
margin-right: .5rem;
}
.username-dropdown-trigger {
background: none;
&:focus:not(:active), &:active {
outline: none !important;
box-shadow: none !important;
}
}
}
}
.project-title {
display: flex;
align-items: center;
justify-content: center;
$edit-icon-width: 1rem;
@media screen and (min-width: $tablet) {
// We need a fixed width for overflowing ellipsis to work
--nav-username-width: 0;
width: calc(100vw - #{$user-dropdown-width-mobile} - #{2 * $hamburger-menu-icon-spacing} - #{$hamburger-menu-icon-width} - #{$edit-icon-width} - #{2 * $navbar-icon-width} - #{$vikunja-nav-logo-full-width} - var(--nav-username-width));
}
@media screen and (max-width: $tablet) {
// We need a fixed width for overflowing ellipsis to work
width: calc(100vw - #{$user-dropdown-width-mobile} - #{2 * $hamburger-menu-icon-spacing} - #{$hamburger-menu-icon-width} - #{$edit-icon-width} - #{2 * $navbar-icon-width});
}
h1 {
margin: 0;
}
:deep(.dropdown-trigger) {
color: var(--grey-400);
margin-left: .5rem;
height: 1rem;
width: 1rem;
cursor: pointer;
}
}
.info-button {
text-align: center;
height: 1.25rem;
line-height: 1.25rem;
width: 2rem;
margin-top: .25rem;
padding: 0 .5rem;
color: var(--grey-400);
margin-left: .5rem;
} }
</style> </style>

View File

@ -1,16 +1,16 @@
<template> <template>
<div class="content-auth"> <div class="content-auth">
<BaseButton <BaseButton
v-show="menuActive" v-if="menuActive"
@click="baseStore.setMenuActive(false)" @click="baseStore.setMenuActive(false)"
class="menu-hide-button d-print-none" class="menu-hide-button d-print-none"
> >
<icon icon="times"/> <icon icon="times"/>
</BaseButton> </BaseButton>
<div <div
class="app-container"
:class="{'has-background': background || blurHash}" :class="{'has-background': background || blurHash}"
:style="{'background-image': blurHash && `url(${blurHash})`}" :style="{'background-image': blurHash && `url(${blurHash})`}"
class="app-container"
> >
<div <div
:class="{'is-visible': background}" :class="{'is-visible': background}"
@ -18,14 +18,14 @@
:style="{'background-image': background && `url(${background})`}"></div> :style="{'background-image': background && `url(${background})`}"></div>
<navigation class="d-print-none"/> <navigation class="d-print-none"/>
<main <main
class="app-content"
:class="[ :class="[
{ 'is-menu-enabled': menuActive }, { 'is-menu-enabled': menuActive },
$route.name, $route.name,
]" ]"
class="app-content"
> >
<BaseButton <BaseButton
v-show="menuActive" v-if="menuActive"
@click="baseStore.setMenuActive(false)" @click="baseStore.setMenuActive(false)"
class="mobile-overlay d-print-none" class="mobile-overlay d-print-none"
/> />
@ -33,7 +33,7 @@
<quick-actions/> <quick-actions/>
<router-view :route="routeWithModal" v-slot="{ Component }"> <router-view :route="routeWithModal" v-slot="{ Component }">
<keep-alive :include="['list.list', 'list.gantt', 'list.table', 'list.kanban']"> <keep-alive :include="['project.list', 'project.gantt', 'project.table', 'project.kanban']">
<component :is="Component"/> <component :is="Component"/>
</keep-alive> </keep-alive>
</router-view> </router-view>
@ -86,8 +86,11 @@ function showKeyboardShortcuts() {
const route = useRoute() const route = useRoute()
// hide menu on mobile
watch(() => route.fullPath, () => window.innerWidth < 769 && baseStore.setMenuActive(false))
// FIXME: this is really error prone // FIXME: this is really error prone
// Reset the current list highlight in menu if the current route is not list related. // Reset the current project highlight in menu if the current route is not project related.
watch(() => route.name as string, (routeName) => { watch(() => route.name as string, (routeName) => {
if ( if (
routeName && routeName &&
@ -106,7 +109,7 @@ watch(() => route.name as string, (routeName) => {
routeName.startsWith('user.settings') routeName.startsWith('user.settings')
) )
) { ) {
baseStore.handleSetCurrentList({list: null}) baseStore.handleSetCurrentProject({project: null})
} }
}) })
@ -140,6 +143,7 @@ labelStore.loadAllLabels()
&:hover, &:hover,
&:focus { &:focus {
height: 1rem;
color: var(--grey-600); color: var(--grey-600);
} }
} }
@ -221,4 +225,9 @@ labelStore.loadAllLabels()
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.is-touch .content-auth,
.content-auth.z-unset {
z-index: unset;
}
</style> </style>

View File

@ -9,9 +9,9 @@
<Logo class="logo" v-if="logoVisible"/> <Logo class="logo" v-if="logoVisible"/>
<h1 <h1
:class="{'m-0': !logoVisible}" :class="{'m-0': !logoVisible}"
:style="{ 'opacity': currentList.title === '' ? '0': '1' }" :style="{ 'opacity': currentProject.title === '' ? '0': '1' }"
class="title"> class="title">
{{ currentList.title === '' ? $t('misc.loading') : currentList.title }} {{ currentProject.title === '' ? $t('misc.loading') : currentProject.title }}
</h1> </h1>
<div class="box has-text-left view"> <div class="box has-text-left view">
<router-view/> <router-view/>
@ -31,7 +31,7 @@ import Logo from '@/components/home/Logo.vue'
import PoweredByLink from './PoweredByLink.vue' import PoweredByLink from './PoweredByLink.vue'
const baseStore = useBaseStore() const baseStore = useBaseStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const background = computed(() => baseStore.background) const background = computed(() => baseStore.background)
const logoVisible = computed(() => baseStore.logoVisible) const logoVisible = computed(() => baseStore.logoVisible)
</script> </script>

View File

@ -52,37 +52,37 @@
<template v-for="(n, nk) in namespaces" :key="n.id"> <template v-for="(n, nk) in namespaces" :key="n.id">
<div class="namespace-title" :class="{'has-menu': n.id > 0}"> <div class="namespace-title" :class="{'has-menu': n.id > 0}">
<BaseButton <BaseButton
@click="toggleLists(n.id)" @click="toggleProjects(n.id)"
class="menu-label" class="menu-label"
v-tooltip="namespaceTitles[nk]" v-tooltip="namespaceTitles[nk]"
> >
<ColorBubble <ColorBubble
v-if="n.hexColor !== ''" v-if="n.hexColor !== ''"
:color="n.hexColor" :color="n.hexColor"
class="mr-1" class="mr-1"
/> />
<span class="name">{{ namespaceTitles[nk] }}</span> <span class="name">{{ namespaceTitles[nk] }}</span>
<div <div
class="icon menu-item-icon is-small toggle-lists-icon pl-2" class="icon menu-item-icon is-small toggle-lists-icon pl-2"
:class="{'active': typeof listsVisible[n.id] !== 'undefined' ? listsVisible[n.id] : true}" :class="{'active': typeof projectsVisible[n.id] !== 'undefined' ? projectsVisible[n.id] : true}"
> >
<icon icon="chevron-down"/> <icon icon="chevron-down"/>
</div> </div>
<span class="count" :class="{'ml-2 mr-0': n.id > 0}"> <span class="count" :class="{'ml-2 mr-0': n.id > 0}">
({{ namespaceListsCount[nk] }}) ({{ namespaceProjectsCount[nk] }})
</span> </span>
</BaseButton> </BaseButton>
<namespace-settings-dropdown class="menu-list-dropdown" :namespace="n" v-if="n.id > 0"/> <namespace-settings-dropdown class="menu-list-dropdown" :namespace="n" v-if="n.id > 0"/>
</div> </div>
<!-- <!--
NOTE: a v-model / computed setter is not possible, since the updateActiveLists function NOTE: a v-model / computed setter is not possible, since the updateActiveProjects function
triggered by the change needs to have access to the current namespace triggered by the change needs to have access to the current namespace
--> -->
<draggable <draggable
v-if="listsVisible[n.id] ?? true" v-if="projectsVisible[n.id] ?? true"
v-bind="dragOptions" v-bind="dragOptions"
:modelValue="activeLists[nk]" :modelValue="activeProjects[nk]"
@update:modelValue="(lists) => updateActiveLists(n, lists)" @update:modelValue="(projects) => updateActiveProjects(n, projects)"
group="namespace-lists" group="namespace-lists"
@start="() => drag = true" @start="() => drag = true"
@end="saveListPosition" @end="saveListPosition"
@ -100,45 +100,45 @@
{ 'dragging-disabled': n.id < 0 } { 'dragging-disabled': n.id < 0 }
] ]
}" }"
> >
<template #item="{element: l}"> <template #item="{element: l}">
<li <li
class="list-menu loader-container is-loading-small" class="list-menu loader-container is-loading-small"
:class="{'is-loading': listUpdating[l.id]}" :class="{'is-loading': projectUpdating[l.id]}"
> >
<BaseButton <BaseButton
:to="{ name: 'list.index', params: { listId: l.id} }" :to="{ name: 'project.index', params: { projectId: l.id} }"
class="list-menu-link" class="list-menu-link"
:class="{'router-link-exact-active': currentList.id === l.id}" :class="{'router-link-exact-active': currentProject.id === l.id}"
> >
<span class="icon menu-item-icon handle"> <span class="icon menu-item-icon handle">
<icon icon="grip-lines"/> <icon icon="grip-lines"/>
</span> </span>
<ColorBubble <ColorBubble
v-if="l.hexColor !== ''" v-if="l.hexColor !== ''"
:color="l.hexColor" :color="l.hexColor"
class="mr-1" class="mr-1"
/> />
<span class="list-menu-title">{{ getListTitle(l) }}</span> <span class="list-menu-title">{{ getProjectTitle(l) }}</span>
</BaseButton> </BaseButton>
<BaseButton <BaseButton
class="favorite" class="favorite"
:class="{'is-favorite': l.isFavorite}" :class="{'is-favorite': l.isFavorite}"
@click="listStore.toggleListFavorite(l)" @click="projectStore.toggleProjectFavorite(l)"
> >
<icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/> <icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/>
</BaseButton> </BaseButton>
<list-settings-dropdown class="menu-list-dropdown" :list="l" v-if="l.id > 0"> <list-settings-dropdown class="menu-list-dropdown" :list="l" v-if="l.id > 0">
<template #trigger="{toggleOpen}"> <template #trigger="{toggleOpen}">
<BaseButton class="menu-list-dropdown-trigger" @click="toggleOpen"> <BaseButton class="menu-list-dropdown-trigger" @click="toggleOpen">
<icon icon="ellipsis-h" class="icon"/> <icon icon="ellipsis-h" class="icon"/>
</BaseButton> </BaseButton>
</template> </template>
</list-settings-dropdown> </list-settings-dropdown>
<span class="list-setting-spacer" v-else></span> <span class="list-setting-spacer" v-else></span>
</li> </li>
</template> </template>
</draggable> </draggable>
</template> </template>
</nav> </nav>
<PoweredByLink/> <PoweredByLink/>
@ -146,25 +146,26 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {ref, computed, onBeforeMount} from 'vue' import {ref, computed, onMounted, onBeforeMount} from 'vue'
import draggable from 'zhyswan-vuedraggable' import draggable from 'zhyswan-vuedraggable'
import type {SortableEvent} from 'sortablejs' import type {SortableEvent} from 'sortablejs'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue' import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
import NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue' import NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue'
import PoweredByLink from '@/components/home/PoweredByLink.vue' import PoweredByLink from '@/components/home/PoweredByLink.vue'
import Logo from '@/components/home/Logo.vue' import Logo from '@/components/home/Logo.vue'
import {calculateItemPosition} from '@/helpers/calculateItemPosition' import {calculateItemPosition} from '@/helpers/calculateItemPosition'
import {getNamespaceTitle} from '@/helpers/getNamespaceTitle' import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
import {getListTitle} from '@/helpers/getListTitle' import {getProjectTitle} from '@/helpers/getProjectTitle'
import type {IList} from '@/modelTypes/IList' import {useEventListener} from '@vueuse/core'
import type {IProject} from '@/modelTypes/IProject'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import ColorBubble from '@/components/misc/colorBubble.vue' import ColorBubble from '@/components/misc/colorBubble.vue'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
const drag = ref(false) const drag = ref(false)
@ -175,7 +176,7 @@ const dragOptions = {
const baseStore = useBaseStore() const baseStore = useBaseStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const currentList = computed(() => baseStore.currentList) const currentProject = computed(() => baseStore.currentProject)
const menuActive = computed(() => baseStore.menuActive) const menuActive = computed(() => baseStore.menuActive)
const loading = computed(() => namespaceStore.isLoading) const loading = computed(() => namespaceStore.isLoading)
@ -183,9 +184,9 @@ const loading = computed(() => namespaceStore.isLoading)
const namespaces = computed(() => { const namespaces = computed(() => {
return namespaceStore.namespaces.filter(n => !n.isArchived) return namespaceStore.namespaces.filter(n => !n.isArchived)
}) })
const activeLists = computed(() => { const activeProjects = computed(() => {
return namespaces.value.map(({lists}) => { return namespaces.value.map(({projects}) => {
return lists?.filter(item => { return projects?.filter(item => {
return typeof item !== 'undefined' && !item.isArchived return typeof item !== 'undefined' && !item.isArchived
}) })
}) })
@ -195,45 +196,54 @@ const namespaceTitles = computed(() => {
return namespaces.value.map((namespace) => getNamespaceTitle(namespace)) return namespaces.value.map((namespace) => getNamespaceTitle(namespace))
}) })
const namespaceListsCount = computed(() => { const namespaceProjectsCount = computed(() => {
return namespaces.value.map((_, index) => activeLists.value[index]?.length ?? 0) return namespaces.value.map((_, index) => activeProjects.value[index]?.length ?? 0)
}) })
const listStore = useListStore()
function toggleLists(namespaceId: INamespace['id']) { useEventListener('resize', resize)
listsVisible.value[namespaceId] = !listsVisible.value[namespaceId] onMounted(() => resize())
const projectStore = useProjectStore()
function resize() {
// Hide the menu by default on mobile
baseStore.setMenuActive(window.innerWidth >= 770)
} }
const listsVisible = ref<{ [id: INamespace['id']]: boolean }>({}) function toggleProjects(namespaceId: INamespace['id']) {
projectsVisible.value[namespaceId] = !projectsVisible.value[namespaceId]
}
const projectsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
// FIXME: async action will be unfinished when component mounts // FIXME: async action will be unfinished when component mounts
onBeforeMount(async () => { onBeforeMount(async () => {
const namespaces = await namespaceStore.loadNamespaces() const namespaces = await namespaceStore.loadNamespaces()
namespaces.forEach(n => { namespaces.forEach(n => {
if (typeof listsVisible.value[n.id] === 'undefined') { if (typeof projectsVisible.value[n.id] === 'undefined') {
listsVisible.value[n.id] = true projectsVisible.value[n.id] = true
} }
}) })
}) })
function updateActiveLists(namespace: INamespace, activeLists: IList[]) { function updateActiveProjects(namespace: INamespace, activeProjects: IProject[]) {
// This is a bit hacky: since we do have to filter out the archived items from the list // This is a bit hacky: since we do have to filter out the archived items from the list
// for vue draggable updating it is not as simple as replacing it. // for vue draggable updating it is not as simple as replacing it.
// To work around this, we merge the active lists with the archived ones. Doing so breaks the order // To work around this, we merge the active projects with the archived ones. Doing so breaks the order
// because now all archived lists are sorted after the active ones. This is fine because they are sorted // because now all archived projects are sorted after the active ones. This is fine because they are sorted
// later when showing them anyway, and it makes the merging happening here a lot easier. // later when showing them anyway, and it makes the merging happening here a lot easier.
const lists = [ const projects = [
...activeLists, ...activeProjects,
...namespace.lists.filter(l => l.isArchived), ...namespace.projects.filter(l => l.isArchived),
] ]
namespaceStore.setNamespaceById({ namespaceStore.setNamespaceById({
...namespace, ...namespace,
lists, projects,
}) })
} }
const listUpdating = ref<{ [id: INamespace['id']]: boolean }>({}) const projectUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
async function saveListPosition(e: SortableEvent) { async function saveListPosition(e: SortableEvent) {
if (!e.newIndex && e.newIndex !== 0) return if (!e.newIndex && e.newIndex !== 0) return
@ -241,31 +251,31 @@ async function saveListPosition(e: SortableEvent) {
const namespaceId = parseInt(e.to.dataset.namespaceId as string) const namespaceId = parseInt(e.to.dataset.namespaceId as string)
const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string) const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string)
const listsActive = activeLists.value[newNamespaceIndex] const projectsActive = activeProjects.value[newNamespaceIndex]
// If the list was dragged to the last position, Safari will report e.newIndex as the size of the listsActive // If the project was dragged to the last position, Safari will report e.newIndex as the size of the projectsActive
// array instead of using the position. Because the index is wrong in that case, dragging the list will fail. // array instead of using the position. Because the index is wrong in that case, dragging the project will fail.
// To work around that we're explicitly checking that case here and decrease the index. // To work around that we're explicitly checking that case here and decrease the index.
const newIndex = e.newIndex === listsActive.length ? e.newIndex - 1 : e.newIndex const newIndex = e.newIndex === projectsActive.length ? e.newIndex - 1 : e.newIndex
const list = listsActive[newIndex] const project = projectsActive[newIndex]
const listBefore = listsActive[newIndex - 1] ?? null const projectBefore = projectsActive[newIndex - 1] ?? null
const listAfter = listsActive[newIndex + 1] ?? null const projectAfter = projectsActive[newIndex + 1] ?? null
listUpdating.value[list.id] = true projectUpdating.value[project.id] = true
const position = calculateItemPosition( const position = calculateItemPosition(
listBefore !== null ? listBefore.position : null, projectBefore !== null ? projectBefore.position : null,
listAfter !== null ? listAfter.position : null, projectAfter !== null ? projectAfter.position : null,
) )
try { try {
// create a copy of the list in order to not violate pinia manipulation // create a copy of the project in order to not violate pinia manipulation
await listStore.updateList({ await projectStore.updateProject({
...list, ...project,
position, position,
namespaceId, namespaceId,
}) })
} finally { } finally {
listUpdating.value[list.id] = false projectUpdating.value[project.id] = false
} }
} }
</script> </script>
@ -422,7 +432,7 @@ $vikunja-nav-selected-width: 0.4rem;
.top-menu { .top-menu {
margin-top: math.div($navbar-padding, 2); margin-top: math.div($navbar-padding, 2);
.menu-list { .menu-list {
li { li {
font-weight: 600; font-weight: 600;

View File

@ -1,11 +1,7 @@
<template> <template>
<div class="update-notification" v-if="updateAvailable"> <div class="update-notification" v-if="updateAvailable">
<p class="update-notification__message">{{ $t('update.available') }}</p> <p>{{ $t('update.available') }}</p>
<x-button <x-button @click="refreshApp()" :shadow="false" class="has-no-text-wrap">
@click="refreshApp()"
:shadow="false"
:wrap="false"
>
{{ $t('update.do') }} {{ $t('update.do') }}
</x-button> </x-button>
</div> </div>
@ -20,13 +16,15 @@ const refreshing = ref(false)
document.addEventListener('swUpdated', showRefreshUI, {once: true}) document.addEventListener('swUpdated', showRefreshUI, {once: true})
navigator?.serviceWorker?.addEventListener( if (navigator && navigator.serviceWorker) {
'controllerchange', () => { navigator.serviceWorker.addEventListener(
if (refreshing.value) return 'controllerchange', () => {
refreshing.value = true if (refreshing.value) return
window.location.reload() refreshing.value = true
}, window.location.reload()
) },
)
}
function showRefreshUI(e: Event) { function showRefreshUI(e: Event) {
console.log('recieved refresh event', e) console.log('recieved refresh event', e)
@ -35,7 +33,6 @@ function showRefreshUI(e: Event) {
} }
function refreshApp() { function refreshApp() {
updateAvailable.value = false
if (!registration.value || !registration.value.waiting) { if (!registration.value || !registration.value.waiting) {
return return
} }
@ -46,30 +43,39 @@ function refreshApp() {
<style lang="scss" scoped> <style lang="scss" scoped>
.update-notification { .update-notification {
position: fixed;
// FIXME: We should prevent usage of z-index or
// at least define it centrally
// the highest z-index of a modal is .hint-modal with 4500
z-index: 5000;
bottom: 1rem;
inset-inline: 1rem;
max-width: max-content;
margin-inline: auto;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
gap: 1rem;
padding: .5rem;
background: $warning; background: $warning;
padding: .5rem;
border-radius: $radius; border-radius: $radius;
font-size: .9rem; font-size: .9rem;
color: var(--grey-900); color: var(--grey-900);
justify-content: space-between;
position: fixed;
bottom: 1rem;
width: 450px;
left: calc(50vw - 225px);
@media screen and (max-width: $tablet) {
position: fixed;
left: 1rem;
right: 1rem;
bottom: 1rem;
width: auto;
}
p {
text-align: center;
width: 100%;
}
> * + * {
margin-left: .5rem;
}
} }
.update-notification__message { .dark .update-notification {
width: 100%; color: var(--grey-200);
text-align: center;
} }
</style> </style>

View File

@ -1,63 +0,0 @@
<template>
<multiselect
v-model="selectedLists"
:search-results="foundLists"
:loading="listService.loading"
:multiple="true"
:placeholder="$t('list.search')"
label="title"
@search="findLists"
/>
</template>
<script setup lang="ts">
import {computed, ref, shallowReactive, watchEffect, type PropType} from 'vue'
import Multiselect from '@/components/input/multiselect.vue'
import type {IList} from '@/modelTypes/IList'
import ListService from '@/services/list'
import {includesById} from '@/helpers/utils'
const props = defineProps({
modelValue: {
type: Array as PropType<IList[]>,
default: () => [],
},
})
const emit = defineEmits<{
(e: 'update:modelValue', value: IList[]): void
}>()
const lists = ref<IList[]>([])
watchEffect(() => {
lists.value = props.modelValue
})
const selectedLists = computed({
get() {
return lists.value
},
set: (value) => {
lists.value = value
emit('update:modelValue', value)
},
})
const listService = shallowReactive(new ListService())
const foundLists = ref<IList[]>([])
async function findLists(query: string) {
if (query === '') {
foundLists.value = []
return
}
const response = await listService.getAll({}, {s: query}) as IList[]
// Filter selected items from the results
foundLists.value = response.filter(({id}) => !includesById(lists.value, id))
}
</script>

View File

@ -0,0 +1,63 @@
<template>
<multiselect
v-model="selectedProjects"
:search-results="foundProjects"
:loading="projectService.loading"
:multiple="true"
:placeholder="$t('project.search')"
label="title"
@search="findProjects"
/>
</template>
<script setup lang="ts">
import {computed, ref, shallowReactive, watchEffect, type PropType} from 'vue'
import Multiselect from '@/components/input/multiselect.vue'
import type {IProject} from '@/modelTypes/IProject'
import ProjectService from '@/services/project'
import {includesById} from '@/helpers/utils'
const props = defineProps({
modelValue: {
type: Array as PropType<IProject[]>,
default: () => [],
},
})
const emit = defineEmits<{
(e: 'update:modelValue', value: IProject[]): void
}>()
const projects = ref<IProject[]>([])
watchEffect(() => {
projects.value = props.modelValue
})
const selectedProjects = computed({
get() {
return projects.value
},
set: (value) => {
projects.value = value
emit('update:modelValue', value)
},
})
const projectService = shallowReactive(new ProjectService())
const foundProjects = ref<IProject[]>([])
async function findProjects(query: string) {
if (query === '') {
foundProjects.value = []
return
}
const response = await projectService.getAll({}, {s: query}) as IProject[]
// Filter selected items from the results
foundProjects.value = response.filter(({id}) => !includesById(projects.value, id))
}
</script>

View File

@ -8,20 +8,17 @@
'has-no-shadow': !shadow || variant === 'tertiary', 'has-no-shadow': !shadow || variant === 'tertiary',
} }
]" ]"
:style="{
'--button-white-space': wrap ? 'break-spaces' : 'nowrap',
}"
> >
<template v-if="icon"> <template v-if="icon">
<icon <icon
v-if="showIconOnly" v-if="showIconOnly"
:icon="icon" :icon="icon"
:style="{'color': iconColor !== '' ? iconColor : undefined}" :style="{'color': iconColor !== '' ? iconColor : false}"
/> />
<span class="icon is-small" v-else> <span class="icon is-small" v-else>
<icon <icon
:icon="icon" :icon="icon"
:style="{'color': iconColor !== '' ? iconColor : undefined}" :style="{'color': iconColor !== '' ? iconColor : false}"
/> />
</span> </span>
</template> </template>
@ -53,7 +50,6 @@ export interface ButtonProps extends BaseButtonProps {
iconColor?: string iconColor?: string
loading?: boolean loading?: boolean
shadow?: boolean shadow?: boolean
wrap?: boolean
} }
const { const {
@ -62,7 +58,6 @@ const {
iconColor = '', iconColor = '',
loading = false, loading = false,
shadow = true, shadow = true,
wrap = true,
} = defineProps<ButtonProps>() } = defineProps<ButtonProps>()
const variantClass = computed(() => BUTTON_TYPES_MAP[variant]) const variantClass = computed(() => BUTTON_TYPES_MAP[variant])
@ -82,7 +77,7 @@ const showIconOnly = computed(() => icon !== '' && typeof slots.default === 'und
min-height: $button-height; min-height: $button-height;
box-shadow: var(--shadow-sm); box-shadow: var(--shadow-sm);
display: inline-flex; display: inline-flex;
white-space: var(--button-white-space); white-space: break-spaces;
&:hover { &:hover {
box-shadow: var(--shadow-md); box-shadow: var(--shadow-md);
@ -104,6 +99,7 @@ const showIconOnly = computed(() => icon !== '' && typeof slots.default === 'und
&.is-primary.is-outlined:hover { &.is-primary.is-outlined:hover {
color: var(--white); color: var(--white);
} }
} }
.is-small { .is-small {

View File

@ -286,11 +286,11 @@ function handleCheckboxClick(e: Event) {
console.debug('no index found') console.debug('no index found')
return return
} }
const listPrefix = text.value.substring(index, index + 1) const projectPrefix = text.value.substring(index, index + 1)
console.debug({index, listPrefix, checked, text: text.value}) console.debug({index, projectPrefix, checked, text: text.value})
text.value = replaceAt(text.value, index, `${listPrefix} ${checked ? '[x]' : '[ ]'} `) text.value = replaceAt(text.value, index, `${projectPrefix} ${checked ? '[x]' : '[ ]'} `)
bubble() bubble()
renderPreview() renderPreview()
} }

View File

@ -1,200 +0,0 @@
<template>
<div
:class="{ 'is-loading': listService.loading, 'is-archived': currentList.isArchived}"
class="loader-container"
>
<div class="switch-view-container">
<div class="switch-view">
<BaseButton
v-shortcut="'g l'"
:title="$t('keyboardShortcuts.list.switchToListView')"
class="switch-view-button"
:class="{'is-active': viewName === 'list'}"
:to="{ name: 'list.list', params: { listId } }"
>
{{ $t('list.list.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g g'"
:title="$t('keyboardShortcuts.list.switchToGanttView')"
class="switch-view-button"
:class="{'is-active': viewName === 'gantt'}"
:to="{ name: 'list.gantt', params: { listId } }"
>
{{ $t('list.gantt.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g t'"
:title="$t('keyboardShortcuts.list.switchToTableView')"
class="switch-view-button"
:class="{'is-active': viewName === 'table'}"
:to="{ name: 'list.table', params: { listId } }"
>
{{ $t('list.table.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g k'"
:title="$t('keyboardShortcuts.list.switchToKanbanView')"
class="switch-view-button"
:class="{'is-active': viewName === 'kanban'}"
:to="{ name: 'list.kanban', params: { listId } }"
>
{{ $t('list.kanban.title') }}
</BaseButton>
</div>
<slot name="header" />
</div>
<CustomTransition name="fade">
<Message variant="warning" v-if="currentList.isArchived" class="mb-4">
{{ $t('list.archived') }}
</Message>
</CustomTransition>
<slot v-if="loadedListId"/>
</div>
</template>
<script setup lang="ts">
import {ref, computed, watch} from 'vue'
import {useRoute} from 'vue-router'
import BaseButton from '@/components/base/BaseButton.vue'
import Message from '@/components/misc/message.vue'
import CustomTransition from '@/components/misc/CustomTransition.vue'
import ListModel from '@/models/list'
import ListService from '@/services/list'
import {getListTitle} from '@/helpers/getListTitle'
import {saveListToHistory} from '@/modules/listHistory'
import {useTitle} from '@/composables/useTitle'
import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists'
const props = defineProps({
listId: {
type: Number,
required: true,
},
viewName: {
type: String,
required: true,
},
})
const route = useRoute()
const baseStore = useBaseStore()
const listStore = useListStore()
const listService = ref(new ListService())
const loadedListId = ref(0)
const currentList = computed(() => {
return typeof baseStore.currentList === 'undefined' ? {
id: 0,
title: '',
isArchived: false,
maxRight: null,
} : baseStore.currentList
})
useTitle(() => currentList.value.id ? getListTitle(currentList.value) : '')
// 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 list multiple times, even when navigating away from it.
// This caused wired bugs where the list background would be set on the home page but only right after setting a new
// list background and then navigating to home. It also highlighted the list in the menu and didn't allow changing any
// of it, most likely due to the rights not being properly populated.
watch(
() => props.listId,
// loadList
async (listIdToLoad: number) => {
const listData = {id: listIdToLoad}
saveListToHistory(listData)
// Don't load the list if we either already loaded it or aren't dealing with a list at all currently and
// the currently loaded list has the right set.
if (
(
listIdToLoad === loadedListId.value ||
typeof listIdToLoad === 'undefined' ||
listIdToLoad === currentList.value.id
)
&& typeof currentList.value !== 'undefined' && currentList.value.maxRight !== null
) {
loadedListId.value = props.listId
return
}
console.debug(`Loading list, props.viewName = ${props.viewName}, $route.params =`, route.params, `, loadedListId = ${loadedListId.value}, currentList = `, currentList.value)
// Set the current list to the one we're about to load so that the title is already shown at the top
loadedListId.value = 0
const listFromStore = listStore.getListById(listData.id)
if (listFromStore !== null) {
baseStore.setBackground(null)
baseStore.setBlurHash(null)
baseStore.handleSetCurrentList({list: listFromStore})
}
// We create an extra list object instead of creating it in list.value because that would trigger a ui update which would result in bad ux.
const list = new ListModel(listData)
try {
const loadedList = await listService.value.get(list)
baseStore.handleSetCurrentList({list: loadedList})
} finally {
loadedListId.value = props.listId
}
},
{immediate: true},
)
</script>
<style lang="scss" scoped>
.switch-view-container {
@media screen and (max-width: $tablet) {
display: flex;
justify-content: center;
flex-direction: column;
}
}
.switch-view {
background: var(--white);
display: inline-flex;
border-radius: $radius;
font-size: .75rem;
box-shadow: var(--shadow-sm);
height: $switch-view-height;
margin: 0 auto 1rem;
padding: .5rem;
}
.switch-view-button {
padding: .25rem .5rem;
display: block;
border-radius: $radius;
transition: all 100ms;
&:not(:last-child) {
margin-right: .5rem;
}
&:hover {
color: var(--switch-view-color);
background: var(--primary);
}
&.is-active {
color: var(--switch-view-color);
background: var(--primary);
font-weight: bold;
box-shadow: var(--shadow-xs);
}
}
// FIXME: this should be in notification and set via a prop
.is-archived .notification.is-warning {
margin-bottom: 1rem;
}
</style>

View File

@ -1,77 +0,0 @@
<template>
<ul class="list-grid">
<li
v-for="(item, index) in filteredLists"
:key="`list_${item.id}_${index}`"
class="list-grid-item"
>
<ListCard :list="item" />
</li>
</ul>
</template>
<script lang="ts" setup>
import {computed, type PropType} from 'vue'
import type {IList} from '@/modelTypes/IList'
import ListCard from './ListCard.vue'
const props = defineProps({
lists: {
type: Array as PropType<IList[]>,
default: () => [],
},
showArchived: {
default: false,
type: Boolean,
},
itemLimit: {
type: Boolean,
default: false,
},
})
const filteredLists = computed(() => {
return props.showArchived
? props.lists
: props.lists.filter(l => !l.isArchived)
})
</script>
<style lang="scss" scoped>
$list-height: 150px;
$list-spacing: 1rem;
.list-grid {
margin: 0; // reset li
list-style-type: none;
display: grid;
grid-template-columns: repeat(var(--list-columns), 1fr);
grid-auto-rows: $list-height;
gap: $list-spacing;
@media screen and (min-width: $mobile) {
--list-rows: 4;
--list-columns: 1;
}
@media screen and (min-width: $mobile) and (max-width: $tablet) {
--list-columns: 2;
}
@media screen and (min-width: $tablet) and (max-width: $widescreen) {
--list-columns: 3;
--list-rows: 3;
}
@media screen and (min-width: $widescreen) {
--list-columns: 5;
--list-rows: 2;
}
}
.list-grid-item {
display: grid;
margin-top: 0; // remove padding coming form .content li + li
}
</style>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="dropdown" ref="dropdown"> <div class="dropdown" ref="dropdown">
<slot name="trigger" :close="close" :toggleOpen="toggleOpen" :open="open"> <slot name="trigger" :close="close" :toggleOpen="toggleOpen">
<BaseButton class="dropdown-trigger is-flex" @click="toggleOpen"> <BaseButton class="dropdown-trigger is-flex" @click="toggleOpen">
<icon :icon="triggerIcon" class="icon"/> <icon :icon="triggerIcon" class="icon"/>
</BaseButton> </BaseButton>
@ -56,6 +56,7 @@ onClickOutside(dropdown, (e: Event) => {
.dropdown { .dropdown {
display: inline-flex; display: inline-flex;
position: relative; position: relative;
vertical-align: top;
} }
.dropdown-menu { .dropdown-menu {

View File

@ -61,8 +61,8 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
], ],
}, },
{ {
title: 'list.kanban.title', title: 'project.kanban.title',
available: (route) => route.name === 'list.kanban', available: (route) => route.name === 'project.kanban',
shortcuts: [ shortcuts: [
{ {
title: 'keyboardShortcuts.task.done', title: 'keyboardShortcuts.task.done',
@ -71,26 +71,26 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
], ],
}, },
{ {
title: 'keyboardShortcuts.list.title', title: 'keyboardShortcuts.project.title',
available: (route) => (route.name as string)?.startsWith('list.'), available: (route) => (route.name as string)?.startsWith('project.'),
shortcuts: [ shortcuts: [
{ {
title: 'keyboardShortcuts.list.switchToListView', title: 'keyboardShortcuts.project.switchToProjectView',
keys: ['g', 'l'], keys: ['g', 'l'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToGanttView', title: 'keyboardShortcuts.project.switchToGanttView',
keys: ['g', 'g'], keys: ['g', 'g'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToTableView', title: 'keyboardShortcuts.project.switchToTableView',
keys: ['g', 't'], keys: ['g', 't'],
combination: 'then', combination: 'then',
}, },
{ {
title: 'keyboardShortcuts.list.switchToKanbanView', title: 'keyboardShortcuts.project.switchToKanbanView',
keys: ['g', 'k'], keys: ['g', 'k'],
combination: 'then', combination: 'then',
}, },

View File

@ -73,14 +73,14 @@ const {t} = useI18n({useScope: 'global'})
const tooltipText = computed(() => { const tooltipText = computed(() => {
if (disabled.value) { if (disabled.value) {
if (props.entity === 'list' && subscriptionEntity.value === 'namespace') { if (props.entity === 'project' && subscriptionEntity.value === 'namespace') {
return t('task.subscription.subscribedListThroughParentNamespace') return t('task.subscription.subscribedProjectThroughParentNamespace')
} }
if (props.entity === 'task' && subscriptionEntity.value === 'namespace') { if (props.entity === 'task' && subscriptionEntity.value === 'namespace') {
return t('task.subscription.subscribedTaskThroughParentNamespace') return t('task.subscription.subscribedTaskThroughParentNamespace')
} }
if (props.entity === 'task' && subscriptionEntity.value === 'list') { if (props.entity === 'task' && subscriptionEntity.value === 'project') {
return t('task.subscription.subscribedTaskThroughParentList') return t('task.subscription.subscribedTaskThroughParentProject')
} }
return '' return ''
@ -91,10 +91,10 @@ const tooltipText = computed(() => {
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedNamespace') : t('task.subscription.subscribedNamespace') :
t('task.subscription.notSubscribedNamespace') t('task.subscription.notSubscribedNamespace')
case 'list': case 'project':
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedList') : t('task.subscription.subscribedProject') :
t('task.subscription.notSubscribedList') t('task.subscription.notSubscribedProject')
case 'task': case 'task':
return props.modelValue !== null ? return props.modelValue !== null ?
t('task.subscription.subscribedTask') : t('task.subscription.subscribedTask') :
@ -133,8 +133,8 @@ async function subscribe() {
case 'namespace': case 'namespace':
message = t('task.subscription.subscribeSuccessNamespace') message = t('task.subscription.subscribeSuccessNamespace')
break break
case 'list': case 'project':
message = t('task.subscription.subscribeSuccessList') message = t('task.subscription.subscribeSuccessProject')
break break
case 'task': case 'task':
message = t('task.subscription.subscribeSuccessTask') message = t('task.subscription.subscribeSuccessTask')
@ -156,8 +156,8 @@ async function unsubscribe() {
case 'namespace': case 'namespace':
message = t('task.subscription.unsubscribeSuccessNamespace') message = t('task.subscription.unsubscribeSuccessNamespace')
break break
case 'list': case 'project':
message = t('task.subscription.unsubscribeSuccessList') message = t('task.subscription.unsubscribeSuccessProject')
break break
case 'task': case 'task':
message = t('task.subscription.unsubscribeSuccessTask') message = t('task.subscription.unsubscribeSuccessTask')

View File

@ -30,10 +30,10 @@
{{ $t('menu.share') }} {{ $t('menu.share') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.create', params: { namespaceId: namespace.id } }" :to="{ name: 'project.create', params: { namespaceId: namespace.id } }"
icon="plus" icon="plus"
> >
{{ $t('menu.newList') }} {{ $t('menu.newProject') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }" :to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }"

View File

@ -1,11 +1,11 @@
<template> <template>
<div class="notifications"> <div class="notifications">
<slot name="trigger" toggleOpen="() => showNotifications = !showNotifications" :has-unread-notifications="unreadNotifications > 0"> <div class="is-flex is-justify-content-center">
<BaseButton class="trigger-button" @click.stop="showNotifications = !showNotifications"> <BaseButton @click.stop="showNotifications = !showNotifications" class="trigger-button">
<span class="unread-indicator" v-if="unreadNotifications > 0"></span> <span class="unread-indicator" v-if="unreadNotifications > 0"></span>
<icon icon="bell"/> <icon icon="bell"/>
</BaseButton> </BaseButton>
</slot> </div>
<CustomTransition name="fade"> <CustomTransition name="fade">
<div class="notifications-list" v-if="showNotifications" ref="popup"> <div class="notifications-list" v-if="showNotifications" ref="popup">
@ -117,9 +117,9 @@ function to(n, index) {
case names.TASK_DELETED: case names.TASK_DELETED:
// Nothing // Nothing
break break
case names.LIST_CREATED: case names.PROJECT_CREATED:
to.name = 'task.index' to.name = 'task.index'
to.params.listId = n.notification.list.id to.params.projectId = n.notification.project.id
break break
case names.TEAM_MEMBER_ADDED: case names.TEAM_MEMBER_ADDED:
to.name = 'teams.edit' to.name = 'teams.edit'
@ -141,11 +141,7 @@ function to(n, index) {
<style lang="scss" scoped> <style lang="scss" scoped>
.notifications { .notifications {
display: flex; width: $navbar-icon-width;
.trigger-button {
width: 100%;
}
.unread-indicator { .unread-indicator {
position: absolute; position: absolute;
@ -160,9 +156,9 @@ function to(n, index) {
} }
.notifications-list { .notifications-list {
position: absolute; position: fixed;
right: 1rem; right: 1rem;
top: calc(100% + 1rem); margin-top: 1rem;
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;

View File

@ -0,0 +1,199 @@
<template>
<div
:class="{ 'is-loading': projectService.loading, 'is-archived': currentProject.isArchived}"
class="loader-container"
>
<div class="switch-view-container">
<div class="switch-view">
<BaseButton
v-shortcut="'g l'"
:title="$t('keyboardShortcuts.project.switchToProjectView')"
class="switch-view-button"
:class="{'is-active': viewName === 'project'}"
:to="{ name: 'project.list', params: { projectId } }"
>
{{ $t('project.list.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g g'"
:title="$t('keyboardShortcuts.project.switchToGanttView')"
class="switch-view-button"
:class="{'is-active': viewName === 'gantt'}"
:to="{ name: 'project.gantt', params: { projectId } }"
>
{{ $t('project.gantt.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g t'"
:title="$t('keyboardShortcuts.project.switchToTableView')"
class="switch-view-button"
:class="{'is-active': viewName === 'table'}"
:to="{ name: 'project.table', params: { projectId } }"
>
{{ $t('project.table.title') }}
</BaseButton>
<BaseButton
v-shortcut="'g k'"
:title="$t('keyboardShortcuts.project.switchToKanbanView')"
class="switch-view-button"
:class="{'is-active': viewName === 'kanban'}"
:to="{ name: 'project.kanban', params: { projectId } }"
>
{{ $t('project.kanban.title') }}
</BaseButton>
</div>
<slot name="header" />
</div>
<transition name="fade">
<Message variant="warning" v-if="currentProject.isArchived" class="mb-4">
{{ $t('project.archived') }}
</Message>
</transition>
<slot v-if="loadedProjectId"/>
</div>
</template>
<script setup lang="ts">
import {ref, computed, watch} from 'vue'
import {useRoute} from 'vue-router'
import BaseButton from '@/components/base/BaseButton.vue'
import Message from '@/components/misc/message.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'
const props = defineProps({
projectId: {
type: Number,
required: true,
},
viewName: {
type: String,
required: true,
},
})
const route = useRoute()
const baseStore = useBaseStore()
const projectStore = useProjectStore()
const projectService = ref(new ProjectService())
const loadedProjectId = ref(0)
const currentProject = computed(() => {
return typeof baseStore.currentProject === 'undefined' ? {
id: 0,
title: '',
isArchived: false,
maxRight: null,
} : baseStore.currentProject
})
useTitle(() => currentProject.value.id ? getProjectTitle(currentProject.value) : '')
// 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 = props.projectId
return
}
console.debug(`Loading project, props.viewName = ${props.viewName}, $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.getProjectById(projectData.id)
if (projectFromStore !== null) {
baseStore.setBackground(null)
baseStore.setBlurHash(null)
baseStore.handleSetCurrentProject({project: projectFromStore})
}
// 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})
} finally {
loadedProjectId.value = props.projectId
}
},
{immediate: true},
)
</script>
<style lang="scss" scoped>
.switch-view-container {
@media screen and (max-width: $tablet) {
display: flex;
justify-content: center;
flex-direction: column;
}
}
.switch-view {
background: var(--white);
display: inline-flex;
border-radius: $radius;
font-size: .75rem;
box-shadow: var(--shadow-sm);
height: $switch-view-height;
margin: 0 auto 1rem;
padding: .5rem;
}
.switch-view-button {
padding: .25rem .5rem;
display: block;
border-radius: $radius;
transition: all 100ms;
&:not(:last-child) {
margin-right: .5rem;
}
&:hover {
color: var(--switch-view-color);
background: var(--primary);
}
&.is-active {
color: var(--switch-view-color);
background: var(--primary);
font-weight: bold;
box-shadow: var(--shadow-xs);
}
}
// FIXME: this should be in notification and set via a prop
.is-archived .notification.is-warning {
margin-bottom: 1rem;
}
</style>

View File

@ -1,39 +1,39 @@
<template> <template>
<div <div
class="list-card" class="project-card"
:class="{ :class="{
'has-light-text': background !== null, 'has-light-text': background !== null,
'has-background': blurHashUrl !== '' || background !== null 'has-background': blurHashUrl !== '' || background !== null
}" }"
:style="{ :style="{
'border-left': list.hexColor ? `0.25rem solid ${list.hexColor}` : undefined, 'border-left': project.hexColor ? `0.25rem solid ${project.hexColor}` : undefined,
'background-image': blurHashUrl !== '' ? `url(${blurHashUrl})` : undefined, 'background-image': blurHashUrl !== '' ? `url(${blurHashUrl})` : undefined,
}" }"
> >
<div <div
class="list-background background-fade-in" class="project-background background-fade-in"
:class="{'is-visible': background}" :class="{'is-visible': background}"
:style="{'background-image': background !== null ? `url(${background})` : undefined}" :style="{'background-image': background !== null ? `url(${background})` : undefined}"
/> />
<span v-if="list.isArchived" class="is-archived" >{{ $t('namespace.archived') }}</span> <span v-if="project.isArchived" class="is-archived" >{{ $t('namespace.archived') }}</span>
<div class="list-title" aria-hidden="true">{{ list.title }}</div> <div class="project-title" aria-hidden="true">{{ project.title }}</div>
<BaseButton <BaseButton
class="list-button" class="project-button"
:aria-label="list.title" :aria-label="project.title"
:title="list.description" :title="project.description"
:to="{ :to="{
name: 'list.index', name: 'project.index',
params: { listId: list.id} params: { projectId: project.id}
}" }"
/> />
<BaseButton <BaseButton
v-if="!list.isArchived" v-if="!project.isArchived"
class="favorite" class="favorite"
:class="{'is-favorite': list.isFavorite}" :class="{'is-favorite': project.isFavorite}"
@click.prevent.stop="listStore.toggleListFavorite(list)" @click.prevent.stop="projectStore.toggleProjectFavorite(project)"
> >
<icon :icon="list.isFavorite ? 'star' : ['far', 'star']" /> <icon :icon="project.isFavorite ? 'star' : ['far', 'star']" />
</BaseButton> </BaseButton>
</div> </div>
</template> </template>
@ -41,30 +41,30 @@
<script lang="ts" setup> <script lang="ts" setup>
import {toRef, type PropType} from 'vue' import {toRef, type PropType} from 'vue'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import {useListBackground} from './useListBackground' import {useProjectBackground} from './useProjectBackground'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
const props = defineProps({ const props = defineProps({
list: { project: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: true, required: true,
}, },
}) })
const {background, blurHashUrl} = useListBackground(toRef(props, 'list')) const {background, blurHashUrl} = useProjectBackground(toRef(props, 'project'))
const listStore = useListStore() const projectStore = useProjectStore()
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list-card { .project-card {
--list-card-padding: 1rem; --project-card-padding: 1rem;
background: var(--white); background: var(--white);
padding: var(--list-card-padding); padding: var(--project-card-padding);
border-radius: $radius; border-radius: $radius;
box-shadow: var(--shadow-sm); box-shadow: var(--shadow-sm);
transition: box-shadow $transition; transition: box-shadow $transition;
@ -91,14 +91,14 @@ const listStore = useListStore()
} }
.has-background, .has-background,
.list-background { .project-background {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
} }
.list-background, .project-background,
.list-button { .project-button {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
@ -111,7 +111,7 @@ const listStore = useListStore()
float: left; float: left;
} }
.list-title { .project-title {
align-self: flex-end; align-self: flex-end;
font-family: $vikunja-font; font-family: $vikunja-font;
font-weight: 400; font-weight: 400;
@ -120,7 +120,7 @@ const listStore = useListStore()
color: var(--text); color: var(--text);
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
max-height: calc(100% - (var(--list-card-padding) + 1rem)); // padding & height of the "is archived" badge max-height: calc(100% - (var(--project-card-padding) + 1rem)); // padding & height of the "is archived" badge
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
word-break: break-word; word-break: break-word;
@ -130,11 +130,11 @@ const listStore = useListStore()
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.has-light-text .list-title { .has-light-text .project-title {
color: var(--grey-100); color: var(--grey-100);
} }
.has-background .list-title { .has-background .project-title {
text-shadow: text-shadow:
0 0 10px var(--black), 0 0 10px var(--black),
1px 1px 5px var(--grey-700), 1px 1px 5px var(--grey-700),
@ -144,8 +144,8 @@ const listStore = useListStore()
.favorite { .favorite {
position: absolute; position: absolute;
top: var(--list-card-padding); top: var(--project-card-padding);
right: var(--list-card-padding); right: var(--project-card-padding);
transition: opacity $transition, color $transition; transition: opacity $transition, color $transition;
opacity: 0; opacity: 0;
@ -160,7 +160,7 @@ const listStore = useListStore()
} }
} }
.list-card:hover .favorite { .project-card:hover .favorite {
opacity: 1; opacity: 1;
} }

View File

@ -0,0 +1,77 @@
<template>
<ul class="project-grid">
<li
v-for="(item, index) in filteredProjects"
:key="`project_${item.id}_${index}`"
class="project-grid-item"
>
<ProjectCard :project="item" />
</li>
</ul>
</template>
<script lang="ts" setup>
import {computed, type PropType} from 'vue'
import type {IProject} from '@/modelTypes/IProject'
import ProjectCard from './ProjectCard.vue'
const props = defineProps({
projects: {
type: Array as PropType<IProject[]>,
default: () => [],
},
showArchived: {
default: false,
type: Boolean,
},
itemLimit: {
type: Boolean,
default: false,
},
})
const filteredProjects = computed(() => {
return props.showArchived
? props.projects
: props.projects.filter(l => !l.isArchived)
})
</script>
<style lang="scss" scoped>
$project-height: 150px;
$project-spacing: 1rem;
.project-grid {
margin: 0; // reset li
project-style-type: none;
display: grid;
grid-template-columns: repeat(var(--project-columns), 1fr);
grid-auto-rows: $project-height;
gap: $project-spacing;
@media screen and (min-width: $mobile) {
--project-rows: 4;
--project-columns: 1;
}
@media screen and (min-width: $mobile) and (max-width: $tablet) {
--project-columns: 2;
}
@media screen and (min-width: $tablet) and (max-width: $widescreen) {
--project-columns: 3;
--project-rows: 3;
}
@media screen and (min-width: $widescreen) {
--project-columns: 5;
--project-rows: 2;
}
}
.project-grid-item {
display: grid;
margin-top: 0; // remove padding coming form .content li + li
}
</style>

View File

@ -32,7 +32,7 @@
<script setup lang="ts"> <script setup lang="ts">
import {computed, ref, watch} from 'vue' import {computed, ref, watch} from 'vue'
import Filters from '@/components/list/partials/filters.vue' import Filters from '@/components/project/partials/filters.vue'
import {getDefaultParams} from '@/composables/useTaskList' import {getDefaultParams} from '@/composables/useTaskList'

View File

@ -20,7 +20,7 @@
{{ $t('filters.attributes.showDoneTasks') }} {{ $t('filters.attributes.showDoneTasks') }}
</fancycheckbox> </fancycheckbox>
<fancycheckbox <fancycheckbox
v-if="!['list.kanban', 'list.table'].includes($route.name as string)" v-if="!['project.kanban', 'project.table'].includes($route.name as string)"
v-model="sortAlphabetically" v-model="sortAlphabetically"
@update:model-value="change()" @update:model-value="change()"
> >
@ -154,14 +154,14 @@
</div> </div>
<template <template
v-if="['filters.create', 'list.edit', 'filter.settings.edit'].includes($route.name as string)"> v-if="['filters.create', 'project.edit', 'filter.settings.edit'].includes($route.name as string)">
<div class="field"> <div class="field">
<label class="label">{{ $t('list.lists') }}</label> <label class="label">{{ $t('project.lists') }}</label>
<div class="control"> <div class="control">
<SelectList <SelectProject
v-model="entities.lists" v-model="entities.projects"
@select="changeMultiselectFilter('lists', 'list_id')" @select="changeMultiselectFilter('projects', 'project_id')"
@remove="changeMultiselectFilter('lists', 'list_id')" @remove="changeMultiselectFilter('projects', 'project_id')"
/> />
</div> </div>
</div> </div>
@ -190,7 +190,7 @@ import {camelCase} from 'camel-case'
import type {ILabel} from '@/modelTypes/ILabel' import type {ILabel} from '@/modelTypes/ILabel'
import type {IUser} from '@/modelTypes/IUser' import type {IUser} from '@/modelTypes/IUser'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import {useLabelStore} from '@/stores/labels' import {useLabelStore} from '@/stores/labels'
@ -200,7 +200,7 @@ import PercentDoneSelect from '@/components/tasks/partials/percentDoneSelect.vue
import EditLabels from '@/components/tasks/partials/editLabels.vue' import EditLabels from '@/components/tasks/partials/editLabels.vue'
import Fancycheckbox from '@/components/input/fancycheckbox.vue' import Fancycheckbox from '@/components/input/fancycheckbox.vue'
import SelectUser from '@/components/input/SelectUser.vue' import SelectUser from '@/components/input/SelectUser.vue'
import SelectList from '@/components/input/SelectList.vue' import SelectProject from '@/components/input/SelectProject.vue'
import SelectNamespace from '@/components/input/SelectNamespace.vue' import SelectNamespace from '@/components/input/SelectNamespace.vue'
import {parseDateOrString} from '@/helpers/time/parseDateOrString' import {parseDateOrString} from '@/helpers/time/parseDateOrString'
@ -208,13 +208,13 @@ import {dateIsValid, formatISO} from '@/helpers/time/formatDate'
import {objectToSnakeCase} from '@/helpers/case' import {objectToSnakeCase} from '@/helpers/case'
import UserService from '@/services/user' import UserService from '@/services/user'
import ListService from '@/services/list' import ProjectService from '@/services/project'
import NamespaceService from '@/services/namespace' import NamespaceService from '@/services/namespace'
// FIXME: do not use this here for now. instead create new version from DEFAULT_PARAMS // FIXME: do not use this here for now. instead create new version from DEFAULT_PARAMS
import {getDefaultParams} from '@/composables/useTaskList' import {getDefaultParams} from '@/composables/useTaskList'
// FIXME: merge with DEFAULT_PARAMS in taskList.js // FIXME: merge with DEFAULT_PARAMS in taskProject.js
const DEFAULT_PARAMS = { const DEFAULT_PARAMS = {
sort_by: [], sort_by: [],
order_by: [], order_by: [],
@ -239,7 +239,7 @@ const DEFAULT_FILTERS = {
reminders: '', reminders: '',
assignees: '', assignees: '',
labels: '', labels: '',
list_id: '', project_id: '',
namespace: '', namespace: '',
} as const } as const
@ -264,23 +264,23 @@ const filters = ref({...DEFAULT_FILTERS})
const services = { const services = {
users: shallowReactive(new UserService()), users: shallowReactive(new UserService()),
lists: shallowReactive(new ListService()), projects: shallowReactive(new ProjectService()),
namespace: shallowReactive(new NamespaceService()), namespace: shallowReactive(new NamespaceService()),
} }
interface Entities { interface Entities {
users: IUser[] users: IUser[]
labels: ILabel[] labels: ILabel[]
lists: IList[] projects: IProject[]
namespace: INamespace[] namespace: INamespace[]
} }
type EntityType = 'users' | 'labels' | 'lists' | 'namespace' type EntityType = 'users' | 'labels' | 'projects' | 'namespace'
const entities: Entities = reactive({ const entities: Entities = reactive({
users: [], users: [],
labels: [], labels: [],
lists: [], projects: [],
namespace: [], namespace: [],
}) })
@ -327,7 +327,7 @@ function prepareFilters() {
prepareSingleValue('percent_done', 'percentDone', 'usePercentDone', true) prepareSingleValue('percent_done', 'percentDone', 'usePercentDone', true)
prepareDate('reminders') prepareDate('reminders')
prepareRelatedObjectFilter('users', 'assignees') prepareRelatedObjectFilter('users', 'assignees')
prepareRelatedObjectFilter('lists', 'list_id') prepareRelatedObjectFilter('projects', 'project_id')
prepareRelatedObjectFilter('namespace') prepareRelatedObjectFilter('namespace')
prepareSingleValue('labels') prepareSingleValue('labels')

View File

@ -1,30 +1,30 @@
import {ref, watch, type Ref} from 'vue' import {ref, watch, type Ref} from 'vue'
import ListService from '@/services/list' import ProjectService from '@/services/project'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash' import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
export function useListBackground(list: Ref<IList>) { export function useProjectBackground(project: Ref<IProject>) {
const background = ref<string | null>(null) const background = ref<string | null>(null)
const backgroundLoading = ref(false) const backgroundLoading = ref(false)
const blurHashUrl = ref('') const blurHashUrl = ref('')
watch( watch(
() => [list.value.id, list.value.backgroundBlurHash] as [IList['id'], IList['backgroundBlurHash']], () => [project.value.id, project.value.backgroundBlurHash] as [IProject['id'], IProject['backgroundBlurHash']],
async ([listId, blurHash], oldValue) => { async ([projectId, blurHash], oldValue) => {
if ( if (
list.value === null || project.value === null ||
!list.value.backgroundInformation || !project.value.backgroundInformation ||
backgroundLoading.value backgroundLoading.value
) { ) {
return return
} }
const [oldListId, oldBlurHash] = oldValue || [] const [oldProjectId, oldBlurHash] = oldValue || []
if ( if (
oldValue !== undefined && oldValue !== undefined &&
listId === oldListId && blurHash === oldBlurHash projectId === oldProjectId && blurHash === oldBlurHash
) { ) {
// list hasn't changed // project hasn't changed
return return
} }
@ -35,8 +35,8 @@ export function useListBackground(list: Ref<IList>) {
blurHashUrl.value = blurHash ? window.URL.createObjectURL(blurHash) : '' blurHashUrl.value = blurHash ? window.URL.createObjectURL(blurHash) : ''
}) })
const listService = new ListService() const projectService = new ProjectService()
const backgroundPromise = listService.background(list.value).then((result) => { const backgroundPromise = projectService.background(project.value).then((result) => {
background.value = result background.value = result
}) })
await Promise.all([blurHashPromise, backgroundPromise]) await Promise.all([blurHashPromise, backgroundPromise])
@ -44,7 +44,7 @@ export function useListBackground(list: Ref<IList>) {
backgroundLoading.value = false backgroundLoading.value = false
} }
}, },
{ immediate: true }, {immediate: true},
) )
return { return {
@ -52,4 +52,4 @@ export function useListBackground(list: Ref<IList>) {
blurHashUrl, blurHashUrl,
backgroundLoading, backgroundLoading,
} }
} }

View File

@ -8,24 +8,24 @@
</slot> </slot>
</template> </template>
<template v-if="isSavedFilter(list)"> <template v-if="isSavedFilter(project)">
<dropdown-item <dropdown-item
:to="{ name: 'filter.settings.edit', params: { listId: list.id } }" :to="{ name: 'filter.settings.edit', params: { projectId: project.id } }"
icon="pen" icon="pen"
> >
{{ $t('menu.edit') }} {{ $t('menu.edit') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'filter.settings.delete', params: { listId: list.id } }" :to="{ name: 'filter.settings.delete', params: { projectId: project.id } }"
icon="trash-alt" icon="trash-alt"
> >
{{ $t('misc.delete') }} {{ $t('misc.delete') }}
</dropdown-item> </dropdown-item>
</template> </template>
<template v-else-if="list.isArchived"> <template v-else-if="project.isArchived">
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.archive', params: { listId: list.id } }" :to="{ name: 'project.settings.archive', params: { projectId: project.id } }"
icon="archive" icon="archive"
> >
{{ $t('menu.unarchive') }} {{ $t('menu.unarchive') }}
@ -33,32 +33,32 @@
</template> </template>
<template v-else> <template v-else>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.edit', params: { listId: list.id } }" :to="{ name: 'project.settings.edit', params: { projectId: project.id } }"
icon="pen" icon="pen"
> >
{{ $t('menu.edit') }} {{ $t('menu.edit') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
v-if="backgroundsEnabled" v-if="backgroundsEnabled"
:to="{ name: 'list.settings.background', params: { listId: list.id } }" :to="{ name: 'project.settings.background', params: { projectId: project.id } }"
icon="image" icon="image"
> >
{{ $t('menu.setBackground') }} {{ $t('menu.setBackground') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.share', params: { listId: list.id } }" :to="{ name: 'project.settings.share', params: { projectId: project.id } }"
icon="share-alt" icon="share-alt"
> >
{{ $t('menu.share') }} {{ $t('menu.share') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.duplicate', params: { listId: list.id } }" :to="{ name: 'project.settings.duplicate', params: { projectId: project.id } }"
icon="paste" icon="paste"
> >
{{ $t('menu.duplicate') }} {{ $t('menu.duplicate') }}
</dropdown-item> </dropdown-item>
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.archive', params: { listId: list.id } }" :to="{ name: 'project.settings.archive', params: { projectId: project.id } }"
icon="archive" icon="archive"
> >
{{ $t('menu.archive') }} {{ $t('menu.archive') }}
@ -66,14 +66,14 @@
<Subscription <Subscription
class="has-no-shadow" class="has-no-shadow"
:is-button="false" :is-button="false"
entity="list" entity="project"
:entity-id="list.id" :entity-id="project.id"
:model-value="list.subscription" :model-value="project.subscription"
@update:model-value="setSubscriptionInStore" @update:model-value="setSubscriptionInStore"
type="dropdown" type="dropdown"
/> />
<dropdown-item <dropdown-item
:to="{ name: 'list.settings.delete', params: { listId: list.id } }" :to="{ name: 'project.settings.delete', params: { projectId: project.id } }"
icon="trash-alt" icon="trash-alt"
class="has-text-danger" class="has-text-danger"
> >
@ -90,26 +90,26 @@ import BaseButton from '@/components/base/BaseButton.vue'
import Dropdown from '@/components/misc/dropdown.vue' import Dropdown from '@/components/misc/dropdown.vue'
import DropdownItem from '@/components/misc/dropdown-item.vue' import DropdownItem from '@/components/misc/dropdown-item.vue'
import Subscription from '@/components/misc/subscription.vue' import Subscription from '@/components/misc/subscription.vue'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {ISubscription} from '@/modelTypes/ISubscription' import type {ISubscription} from '@/modelTypes/ISubscription'
import {isSavedFilter} from '@/services/savedFilter' import {isSavedFilter} from '@/services/savedFilter'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
const props = defineProps({ const props = defineProps({
list: { project: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: true, required: true,
}, },
}) })
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const subscription = ref<ISubscription | null>(null) const subscription = ref<ISubscription | null>(null)
watchEffect(() => { watchEffect(() => {
subscription.value = props.list.subscription ?? null subscription.value = props.project.subscription ?? null
}) })
const configStore = useConfigStore() const configStore = useConfigStore()
@ -117,11 +117,11 @@ const backgroundsEnabled = computed(() => configStore.enabledBackgroundProviders
function setSubscriptionInStore(sub: ISubscription) { function setSubscriptionInStore(sub: ISubscription) {
subscription.value = sub subscription.value = sub
const updatedList = { const updatedProject = {
...props.list, ...props.project,
subscription: sub, subscription: sub,
} }
listStore.setList(updatedList) projectStore.setProject(updatedProject)
namespaceStore.setListInNamespaceById(updatedList) namespaceStore.setProjectInNamespaceById(updatedProject)
} }
</script> </script>

View File

@ -63,18 +63,18 @@ import TeamService from '@/services/team'
import NamespaceModel from '@/models/namespace' import NamespaceModel from '@/models/namespace'
import TeamModel from '@/models/team' import TeamModel from '@/models/team'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue' import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import {useLabelStore} from '@/stores/labels' import {useLabelStore} from '@/stores/labels'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
import {getHistory} from '@/modules/listHistory' import {getHistory} from '@/modules/projectHistory'
import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText' import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText'
import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode' import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
import {success} from '@/message' import {success} from '@/message'
@ -82,13 +82,13 @@ import {success} from '@/message'
import type {ITeam} from '@/modelTypes/ITeam' import type {ITeam} from '@/modelTypes/ITeam'
import type {ITask} from '@/modelTypes/ITask' import type {ITask} from '@/modelTypes/ITask'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const router = useRouter() const router = useRouter()
const baseStore = useBaseStore() const baseStore = useBaseStore()
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const labelStore = useLabelStore() const labelStore = useLabelStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
@ -98,13 +98,13 @@ type DoAction<Type = any> = { type: ACTION_TYPE } & Type
enum ACTION_TYPE { enum ACTION_TYPE {
CMD = 'cmd', CMD = 'cmd',
TASK = 'task', TASK = 'task',
LIST = 'list', PROJECT = 'project',
TEAM = 'team', TEAM = 'team',
} }
enum COMMAND_TYPE { enum COMMAND_TYPE {
NEW_TASK = 'newTask', NEW_TASK = 'newTask',
NEW_LIST = 'newList', NEW_PROJECT = 'newProject',
NEW_NAMESPACE = 'newNamespace', NEW_NAMESPACE = 'newNamespace',
NEW_TEAM = 'newTeam', NEW_TEAM = 'newTeam',
} }
@ -112,7 +112,7 @@ enum COMMAND_TYPE {
enum SEARCH_MODE { enum SEARCH_MODE {
ALL = 'all', ALL = 'all',
TASKS = 'tasks', TASKS = 'tasks',
LISTS = 'lists', PROJECTS = 'projects',
TEAMS = 'teams', TEAMS = 'teams',
} }
@ -137,26 +137,26 @@ function closeQuickActions() {
baseStore.setQuickActionsActive(false) baseStore.setQuickActionsActive(false)
} }
const foundLists = computed(() => { const foundProjects = computed(() => {
const { list } = parsedQuery.value const { project } = parsedQuery.value
if ( if (
searchMode.value === SEARCH_MODE.ALL || searchMode.value === SEARCH_MODE.ALL ||
searchMode.value === SEARCH_MODE.LISTS || searchMode.value === SEARCH_MODE.PROJECTS ||
list === null project === null
) { ) {
return [] return []
} }
const ncache: { [id: ListModel['id']]: INamespace } = {} const ncache: { [id: ProjectModel['id']]: INamespace } = {}
const history = getHistory() const history = getHistory()
const allLists = [ const allProjects = [
...new Set([ ...new Set([
...history.map((l) => listStore.getListById(l.id)), ...history.map((l) => projectStore.getProjectById(l.id)),
...listStore.searchList(list), ...projectStore.searchProject(project),
]), ]),
] ]
return allLists.filter((l) => { return allProjects.filter((l) => {
if (typeof l === 'undefined' || l === null) { if (typeof l === 'undefined' || l === null) {
return false return false
} }
@ -191,9 +191,9 @@ const results = computed<Result[]>(() => {
items: foundTasks.value, items: foundTasks.value,
}, },
{ {
type: ACTION_TYPE.LIST, type: ACTION_TYPE.PROJECT,
title: t('quickActions.lists'), title: t('quickActions.projects'),
items: foundLists.value, items: foundProjects.value,
}, },
{ {
type: ACTION_TYPE.TEAM, type: ACTION_TYPE.TEAM,
@ -206,7 +206,7 @@ const results = computed<Result[]>(() => {
const loading = computed(() => const loading = computed(() =>
taskService.loading || taskService.loading ||
namespaceStore.isLoading || namespaceStore.isLoading ||
listStore.isLoading || projectStore.isLoading ||
teamService.loading, teamService.loading,
) )
@ -224,11 +224,11 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
placeholder: t('quickActions.newTask'), placeholder: t('quickActions.newTask'),
action: newTask, action: newTask,
}, },
newList: { newProject: {
type: COMMAND_TYPE.NEW_LIST, type: COMMAND_TYPE.NEW_PROJECT,
title: t('quickActions.cmds.newList'), title: t('quickActions.cmds.newProject'),
placeholder: t('quickActions.newList'), placeholder: t('quickActions.newProject'),
action: newList, action: newProject,
}, },
newNamespace: { newNamespace: {
type: COMMAND_TYPE.NEW_NAMESPACE, type: COMMAND_TYPE.NEW_NAMESPACE,
@ -246,24 +246,24 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
const placeholder = computed(() => selectedCmd.value?.placeholder || t('quickActions.placeholder')) const placeholder = computed(() => selectedCmd.value?.placeholder || t('quickActions.placeholder'))
const currentList = computed(() => Object.keys(baseStore.currentList).length === 0 const currentProject = computed(() => Object.keys(baseStore.currentProject).length === 0
? null ? null
: baseStore.currentList, : baseStore.currentProject,
) )
const hintText = computed(() => { const hintText = computed(() => {
let namespace let namespace
if (selectedCmd.value !== null && currentList.value !== null) { if (selectedCmd.value !== null && currentProject.value !== null) {
switch (selectedCmd.value.type) { switch (selectedCmd.value.type) {
case COMMAND_TYPE.NEW_TASK: case COMMAND_TYPE.NEW_TASK:
return t('quickActions.createTask', { return t('quickActions.createTask', {
title: currentList.value.title, title: currentProject.value.title,
}) })
case COMMAND_TYPE.NEW_LIST: case COMMAND_TYPE.NEW_PROJECT:
namespace = namespaceStore.getNamespaceById( namespace = namespaceStore.getNamespaceById(
currentList.value.namespaceId, currentProject.value.namespaceId,
) )
return t('quickActions.createList', { return t('quickActions.createProject', {
title: namespace?.title, title: namespace?.title,
}) })
} }
@ -275,8 +275,8 @@ const hintText = computed(() => {
const availableCmds = computed(() => { const availableCmds = computed(() => {
const cmds = [] const cmds = []
if (currentList.value !== null) { if (currentProject.value !== null) {
cmds.push(commands.value.newTask, commands.value.newList) cmds.push(commands.value.newTask, commands.value.newProject)
} }
cmds.push(commands.value.newNamespace, commands.value.newTeam) cmds.push(commands.value.newNamespace, commands.value.newTeam)
return cmds return cmds
@ -288,21 +288,21 @@ const searchMode = computed(() => {
if (query.value === '') { if (query.value === '') {
return SEARCH_MODE.ALL return SEARCH_MODE.ALL
} }
const { text, list, labels, assignees } = parsedQuery.value const { text, project, labels, assignees } = parsedQuery.value
if (assignees.length === 0 && text !== '') { if (assignees.length === 0 && text !== '') {
return SEARCH_MODE.TASKS return SEARCH_MODE.TASKS
} }
if ( if (
assignees.length === 0 && assignees.length === 0 &&
list !== null && project !== null &&
text === '' && text === '' &&
labels.length === 0 labels.length === 0
) { ) {
return SEARCH_MODE.LISTS return SEARCH_MODE.PROJECTS
} }
if ( if (
assignees.length > 0 && assignees.length > 0 &&
list === null && project === null &&
text === '' && text === '' &&
labels.length === 0 labels.length === 0
) { ) {
@ -356,7 +356,7 @@ function searchTasks() {
taskSearchTimeout.value = null taskSearchTimeout.value = null
} }
const { text, list: listName, labels } = parsedQuery.value const { text, project: projectName, labels } = parsedQuery.value
const filters: Filter[] = [] const filters: Filter[] = []
@ -373,10 +373,10 @@ function searchTasks() {
}) })
} }
if (listName !== null) { if (projectName !== null) {
const list = listStore.findListByExactname(listName) const project = projectStore.findProjectByExactname(projectName)
if (list !== null) { if (project !== null) {
addFilter('listId', list.id, 'equals') addFilter('projectId', project.id, 'equals')
} }
} }
@ -396,9 +396,9 @@ function searchTasks() {
const r = await taskService.getAll({}, params) as DoAction<ITask>[] const r = await taskService.getAll({}, params) as DoAction<ITask>[]
foundTasks.value = r.map((t) => { foundTasks.value = r.map((t) => {
t.type = ACTION_TYPE.TASK t.type = ACTION_TYPE.TASK
const list = listStore.getListById(t.listId) const project = projectStore.getProjectById(t.projectId)
if (list !== null) { if (project !== null) {
t.title = `${t.title} (${list.title})` t.title = `${t.title} (${project.title})`
} }
return t return t
}) })
@ -444,11 +444,11 @@ const searchInput = ref<HTMLElement | null>(null)
async function doAction(type: ACTION_TYPE, item: DoAction) { async function doAction(type: ACTION_TYPE, item: DoAction) {
switch (type) { switch (type) {
case ACTION_TYPE.LIST: case ACTION_TYPE.PROJECT:
closeQuickActions() closeQuickActions()
await router.push({ await router.push({
name: 'list.index', name: 'project.index',
params: { listId: (item as DoAction<IList>).id }, params: { projectId: (item as DoAction<IProject>).id },
}) })
break break
case ACTION_TYPE.TASK: case ACTION_TYPE.TASK:
@ -482,29 +482,29 @@ async function doCmd() {
} }
async function newTask() { async function newTask() {
if (currentList.value === null) { if (currentProject.value === null) {
return return
} }
const task = await taskStore.createNewTask({ const task = await taskStore.createNewTask({
title: query.value, title: query.value,
listId: currentList.value.id, projectId: currentProject.value.id,
}) })
success({ message: t('task.createSuccess') }) success({ message: t('task.createSuccess') })
await router.push({ name: 'task.detail', params: { id: task.id } }) await router.push({ name: 'task.detail', params: { id: task.id } })
} }
async function newList() { async function newProject() {
if (currentList.value === null) { if (currentProject.value === null) {
return return
} }
const newList = await listStore.createList(new ListModel({ const newProject = await projectStore.createProject(new ProjectModel({
title: query.value, title: query.value,
namespaceId: currentList.value.namespaceId, namespaceId: currentProject.value.namespaceId,
})) }))
success({ message: t('list.create.createdSuccess')}) success({ message: t('project.create.createdSuccess')})
await router.push({ await router.push({
name: 'list.index', name: 'project.index',
params: { listId: newList.id }, params: { projectId: newProject.id },
}) })
} }
@ -546,7 +546,7 @@ function select(parentIndex: number, index: number) {
} }
let elems = resultRefs.value[parentIndex][index] let elems = resultRefs.value[parentIndex][index]
if (results.value[parentIndex].items.length === index) { if (results.value[parentIndex].items.length === index) {
elems = resultRefs.value[parentIndex + 1] ? resultRefs.value[parentIndex + 1][0] : undefined elems = resultRefs.value[parentIndex + 1][0]
} }
if ( if (
typeof elems === 'undefined' typeof elems === 'undefined'
@ -576,8 +576,6 @@ function reset() {
<style lang="scss" scoped> <style lang="scss" scoped>
.quick-actions { .quick-actions {
overflow: hidden;
// FIXME: changed position should be an option of the modal // FIXME: changed position should be an option of the modal
:deep(.modal-content) { :deep(.modal-content) {
top: 3rem; top: 3rem;

View File

@ -1,39 +1,39 @@
<template> <template>
<div> <div>
<p class="has-text-weight-bold"> <p class="has-text-weight-bold">
{{ $t('list.share.links.title') }} {{ $t('project.share.links.title') }}
<span <span
class="is-size-7 has-text-grey is-italic ml-3" class="is-size-7 has-text-grey is-italic ml-3"
v-tooltip="$t('list.share.links.explanation')"> v-tooltip="$t('project.share.links.explanation')">
{{ $t('list.share.links.what') }} {{ $t('project.share.links.what') }}
</span> </span>
</p> </p>
<div class="sharables-list"> <div class="sharables-project">
<x-button <x-button
v-if="!(linkShares.length === 0 || showNewForm)" v-if="!(linkShares.length === 0 || showNewForm)"
@click="showNewForm = true" @click="showNewForm = true"
icon="plus" icon="plus"
class="mb-4"> class="mb-4">
{{ $t('list.share.links.create') }} {{ $t('project.share.links.create') }}
</x-button> </x-button>
<div class="p-4" v-if="linkShares.length === 0 || showNewForm"> <div class="p-4" v-if="linkShares.length === 0 || showNewForm">
<div class="field"> <div class="field">
<label class="label" for="linkShareRight"> <label class="label" for="linkShareRight">
{{ $t('list.share.right.title') }} {{ $t('project.share.right.title') }}
</label> </label>
<div class="control"> <div class="control">
<div class="select"> <div class="select">
<select v-model="selectedRight" id="linkShareRight"> <select v-model="selectedRight" id="linkShareRight">
<option :value="RIGHTS.READ"> <option :value="RIGHTS.READ">
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</option> </option>
<option :value="RIGHTS.READ_WRITE"> <option :value="RIGHTS.READ_WRITE">
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</option> </option>
<option :value="RIGHTS.ADMIN"> <option :value="RIGHTS.ADMIN">
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</option> </option>
</select> </select>
</div> </div>
@ -41,21 +41,21 @@
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="linkShareName"> <label class="label" for="linkShareName">
{{ $t('list.share.links.name') }} {{ $t('project.share.links.name') }}
</label> </label>
<div class="control"> <div class="control">
<input <input
id="linkShareName" id="linkShareName"
class="input" class="input"
:placeholder="$t('list.share.links.namePlaceholder')" :placeholder="$t('project.share.links.namePlaceholder')"
v-tooltip="$t('list.share.links.nameExplanation')" v-tooltip="$t('project.share.links.nameExplanation')"
v-model="name" v-model="name"
/> />
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="linkSharePassword"> <label class="label" for="linkSharePassword">
{{ $t('list.share.links.password') }} {{ $t('project.share.links.password') }}
</label> </label>
<div class="control"> <div class="control">
<input <input
@ -63,25 +63,25 @@
type="password" type="password"
class="input" class="input"
:placeholder="$t('user.auth.passwordPlaceholder')" :placeholder="$t('user.auth.passwordPlaceholder')"
v-tooltip="$t('list.share.links.passwordExplanation')" v-tooltip="$t('project.share.links.passwordExplanation')"
v-model="password" v-model="password"
/> />
</div> </div>
</div> </div>
<x-button @click="add(listId)" icon="plus"> <x-button @click="add(projectId)" icon="plus">
{{ $t('list.share.share') }} {{ $t('project.share.share') }}
</x-button> </x-button>
</div> </div>
<table <table
class="table has-actions is-striped is-hoverable is-fullwidth link-share-list" class="table has-actions is-striped is-hoverable is-fullwidth"
v-if="linkShares.length > 0" v-if="linkShares.length > 0"
> >
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th>{{ $t('list.share.links.view') }}</th> <th>{{ $t('project.share.links.view') }}</th>
<th>{{ $t('list.share.attributes.delete') }}</th> <th>{{ $t('project.share.attributes.delete') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -92,7 +92,7 @@
</p> </p>
<p class="mb-2"> <p class="mb-2">
<i18n-t keypath="list.share.links.sharedBy" scope="global"> <i18n-t keypath="project.share.links.sharedBy" scope="global">
<strong>{{ getDisplayName(s.sharedBy) }}</strong> <strong>{{ getDisplayName(s.sharedBy) }}</strong>
</i18n-t> </i18n-t>
</p> </p>
@ -102,19 +102,19 @@
<span class="icon is-small"> <span class="icon is-small">
<icon icon="lock"/> <icon icon="lock"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</template> </template>
<template v-else-if="s.right === RIGHTS.READ_WRITE"> <template v-else-if="s.right === RIGHTS.READ_WRITE">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="pen"/> <icon icon="pen"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</template> </template>
<template v-else> <template v-else>
<span class="icon is-small"> <span class="icon is-small">
<icon icon="users"/> <icon icon="users"/>
</span>&nbsp; </span>&nbsp;
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</template> </template>
</p> </p>
@ -172,14 +172,14 @@
<modal <modal
:enabled="showDeleteModal" :enabled="showDeleteModal"
@close="showDeleteModal = false" @close="showDeleteModal = false"
@submit="remove(listId)" @submit="remove(projectId)"
> >
<template #header> <template #header>
<span>{{ $t('list.share.links.remove') }}</span> <span>{{ $t('project.share.links.remove') }}</span>
</template> </template>
<template #text> <template #text>
<p>{{ $t('list.share.links.removeText') }}</p> <p>{{ $t('project.share.links.removeText') }}</p>
</template> </template>
</modal> </modal>
</div> </div>
@ -193,19 +193,19 @@ import {RIGHTS} from '@/constants/rights'
import LinkShareModel from '@/models/linkShare' import LinkShareModel from '@/models/linkShare'
import type {ILinkShare} from '@/modelTypes/ILinkShare' import type {ILinkShare} from '@/modelTypes/ILinkShare'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import LinkShareService from '@/services/linkShare' import LinkShareService from '@/services/linkShare'
import {useCopyToClipboard} from '@/composables/useCopyToClipboard' import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
import {success} from '@/message' import {success} from '@/message'
import {getDisplayName} from '@/models/user' import {getDisplayName} from '@/models/user'
import type {ListView} from '@/types/ListView' import type {ProjectView} from '@/types/ProjectView'
import {LIST_VIEWS} from '@/types/ListView' import {PROJECT_VIEWS} from '@/types/ProjectView'
import {useConfigStore} from '@/stores/config' import {useConfigStore} from '@/stores/config'
const props = defineProps({ const props = defineProps({
listId: { projectId: {
default: 0, default: 0,
required: true, required: true,
}, },
@ -222,20 +222,20 @@ const showDeleteModal = ref(false)
const linkIdToDelete = ref(0) const linkIdToDelete = ref(0)
const showNewForm = ref(false) const showNewForm = ref(false)
type SelectedViewMapper = Record<IList['id'], ListView> type SelectedViewMapper = Record<IProject['id'], ProjectView>
const selectedView = ref<SelectedViewMapper>({}) const selectedView = ref<SelectedViewMapper>({})
const availableViews = computed<Record<ListView, string>>(() => ({ const availableViews = computed<Record<ProjectView, string>>(() => ({
list: t('list.list.title'), list: t('project.list.title'),
gantt: t('list.gantt.title'), gantt: t('project.gantt.title'),
table: t('list.table.title'), table: t('project.table.title'),
kanban: t('list.kanban.title'), kanban: t('project.kanban.title'),
})) }))
const copy = useCopyToClipboard() const copy = useCopyToClipboard()
watch( watch(
() => props.listId, () => props.projectId,
load, load,
{immediate: true}, {immediate: true},
) )
@ -243,23 +243,23 @@ watch(
const configStore = useConfigStore() const configStore = useConfigStore()
const frontendUrl = computed(() => configStore.frontendUrl) const frontendUrl = computed(() => configStore.frontendUrl)
async function load(listId: IList['id']) { async function load(projectId: IProject['id']) {
// If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here // If projectId == 0 the project on the calling component wasn't already loaded, so we just bail out here
if (listId === 0) { if (projectId === 0) {
return return
} }
const links = await linkShareService.getAll({listId}) const links = await linkShareService.getAll({projectId})
links.forEach((l: ILinkShare) => { links.forEach((l: ILinkShare) => {
selectedView.value[l.id] = 'list' selectedView.value[l.id] = 'project'
}) })
linkShares.value = links linkShares.value = links
} }
async function add(listId: IList['id']) { async function add(projectId: IProject['id']) {
const newLinkShare = new LinkShareModel({ const newLinkShare = new LinkShareModel({
right: selectedRight.value, right: selectedRight.value,
listId, projectId,
name: name.value, name: name.value,
password: password.value, password: password.value,
}) })
@ -268,31 +268,31 @@ async function add(listId: IList['id']) {
name.value = '' name.value = ''
password.value = '' password.value = ''
showNewForm.value = false showNewForm.value = false
success({message: t('list.share.links.createSuccess')}) success({message: t('project.share.links.createSuccess')})
await load(listId) await load(projectId)
} }
async function remove(listId: IList['id']) { async function remove(projectId: IProject['id']) {
try { try {
await linkShareService.delete(new LinkShareModel({ await linkShareService.delete(new LinkShareModel({
id: linkIdToDelete.value, id: linkIdToDelete.value,
listId, projectId,
})) }))
success({message: t('list.share.links.deleteSuccess')}) success({message: t('project.share.links.deleteSuccess')})
await load(listId) await load(projectId)
} finally { } finally {
showDeleteModal.value = false showDeleteModal.value = false
} }
} }
function getShareLink(hash: string, view: ListView = LIST_VIEWS.LIST) { function getShareLink(hash: string, view: ProjectView = PROJECT_VIEWS.LIST) {
return frontendUrl.value + 'share/' + hash + '/auth?view=' + view return frontendUrl.value + 'share/' + hash + '/auth?view=' + view
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// FIXME: I think this is not needed // FIXME: I think this is not needed
.sharables-list:not(.card-content) { .sharables-project:not(.card-content) {
overflow-y: auto overflow-y: auto
} }
</style> </style>

View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<p class="has-text-weight-bold"> <p class="has-text-weight-bold">
{{ $t('list.share.userTeam.shared', {type: shareTypeNames}) }} {{ $t('project.share.userTeam.shared', {type: shareTypeNames}) }}
</p> </p>
<div v-if="userIsAdmin"> <div v-if="userIsAdmin">
<div class="field has-addons"> <div class="field has-addons">
@ -19,7 +19,7 @@
/> />
</p> </p>
<p class="control"> <p class="control">
<x-button @click="add()">{{ $t('list.share.share') }}</x-button> <x-button @click="add()">{{ $t('project.share.share') }}</x-button>
</p> </p>
</div> </div>
</div> </div>
@ -31,7 +31,7 @@
<td>{{ getDisplayName(s) }}</td> <td>{{ getDisplayName(s) }}</td>
<td> <td>
<template v-if="s.id === userInfo.id"> <template v-if="s.id === userInfo.id">
<b class="is-success">{{ $t('list.share.userTeam.you') }}</b> <b class="is-success">{{ $t('project.share.userTeam.you') }}</b>
</template> </template>
</td> </td>
</template> </template>
@ -52,19 +52,19 @@
<span class="icon is-small"> <span class="icon is-small">
<icon icon="lock"/> <icon icon="lock"/>
</span> </span>
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</template> </template>
<template v-else-if="s.right === RIGHTS.READ_WRITE"> <template v-else-if="s.right === RIGHTS.READ_WRITE">
<span class="icon is-small"> <span class="icon is-small">
<icon icon="pen"/> <icon icon="pen"/>
</span> </span>
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</template> </template>
<template v-else> <template v-else>
<span class="icon is-small"> <span class="icon is-small">
<icon icon="users"/> <icon icon="users"/>
</span> </span>
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</template> </template>
</td> </td>
<td class="actions" v-if="userIsAdmin"> <td class="actions" v-if="userIsAdmin">
@ -78,19 +78,19 @@
:selected="s.right === RIGHTS.READ" :selected="s.right === RIGHTS.READ"
:value="RIGHTS.READ" :value="RIGHTS.READ"
> >
{{ $t('list.share.right.read') }} {{ $t('project.share.right.read') }}
</option> </option>
<option <option
:selected="s.right === RIGHTS.READ_WRITE" :selected="s.right === RIGHTS.READ_WRITE"
:value="RIGHTS.READ_WRITE" :value="RIGHTS.READ_WRITE"
> >
{{ $t('list.share.right.readWrite') }} {{ $t('project.share.right.readWrite') }}
</option> </option>
<option <option
:selected="s.right === RIGHTS.ADMIN" :selected="s.right === RIGHTS.ADMIN"
:value="RIGHTS.ADMIN" :value="RIGHTS.ADMIN"
> >
{{ $t('list.share.right.admin') }} {{ $t('project.share.right.admin') }}
</option> </option>
</select> </select>
</div> </div>
@ -110,7 +110,7 @@
</table> </table>
<nothing v-else> <nothing v-else>
{{ $t('list.share.userTeam.notShared', {type: shareTypeNames}) }} {{ $t('project.share.userTeam.notShared', {type: shareTypeNames}) }}
</nothing> </nothing>
<modal <modal
@ -120,11 +120,11 @@
> >
<template #header> <template #header>
<span>{{ <span>{{
$t('list.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName}) $t('project.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName})
}}</span> }}</span>
</template> </template>
<template #text> <template #text>
<p>{{ $t('list.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}</p> <p>{{ $t('project.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}</p>
</template> </template>
</modal> </modal>
</div> </div>
@ -143,9 +143,9 @@ import UserNamespaceService from '@/services/userNamespace'
import UserNamespaceModel from '@/models/userNamespace' import UserNamespaceModel from '@/models/userNamespace'
import type {IUserNamespace} from '@/modelTypes/IUserNamespace' import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
import UserListService from '@/services/userList' import UserProjectService from '@/services/userProject'
import UserListModel from '@/models/userList' import UserProjectModel from '@/models/userProject'
import type {IUserList} from '@/modelTypes/IUserList' import type {IUserProject} from '@/modelTypes/IUserProject'
import UserService from '@/services/user' import UserService from '@/services/user'
import UserModel, { getDisplayName } from '@/models/user' import UserModel, { getDisplayName } from '@/models/user'
@ -155,9 +155,9 @@ import TeamNamespaceService from '@/services/teamNamespace'
import TeamNamespaceModel from '@/models/teamNamespace' import TeamNamespaceModel from '@/models/teamNamespace'
import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace' import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace'
import TeamListService from '@/services/teamList' import TeamProjectService from '@/services/teamProject'
import TeamListModel from '@/models/teamList' import TeamProjectModel from '@/models/teamProject'
import type { ITeamList } from '@/modelTypes/ITeamList' import type { ITeamProject } from '@/modelTypes/ITeamProject'
import TeamService from '@/services/team' import TeamService from '@/services/team'
import TeamModel from '@/models/team' import TeamModel from '@/models/team'
@ -172,7 +172,7 @@ import {useAuthStore} from '@/stores/auth'
const props = defineProps({ const props = defineProps({
type: { type: {
type: String as PropType<'list' | 'namespace'>, type: String as PropType<'project' | 'namespace'>,
default: '', default: '',
}, },
shareType: { shareType: {
@ -191,9 +191,9 @@ const props = defineProps({
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
// This user service is either a userNamespaceService or a userListService, depending on the type we are using // This user service is either a userNamespaceService or a userProjectService, depending on the type we are using
let stuffService: UserNamespaceService | UserListService | TeamListService | TeamNamespaceService let stuffService: UserNamespaceService | UserProjectService | TeamProjectService | TeamNamespaceService
let stuffModel: IUserNamespace | IUserList | ITeamList | ITeamNamespace let stuffModel: IUserNamespace | IUserProject | ITeamProject | ITeamNamespace
let searchService: UserService | TeamService let searchService: UserService | TeamService
let sharable: Ref<IUser | ITeam> let sharable: Ref<IUser | ITeam>
@ -201,7 +201,7 @@ const searchLabel = ref('')
const selectedRight = ref({}) const selectedRight = ref({})
// This holds either teams or users who this namepace or list is shared with // This holds either teams or users who this namepace or project is shared with
const sharables = ref([]) const sharables = ref([])
const showDeleteModal = ref(false) const showDeleteModal = ref(false)
@ -212,11 +212,11 @@ const userInfo = computed(() => authStore.info)
function createShareTypeNameComputed(count: number) { function createShareTypeNameComputed(count: number) {
return computed(() => { return computed(() => {
if (props.shareType === 'user') { if (props.shareType === 'user') {
return t('list.share.userTeam.typeUser', count) return t('project.share.userTeam.typeUser', count)
} }
if (props.shareType === 'team') { if (props.shareType === 'team') {
return t('list.share.userTeam.typeTeam', count) return t('project.share.userTeam.typeTeam', count)
} }
return '' return ''
@ -227,8 +227,8 @@ const shareTypeNames = createShareTypeNameComputed(2)
const shareTypeName = createShareTypeNameComputed(1) const shareTypeName = createShareTypeNameComputed(1)
const sharableName = computed(() => { const sharableName = computed(() => {
if (props.type === 'list') { if (props.type === 'project') {
return t('list.list.title') return t('project.list.title')
} }
if (props.shareType === 'namespace') { if (props.shareType === 'namespace') {
@ -244,9 +244,9 @@ if (props.shareType === 'user') {
sharable = ref(new UserModel()) sharable = ref(new UserModel())
searchLabel.value = 'username' searchLabel.value = 'username'
if (props.type === 'list') { if (props.type === 'project') {
stuffService = shallowReactive(new UserListService()) stuffService = shallowReactive(new UserProjectService())
stuffModel = reactive(new UserListModel({listId: props.id})) stuffModel = reactive(new UserProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') { } else if (props.type === 'namespace') {
stuffService = shallowReactive(new UserNamespaceService()) stuffService = shallowReactive(new UserNamespaceService())
stuffModel = reactive(new UserNamespaceModel({ stuffModel = reactive(new UserNamespaceModel({
@ -261,9 +261,9 @@ if (props.shareType === 'user') {
sharable = ref(new TeamModel()) sharable = ref(new TeamModel())
searchLabel.value = 'name' searchLabel.value = 'name'
if (props.type === 'list') { if (props.type === 'project') {
stuffService = shallowReactive(new TeamListService()) stuffService = shallowReactive(new TeamProjectService())
stuffModel = reactive(new TeamListModel({listId: props.id})) stuffModel = reactive(new TeamProjectModel({projectId: props.id}))
} else if (props.type === 'namespace') { } else if (props.type === 'namespace') {
stuffService = shallowReactive(new TeamNamespaceService()) stuffService = shallowReactive(new TeamNamespaceService())
stuffModel = reactive(new TeamNamespaceModel({ stuffModel = reactive(new TeamNamespaceModel({
@ -303,7 +303,7 @@ async function deleteSharable() {
} }
} }
success({ success({
message: t('list.share.userTeam.removeSuccess', { message: t('project.share.userTeam.removeSuccess', {
type: shareTypeName.value, type: shareTypeName.value,
sharable: sharableName.value, sharable: sharableName.value,
}), }),
@ -326,7 +326,7 @@ async function add(admin) {
} }
await stuffService.create(stuffModel) await stuffService.create(stuffModel)
success({message: t('list.share.userTeam.addedSuccess', {type: shareTypeName.value})}) success({message: t('project.share.userTeam.addedSuccess', {type: shareTypeName.value})})
await load() await load()
} }
@ -358,7 +358,7 @@ async function toggleType(sharable) {
sharables.value[i].right = r.right sharables.value[i].right = r.right
} }
} }
success({message: t('list.share.userTeam.updatedSuccess', {type: shareTypeName.value})}) success({message: t('project.share.userTeam.updatedSuccess', {type: shareTypeName.value})})
} }
const found = ref([]) const found = ref([])

View File

@ -50,7 +50,7 @@ import {parseKebabDate} from '@/helpers/time/parseKebabDate'
import type {ITask, ITaskPartialWithId} from '@/modelTypes/ITask' import type {ITask, ITaskPartialWithId} from '@/modelTypes/ITask'
import type {DateISO} from '@/types/DateISO' import type {DateISO} from '@/types/DateISO'
import type {GanttFilters} from '@/views/list/helpers/useGanttFilters' import type {GanttFilters} from '@/views/project/helpers/useGanttFilters'
import { import {
extendDayjs, extendDayjs,

View File

@ -5,7 +5,7 @@
<textarea <textarea
class="add-task-textarea input" class="add-task-textarea input"
:class="{'textarea-empty': newTaskTitle === ''}" :class="{'textarea-empty': newTaskTitle === ''}"
:placeholder="$t('list.list.addPlaceholder')" :placeholder="$t('project.list.addPlaceholder')"
rows="1" rows="1"
v-focus v-focus
v-model="newTaskTitle" v-model="newTaskTitle"
@ -24,10 +24,10 @@
@click="addTask()" @click="addTask()"
icon="plus" icon="plus"
:loading="loading" :loading="loading"
:aria-label="$t('list.list.add')" :aria-label="$t('project.list.add')"
> >
<span class="button-text"> <span class="button-text">
{{ $t('list.list.add') }} {{ $t('project.list.add') }}
</span> </span>
</x-button> </x-button>
</p> </p>
@ -107,7 +107,7 @@ const loading = computed(() => taskStore.isLoading)
async function addTask() { async function addTask() {
if (newTaskTitle.value === '') { if (newTaskTitle.value === '') {
errorMessage.value = t('list.create.addTitleRequired') errorMessage.value = t('project.create.addTitleRequired')
return return
} }
errorMessage.value = '' errorMessage.value = ''
@ -128,20 +128,20 @@ async function addTask() {
const allLabels = tasksToCreate.map(({title}) => getLabelsFromPrefix(title) ?? []) const allLabels = tasksToCreate.map(({title}) => getLabelsFromPrefix(title) ?? [])
await taskStore.ensureLabelsExist(allLabels.flat()) await taskStore.ensureLabelsExist(allLabels.flat())
const newTasks = tasksToCreate.map(async ({title, list}) => { const newTasks = tasksToCreate.map(async ({title, project}) => {
if (title === '') { if (title === '') {
return return
} }
// If the task has a list specified, make sure to use it // If the task has a project specified, make sure to use it
let listId = null let projectId = null
if (list !== null) { if (project !== null) {
listId = await taskStore.findListId({list, listId: 0}) projectId = await taskStore.findProjectId({project, projectId: 0})
} }
const task = await taskStore.createNewTask({ const task = await taskStore.createNewTask({
title, title,
listId: listId || authStore.settings.defaultListId, projectId: projectId || authStore.settings.defaultProjectId,
position: props.defaultPosition, position: props.defaultPosition,
}) })
createdTasks[title] = task createdTasks[title] = task
@ -176,7 +176,7 @@ async function addTask() {
})) }))
createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask] createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask]
// we're only emitting here so that the relation shows up in the task list // we're only emitting here so that the relation shows up in the project
emit('taskAdded', createdTask) emit('taskAdded', createdTask)
return rel return rel
@ -184,8 +184,8 @@ async function addTask() {
await Promise.all(relations) await Promise.all(relations)
} catch (e: any) { } catch (e: any) {
newTaskTitle.value = taskTitleBackup newTaskTitle.value = taskTitleBackup
if (e?.message === 'NO_LIST') { if (e?.message === 'NO_PROJECT') {
errorMessage.value = t('list.create.addListRequired') errorMessage.value = t('project.create.addProjectRequired')
return return
} }
throw e throw e

View File

@ -1,6 +1,6 @@
<template> <template>
<Multiselect <Multiselect
:loading="listUserService.loading" :loading="projectUserService.loading"
:placeholder="$t('task.assignee.placeholder')" :placeholder="$t('task.assignee.placeholder')"
:multiple="true" :multiple="true"
@search="findUser" @search="findUser"
@ -30,7 +30,7 @@ import Multiselect from '@/components/input/multiselect.vue'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import {includesById} from '@/helpers/utils' import {includesById} from '@/helpers/utils'
import ListUserService from '@/services/listUsers' import ProjectUserService from '@/services/projectUsers'
import {success} from '@/message' import {success} from '@/message'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
@ -42,7 +42,7 @@ const props = defineProps({
type: Number, type: Number,
required: true, required: true,
}, },
listId: { projectId: {
type: Number, type: Number,
required: true, required: true,
}, },
@ -59,7 +59,7 @@ const emit = defineEmits(['update:modelValue'])
const taskStore = useTaskStore() const taskStore = useTaskStore()
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const listUserService = shallowReactive(new ListUserService()) const projectUserService = shallowReactive(new ProjectUserService())
const foundUsers = ref<IUser[]>([]) const foundUsers = ref<IUser[]>([])
const assignees = ref<IUser[]>([]) const assignees = ref<IUser[]>([])
let isAdding = false let isAdding = false
@ -94,7 +94,7 @@ async function addAssignee(user: IUser) {
async function removeAssignee(user: IUser) { async function removeAssignee(user: IUser) {
await taskStore.removeAssignee({user: user, taskId: props.taskId}) await taskStore.removeAssignee({user: user, taskId: props.taskId})
// Remove the assignee from the list // Remove the assignee from the project
for (const a in assignees.value) { for (const a in assignees.value) {
if (assignees.value[a].id === user.id) { if (assignees.value[a].id === user.id) {
assignees.value.splice(a, 1) assignees.value.splice(a, 1)
@ -109,7 +109,7 @@ async function findUser(query: string) {
return return
} }
const response = await listUserService.getAll({listId: props.listId}, {s: query}) as IUser[] const response = await projectUserService.getAll({projectId: props.projectId}, {s: query}) as IUser[]
// Filter the results to not include users who are already assigned // Filter the results to not include users who are already assigned
foundUsers.value = response foundUsers.value = response

View File

@ -1,18 +1,18 @@
<template> <template>
<Multiselect <Multiselect
class="control is-expanded" class="control is-expanded"
:placeholder="$t('list.search')" :placeholder="$t('project.search')"
:search-results="foundLists" :search-results="foundProjects"
label="title" label="title"
:select-placeholder="$t('list.searchSelect')" :select-placeholder="$t('project.searchSelect')"
:model-value="list" :model-value="project"
@update:model-value="Object.assign(list, $event)" @update:model-value="Object.assign(project, $event)"
@select="select" @select="select"
@search="findLists" @search="findProjects"
> >
<template #searchResult="{option}"> <template #searchResult="{option}">
<span class="list-namespace-title search-result">{{ namespace((option as IList).namespaceId) }} ></span> <span class="project-namespace-title search-result">{{ namespace((option as IProject).namespaceId) }} ></span>
{{ (option as IList).title }} {{ (option as IProject).title }}
</template> </template>
</Multiselect> </Multiselect>
</template> </template>
@ -22,19 +22,19 @@ import {reactive, ref, watch} from 'vue'
import type {PropType} from 'vue' import type {PropType} from 'vue'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
import type {INamespace} from '@/modelTypes/INamespace' import type {INamespace} from '@/modelTypes/INamespace'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import ListModel from '@/models/list' import ProjectModel from '@/models/project'
import Multiselect from '@/components/input/multiselect.vue' import Multiselect from '@/components/input/multiselect.vue'
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {
type: Object as PropType<IList>, type: Object as PropType<IProject>,
required: false, required: false,
}, },
}) })
@ -42,45 +42,45 @@ const emit = defineEmits(['update:modelValue'])
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const list: IList = reactive(new ListModel()) const project: IProject = reactive(new ProjectModel())
watch( watch(
() => props.modelValue, () => props.modelValue,
(newList) => Object.assign(list, newList), (newProject) => Object.assign(project, newProject),
{ {
immediate: true, immediate: true,
deep: true, deep: true,
}, },
) )
const listStore = useListStore() const projectStore = useProjectStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const foundLists = ref<IList[]>([]) const foundProjects = ref<IProject[]>([])
function findLists(query: string) { function findProjects(query: string) {
if (query === '') { if (query === '') {
select(null) select(null)
} }
foundLists.value = listStore.searchList(query) foundProjects.value = projectStore.searchProject(query)
} }
function select(l: IList | null) { function select(l: IProject | null) {
if (l === null) { if (l === null) {
return return
} }
Object.assign(list, l) Object.assign(project, l)
emit('update:modelValue', list) emit('update:modelValue', project)
} }
function namespace(namespaceId: INamespace['id']) { function namespace(namespaceId: INamespace['id']) {
const namespace = namespaceStore.getNamespaceById(namespaceId) const namespace = namespaceStore.getNamespaceById(namespaceId)
return namespace !== null return namespace !== null
? namespace.title ? namespace.title
: t('list.shared') : t('project.shared')
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list-namespace-title { .project-namespace-title {
color: var(--grey-500); color: var(--grey-500);
} }
</style> </style>

View File

@ -37,14 +37,14 @@
{{ $t('task.quickAddMagic.multiple') }} {{ $t('task.quickAddMagic.multiple') }}
</p> </p>
<h3>{{ $t('list.list.title') }}</h3> <h3>{{ $t('project.list.title') }}</h3>
<p> <p>
{{ $t('task.quickAddMagic.list1', {prefix: prefixes.list}) }} {{ $t('task.quickAddMagic.project1', {prefix: prefixes.project}) }}
{{ $t('task.quickAddMagic.list2') }} {{ $t('task.quickAddMagic.project2') }}
</p> </p>
<p> <p>
{{ $t('task.quickAddMagic.list3') }} {{ $t('task.quickAddMagic.project3') }}
{{ $t('task.quickAddMagic.list4', {prefix: prefixes.list}) }} {{ $t('task.quickAddMagic.project4', {prefix: prefixes.project}) }}
</p> </p>
<h3>{{ $t('task.quickAddMagic.dateAndTime') }}</h3> <h3>{{ $t('task.quickAddMagic.dateAndTime') }}</h3>

View File

@ -43,8 +43,8 @@
:class="{'is-strikethrough': task.done}" :class="{'is-strikethrough': task.done}"
> >
<span <span
class="different-list" class="different-project"
v-if="task.listId !== listId" v-if="task.projectId !== projectId"
> >
<span <span
v-if="task.differentNamespace !== null" v-if="task.differentNamespace !== null"
@ -52,9 +52,9 @@
{{ task.differentNamespace }} > {{ task.differentNamespace }} >
</span> </span>
<span <span
v-if="task.differentList !== null" v-if="task.differentProject !== null"
v-tooltip="$t('task.relation.differentList')"> v-tooltip="$t('task.relation.differentProject')">
{{ task.differentList }} > {{ task.differentProject }} >
</span> </span>
</span> </span>
{{ task.title }} {{ task.title }}
@ -98,8 +98,8 @@
:class="{ 'is-strikethrough': t.done}" :class="{ 'is-strikethrough': t.done}"
> >
<span <span
class="different-list" class="different-project"
v-if="t.listId !== listId" v-if="t.projectId !== projectId"
> >
<span <span
v-if="t.differentNamespace !== null" v-if="t.differentNamespace !== null"
@ -107,9 +107,9 @@
{{ t.differentNamespace }} > {{ t.differentNamespace }} >
</span> </span>
<span <span
v-if="t.differentList !== null" v-if="t.differentProject !== null"
v-tooltip="$t('task.relation.differentList')"> v-tooltip="$t('task.relation.differentProject')">
{{ t.differentList }} > {{ t.differentProject }} >
</span> </span>
</span> </span>
{{ t.title }} {{ t.title }}
@ -186,7 +186,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
listId: { projectId: {
type: Number, type: Number,
default: 0, default: 0,
}, },
@ -230,17 +230,17 @@ async function findTasks(newQuery: string) {
foundTasks.value = await taskService.getAll({}, {s: newQuery}) foundTasks.value = await taskService.getAll({}, {s: newQuery})
} }
const getListAndNamespaceById = (listId: number) => namespaceStore.getListAndNamespaceById(listId, true) const getProjectAndNamespaceById = (projectId: number) => namespaceStore.getProjectAndNamespaceById(projectId, true)
const namespace = computed(() => getListAndNamespaceById(props.listId)?.namespace) const namespace = computed(() => getProjectAndNamespaceById(props.projectId)?.namespace)
function mapRelatedTasks(tasks: ITask[]) { function mapRelatedTasks(tasks: ITask[]) {
return tasks.map(task => { return tasks.map(task => {
// by doing this here once we can save a lot of duplicate calls in the template // by doing this here once we can save a lot of duplicate calls in the template
const { const {
list, project,
namespace: taskNamespace, namespace: taskNamespace,
} = getListAndNamespaceById(task.listId) || {list: null, namespace: null} } = getProjectAndNamespaceById(task.projectId) || {project: null, namespace: null}
return { return {
...task, ...task,
@ -248,10 +248,10 @@ function mapRelatedTasks(tasks: ITask[]) {
(taskNamespace !== null && (taskNamespace !== null &&
taskNamespace.id !== namespace.value.id && taskNamespace.id !== namespace.value.id &&
taskNamespace?.title) || null, taskNamespace?.title) || null,
differentList: differentProject:
(list !== null && (project !== null &&
task.listId !== props.listId && task.projectId !== props.projectId &&
list?.title) || null, project?.title) || null,
} }
}) })
} }
@ -343,7 +343,7 @@ async function removeTaskRelation() {
} }
async function createAndRelateTask(title: string) { async function createAndRelateTask(title: string) {
const newTask = await taskService.create(new TaskModel({title, listId: props.listId})) const newTask = await taskService.create(new TaskModel({title, projectId: props.projectId}))
newTaskRelation.task = newTask newTaskRelation.task = newTask
await addTaskRelation() await addTaskRelation()
} }
@ -351,7 +351,7 @@ async function createAndRelateTask(title: string) {
async function toggleTaskDone(task: ITask) { async function toggleTaskDone(task: ITask) {
await taskStore.update(task) await taskStore.update(task)
// Find the task in the list and update it so that it is correctly strike through // Find the task in the project and update it so that it is correctly strike through
Object.entries(relatedTasks.value).some(([kind, tasks]) => { Object.entries(relatedTasks.value).some(([kind, tasks]) => {
return (tasks as ITask[]).some((t, key) => { return (tasks as ITask[]).some((t, key) => {
const found = t.id === task.id const found = t.id === task.id
@ -379,7 +379,7 @@ async function toggleTaskDone(task: ITask) {
} }
} }
.different-list { .different-project {
color: var(--grey-500); color: var(--grey-500);
width: auto; width: auto;
} }

View File

@ -7,24 +7,24 @@
/> />
<ColorBubble <ColorBubble
v-if="showListColor && listColor !== '' && currentList.id !== task.listId" v-if="showProjectColor && projectColor !== '' && currentProject.id !== task.projectId"
:color="listColor" :color="projectColor"
class="mr-1" class="mr-1"
/> />
<router-link <router-link
:to="taskDetailRoute" :to="taskDetailRoute"
:class="{ 'done': task.done, 'show-list': showList && taskList !== null}" :class="{ 'done': task.done, 'show-list': showProject && project !== null}"
class="tasktext" class="tasktext"
> >
<span> <span>
<router-link <router-link
v-if="showList && taskList !== null" v-if="showProject && project !== null"
:to="{ name: 'list.list', params: { listId: task.listId } }" :to="{ name: 'project.list', params: { projectId: task.projectId } }"
class="task-list" class="task-project"
:class="{'mr-2': task.hexColor !== ''}" :class="{'mr-2': task.hexColor !== ''}"
v-tooltip="$t('task.detail.belongsToList', {list: taskList.title})"> v-tooltip="$t('task.detail.belongsToProject', {project: project.title})">
{{ taskList.title }} {{ project.title }}
</router-link> </router-link>
<ColorBubble <ColorBubble
@ -81,13 +81,13 @@
<priority-label :priority="task.priority" :done="task.done"/> <priority-label :priority="task.priority" :done="task.done"/>
<span> <span>
<span class="list-task-icon" v-if="task.attachments.length > 0"> <span class="project-task-icon" v-if="task.attachments.length > 0">
<icon icon="paperclip"/> <icon icon="paperclip"/>
</span> </span>
<span class="list-task-icon" v-if="task.description"> <span class="project-task-icon" v-if="task.description">
<icon icon="align-left"/> <icon icon="align-left"/>
</span> </span>
<span class="list-task-icon" v-if="task.repeatAfter.amount > 0"> <span class="project-task-icon" v-if="task.repeatAfter.amount > 0">
<icon icon="history"/> <icon icon="history"/>
</span> </span>
</span> </span>
@ -104,12 +104,12 @@
</progress> </progress>
<router-link <router-link
v-if="!showList && currentList.id !== task.listId && taskList !== null" v-if="!showProject && currentProject.id !== task.projectId && project !== null"
:to="{ name: 'list.list', params: { listId: task.listId } }" :to="{ name: 'project.list', params: { projectId: task.projectId } }"
class="task-list" class="task-project"
v-tooltip="$t('task.detail.belongsToList', {list: taskList.title})" v-tooltip="$t('task.detail.belongsToProject', {project: project.title})"
> >
{{ taskList.title }} {{ project.title }}
</router-link> </router-link>
<BaseButton <BaseButton
@ -148,7 +148,7 @@ import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate' import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate'
import {success} from '@/message' import {success} from '@/message'
import {useListStore} from '@/stores/lists' import {useProjectStore} from '@/stores/projects'
import {useNamespaceStore} from '@/stores/namespaces' import {useNamespaceStore} from '@/stores/namespaces'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useTaskStore} from '@/stores/tasks' import {useTaskStore} from '@/stores/tasks'
@ -162,7 +162,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
showList: { showProject: {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
@ -170,7 +170,7 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
showListColor: { showProjectColor: {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
@ -207,18 +207,18 @@ onBeforeUnmount(() => {
}) })
const baseStore = useBaseStore() const baseStore = useBaseStore()
const listStore = useListStore() const projectStore = useProjectStore()
const taskStore = useTaskStore() const taskStore = useTaskStore()
const namespaceStore = useNamespaceStore() const namespaceStore = useNamespaceStore()
const taskList = computed(() => listStore.getListById(task.value.listId)) const project = computed(() => projectStore.getProjectById(task.value.projectId))
const listColor = computed(() => taskList.value !== null ? taskList.value.hexColor : '') const projectColor = computed(() => project.value !== null ? project.value.hexColor : '')
const currentList = computed(() => { const currentProject = computed(() => {
return typeof baseStore.currentList === 'undefined' ? { return typeof baseStore.currentProject === 'undefined' ? {
id: 0, id: 0,
title: '', title: '',
} : baseStore.currentList } : baseStore.currentProject
}) })
const taskDetailRoute = computed(() => ({ const taskDetailRoute = computed(() => ({
@ -307,7 +307,7 @@ function hideDeferDueDatePopup(e) {
} }
} }
.task-list { .task-project {
width: auto; width: auto;
color: var(--grey-400); color: var(--grey-400);
font-size: .9rem; font-size: .9rem;
@ -322,7 +322,7 @@ function hideDeferDueDatePopup(e) {
width: 27px; width: 27px;
} }
.list-task-icon { .project-task-icon {
margin-left: 6px; margin-left: 6px;
&:not(:first-of-type) { &:not(:first-of-type) {

View File

@ -1,47 +0,0 @@
import {ref, watch, readonly} from 'vue'
import {useLocalStorage, useMediaQuery} from '@vueuse/core'
const BULMA_MOBILE_BREAKPOINT = 768
export function useMenuActive() {
const isMobile = useMediaQuery(`(max-width: ${BULMA_MOBILE_BREAKPOINT}px)`)
const desktopPreference = useLocalStorage(
'menuActiveDesktopPreference',
true,
// If we have two tabs open we want to be able to have the menu open in one window
// and closed in the other. The last changed value will be the new preference
{listenToStorageChanges: false},
)
const menuActive = ref(false)
// set to prefered value
watch(isMobile, (current) => {
menuActive.value = current
// On mobile we don't show the menu in an expanded state
// because that would hide the main content
? false
: desktopPreference.value
}, {immediate: true})
watch(menuActive, (current) => {
if (!isMobile.value) {
desktopPreference.value = current
}
})
function setMenuActive(newMenuActive: boolean) {
menuActive.value = newMenuActive
}
function toggleMenu() {
menuActive.value = menuActive.value = !menuActive.value
}
return {
menuActive: readonly(menuActive),
setMenuActive,
toggleMenu,
}
}

View File

@ -3,7 +3,7 @@ import {useRouter} from 'vue-router'
import {useEventListener} from '@vueuse/core' import {useEventListener} from '@vueuse/core'
import {useAuthStore} from '@/stores/auth' import {useAuthStore} from '@/stores/auth'
import {MILLISECONDS_A_SECOND, SECONDS_A_HOUR} from '@/constants/date' import {MILLISECONDS_A_HOUR, SECONDS_A_HOUR} from '@/constants/date'
const SECONDS_TOKEN_VALID = 60 * SECONDS_A_HOUR const SECONDS_TOKEN_VALID = 60 * SECONDS_A_HOUR
@ -24,14 +24,11 @@ export function useRenewTokenOnFocus() {
return return
} }
const nowInSeconds = new Date().getTime() / MILLISECONDS_A_SECOND const expiresIn = (userInfo.value !== null ? userInfo.value.exp : 0) - new Date().valueOf() / MILLISECONDS_A_HOUR
const expiresIn = userInfo.value !== null
? userInfo.value.exp - nowInSeconds
: 0
// If the token expiry is negative, it is already expired and we have no choice but to redirect // If the token expiry is negative, it is already expired and we have no choice but to redirect
// the user to the login page // the user to the login page
if (expiresIn <= 0) { if (expiresIn < 0) {
await authStore.checkAuth() await authStore.checkAuth()
await router.push({name: 'user.login'}) await router.push({name: 'user.login'})
return return

View File

@ -42,9 +42,9 @@ const SORT_BY_DEFAULT = {
} }
/** /**
* This mixin provides a base set of methods and properties to get tasks on a list. * This mixin provides a base set of methods and properties to get tasks.
*/ */
export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) { export function useTaskList(projectId, sortByDefault = SORT_BY_DEFAULT) {
const params = ref({...getDefaultParams()}) const params = ref({...getDefaultParams()})
const search = ref('') const search = ref('')
@ -64,7 +64,7 @@ export function useTaskList(listId, sortByDefault = SORT_BY_DEFAULT) {
loadParams = formatSortOrder(sortBy.value, loadParams) loadParams = formatSortOrder(sortBy.value, loadParams)
return [ return [
{listId: listId.value}, {projectId: projectId.value},
loadParams, loadParams,
page.value || 1, page.value || 1,
] ]

View File

@ -1,14 +0,0 @@
/**
* Get full BASE_URL
* - including path
* - will always end with a trailing slash
*/
export function getFullBaseUrl() {
// (1) The injected BASE_URL is declared from the `resolvedBase` that might miss a trailing slash...
// see: https://github.com/vitejs/vite/blob/b35fe883fdc699ac1450882562872095abe9959b/packages/vite/src/node/config.ts#LL614C25-L614C25
const rawBase = import.meta.env.BASE_URL
// (2) so we readd a slash like done here
// https://github.com/vitejs/vite/blob/b35fe883fdc699ac1450882562872095abe9959b/packages/vite/src/node/config.ts#L643
// See this comment: https://github.com/vitejs/vite/pull/10723#issuecomment-1303627478
return rawBase.endsWith('/') ? rawBase : rawBase + '/'
}

View File

@ -1,9 +0,0 @@
import {i18n} from '@/i18n'
import type {IList} from '@/modelTypes/IList'
export function getListTitle(l: IList) {
if (l.id === -1) {
return i18n.global.t('list.pseudo.favorites.title')
}
return l.title
}

View File

@ -3,7 +3,7 @@ import type {INamespace} from '@/modelTypes/INamespace'
export const getNamespaceTitle = (n: INamespace) => { export const getNamespaceTitle = (n: INamespace) => {
if (n.id === -1) { if (n.id === -1) {
return i18n.global.t('namespace.pseudo.sharedLists.title') return i18n.global.t('namespace.pseudo.sharedProjects.title')
} }
if (n.id === -2) { if (n.id === -2) {
return i18n.global.t('namespace.pseudo.favorites.title') return i18n.global.t('namespace.pseudo.favorites.title')

View File

@ -0,0 +1,9 @@
import {i18n} from '@/i18n'
import type {IProject} from '@/modelTypes/IProject'
export function getProjectTitle(l: IProject) {
if (l.id === -1) {
return i18n.global.t('project.pseudo.favorites.title')
}
return l.title
}

View File

@ -1,4 +1,4 @@
import {getListFromPrefix} from '@/modules/parseTaskText' import {getProjectFromPrefix} from '@/modules/parseTaskText'
export interface TaskWithParent { export interface TaskWithParent {
title: string, title: string,
@ -26,7 +26,7 @@ export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[]
list: null, list: null,
} }
task.list = getListFromPrefix(task.title) task.list = getProjectFromPrefix(task.title)
if (index === 0) { if (index === 0) {
return task return task
@ -49,7 +49,7 @@ export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[]
task.parent = task.parent.replace(spaceRegex, '') task.parent = task.parent.replace(spaceRegex, '')
if (task.list === null) { if (task.list === null) {
// This allows to specify a list once for the parent task and inherit it to all subtasks // This allows to specify a list once for the parent task and inherit it to all subtasks
task.list = getListFromPrefix(task.parent) task.list = getProjectFromPrefix(task.parent)
} }
} }

View File

@ -1,5 +1,5 @@
import type {IBucket} from '@/modelTypes/IBucket' import type {IBucket} from '@/modelTypes/IBucket'
import type {IList} from '@/modelTypes/IList' import type {IProject} from '@/modelTypes/IProject'
const key = 'collapsedBuckets' const key = 'collapsedBuckets'
@ -13,22 +13,22 @@ function getAllState() {
} }
export const saveCollapsedBucketState = ( export const saveCollapsedBucketState = (
listId: IList['id'], projectId: IProject['id'],
collapsedBuckets: CollapsedBuckets, collapsedBuckets: CollapsedBuckets,
) => { ) => {
const state = getAllState() const state = getAllState()
state[listId] = collapsedBuckets state[projectId] = collapsedBuckets
for (const bucketId in state[listId]) { for (const bucketId in state[projectId]) {
if (!state[listId][bucketId]) { if (!state[projectId][bucketId]) {
delete state[listId][bucketId] delete state[projectId][bucketId]
} }
} }
localStorage.setItem(key, JSON.stringify(state)) localStorage.setItem(key, JSON.stringify(state))
} }
export function getCollapsedBucketState(listId : IList['id']) { export function getCollapsedBucketState(projectId : IProject['id']) {
const state = getAllState() const state = getAllState()
return typeof state[listId] !== 'undefined' return typeof state[projectId] !== 'undefined'
? state[listId] ? state[projectId]
: {} : {}
} }

View File

@ -1,53 +0,0 @@
import type { IList } from '@/modelTypes/IList'
type ListView = Record<IList['id'], string>
const DEFAULT_LIST_VIEW = 'list.list' as const
/**
* Save the current list view to local storage
*/
export function saveListView(listId: IList['id'], routeName: string) {
if (routeName.includes('settings.')) {
return
}
if (!listId) {
return
}
// We use local storage and not the store here to make it persistent across reloads.
const savedListView = localStorage.getItem('listView')
let savedListViewJson: ListView | false = false
if (savedListView !== null) {
savedListViewJson = JSON.parse(savedListView) as ListView
}
let listView: ListView = {}
if (savedListViewJson) {
listView = savedListViewJson
}
listView[listId] = routeName
localStorage.setItem('listView', JSON.stringify(listView))
}
export const getListView = (listId: IList['id']) => {
// Remove old stored settings
const savedListView = localStorage.getItem('listView')
if (savedListView !== null && savedListView.startsWith('list.')) {
localStorage.removeItem('listView')
}
if (!savedListView) {
return DEFAULT_LIST_VIEW
}
const savedListViewJson: ListView = JSON.parse(savedListView)
if (!savedListViewJson[listId]) {
return DEFAULT_LIST_VIEW
}
return savedListViewJson[listId]
}

View File

@ -0,0 +1,63 @@
import type { IProject } from '@/modelTypes/IProject'
type ProjectView = Record<IProject['id'], string>
const DEFAULT_PROJECT_VIEW = 'project.list' as const
const PROJECT_VIEW_SETTINGS_KEY = 'projectView'
/**
* Save the current project view to local storage
*/
export function saveProjectView(projectId: IProject['id'], routeName: string) {
if (routeName.includes('settings.')) {
return
}
if (!projectId) {
return
}
// We use local storage and not the store here to make it persistent across reloads.
const savedProjectView = localStorage.getItem(PROJECT_VIEW_SETTINGS_KEY)
let savedProjectViewJson: ProjectView | false = false
if (savedProjectView !== null) {
savedProjectViewJson = JSON.parse(savedProjectView) as ProjectView
}
let projectView: ProjectView = {}
if (savedProjectViewJson) {
projectView = savedProjectViewJson
}
projectView[projectId] = routeName
localStorage.setItem(PROJECT_VIEW_SETTINGS_KEY, JSON.stringify(projectView))
}
export const getProjectView = (projectId: IProject['id']) => {
// Migrate old setting over
// TODO: remove when 1.0 release
const oldListViewSettings = localStorage.getItem('listView')
if (oldListViewSettings !== null) {
localStorage.setItem(PROJECT_VIEW_SETTINGS_KEY, oldListViewSettings)
localStorage.removeItem('listView')
}
// Remove old stored settings
// TODO: remove when 1.0 release
const savedProjectView = localStorage.getItem(PROJECT_VIEW_SETTINGS_KEY)
if (savedProjectView !== null && savedProjectView.startsWith('project.')) {
localStorage.removeItem(PROJECT_VIEW_SETTINGS_KEY)
}
if (!savedProjectView) {
return DEFAULT_PROJECT_VIEW
}
const savedProjectViewJson: ProjectView = JSON.parse(savedProjectView)
if (!savedProjectViewJson[projectId]) {
return DEFAULT_PROJECT_VIEW
}
return savedProjectViewJson[projectId]
}

View File

@ -233,7 +233,7 @@ export const getDateFromTextIn = (text: string, now: Date = new Date()) => {
} }
const getDateFromWeekday = (text: string): dateFoundResult => { const getDateFromWeekday = (text: string): dateFoundResult => {
const matcher = /(^| )(next )?(monday|mon|tuesday|tue|wednesday|wed|thursday|thu|friday|fri|saturday|sat|sunday|sun)($| )/g const matcher = / (next )?(monday|mon|tuesday|tue|wednesday|wed|thursday|thu|friday|fri|saturday|sat|sunday|sun)($| )/g
const results: string[] | null = matcher.exec(text.toLowerCase()) // The i modifier does not seem to work. const results: string[] | null = matcher.exec(text.toLowerCase()) // The i modifier does not seem to work.
if (results === null) { if (results === null) {
return { return {
@ -246,7 +246,7 @@ const getDateFromWeekday = (text: string): dateFoundResult => {
const currentDay: number = date.getDay() const currentDay: number = date.getDay()
let day = 0 let day = 0
switch (results[3]) { switch (results[2]) {
case 'mon': case 'mon':
case 'monday': case 'monday':
day = 1 day = 1

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migrate from other services to Vikunja",
"titleService": "Import your data from {name} into Vikunja", "titleService": "Import your data from {name} into Vikunja",
"import": "Import your data into Vikunja", "import": "Import your data into Vikunja",
"description": "Click on the logo of one of the third-party services below to get started.", "description": "Click on the logo of one of the third-party services below to get started.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "There is an update for Vikunja available!",
"do": "Update Now" "do": "Update Now"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migrace z jiných služeb do Vikunja",
"titleService": "Importujte svá data z {name} do Vikunja", "titleService": "Importujte svá data z {name} do Vikunja",
"import": "Importujte svá data do Vikunja", "import": "Importujte svá data do Vikunja",
"description": "Chcete-li začít, klikněte na logo jedné ze služeb třetích stran.", "description": "Chcete-li začít, klikněte na logo jedné ze služeb třetích stran.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "K dispozici je aktualizace pro Vikunja!",
"do": "Aktualizovat nyní" "do": "Aktualizovat nyní"
}, },
"menu": { "menu": {

File diff suppressed because it is too large Load Diff

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Aus anderen Diensten importieren", "title": "Von einem anderen Dienst zu Vikunja migrieren",
"titleService": "Importiere deine Daten von {name} in Vikunja", "titleService": "Importiere deine Daten von {name} in Vikunja",
"import": "Importiere deine Daten in Vikunja", "import": "Importiere deine Daten in Vikunja",
"description": "Klicke auf das Logo eines der unten aufgeführten Drittanbieterdienste, um loszulegen.", "description": "Klicke auf das Logo eines der unten aufgeführten Drittanbieterdienste, um loszulegen.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "Es ist ein Update verfügbar!", "available": "Es ist ein Aktualisierung für Vikunja verfügbar!",
"do": "Jetzt aktualisieren" "do": "Jetzt aktualisieren"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Aus anderen Diensten importieren", "title": "Vomene andere Dienst zu Vikunja migriere",
"titleService": "Dini Date vo {name} in Vikunja importiere", "titleService": "Dini Date vo {name} in Vikunja importiere",
"import": "Dini Date in Vikunja importiere", "import": "Dini Date in Vikunja importiere",
"description": "Klick ufs Logo une vo eine vo de Drittabüüter um aahzfange.", "description": "Klick ufs Logo une vo eine vo de Drittabüüter um aahzfange.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "Es ist ein Update verfügbar!", "available": "Es het es Update für Vikiunja!",
"do": "Jetzt aktualisierä" "do": "Jetzt aktualisierä"
}, },
"menu": { "menu": {

View File

@ -5,10 +5,10 @@
"welcomeDay": "Hi {username}!", "welcomeDay": "Hi {username}!",
"welcomeEvening": "Good Evening {username}!", "welcomeEvening": "Good Evening {username}!",
"lastViewed": "Last viewed", "lastViewed": "Last viewed",
"list": { "project": {
"newText": "You can create a new list for your new tasks:", "newText": "You can create a new project for your new tasks:",
"new": "New list", "new": "New project",
"importText": "Or import your lists and tasks from other services into Vikunja:", "importText": "Or import your projects and tasks from other services into Vikunja:",
"import": "Import your data into Vikunja" "import": "Import your data into Vikunja"
} }
}, },
@ -85,7 +85,7 @@
"weekStartSunday": "Sunday", "weekStartSunday": "Sunday",
"weekStartMonday": "Monday", "weekStartMonday": "Monday",
"language": "Language", "language": "Language",
"defaultList": "Default List", "defaultProject": "Default Project",
"timezone": "Time Zone", "timezone": "Time Zone",
"overdueTasksRemindersTime": "Overdue tasks reminder email time" "overdueTasksRemindersTime": "Overdue tasks reminder email time"
}, },
@ -143,7 +143,7 @@
}, },
"deletion": { "deletion": {
"title": "Delete your Vikunja Account", "title": "Delete your Vikunja Account",
"text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, lists, tasks and everything associated with it.", "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
"text2": "To proceed, please enter your password. You will receive an email with further instructions.", "text2": "To proceed, please enter your password. You will receive an email with further instructions.",
"confirm": "Delete my account", "confirm": "Delete my account",
"requestSuccess": "The request was successful. You'll receive an email with further instructions.", "requestSuccess": "The request was successful. You'll receive an email with further instructions.",
@ -157,40 +157,40 @@
}, },
"export": { "export": {
"title": "Export your Vikunja data", "title": "Export your Vikunja data",
"description": "You can request a copy of all your Vikunja data. This include Namespaces, Lists, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.", "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
"descriptionPasswordRequired": "Please enter your password to proceed:", "descriptionPasswordRequired": "Please enter your password to proceed:",
"request": "Request a copy of my Vikunja Data", "request": "Request a copy of my Vikunja Data",
"success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.", "success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.",
"downloadTitle": "Download your exported Vikunja data" "downloadTitle": "Download your exported Vikunja data"
} }
}, },
"list": { "project": {
"archived": "This list is archived. It is not possible to create new or edit tasks for it.", "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title", "title": "Project Title",
"color": "Color", "color": "Color",
"lists": "Lists", "projects": "Projects",
"list": "List", "project": "Project",
"search": "Type to search for a list…", "search": "Type to search for a project…",
"searchSelect": "Click or press enter to select this list", "searchSelect": "Click or press enter to select this project",
"shared": "Shared Lists", "shared": "Shared Projects",
"noDescriptionAvailable": "No list description is available.", "noDescriptionAvailable": "No project description is available.",
"create": { "create": {
"header": "New list", "header": "New project",
"titlePlaceholder": "The list's title goes here…", "titlePlaceholder": "The project's title goes here…",
"addTitleRequired": "Please specify a title.", "addTitleRequired": "Please specify a title.",
"createdSuccess": "The list was successfully created.", "createdSuccess": "The project was successfully created.",
"addListRequired": "Please specify a list or set a default list in the settings." "addProjectRequired": "Please specify a project or set a default project in the settings."
}, },
"archive": { "archive": {
"title": "Archive \"{list}\"", "title": "Archive \"{project}\"",
"archive": "Archive this list", "archive": "Archive this project",
"unarchive": "Un-Archive this list", "unarchive": "Un-Archive this project",
"unarchiveText": "You will be able to create new tasks or edit it.", "unarchiveText": "You will be able to create new tasks or edit it.",
"archiveText": "You won't be able to edit this list or create new tasks until you un-archive it.", "archiveText": "You won't be able to edit this project or create new tasks until you un-archive it.",
"success": "The list was successfully archived." "success": "The project was successfully archived."
}, },
"background": { "background": {
"title": "Set list background", "title": "Set project background",
"remove": "Remove Background", "remove": "Remove Background",
"upload": "Choose a background from your pc", "upload": "Choose a background from your pc",
"searchPlaceholder": "Search for a background…", "searchPlaceholder": "Search for a background…",
@ -200,40 +200,40 @@
"removeSuccess": "The background has been removed successfully!" "removeSuccess": "The background has been removed successfully!"
}, },
"delete": { "delete": {
"title": "Delete \"{list}\"", "title": "Delete \"{project}\"",
"header": "Delete this list", "header": "Delete this project",
"text1": "Are you sure you want to delete this list and all of its contents?", "text1": "Are you sure you want to delete this project and all of its contents?",
"text2": "This includes all tasks and CANNOT BE UNDONE!", "text2": "This includes all tasks and CANNOT BE UNDONE!",
"success": "The list was successfully deleted.", "success": "The project was successfully deleted.",
"tasksToDelete": "This will irrevocably remove approx. {count} tasks.", "tasksToDelete": "This will irrevocably remove approx. {count} tasks.",
"noTasksToDelete": "This list does not contain any tasks, it should be safe to delete." "noTasksToDelete": "This project does not contain any tasks, it should be safe to delete."
}, },
"duplicate": { "duplicate": {
"title": "Duplicate this list", "title": "Duplicate this project",
"label": "Duplicate", "label": "Duplicate",
"text": "Select a namespace which should hold the duplicated list:", "text": "Select a namespace which should hold the duplicated project:",
"success": "The list was successfully duplicated." "success": "The project was successfully duplicated."
}, },
"edit": { "edit": {
"header": "Edit This List", "header": "Edit This Project",
"title": "Edit \"{list}\"", "title": "Edit \"{project}\"",
"titlePlaceholder": "The list title goes here…", "titlePlaceholder": "The project title goes here…",
"identifierTooltip": "The list identifier can be used to uniquely identify a task across lists. You can set it to empty to disable it.", "identifierTooltip": "The project identifier can be used to uniquely identify a task across projects. You can set it to empty to disable it.",
"identifier": "List Identifier", "identifier": "Project Identifier",
"identifierPlaceholder": "The list identifier goes here…", "identifierPlaceholder": "The project identifier goes here…",
"description": "Description", "description": "Description",
"descriptionPlaceholder": "The lists description goes here…", "descriptionPlaceholder": "The projects description goes here…",
"color": "Color", "color": "Color",
"success": "The list was successfully updated." "success": "The project was successfully updated."
}, },
"share": { "share": {
"header": "Share this list", "header": "Share this project",
"title": "Share \"{list}\"", "title": "Share \"{project}\"",
"share": "Share", "share": "Share",
"links": { "links": {
"title": "Share Links", "title": "Share Links",
"what": "What is a share link?", "what": "What is a share link?",
"explanation": "Share Links allow you to easily share a list with other users who don't have an account on Vikunja.", "explanation": "Share Links allow you to easily share a project with other users who don't have an account on Vikunja.",
"create": "Create a new link share", "create": "Create a new link share",
"name": "Name (optional)", "name": "Name (optional)",
"namePlaceholder": "e.g. Lorem Ipsum", "namePlaceholder": "e.g. Lorem Ipsum",
@ -242,7 +242,7 @@
"passwordExplanation": "When authenticating, the user will be required to enter this password.", "passwordExplanation": "When authenticating, the user will be required to enter this password.",
"noName": "No name set", "noName": "No name set",
"remove": "Remove a link share", "remove": "Remove a link share",
"removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this list with this link share. This cannot be undone!", "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": "The link share was successfully created.", "createSuccess": "The link share was successfully created.",
"deleteSuccess": "The link share was successfully deleted", "deleteSuccess": "The link share was successfully deleted",
"view": "View", "view": "View",
@ -275,7 +275,7 @@
"title": "List", "title": "List",
"add": "Add", "add": "Add",
"addPlaceholder": "Add a new task…", "addPlaceholder": "Add a new task…",
"empty": "This list is currently empty.", "empty": "This project is currently empty.",
"newTaskCta": "Create a new task.", "newTaskCta": "Create a new task.",
"editTask": "Edit Task" "editTask": "Edit Task"
}, },
@ -323,36 +323,36 @@
} }
}, },
"namespace": { "namespace": {
"title": "Namespaces & Lists", "title": "Namespaces & Projects",
"namespace": "Namespace", "namespace": "Namespace",
"showArchived": "Show Archived", "showArchived": "Show Archived",
"noneAvailable": "You don't have any namespaces right now.", "noneAvailable": "You don't have any namespaces right now.",
"unarchive": "Un-Archive", "unarchive": "Un-Archive",
"archived": "Archived", "archived": "Archived",
"noLists": "This namespace does not contain any lists.", "noProjects": "This namespace does not contain any projects.",
"createList": "Create a new list in this namespace.", "createProject": "Create a new project in this namespace.",
"namespaces": "Namespaces", "namespaces": "Namespaces",
"search": "Type to search for a namespace…", "search": "Type to search for a namespace…",
"create": { "create": {
"title": "New namespace", "title": "New namespace",
"titleRequired": "Please specify a title.", "titleRequired": "Please specify a title.",
"explanation": "A namespace is a collection of lists you can share and use to organize your lists with. In fact, every list belongs to a namespace.", "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
"tooltip": "What's a namespace?", "tooltip": "What's a namespace?",
"success": "The namespace was successfully created." "success": "The namespace was successfully created."
}, },
"archive": { "archive": {
"titleArchive": "Archive \"{namespace}\"", "titleArchive": "Archive \"{namespace}\"",
"titleUnarchive": "Un-Archive \"{namespace}\"", "titleUnarchive": "Un-Archive \"{namespace}\"",
"archiveText": "You won't be able to edit this namespace or create new lists until you un-archive it. This will also archive all lists in this namespace.", "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
"unarchiveText": "You will be able to create new lists or edit it.", "unarchiveText": "You will be able to create new projects or edit it.",
"success": "The namespace was successfully archived.", "success": "The namespace was successfully archived.",
"unarchiveSuccess": "The namespace was successfully un-archived.", "unarchiveSuccess": "The namespace was successfully un-archived.",
"description": "If a namespace is archived, you cannot create new lists or edit it." "description": "If a namespace is archived, you cannot create new projects or edit it."
}, },
"delete": { "delete": {
"title": "Delete \"{namespace}\"", "title": "Delete \"{namespace}\"",
"text1": "Are you sure you want to delete this namespace and all of its contents?", "text1": "Are you sure you want to delete this namespace and all of its contents?",
"text2": "This includes all lists and tasks and CANNOT BE UNDONE!", "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
"success": "The namespace was successfully deleted." "success": "The namespace was successfully deleted."
}, },
"edit": { "edit": {
@ -372,8 +372,8 @@
"isArchived": "This namespace is archived" "isArchived": "This namespace is archived"
}, },
"pseudo": { "pseudo": {
"sharedLists": { "sharedProjects": {
"title": "Shared Lists" "title": "Shared Projects"
}, },
"favorites": { "favorites": {
"title": "Favorites" "title": "Favorites"
@ -404,7 +404,7 @@
}, },
"create": { "create": {
"title": "New Saved Filter", "title": "New Saved Filter",
"description": "A saved filter is a virtual list which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.", "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
"action": "Create new saved filter" "action": "Create new saved filter"
}, },
"delete": { "delete": {
@ -435,7 +435,7 @@
"label": { "label": {
"title": "Labels", "title": "Labels",
"manage": "Manage labels", "manage": "Manage labels",
"description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose list you have access.", "description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose project you have access.",
"newCTA": "You currently do not have any labels.", "newCTA": "You currently do not have any labels.",
"search": "Type to search for a label…", "search": "Type to search for a label…",
"create": { "create": {
@ -460,7 +460,7 @@
}, },
"sharing": { "sharing": {
"authenticating": "Authenticating…", "authenticating": "Authenticating…",
"passwordRequired": "This shared list requires a password. Please enter it below:", "passwordRequired": "This shared project requires a password. Please enter it below:",
"error": "An error occured.", "error": "An error occured.",
"invalidPassword": "The password is invalid." "invalidPassword": "The password is invalid."
}, },
@ -529,7 +529,7 @@
"code": "Code", "code": "Code",
"quote": "Quote", "quote": "Quote",
"unorderedList": "Unordered List", "unorderedList": "Unordered List",
"orderedList": "Ordered List", "orderedList ": "Ordered List",
"cleanBlock": "Clean Block", "cleanBlock": "Clean Block",
"link": "Link", "link": "Link",
"image": "Image", "image": "Image",
@ -621,7 +621,7 @@
"chooseDueDate": "Click here to set a due date", "chooseDueDate": "Click here to set a due date",
"chooseStartDate": "Click here to set a start date", "chooseStartDate": "Click here to set a start date",
"chooseEndDate": "Click here to set an end date", "chooseEndDate": "Click here to set an end date",
"move": "Move task to a different list", "move": "Move task to a different project",
"done": "Mark task done!", "done": "Mark task done!",
"undone": "Mark as undone", "undone": "Mark as undone",
"created": "Created {0} by {1}", "created": "Created {0} by {1}",
@ -629,7 +629,7 @@
"doneAt": "Done {0}", "doneAt": "Done {0}",
"updateSuccess": "The task was saved successfully.", "updateSuccess": "The task was saved successfully.",
"deleteSuccess": "The task has been deleted successfully.", "deleteSuccess": "The task has been deleted successfully.",
"belongsToList": "This task belongs to list '{list}'", "belongsToProject": "This task belongs to project '{project}'",
"due": "Due {at}", "due": "Due {at}",
"closePopup": "Close popup", "closePopup": "Close popup",
"delete": { "delete": {
@ -649,7 +649,7 @@
"percentDone": "Set Progress", "percentDone": "Set Progress",
"attachments": "Add Attachments", "attachments": "Add Attachments",
"relatedTasks": "Add Relation", "relatedTasks": "Add Relation",
"moveList": "Move", "moveProject": "Move",
"color": "Set Color", "color": "Set Color",
"delete": "Delete", "delete": "Delete",
"favorite": "Add to Favorites", "favorite": "Add to Favorites",
@ -676,21 +676,21 @@
"updated": "Updated" "updated": "Updated"
}, },
"subscription": { "subscription": {
"subscribedListThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this list through its namespace.", "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
"subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.", "subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.",
"subscribedTaskThroughParentList": "You can't unsubscribe here because you are subscribed to this task through its list.", "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
"subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.", "subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.",
"notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.", "notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.",
"subscribedList": "You are currently subscribed to this list and will receive notifications for changes.", "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
"notSubscribedList": "You are not subscribed to this list and won't receive notifications for changes.", "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
"subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.", "subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.",
"notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.", "notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.",
"subscribe": "Subscribe", "subscribe": "Subscribe",
"unsubscribe": "Unsubscribe", "unsubscribe": "Unsubscribe",
"subscribeSuccessNamespace": "You are now subscribed to this namespace", "subscribeSuccessNamespace": "You are now subscribed to this namespace",
"unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace", "unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace",
"subscribeSuccessList": "You are now subscribed to this list", "subscribeSuccessProject": "You are now subscribed to this project",
"unsubscribeSuccessList": "You are now unsubscribed to this list", "unsubscribeSuccessProject": "You are now unsubscribed to this project",
"subscribeSuccessTask": "You are now subscribed to this task", "subscribeSuccessTask": "You are now subscribed to this task",
"unsubscribeSuccessTask": "You are now unsubscribed to this task" "unsubscribeSuccessTask": "You are now unsubscribed to this task"
}, },
@ -764,7 +764,7 @@
"new": "New Task Relation", "new": "New Task Relation",
"searchPlaceholder": "Type search for a new task to add as related…", "searchPlaceholder": "Type search for a new task to add as related…",
"createPlaceholder": "Add this as new related task", "createPlaceholder": "Add this as new related task",
"differentList": "This task belongs to a different list.", "differentProject": "This task belongs to a different project.",
"differentNamespace": "This task belongs to a different namespace.", "differentNamespace": "This task belongs to a different namespace.",
"noneYet": "No task relations yet.", "noneYet": "No task relations yet.",
"delete": "Delete Task Relation", "delete": "Delete Task Relation",
@ -814,10 +814,10 @@
"priority1": "To set a task's priority, add a number 1-5, prefixed with a {prefix}.", "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": "The higher the number, the higher the priority.",
"assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.", "assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.",
"list1": "To set a list for the task to appear in, enter its name prefixed with {prefix}.", "project1": "To set a project for the task to appear in, enter its name prefixed with {prefix}.",
"list2": "This will return an error if the list does not exist.", "project2": "This will return an error if the project does not exist.",
"list3": "To use spaces, simply add a \" or ' around the list name.", "project3": "To use spaces, simply add a \" or ' around the project name.",
"list4": "For example: {prefix}\"List with spaces\".", "project4": "For example: {prefix}\"Project with spaces\".",
"dateAndTime": "Date and time", "dateAndTime": "Date and time",
"date": "Any date will be used as the due date of the new task. You can use dates in any of these formats:", "date": "Any date will be used as the due date of the new task. You can use dates in any of these formats:",
"dateWeekday": "any weekday, will use the next date with that date", "dateWeekday": "any weekday, will use the next date with that date",
@ -850,19 +850,19 @@
"delete": { "delete": {
"header": "Delete the team", "header": "Delete the team",
"text1": "Are you sure you want to delete this team and all of its members?", "text1": "Are you sure you want to delete this team and all of its members?",
"text2": "All team members will lose access to lists and namespaces shared with this team. This CANNOT BE UNDONE!", "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
"success": "The team was successfully deleted." "success": "The team was successfully deleted."
}, },
"deleteUser": { "deleteUser": {
"header": "Remove a user from the team", "header": "Remove a user from the team",
"text1": "Are you sure you want to remove this user from the team?", "text1": "Are you sure you want to remove this user from the team?",
"text2": "They will lose access to all lists and namespaces this team has access to. This CANNOT BE UNDONE!", "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
"success": "The user was successfully deleted from the team." "success": "The user was successfully deleted from the team."
}, },
"leave": { "leave": {
"title": "Leave team", "title": "Leave team",
"text1": "Are you sure you want to leave this team?", "text1": "Are you sure you want to leave this team?",
"text2": "You will lose access to all lists and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.", "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
"success": "You have successfully left the team." "success": "You have successfully left the team."
} }
}, },
@ -894,13 +894,13 @@
"attachment": "Add an attachment to this task", "attachment": "Add an attachment to this task",
"related": "Modify related tasks of this task", "related": "Modify related tasks of this task",
"color": "Change the color of this task", "color": "Change the color of this task",
"move": "Move this task to another list", "move": "Move this task to another project",
"reminder": "Manage reminders of this task", "reminder": "Manage reminders of this task",
"description": "Toggle editing of the task description" "description": "Toggle editing of the task description"
}, },
"list": { "project": {
"title": "List Views", "title": "Project Views",
"switchToListView": "Switch to list view", "switchToListView": "Switch to project view",
"switchToGanttView": "Switch to gantt view", "switchToGanttView": "Switch to gantt view",
"switchToKanbanView": "Switch to kanban view", "switchToKanbanView": "Switch to kanban view",
"switchToTableView": "Switch to table view" "switchToTableView": "Switch to table view"
@ -909,13 +909,13 @@
"title": "Navigation", "title": "Navigation",
"overview": "Navigate to overview", "overview": "Navigate to overview",
"upcoming": "Navigate to upcoming tasks", "upcoming": "Navigate to upcoming tasks",
"namespaces": "Navigate to namespaces & lists", "namespaces": "Navigate to namespaces & projects",
"labels": "Navigate to labels", "labels": "Navigate to labels",
"teams": "Navigate to teams" "teams": "Navigate to teams"
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "There is an update for Vikunja available!",
"do": "Update Now" "do": "Update Now"
}, },
"menu": { "menu": {
@ -926,7 +926,7 @@
"unarchive": "Un-Archive", "unarchive": "Un-Archive",
"setBackground": "Set background", "setBackground": "Set background",
"share": "Share", "share": "Share",
"newList": "New list" "newProject": "New project"
}, },
"apiConfig": { "apiConfig": {
"url": "Vikunja URL", "url": "Vikunja URL",
@ -945,24 +945,24 @@
"notification": { "notification": {
"title": "Notifications", "title": "Notifications",
"none": "You don't have any notifications. Have a nice day!", "none": "You don't have any notifications. Have a nice day!",
"explainer": "Notifications will appear here when actions on namespaces, lists or tasks you subscribed to happen." "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
}, },
"quickActions": { "quickActions": {
"commands": "Commands", "commands": "Commands",
"placeholder": "Type a command or search…", "placeholder": "Type a command or search…",
"hint": "You can use {list} to limit the search to a list. Combine {list} or {label} (labels) with a search query to search for a task with these labels or on that list. Use {assignee} to only search for teams.", "hint": "You can use {project} to limit the search to a project. Combine {project} or {label} (labels) with a search query to search for a task with these labels or on that project. Use {assignee} to only search for teams.",
"tasks": "Tasks", "tasks": "Tasks",
"lists": "Lists", "projects": "Projects",
"teams": "Teams", "teams": "Teams",
"newList": "Enter the title of the new list…", "newProject": "Enter the title of the new project…",
"newTask": "Enter the title of the new task…", "newTask": "Enter the title of the new task…",
"newNamespace": "Enter the title of the new namespace…", "newNamespace": "Enter the title of the new namespace…",
"newTeam": "Enter the name of the new team…", "newTeam": "Enter the name of the new team…",
"createTask": "Create a task in the current list ({title})", "createTask": "Create a task in the current project ({title})",
"createList": "Create a list in the current namespace ({title})", "createProject": "Create a project in the current namespace ({title})",
"cmds": { "cmds": {
"newTask": "New task", "newTask": "New task",
"newList": "New list", "newProject": "New project",
"newNamespace": "New namespace", "newNamespace": "New namespace",
"newTeam": "New team" "newTeam": "New team"
} }
@ -994,15 +994,15 @@
"1018": "The user avatar type setting is invalid.", "1018": "The user avatar type setting is invalid.",
"2001": "ID cannot be empty or 0.", "2001": "ID cannot be empty or 0.",
"2002": "Some of the request data was invalid.", "2002": "Some of the request data was invalid.",
"3001": "The list does not exist.", "3001": "The project does not exist.",
"3004": "You need to have read permissions on that list to perform that action.", "3004": "You need to have read permissions on that project to perform that action.",
"3005": "The list title cannot be empty.", "3005": "The project title cannot be empty.",
"3006": "The list share does not exist.", "3006": "The project share does not exist.",
"3007": "A list with this identifier already exists.", "3007": "A project with this identifier already exists.",
"3008": "The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list.", "3008": "The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project.",
"4001": "The list task text cannot be empty.", "4001": "The project task text cannot be empty.",
"4002": "The list task does not exist.", "4002": "The project task does not exist.",
"4003": "All bulk editing tasks must belong to the same list.", "4003": "All bulk editing tasks must belong to the same project.",
"4004": "Need at least one task when bulk editing tasks.", "4004": "Need at least one task when bulk editing tasks.",
"4005": "You do not have the right to see the task.", "4005": "You do not have the right to see the task.",
"4006": "You can't set a parent task as the task itself.", "4006": "You can't set a parent task as the task itself.",
@ -1028,21 +1028,21 @@
"5012": "The namespace is archived and can therefore only be accessed read only.", "5012": "The namespace is archived and can therefore only be accessed read only.",
"6001": "The team name cannot be empty.", "6001": "The team name cannot be empty.",
"6002": "The team does not exist.", "6002": "The team does not exist.",
"6004": "The team already has access to that namespace or list.", "6004": "The team already has access to that namespace or project.",
"6005": "The user is already a member of that team.", "6005": "The user is already a member of that team.",
"6006": "Cannot delete the last team member.", "6006": "Cannot delete the last team member.",
"6007": "The team does not have access to the list to perform that action.", "6007": "The team does not have access to the project to perform that action.",
"7002": "The user already has access to that list.", "7002": "The user already has access to that project.",
"7003": "You do not have access to that list.", "7003": "You do not have access to that project.",
"8001": "This label already exists on that task.", "8001": "This label already exists on that task.",
"8002": "The label does not exist.", "8002": "The label does not exist.",
"8003": "You do not have access to this label.", "8003": "You do not have access to this label.",
"9001": "The right is invalid.", "9001": "The right is invalid.",
"10001": "The bucket does not exist.", "10001": "The bucket does not exist.",
"10002": "The bucket does not belong to that list.", "10002": "The bucket does not belong to that project.",
"10003": "You cannot remove the last bucket on a list.", "10003": "You cannot remove the last bucket on a project.",
"10004": "You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold.", "10004": "You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold.",
"10005": "There can be only one done bucket per list.", "10005": "There can be only one done bucket per project.",
"11001": "The saved filter does not exist.", "11001": "The saved filter does not exist.",
"11002": "Saved filters are not available for link shares.", "11002": "Saved filters are not available for link shares.",
"12001": "The subscription entity type is invalid.", "12001": "The subscription entity type is invalid.",

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migrate from other services to Vikunja",
"titleService": "Import your data from {name} into Vikunja", "titleService": "Import your data from {name} into Vikunja",
"import": "Import your data into Vikunja", "import": "Import your data into Vikunja",
"description": "Click on the logo of one of the third-party services below to get started.", "description": "Click on the logo of one of the third-party services below to get started.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "¡Hay una actualización de Vikunja disponible!",
"do": "Actualizar Ahora" "do": "Actualizar Ahora"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migrer dautres services vers Vikunja",
"titleService": "Importe tes données depuis {name} dans Vikunja", "titleService": "Importe tes données depuis {name} dans Vikunja",
"import": "Importer tes données dans Vikunja", "import": "Importer tes données dans Vikunja",
"description": "Clique sur le logo dun des services tiers ci-dessous pour commencer.", "description": "Clique sur le logo dun des services tiers ci-dessous pour commencer.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "Il y a une mise à jour pour Vikunja disponible !",
"do": "Mettre à jour maintenant" "do": "Mettre à jour maintenant"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Importa da altri servizi", "title": "Migra da altri servizi a Vikunja",
"titleService": "Importa i tuoi dati da {name} in Vikunja", "titleService": "Importa i tuoi dati da {name} in Vikunja",
"import": "Importa i tuoi dati in Vikunja", "import": "Importa i tuoi dati in Vikunja",
"description": "Clicca sul logo di uno dei servizi esterni qui sotto per iniziare.", "description": "Clicca sul logo di uno dei servizi esterni qui sotto per iniziare.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "È disponibile un aggiornamento!", "available": "È disponibile un aggiornamento per Vikunja!",
"do": "Aggiorna Adesso" "do": "Aggiorna Adesso"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migreer van andere diensten naar Vikunja",
"titleService": "Importeer je gegevens van {name} naar Vikunja", "titleService": "Importeer je gegevens van {name} naar Vikunja",
"import": "Importeer je data in Vikunja", "import": "Importeer je data in Vikunja",
"description": "Click on the logo of one of the third-party services below to get started.", "description": "Click on the logo of one of the third-party services below to get started.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "Er is een update voor Vikunja beschikbaar!",
"do": "Nu bijwerken" "do": "Nu bijwerken"
}, },
"menu": { "menu": {

View File

@ -1,6 +1,6 @@
{ {
"home": { "home": {
"welcomeNight": "God Natt {username}!", "welcomeNight": "God Morgen {username}!",
"welcomeMorning": "God Morgen {username}!", "welcomeMorning": "God Morgen {username}!",
"welcomeDay": "Hei {username}!", "welcomeDay": "Hei {username}!",
"welcomeEvening": "God Morgen {username}!", "welcomeEvening": "God Morgen {username}!",
@ -91,7 +91,7 @@
}, },
"totp": { "totp": {
"title": "To-faktor-autentisering", "title": "To-faktor-autentisering",
"enroll": "Registrere", "enroll": "Delta",
"finishSetupPart1": "For å fullføre oppsettet, bruk denne appen (Google Authenticator eller lignende):", "finishSetupPart1": "For å fullføre oppsettet, bruk denne appen (Google Authenticator eller lignende):",
"finishSetupPart2": "Etter det, skriv inn en kode fra appen under.", "finishSetupPart2": "Etter det, skriv inn en kode fra appen under.",
"scanQR": "Alternativt kan du skanne denne QR-koden:", "scanQR": "Alternativt kan du skanne denne QR-koden:",
@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Importer fra andre tjenester", "title": "Migrere fra andre tjenester til Vikunja",
"titleService": "Importer dine data fra {name} til Vikunja", "titleService": "Importer dine data fra {name} til Vikunja",
"import": "Importer dine data til Vikunja", "import": "Importer dine data til Vikunja",
"description": "Klikk på logoen til en av tjenester fra tredjeparter nedenfor for å starte.", "description": "Klikk på logoen til en av tjenester fra tredjeparter nedenfor for å starte.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "Det er en oppdatering tilgjengelig!", "available": "Det er en oppdatering for Vikunja tilgjengelig!",
"do": "Oppdater Nå" "do": "Oppdater Nå"
}, },
"menu": { "menu": {

View File

@ -417,7 +417,7 @@
} }
}, },
"migrate": { "migrate": {
"title": "Import from other services", "title": "Migruj z innych usług do Vikunja",
"titleService": "Zaimportuj swoje dane z {name} do Vikunja", "titleService": "Zaimportuj swoje dane z {name} do Vikunja",
"import": "Zaimportuj swoje dane do Vikunja", "import": "Zaimportuj swoje dane do Vikunja",
"description": "Aby rozpocząć, kliknij logo jednej z usług zewnętrznych.", "description": "Aby rozpocząć, kliknij logo jednej z usług zewnętrznych.",
@ -911,7 +911,7 @@
} }
}, },
"update": { "update": {
"available": "There is an update available!", "available": "Dostępna jest aktualizacja Vikunji!",
"do": "Aktualizuj teraz" "do": "Aktualizuj teraz"
}, },
"menu": { "menu": {

Some files were not shown because too many files have changed in this diff Show More