primeapple
/
frontend
forked from vikunja/frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/new-shortcuts

This commit is contained in:
kolaente 2023-05-10 10:14:38 +02:00
parent 30b7d0f3ed 386727f6c5
commit 285bb037fa
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
16 changed files with 807 additions and 6464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.drone.yml
View File

@ -42,7 +42,7 @@ steps:
# - .cache
- name: dependencies
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -54,7 +54,7 @@ steps:
# - restore-cache
- name: lint
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -65,7 +65,7 @@ steps:
- dependencies
- name: build-prod
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -76,7 +76,7 @@ steps:
- dependencies
- name: test-unit
image: node:18-alpine
image: node:20-alpine
pull: always
commands:
- corepack enable && pnpm config set store-dir .cache/pnpm
@ -86,7 +86,7 @@ steps:
- name: typecheck
failure: ignore
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -136,8 +136,9 @@ steps:
# - dependencies
- name: deploy-preview
image: node:18-alpine
image: williamjackson/netlify-cli
pull: always
user: root # The rest runs as root and thus the permissions wouldn't work
environment:
NETLIFY_AUTH_TOKEN:
from_secret: netlify_auth_token
@ -200,7 +201,7 @@ steps:
# - .cache
- name: build
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -277,7 +278,7 @@ steps:
# - .cache
- name: build
image: node:18-alpine
image: node:20-alpine
pull: always
environment:
PNPM_CACHE_FOLDER: .cache/pnpm
@ -522,6 +523,6 @@ steps:
from_secret: crowdin_key
---
kind: signature
hmac: 303afeb09b75a57ba88720b45dc06c8bf2c7320e19d738d8299f325438246f75
hmac: dd079665e2294411aebac57837243255cd8fcc34fe5625abab21c55bb5c9763a
...

2
Dockerfile
View File

@ -3,7 +3,7 @@
# │─││ │││ │ │
# ┘─┘┘─┘┘┘─┘┘─┘
FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
FROM --platform=$BUILDPLATFORM node:20-alpine AS builder
WORKDIR /build

2
cypress/e2e/tsconfig.json
View File

@ -1,5 +1,5 @@
{
"extends": "@vue/tsconfig/tsconfig.web.json",
"extends": "@vue/tsconfig/tsconfig.dom.json",
"include": ["./**/*", "../support/**/*", "../factories/**/*"],
"compilerOptions": {
"baseUrl": ".",

0
docker/injector.sh Normal file → Executable file
View File

0
docker/ipv6-disable.sh Normal file → Executable file
View File

1
docker/nginx.conf
View File

@ -4,7 +4,6 @@
pid /tmp/nginx.pid;
worker_processes auto;
worker_rlimit_nofile 65535;
events {
multi_accept on;

68
package.json
View File

@ -13,7 +13,7 @@
},
"homepage": "https://vikunja.io/",
"funding": "https://opencollective.com/vikunja",
"packageManager": "pnpm@8.3.0",
"packageManager": "pnpm@8.5.0",
"keywords": [
"todo",
"productivity",
@ -53,32 +53,32 @@
"@infectoone/vue-ganttastic": "2.1.4",
"@intlify/unplugin-vue-i18n": "0.10.0",
"@kyvg/vue3-notification": "2.9.0",
"@sentry/tracing": "7.48.0",
"@sentry/vue": "7.48.0",
"@vueuse/core": "10.0.2",
"axios": "1.3.5",
"@sentry/tracing": "7.51.0",
"@sentry/vue": "7.51.0",
"@vueuse/core": "10.1.2",
"axios": "1.4.0",
"blurhash": "2.0.5",
"bulma-css-variables": "0.9.33",
"camel-case": "4.1.2",
"codemirror": "5.65.12",
"date-fns": "2.29.3",
"codemirror": "5.65.13",
"date-fns": "2.30.0",
"dayjs": "1.11.7",
"dompurify": "3.0.2",
"dompurify": "3.0.3",
"easymde": "2.18.0",
"fast-deep-equal": "3.1.3",
"flatpickr": "4.6.13",
"flexsearch": "0.7.31",
"floating-vue": "2.0.0-beta.20",
"highlight.js": "11.7.0",
"highlight.js": "11.8.0",
"is-touch-device": "1.0.1",
"klona": "2.0.6",
"lodash.debounce": "4.0.8",
"marked": "4.3.0",
"pinia": "2.0.34",
"marked": "5.0.1",
"pinia": "2.0.35",
"register-service-worker": "1.7.2",
"snake-case": "3.0.4",
"sortablejs": "1.15.0",
"ufo": "1.1.1",
"ufo": "1.1.2",
"vue": "3.2.47",
"vue-advanced-cropper": "2.8.8",
"vue-flatpickr-component": "11.0.3",
@ -95,50 +95,50 @@
"@histoire/plugin-screenshot": "0.16.1",
"@histoire/plugin-vue": "0.16.1",
"@rushstack/eslint-patch": "1.2.0",
"@tsconfig/node18": "2.0.0",
"@types/codemirror": "5.60.7",
"@types/dompurify": "3.0.1",
"@types/dompurify": "3.0.2",
"@types/flexsearch": "0.7.3",
"@types/is-touch-device": "1.0.0",
"@types/lodash.debounce": "4.0.7",
"@types/marked": "4.0.8",
"@types/node": "18.15.11",
"@types/marked": "4.3.0",
"@types/node": "18.16.6",
"@types/postcss-preset-env": "7.7.0",
"@types/sortablejs": "1.15.1",
"@typescript-eslint/eslint-plugin": "5.59.0",
"@typescript-eslint/parser": "5.59.0",
"@vitejs/plugin-legacy": "4.0.2",
"@vitejs/plugin-vue": "4.1.0",
"@vue/eslint-config-typescript": "11.0.2",
"@typescript-eslint/eslint-plugin": "5.59.5",
"@typescript-eslint/parser": "5.59.5",
"@vitejs/plugin-legacy": "4.0.3",
"@vitejs/plugin-vue": "4.2.1",
"@vue/eslint-config-typescript": "11.0.3",
"@vue/test-utils": "2.3.2",
"@vue/tsconfig": "0.1.3",
"@vue/tsconfig": "0.3.2",
"autoprefixer": "10.4.14",
"browserslist": "4.21.5",
"caniuse-lite": "1.0.30001479",
"caniuse-lite": "1.0.30001486",
"css-has-pseudo": "5.0.2",
"csstype": "3.1.2",
"cypress": "12.10.0",
"esbuild": "0.17.17",
"eslint": "8.38.0",
"eslint-plugin-vue": "9.11.0",
"happy-dom": "9.7.1",
"cypress": "12.12.0",
"esbuild": "0.17.18",
"eslint": "8.40.0",
"eslint-plugin-vue": "9.11.1",
"happy-dom": "9.10.9",
"histoire": "0.16.1",
"netlify-cli": "13.2.2",
"postcss": "8.4.22",
"postcss": "8.4.23",
"postcss-easing-gradients": "3.0.1",
"postcss-easings": "3.0.1",
"postcss-focus-within": "7.0.2",
"postcss-preset-env": "8.3.2",
"rollup": "3.20.6",
"rollup": "3.21.6",
"rollup-plugin-visualizer": "5.9.0",
"sass": "1.62.0",
"sass": "1.62.1",
"start-server-and-test": "2.0.0",
"typescript": "5.0.4",
"vite": "4.2.2",
"vite": "4.3.5",
"vite-plugin-inject-preload": "1.3.1",
"vite-plugin-pwa": "0.14.7",
"vite-svg-loader": "4.0.0",
"vitest": "0.30.1",
"vue-tsc": "1.2.0",
"vitest": "0.31.0",
"vue-tsc": "1.6.4",
"wait-on": "7.0.1",
"workbox-cli": "6.5.4"
},

7147
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

2
renovate.json
View File

@ -6,7 +6,7 @@
],
"packageRules": [
{
"matchPackageNames": ["netlify-cli", "happy-dom"],
"matchPackageNames": ["happy-dom"],
"extends": ["schedule:weekly"]
},
{

4
scripts/deploy-preview-netlify.mjs
View File

@ -33,9 +33,9 @@ const promiseExec = cmd => {
}
(async function () {
let stdout = await promiseExec(`./node_modules/.bin/netlify link --id ${siteId}`)
let stdout = await promiseExec(`/home/node/docker-netlify-cli/node_modules/.bin/netlify link --id ${siteId}`)
console.log(stdout)
stdout = await promiseExec(`./node_modules/.bin/netlify deploy --alias ${alias}`)
stdout = await promiseExec(`/home/node/docker-netlify-cli/node_modules/.bin/netlify deploy --alias ${alias}`)
console.log(stdout)
const data = await fetch(prIssueCommentsUrl).then(response => response.json())

2
scripts/deploy-preview-netlify.mjs.sha384
View File

@ -1 +1 @@
57af69409e66bc87f4f2fc5822dd8d3c2eb47c601f81af1ac4a56f3e2d80837b1a2de06f4ff57695ec379b7c15b881e3 ./scripts/deploy-preview-netlify.mjs
4a7c1293c7b12e9ab476cdf35251a407c6a1cd005d22c06df994222cccfb25cde5f47d15866a098c9d739778fee4dc19 ./scripts/deploy-preview-netlify.mjs

4
src/components/misc/user.vue
View File

@ -49,9 +49,11 @@ const displayName = computed(() => getDisplayName(props.user))
<style lang="scss" scoped>
.user {
margin: .5rem;
display: flex;
justify-items: center;
&.is-inline {
display: inline;
display: inline-flex;
}
}

1
src/components/tasks/partials/relatedTasks.vue
View File

@ -442,5 +442,6 @@ async function toggleTaskDone(task: ITask) {
.task-done-checkbox {
padding: 0;
height: 18px; // The exact height of the checkbox in the container
margin-right: .75rem;
}
</style>

12
src/views/teams/EditTeam.vue
View File

@ -73,7 +73,11 @@
:search-results="foundUsers"
label="username"
v-model="newMember"
/>
>
<template #searchResult="{option: user}">
<User :avatar-size="24" :user="user" class="m-0"/>
</template>
</multiselect>
</div>
<div class="control">
<x-button @click="addUser" icon="plus">
@ -88,7 +92,9 @@
<table class="table has-actions is-striped is-hoverable is-fullwidth">
<tbody>
<tr :key="m.id" v-for="m in team?.members">
<td>{{ getDisplayName(m) }}</td>
<td>
<User :avatar-size="24" :user="m" class="m-0"/>
</td>
<td>
<template v-if="m.id === userInfo.id">
<b class="is-success">You</b>
@ -185,6 +191,7 @@ import {useRoute, useRouter} from 'vue-router'
import Editor from '@/components/input/AsyncEditor'
import Multiselect from '@/components/input/multiselect.vue'
import User from '@/components/misc/user.vue'
import TeamService from '@/services/team'
import TeamMemberService from '@/services/teamMember'
@ -194,7 +201,6 @@ import {RIGHTS as Rights} from '@/constants/rights'
import {useTitle} from '@/composables/useTitle'
import {success} from '@/message'
import {getDisplayName} from '@/models/user'
import {useAuthStore} from '@/stores/auth'
import type {ITeam} from '@/modelTypes/ITeam'

2
tsconfig.app.json
View File

@ -1,5 +1,5 @@
{
"extends": "@vue/tsconfig/tsconfig.web.json",
"extends": "@vue/tsconfig/tsconfig.dom.json",
"include": ["env.d.ts", "src/**/*.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.json"],
"exclude": ["src/**/__tests__/*"],
"compilerOptions": {

5
tsconfig.config.json
View File

@ -1,5 +1,8 @@
{
"extends": "@vue/tsconfig/tsconfig.node.json",
"extends": [
"@tsconfig/node18/tsconfig.json",
"@vue/tsconfig/tsconfig.json"
],
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "env.config.d.ts"],
"compilerOptions": {
"composite": true,