feat: review changes

.drone.yml

@@ -29,91 +29,26 @@ steps:
 #      AWS_SECRET_ACCESS_KEY:
 #        from_secret: cache_aws_secret_access_key
 #    settings:
-#      debug: true
 #      restore: true
 #      bucket: kolaente.dev-drone-dependency-cache
 #      endpoint: https://s3.fr-par.scw.cloud
 #      region: fr-par
 #      path_style: true
-#      cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
+#      cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
 #      mount:
-#        - .cache
+#        - '.cache'
 
   - name: dependencies
-    image: node:18-alpine
+    image: node:16
     pull: true
     environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
-      CYPRESS_CACHE_FOLDER: .cache/cypress
+      YARN_CACHE_FOLDER: .cache/yarn/
+      CYPRESS_CACHE_FOLDER: .cache/cypress/
     commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm install --fetch-timeout 100000
+      - yarn --frozen-lockfile --network-timeout 100000
 #    depends_on:
 #      - restore-cache
 
-  - name: lint
-    image: node:18-alpine
-    pull: true
-    environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
-    commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm run lint
-    depends_on:
-      - dependencies
-
-  - name: build-prod
-    image: node:18-alpine
-    pull: true
-    environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
-    commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm run build
-    depends_on:
-      - dependencies
-
-  - name: test-unit
-    image: node:18-alpine
-    pull: true
-    commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm run test:unit
-    depends_on:
-      - dependencies
-
-  - name: typecheck
-    failure: ignore
-    image: node:18-alpine
-    pull: true
-    environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
-    commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm run typecheck
-    depends_on:
-      - dependencies
-
-  - name: test-frontend
-    image: cypress/browsers:node16.14.0-chrome99-ff97
-    pull: true
-    environment:
-      CYPRESS_API_URL: http://api:3456/api/v1
-      CYPRESS_TEST_SECRET: averyLongSecretToSe33dtheDB
-      PNPM_CACHE_FOLDER: .cache/pnpm
-      CYPRESS_CACHE_FOLDER: .cache/cypress
-      CYPRESS_DEFAULT_COMMAND_TIMEOUT: 60000
-      CYPRESS_RECORD_KEY:
-        from_secret: cypress_project_key
-    commands:
-      - sed -i 's/localhost/api/g' dist/index.html
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm cypress install
-      - pnpm run serve:dist & npx wait-on http://localhost:4173
-      - pnpm run test:frontend --browser chrome --record
-    depends_on:
-      - build-prod
-
 #  - name: rebuild-cache
 #    image: meltwater/drone-cache:dev
 #    pull: true
@@ -128,14 +63,82 @@ steps:
 #      endpoint: https://s3.fr-par.scw.cloud
 #      region: fr-par
 #      path_style: true
-#      cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
+#      cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
 #      mount:
-#        - .cache
+#        - '.cache'
 #    depends_on:
 #      - dependencies
 
+  - name: lint
+    image: node:16
+    pull: true
+    environment:
+      YARN_CACHE_FOLDER: .cache/yarn/
+      CYPRESS_CACHE_FOLDER: .cache/cypress/
+    commands:
+      - yarn run lint
+    depends_on:
+      - dependencies
+
+  - name: build-prod
+    image: node:16
+    pull: true
+    environment:
+      YARN_CACHE_FOLDER: .cache/yarn/
+    commands:
+      - yarn build
+    depends_on:
+      - dependencies
+
+  - name: test-unit
+    image: node:16
+    pull: true
+    commands:
+      - yarn test:unit
+    depends_on:
+      - dependencies
+
+  - name: test-frontend
+    image: cypress/browsers:node16.5.0-chrome94-ff93
+    pull: true
+    environment:
+      CYPRESS_API_URL: http://api:3456/api/v1
+      CYPRESS_TEST_SECRET: averyLongSecretToSe33dtheDB
+      YARN_CACHE_FOLDER: .cache/yarn/
+      CYPRESS_CACHE_FOLDER: .cache/cypress/
+      CYPRESS_DEFAULT_COMMAND_TIMEOUT: 60000
+    commands:
+      - sed -i 's/localhost/api/g' dist/index.html
+      - yarn serve:dist & npx wait-on http://localhost:5000
+      - yarn test:frontend --browser chrome
+    depends_on:
+      - dependencies
+      - build-prod
+
+  - name: upload-test-results
+    image: plugins/s3
+    pull: true
+    settings:
+      bucket: drone-test-results
+      access_key:
+        from_secret: test_results_aws_access_key_id
+      secret_key:
+        from_secret: test_results_aws_secret_access_key
+      endpoint: https://s3.fr-par.scw.cloud
+      region: fr-par
+      path_style: true
+      source: cypress/screenshots/**/**/*
+      strip_prefix: cypress/screenshots/
+      target: /${DRONE_REPO}/${DRONE_PULL_REQUEST}_${DRONE_BRANCH}/${DRONE_BUILD_NUMBER}/
+    depends_on:
+      - test-frontend
+    when:
+      status:
+        - failure
+        - success
+
   - name: deploy-preview
-    image: node:18-alpine
+    image: node:16
     pull: true
     environment:
       NETLIFY_AUTH_TOKEN:
@@ -145,10 +148,6 @@ steps:
       GITEA_TOKEN:
         from_secret: gitea_token
     commands:
-      - cp -r dist dist-preview
-      # Override the default api url used for preview
-      - sed -i 's|http://localhost:3456|https://try.vikunja.io|g' dist-preview/index.html
-      - apk add --no-cache perl-utils
       - shasum -a 384 -c ./scripts/deploy-preview-netlify.js.sha384
       - node ./scripts/deploy-preview-netlify.js
     depends_on:
@@ -191,22 +190,21 @@ steps:
 #      endpoint: https://s3.fr-par.scw.cloud
 #      region: fr-par
 #      path_style: true
-#      cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
+#      cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
 #      mount:
-#        - .cache
+#        - '.cache'
 
   - name: build
-    image: node:18-alpine
+    image: node:16
     pull: true
     group: build-static
     environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
+      YARN_CACHE_FOLDER: .cache/yarn/
     commands:
-      - corepack enable && pnpm config set store-dir .cache/.pnp
-      - pnpm install --fetch-timeout 100000
-      - pnpm run lint
+      - yarn --frozen-lockfile --network-timeout 100000
+      - yarn run lint
       - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json"
-      - pnpm run build
+      - yarn run build
       - sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing
 #    depends_on:
 #      - restore-cache
@@ -267,22 +265,21 @@ steps:
 #      endpoint: https://s3.fr-par.scw.cloud
 #      region: fr-par
 #      path_style: true
-#      cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
+#      cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
 #      mount:
-#        - .cache
+#        - '.cache'
 
   - name: build
-    image: node:18-alpine
+    image: node:16
     pull: true
     group: build-static
     environment:
-      PNPM_CACHE_FOLDER: .cache/pnpm
+      YARN_CACHE_FOLDER: .cache/yarn/
     commands:
-      - corepack enable && pnpm config set store-dir .cache/pnpm
-      - pnpm install --fetch-timeout 100000
-      - pnpm run lint
+      - yarn --frozen-lockfile --network-timeout 100000
+      - yarn run lint
       - "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json"
-      - pnpm run build
+      - yarn run build
       - sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing
 #    depends_on:
 #      - restore-cache
@@ -659,6 +656,6 @@ steps:
         from_secret: crowdin_key
 ---
 kind: signature
-hmac: c885a0e50db729842402494aa645dd3ac662828b691108550f6bf302158295ba
+hmac: 188ee90100c5fc5922a445e531e7a47453121edddb2a64a182eb23ed2bf602de
 
 ...

.envrc

@@ -1 +0,0 @@
-use flake

.eslintrc.cjs

@@ -1,54 +0,0 @@
-/* eslint-env node */
-require("@rushstack/eslint-patch/modern-module-resolution")
-
-module.exports = {
-	'root': true,
-	'env': {
-		'browser': true,
-		'es2021': true,
-		'node': true,
-		'vue/setup-compiler-macros': true,
-	},
-	'extends': [
-		'eslint:recommended',
-		'plugin:vue/vue3-essential',
-		'@vue/eslint-config-typescript/recommended',
-	],
-	'rules': {
-		'vue/html-quotes': [
-			'error',
-			'double',
-		],
-		'quotes': [
-			'error',
-			'single',
-		],
-		'comma-dangle': [
-			'error',
-			'always-multiline',
-		],
-		'semi': [
-			'error',
-			'never',
-		],
-
-		// see https://segmentfault.com/q/1010000040813116/a-1020000041134455 (original in chinese)
-		'no-unused-vars': 'off',
-		'@typescript-eslint/no-unused-vars': ['error', { vars: 'all', args: 'after-used', ignoreRestSiblings: true }],
-
-		'vue/multi-word-component-names': 0,
-	},
-	'parser': 'vue-eslint-parser',
-	'parserOptions': {
-		'parser': '@typescript-eslint/parser',
-		'ecmaVersion': 2022,
-		'sourceType': 'module',
-	},
-	'ignorePatterns': [
-		'*.test.*',
-		'cypress/*',
-	],
-	'globals': {
-		'defineProps': 'readonly',
-	},
-}

.gitea/issue_template.md

@@ -1,44 +0,0 @@
-<!--
-
-Please fill out this issue template to report a bug.
-If you want to propose a new feature, please open a discussion thread in the forum: https://community.vikunja.io
-
--->
-
-**Version information:**
-
-Frontend Version:
-API Version: 
-Browser and OS Version:
-
-**Steps to reproduce:**
-
-<!--
-Add clear steps to reproduce the bug. Provide screenshots where applicable.
--->
-
-1. 
-2.
-...
-
-**Expected behavior:**
-
-<!--
-Describe what happened.
--->
-
-
-
-**Actual behavior:**
-
-<!--
-Describe what happened instead.
--->
-
-
-
-**Checklist:**
-
-* [ ] I have provided all required information
-* [ ] I am using the latest release or the latest unstable build
-* [ ] I was able to reproduce the bug on [try](https://try.vikunja.io)

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,58 +0,0 @@
-name: Bug Report
-description: Found something you weren't expecting? Report it here!
-labels: kind/bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        NOTE: If your issue is a security concern, please send an email to security@vikunja.io instead of opening a public issue.
-  - type: markdown
-    attributes:
-      value: |
-        Please fill out this issue template to report a bug.
-        
-        1. If you want to propose a new feature, please open a discussion thread in the forum: https://community.vikunja.io
-        2. Please ask questions or configuration/deploy problems on our [Matrix Room](https://matrix.to/#/#vikunja:matrix.org) or forum (https://community.vikunja.io).
-        3. Make sure you are using the latest release and
-           take a moment to check that your issue hasn't been reported before.
-        4. Please give all relevant information below for bug reports, because
-           incomplete details will be handled as an invalid report and closed.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Please provide a description of your issue here, with a URL if you were able to reproduce the issue (see below).
-  - type: input
-    id: frontend-version
-    attributes:
-      label: Vikunja Frontend Version
-      description: Vikunja frontend version (or commit reference) of your instance
-    validations:
-      required: true
-  - type: input
-    id: api-version
-    attributes:
-      label: Vikunja API Version
-      description: Vikunja API version (or commit reference) of your instance
-    validations:
-      required: true
-  - type: input
-    id: browser-version
-    attributes:
-      label: Browser and version
-      description: If your issue is related to a frontend problem, please provide the browser and version you used to reproduce it.
-  - type: dropdown
-    id: can-reproduce
-    attributes:
-      label: Can you reproduce the bug on the Vikunja demo site?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: If this issue involves the Web Interface, please provide one or more screenshots

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: API issues
-    url: https://code.vikunja.io/api/issues
-    about: This is the frontend repo. Please open api-related bug reports and discussions in the api 0repo. Not sure if your issue is frontend or api? Ask in Matrix or the forum first.
-  - name: Forum
-    url: https://community.vikunja.io/
-    about: Feature Requests, Questions, configuration or deployment problems should be discussed in the forum.
-  - name: Security-related issues
-    url: https://vikunja.io/contact/#security
-    about: For security concerns, please send a mail to security@vikunja.io instead of opening a public issue.
-  - name: Chat on Matrix
-    url: https://matrix.to/#/#vikunja:matrix.org
-    about: Please ask any quick questions here.
-  - name: Translations
-    url: https://crowdin.com/project/vikunja
-    about: Any problems or requests for new languages about translations should be handled in crowdin.

.gitignore

@@ -2,21 +2,16 @@
 node_modules
 /dist*
 *.zip
-.direnv/
 
 # local env files
 .env.local
 .env.*.local
 
 # Log files
-logs
-*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 stats.html
-pnpm-debug.log*
-lerna-debug.log*
 
 # Editor directories and files
 .idea

.npmrc

@@ -1,2 +0,0 @@
-auto-install-peers=true
-fetch-timeout=100000

.nvmrc

@@ -1 +1 @@
-v18
+v16

.vscode.example/extensions.json

@@ -3,8 +3,7 @@
     "codezombiech.gitignore",
     "dbaeumer.vscode-eslint",
     "editorconfig.editorconfig",
-    "vue.volar",
-    "vue.vscode-typescript-vue-plugin",
+    "johnsoncodehk.volar",
     "lokalise.i18n-ally",
     "mgmcdermott.vscode-language-babel",
     "mikestead.dotenv",

.vscode.example/settings.json

@@ -1,5 +1,5 @@
 {
-  "eslint.packageManager": "pnpm",
+  "eslint.packageManager": "yarn",
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
     "source.fixAll": true
@@ -18,11 +18,13 @@
     "javascriptreact",
     "vue"
   ],
+  "vetur.validation.template": false,
+
   // i18n ally
   "i18n-ally.localesPaths": [
     "src/i18n/lang"
   ],
   "i18n-ally.sortKeys": true,
   "i18n-ally.keepFulfilled": true,
-  "i18n-ally.keystyle": "nested"
+  "i18n-ally.keystyle": "nested",
 }

Dockerfile

@@ -1,32 +1,28 @@
 # Stage 1: Build application
-FROM node:18-alpine AS compile-image
+FROM node:16 AS compile-image
 
 WORKDIR /build
 
 ARG USE_RELEASE=false
 ARG RELEASE_VERSION=main
 
-ENV PNPM_CACHE_FOLDER .cache/pnpm/
-ADD .  ./
+ENV YARN_CACHE_FOLDER .cache/yarn/
+COPY .  ./
 
 RUN \
   if [ $USE_RELEASE = true ]; then \
+    rm -rf dist/ && \
     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 && \
+  yarn install --frozen-lockfile --network-timeout 100000 && \
   echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \
-  pnpm run build
+  yarn run build
 
 # Stage 2: copy 
-FROM nginx:alpine
+FROM nginx
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY run.sh /run.sh
@@ -40,10 +36,4 @@ ENV PGID 1000
 
 LABEL maintainer="maintainers@vikunja.io"
 
-RUN apk add --no-cache \
-  # for sh file
-	bash \
-	# installs usermod and groupmod
-	shadow
-
 CMD "/run.sh"

README.md

@@ -4,7 +4,7 @@
 
 [![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)
-[![Download](https://img.shields.io/badge/download-v0.19.1-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.18.2-brightgreen.svg)](https://dl.vikunja.io)
 [![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja)
 
 This is the web frontend for Vikunja, written in Vue.js.
@@ -22,27 +22,23 @@ There is a [docker image available](https://hub.docker.com/r/vikunja/api) with s
 ## Project setup
 
 ```shell
-pnpm install
+yarn install
 ```
 
 ### Compiles and hot-reloads for development
 
 ```shell
-pnpm run serve
+yarn run serve
 ```
 
 ### Compiles and minifies for production
 
 ```shell
-pnpm run build
+yarn run build
 ```
 
 ### Lints and fixes files
 
 ```shell
-pnpm run lint
+yarn run lint
 ```
-
-## Sponsors
-
-[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)

cliff.toml

@@ -1,59 +0,0 @@
-[changelog]
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}\
-    ## [unreleased]
-{% endif %}\
-
-
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits
-    | filter(attribute="scope")
-    | sort(attribute="scope") %}
-        * *({{commit.scope}})* {{ commit.message | upper_first }}
-        {%- if commit.breaking %}
-        {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
-        {%- endif -%}
-    {%- endfor -%}
-    {%- for commit in commits %}
-        {%- if commit.scope -%}
-        {% else -%}
-            * {{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }}))
-            {% if commit.breaking -%}
-            {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
-            {% endif -%}
-        {% endif -%}
-    {% endfor -%}
-    {% raw %}\n{% endraw %}\
-{% endfor %}\n
-
-"""
-#{% for group, commits in commits | group_by(attribute="group") %}
-#    ### {{ group | upper_first }}
-#    {% for commit in commits %}\
-#        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }}))
-#    {% endfor %}\
-#{% endfor %}\n
-# remove the leading and trailing whitespace from the template
-trim = true
-
-[git]
-conventional_commits = true
-filter_unconventional = false
-commit_parsers = [
-    { message = ".*(deps).*", group = "Dependencies"},
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^refactor", group = "Refactor"},
-    { message = "^style", group = "Styling"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-    { message = ".*", group = "Other", default_scope = "other"}, # Everything that's not a conventional commit goes into the "Other" category
-]
-

cypress.config.ts

@@ -1,25 +0,0 @@
-import {defineConfig} from 'cypress'
-
-export default defineConfig({
-	env: {
-		API_URL: 'http://localhost:3456/api/v1',
-		TEST_SECRET: 'averyLongSecretToSe33dtheDB',
-	},
-	video: false,
-	retries: {
-		runMode: 2,
-	},
-	projectId: '181c7x',
-	e2e: {
-		baseUrl: 'http://localhost:4173',
-		specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
-	},
-	component: {
-		devServer: {
-			framework: 'vue',
-			bundler: 'vite',
-		},
-	},
-	viewportWidth: 1600,
-	viewportHeight: 900,
-})

cypress.json

@@ -0,0 +1,11 @@
+{
+  "baseUrl": "http://localhost:5000",
+  "env": {
+    "API_URL": "http://localhost:3456/api/v1",
+    "TEST_SECRET": "averyLongSecretToSe33dtheDB"
+  },
+  "video": false,
+  "retries": {
+    "runMode": 2
+  }
+}

cypress/README.md

@@ -36,7 +36,7 @@ to get a shell inside the cypress container.
 In that shell you can then execute the tests with
 
 ```shell
-pnpm run test:frontend
+yarn test:frontend
 ```
 
 ### Using The Cypress Dashboard
@@ -44,5 +44,5 @@ pnpm run test:frontend
 To open the Cypress Dashboard and run tests from there, run
 
 ```shell
-pnpm run cypress:open
+yarn cypress:open
 ```

cypress/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     ports:
       - 3456:3456
   cypress:
-    image: cypress/browsers:node16.14.0-chrome99-ff97
+    image: cypress/browsers:node12.18.3-chrome87-ff82
     volumes:
     - ..:/project
     - $HOME/.cache:/home/node/.cache/

cypress/e2e/list/list-history.spec.ts

@@ -1,56 +0,0 @@
-import {ListFactory} from '../../factories/list'
-
-import '../../support/authenticateUser'
-import {prepareLists} from './prepareLists'
-
-describe('List History', () => {
-	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('.list-cards-wrapper-2-rows')
-			.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)
-	})
-})

cypress/e2e/list/list-view-gantt.spec.ts

@@ -1,78 +0,0 @@
-import {formatISO, format} from 'date-fns'
-import {TaskFactory} from '../../factories/task'
-import {prepareLists} from './prepareLists'
-
-import '../../support/authenticateUser'
-
-describe('List View Gantt', () => {
-	prepareLists()
-
-	it('Hides tasks with no dates', () => {
-		const tasks = TaskFactory.create(1)
-		cy.visit('/lists/1/gantt')
-
-		cy.get('.gantt-chart .tasks')
-			.should('not.contain', tasks[0].title)
-	})
-
-	it('Shows tasks from the current and next month', () => {
-		const now = Date.UTC(2022, 8, 25)
-		cy.clock(now, ['Date'])
-
-		const nextMonth = new Date(now)
-		nextMonth.setDate(1)
-		nextMonth.setMonth(9)
-
-		cy.visit('/lists/1/gantt')
-
-		cy.get('.gantt-chart .months')
-			.should('contain', format(now, 'MMMM'))
-			.should('contain', format(nextMonth, 'MMMM'))
-	})
-
-	it('Shows tasks with dates', () => {
-		const now = new Date()
-		const tasks = TaskFactory.create(1, {
-			start_date: formatISO(now),
-			end_date: formatISO(now.setDate(now.getDate() + 4)),
-		})
-		cy.visit('/lists/1/gantt')
-
-		cy.get('.gantt-chart .tasks')
-			.should('not.be.empty')
-		cy.get('.gantt-chart .tasks')
-			.should('contain', tasks[0].title)
-	})
-
-	it('Shows tasks with no dates after enabling them', () => {
-		TaskFactory.create(1, {
-			start_date: null,
-			end_date: null,
-		})
-		cy.visit('/lists/1/gantt')
-
-		cy.get('.gantt-options .fancycheckbox')
-			.contains('Show tasks which don\'t have dates set')
-			.click()
-
-		cy.get('.gantt-chart .tasks')
-			.should('not.be.empty')
-		cy.get('.gantt-chart .tasks .task.nodate')
-			.should('exist')
-	})
-
-	it('Drags a task around', () => {
-		const now = new Date()
-		TaskFactory.create(1, {
-			start_date: formatISO(now),
-			end_date: formatISO(now.setDate(now.getDate() + 4)),
-		})
-		cy.visit('/lists/1/gantt')
-
-		cy.get('.gantt-chart .tasks .task')
-			.first()
-			.trigger('mousedown', {which: 1})
-			.trigger('mousemove', {clientX: 500, clientY: 0})
-			.trigger('mouseup', {force: true})
-	})
-})

cypress/e2e/list/list-view-kanban.spec.ts

@@ -1,196 +0,0 @@
-import {BucketFactory} from '../../factories/bucket'
-import {ListFactory} from '../../factories/list'
-import {TaskFactory} from '../../factories/task'
-import {prepareLists} from './prepareLists'
-
-import '../../support/authenticateUser'
-
-describe('List View Kanban', () => {
-	let buckets
-	prepareLists()
-
-	beforeEach(() => {
-		buckets = BucketFactory.create(2)
-	})
-
-	it('Shows all buckets with their tasks', () => {
-		const data = TaskFactory.create(10, {
-			list_id: 1,
-			bucket_id: 1,
-		})
-		cy.visit('/lists/1/kanban')
-
-		cy.get('.kanban .bucket .title')
-			.contains(buckets[0].title)
-			.should('exist')
-		cy.get('.kanban .bucket .title')
-			.contains(buckets[1].title)
-			.should('exist')
-		cy.get('.kanban .bucket')
-			.first()
-			.should('contain', data[0].title)
-	})
-
-	it('Can add a new task to a bucket', () => {
-		TaskFactory.create(2, {
-			list_id: 1,
-			bucket_id: 1,
-		})
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket')
-			.contains(buckets[0].title)
-			.get('.bucket-footer .button')
-			.contains('Add another task')
-			.click()
-		cy.get('.kanban .bucket')
-			.contains(buckets[0].title)
-			.get('.bucket-footer .field .control input.input')
-			.type('New Task{enter}')
-
-		cy.get('.kanban .bucket')
-			.first()
-			.should('contain', 'New Task')
-	})
-
-	it('Can create a new bucket', () => {
-		cy.visit('/lists/1/kanban')
-
-		cy.get('.kanban .bucket.new-bucket .button')
-			.click()
-		cy.get('.kanban .bucket.new-bucket input.input')
-			.type('New Bucket{enter}')
-
-		cy.wait(1000) // Wait for the request to finish
-		cy.get('.kanban .bucket .title')
-			.contains('New Bucket')
-			.should('exist')
-	})
-
-	it('Can set a bucket limit', () => {
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
-			.first()
-			.click()
-		cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item')
-			.contains('Limit: Not Set')
-			.click()
-		cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item .field input.input')
-			.first()
-			.type(3)
-		cy.get('[data-cy="setBucketLimit"]')
-			.first()
-			.click()
-
-		cy.get('.kanban .bucket .bucket-header span.limit')
-			.contains('0/3')
-			.should('exist')
-	})
-
-	it('Can rename a bucket', () => {
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .bucket-header .title')
-			.first()
-			.type('{selectall}New Bucket Title{enter}')
-		cy.get('.kanban .bucket .bucket-header .title')
-			.first()
-			.should('contain', 'New Bucket Title')
-	})
-
-	it('Can delete a bucket', () => {
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
-			.first()
-			.click()
-		cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item')
-			.contains('Delete')
-			.click()
-		cy.get('.modal-mask .modal-container .modal-content .header')
-			.should('contain', 'Delete the bucket')
-		cy.get('.modal-mask .modal-container .modal-content .actions .button')
-			.contains('Do it!')
-			.click()
-
-		cy.get('.kanban .bucket .title')
-			.contains(buckets[0].title)
-			.should('not.exist')
-		cy.get('.kanban .bucket .title')
-			.contains(buckets[1].title)
-			.should('exist')
-	})
-
-	it('Can drag tasks around', () => {
-		const tasks = TaskFactory.create(2, {
-			list_id: 1,
-			bucket_id: 1,
-		})
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .tasks .task')
-			.contains(tasks[0].title)
-			.first()
-			.drag('.kanban .bucket:nth-child(2) .tasks')
-		
-		cy.get('.kanban .bucket:nth-child(2) .tasks')
-			.should('contain', tasks[0].title)
-		cy.get('.kanban .bucket:nth-child(1) .tasks')
-			.should('not.contain', tasks[0].title)
-	})
-
-	it('Should navigate to the task when the task card is clicked', () => {
-		const tasks = TaskFactory.create(5, {
-			id: '{increment}',
-			list_id: 1,
-			bucket_id: 1,
-		})
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .tasks .task')
-			.contains(tasks[0].title)
-			.should('be.visible')
-			.click()
-
-		cy.url()
-			.should('contain', `/tasks/${tasks[0].id}`, { timeout: 1000 })
-	})
-
-	it('Should remove a task from the kanban board when moving it to another list', () => {
-		const lists = ListFactory.create(2)
-		BucketFactory.create(2, {
-			list_id: '{increment}',
-		})
-		const tasks = TaskFactory.create(5, {
-			id: '{increment}',
-			list_id: 1,
-			bucket_id: 1,
-		})
-		const task = tasks[0]
-		cy.visit('/lists/1/kanban')
-
-		cy.getSettled('.kanban .bucket .tasks .task')
-			.contains(task.title)
-			.should('be.visible')
-			.click()
-
-		cy.get('.task-view .action-buttons .button', { timeout: 3000 })
-			.contains('Move')
-			.click()
-		cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
-			.type(`${lists[1].title}{enter}`)
-		// 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.
-		cy.get('.task-view .content.details .field .multiselect.control .search-results')
-			.children()
-			.first()
-			.click()
-
-		cy.get('.global-notification', { timeout: 1000 })
-			.should('contain', 'Success')
-		cy.go('back')
-		cy.get('.kanban .bucket')
-			.should('not.contain', task.title)
-	})
-})

cypress/e2e/list/list-view-list.spec.ts

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

cypress/e2e/list/list-view-table.spec.ts

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

cypress/e2e/list/list.spec.ts

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

cypress/e2e/list/prepareLists.ts

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

cypress/e2e/task/overview.spec.ts

@@ -1,131 +0,0 @@
-import {ListFactory} from '../../factories/list'
-import {seed} from '../../support/seed'
-import {TaskFactory} from '../../factories/task'
-import {formatISO} from 'date-fns'
-import {UserFactory} from '../../factories/user'
-import {NamespaceFactory} from '../../factories/namespace'
-import {BucketFactory} from '../../factories/bucket'
-import {updateUserSettings} from '../../support/updateUserSettings'
-
-import '../../support/authenticateUser'
-
-function seedTasks(numberOfTasks = 100, startDueDate = new Date()) {
-	UserFactory.create(1)
-	NamespaceFactory.create(1)
-	const list = ListFactory.create()[0]
-	BucketFactory.create(1, {
-		list_id: list.id,
-	})
-	const tasks = []
-	let dueDate = startDueDate
-	for (let i = 0; i < numberOfTasks; i++) {
-		const now = new Date()
-		dueDate = (new Date(dueDate.valueOf())).setDate((new Date(dueDate.valueOf())).getDate() + 2)
-		tasks.push({
-			id: i + 1,
-			list_id: list.id,
-			done: false,
-			created_by_id: 1,
-			title: 'Test Task ' + i,
-			index: i + 1,
-			due_date: formatISO(dueDate),
-			created: formatISO(now),
-			updated: formatISO(now),
-		})
-	}
-	seed(TaskFactory.table, tasks)
-	return {tasks, list}
-}
-
-describe('Home Page Task Overview', () => {
-	it('Should show tasks with a near due date first on the home page overview', () => {
-		const {tasks} = seedTasks()
-
-		cy.visit('/')
-		cy.get('[data-cy="showTasks"] .card .task')
-			.each(([task], index) => {
-				expect(task.innerText).to.contain(tasks[index].title)
-			})
-	})
-
-	it('Should show overdue tasks first, then show other tasks', () => {
-		const oldDate = (new Date()).setDate((new Date()).getDate() - 14)
-		const {tasks} = seedTasks(100, oldDate)
-
-		cy.visit('/')
-		cy.get('[data-cy="showTasks"] .card .task')
-			.each(([task], index) => {
-				expect(task.innerText).to.contain(tasks[index].title)
-			})
-	})
-
-	it('Should show a new task with a very soon due date at the top', () => {
-		const {tasks} = seedTasks()
-		const newTaskTitle = 'New Task'
-		
-		cy.visit('/')
-		
-		TaskFactory.create(1, {
-			id: 999,
-			title: newTaskTitle,
-			due_date: formatISO(new Date()),
-		}, false)
-		
-		cy.visit(`/lists/${tasks[0].list_id}/list`)
-		cy.get('.tasks .task')
-			.first()
-			.should('contain.text', newTaskTitle)
-		cy.visit('/')
-		cy.get('[data-cy="showTasks"] .card .task')
-			.first()
-			.should('contain.text', newTaskTitle)
-	})
-	
-	it('Should not show a new task without a date at the bottom when there are > 50 tasks', () => {
-		// We're not using the api here to create the task in order to verify the flow
-		const {tasks} = seedTasks()
-		const newTaskTitle = 'New Task'
-
-		cy.visit('/')
-
-		cy.visit(`/lists/${tasks[0].list_id}/list`)
-		cy.get('.task-add textarea')
-			.type(newTaskTitle+'{enter}')
-		cy.visit('/')
-		cy.get('[data-cy="showTasks"] .card .task')
-			.last()
-			.should('not.contain.text', newTaskTitle)
-	})
-	
-	it('Should show a new task without a date at the bottom when there are < 50 tasks', () => {
-		seedTasks(40)
-		const newTaskTitle = 'New Task'
-		TaskFactory.create(1, {
-			id: 999,
-			title: newTaskTitle,
-		}, false)
-
-		cy.visit('/')
-		cy.get('[data-cy="showTasks"] .card .task')
-			.last()
-			.should('contain.text', newTaskTitle)
-	})
-	
-	it('Should show a task without a due date added via default list at the bottom', () => {
-		const {list} = seedTasks(40)
-		updateUserSettings({
-			default_list_id: list.id,
-			overdue_tasks_reminders_time: '9:00',
-		})
-		
-		const newTaskTitle = 'New Task'
-		cy.visit('/')
-		
-		cy.get('.add-task-textarea')
-			.type(`${newTaskTitle}{enter}`)
-		
-		cy.get('[data-cy="showTasks"] .card .task')
-			.last()
-			.should('contain.text', newTaskTitle)
-	})
-})

cypress/e2e/user/logout.spec.ts

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

cypress/factories/bucket.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 import {Factory} from '../support/factory'
 import {formatISO} from 'date-fns'
 

cypress/factories/labels.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 
 import {Factory} from '../support/factory'
 import {formatISO} from 'date-fns'

cypress/factories/link_sharing.js

@@ -1,6 +1,6 @@
 import {Factory} from '../support/factory'
 import {formatISO} from "date-fns"
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 
 export class LinkShareFactory extends Factory {
 	static table = 'link_shares'

cypress/factories/list.js

@@ -1,6 +1,6 @@
 import {Factory} from '../support/factory'
 import {formatISO} from "date-fns"
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 
 export class ListFactory extends Factory {
 	static table = 'lists'

cypress/factories/namespace.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 import {Factory} from '../support/factory'
 import {formatISO} from 'date-fns'
 

cypress/factories/task.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 import {Factory} from '../support/factory'
 import {formatISO} from 'date-fns'
 
@@ -15,7 +15,6 @@ export class TaskFactory extends Factory {
 			list_id: 1,
 			created_by_id: 1,
 			index: '{increment}',
-			position: '{increment}',
 			created: formatISO(now),
 			updated: formatISO(now)
 		}

cypress/factories/task_attachments.ts

@@ -1,17 +0,0 @@
-import {Factory} from '../support/factory'
-import {formatISO} from 'date-fns'
-
-export class TaskAttachmentFactory extends Factory {
-	static table = 'task_attachments'
-	
-	static factory() {
-		const now = new Date()
-
-		return {
-			id: '{increment}',
-			task_id: 1,
-			file_id: 1,
-			created: formatISO(now),
-		}
-	}
-}

cypress/factories/task_comment.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 
 import {Factory} from '../support/factory'
 import {formatISO} from "date-fns"

cypress/factories/team.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 import {Factory} from '../support/factory'
 import {formatISO} from 'date-fns'
 

cypress/factories/user.js

@@ -1,4 +1,4 @@
-import {faker} from '@faker-js/faker'
+import faker from 'faker'
 
 import {Factory} from '../support/factory'
 import {formatISO} from "date-fns"
@@ -14,7 +14,6 @@ export class UserFactory extends Factory {
             username: faker.lorem.word(10) + faker.datatype.uuid(),
             password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.', // 1234
 			status: 0,
-			issuer: 'local',
 			created: formatISO(now),
 			updated: formatISO(now)
 		}

cypress/integration/list/list.spec.js

@@ -0,0 +1,540 @@
+import {formatISO, format} from 'date-fns'
+
+import {TaskFactory} from '../../factories/task'
+import {ListFactory} from '../../factories/list'
+import {UserListFactory} from '../../factories/users_list'
+import {UserFactory} from '../../factories/user'
+import {NamespaceFactory} from '../../factories/namespace'
+import {BucketFactory} from '../../factories/bucket'
+
+import '../../support/authenticateUser'
+
+describe('Lists', () => {
+	let lists
+
+	beforeEach(() => {
+		UserFactory.create(1)
+		NamespaceFactory.create(1)
+		lists = ListFactory.create(1, {
+			title: 'First List'
+		})
+		TaskFactory.truncate()
+	})
+
+	it('Should create a new list', () => {
+		cy.visit('/')
+		cy.get('.namespace-title .dropdown-trigger')
+			.click()
+		cy.get('.namespace-title .dropdown .dropdown-item')
+			.contains('New list')
+			.click()
+		cy.url()
+			.should('contain', '/namespaces/1/list')
+		cy.get('.card-header-title')
+			.contains('New list')
+		cy.get('input.input')
+			.type('New List')
+		cy.get('.button')
+			.contains('Create')
+			.click()
+
+		cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new list is done
+			.should('contain', 'Success')
+		cy.url()
+			.should('contain', '/lists/')
+		cy.get('.list-title h1')
+			.should('contain', 'New List')
+	})
+
+	it('Should redirect to a specific list view after visited', () => {
+		cy.visit('/lists/1/kanban')
+		cy.url()
+			.should('contain', '/lists/1/kanban')
+		cy.visit('/lists/1')
+		cy.url()
+			.should('contain', '/lists/1/kanban')
+	})
+
+	it('Should rename the list in all places', () => {
+		const tasks = TaskFactory.create(5, {
+			id: '{increment}',
+			list_id: 1,
+		})
+		const newListName = 'New list name'
+
+		cy.visit('/lists/1')
+		cy.get('.list-title h1')
+			.should('contain', 'First List')
+
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list li:first-child .dropdown .dropdown-trigger')
+			.click()
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list li:first-child .dropdown .dropdown-content')
+			.contains('Edit')
+			.click()
+		cy.get('#title')
+			.type(`{selectall}${newListName}`)
+		cy.get('footer.modal-card-foot .button')
+			.contains('Save')
+			.click()
+
+		cy.get('.global-notification')
+			.should('contain', 'Success')
+		cy.get('.list-title h1')
+			.should('contain', newListName)
+			.should('not.contain', lists[0].title)
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list li:first-child')
+			.should('contain', newListName)
+			.should('not.contain', lists[0].title)
+		cy.visit('/')
+		cy.get('.card-content .tasks')
+			.should('contain', newListName)
+			.should('not.contain', lists[0].title)
+	})
+
+	it('Should remove a list', () => {
+		cy.visit(`/lists/${lists[0].id}`)
+
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list li:first-child .dropdown .dropdown-trigger')
+			.click()
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list li:first-child .dropdown .dropdown-content')
+			.contains('Delete')
+			.click()
+		cy.url()
+			.should('contain', '/settings/delete')
+		cy.get('[data-cy="modalPrimary"]')
+			.contains('Do it')
+			.click()
+
+		cy.get('.global-notification')
+			.should('contain', 'Success')
+		cy.get('.namespace-container .menu.namespaces-lists .more-container .menu-list')
+			.should('not.contain', lists[0].title)
+		cy.location('pathname')
+			.should('equal', '/')
+	})
+
+	describe('List View', () => {
+		it('Should be an empty list', () => {
+			cy.visit('/lists/1')
+			cy.url()
+				.should('contain', '/lists/1/list')
+			cy.get('.list-title h1')
+				.should('contain', 'First List')
+			cy.get('.list-title .dropdown')
+				.should('exist')
+			cy.get('p')
+				.contains('This list is currently empty.')
+				.should('exist')
+		})
+
+		it('Should navigate to the task when the title is clicked', () => {
+			const tasks = TaskFactory.create(5, {
+				id: '{increment}',
+				list_id: 1,
+			})
+			cy.visit('/lists/1/list')
+
+			cy.get('.tasks .task .tasktext')
+				.contains(tasks[0].title)
+				.first()
+				.click()
+
+			cy.url()
+				.should('contain', `/tasks/${tasks[0].id}`)
+		})
+
+		it('Should not see any elements for a list which is shared read only', () => {
+			UserFactory.create(2)
+			UserListFactory.create(1, {
+				list_id: 2,
+				user_id: 1,
+				right: 0,
+			})
+			const lists = ListFactory.create(2, {
+				owner_id: '{increment}',
+				namespace_id: '{increment}',
+			})
+			cy.visit(`/lists/${lists[1].id}/`)
+
+			cy.get('.list-title a.icon')
+				.should('not.exist')
+			cy.get('input.input[placeholder="Add a new task..."')
+				.should('not.exist')
+		})
+
+		it('Should only show the color of a list in the navigation and not in the list view', () => {
+			const lists = ListFactory.create(1, {
+				hex_color: '00db60',
+			})
+			TaskFactory.create(10, {
+				list_id: lists[0].id,
+			})
+			cy.visit(`/lists/${lists[0].id}/`)
+
+			cy.get('.menu-list li .list-menu-link .color-bubble')
+				.should('have.css', 'background-color', 'rgb(0, 219, 96)')
+			cy.get('.tasks-container .tasks .color-bubble')
+				.should('not.exist')
+		})
+
+		it('Should paginate for > 50 tasks', () => {
+			const tasks = TaskFactory.create(100, {
+				id: '{increment}',
+				title: i => `task${i}`,
+				list_id: 1,
+			})
+			cy.visit('/lists/1/list')
+
+			cy.get('.tasks-container .tasks')
+				.should('contain', tasks[99].title)
+
+			cy.get('.card-content .pagination .pagination-link')
+				.contains('2')
+				.click()
+
+			cy.url()
+				.should('contain', '?page=2')
+			cy.get('.tasks-container .tasks')
+				.should('contain', tasks[1].title)
+			cy.get('.tasks-container .tasks')
+				.should('not.contain', tasks[99].title)
+		})
+	})
+
+	describe('Table View', () => {
+		it('Should show a table with tasks', () => {
+			const tasks = TaskFactory.create(1)
+			cy.visit('/lists/1/table')
+
+			cy.get('.table-view table.table')
+				.should('exist')
+			cy.get('.table-view table.table')
+				.should('contain', tasks[0].title)
+		})
+
+		it('Should have working column switches', () => {
+			TaskFactory.create(1)
+			cy.visit('/lists/1/table')
+
+			cy.get('.table-view .filter-container .items .button')
+				.contains('Columns')
+				.click()
+			cy.get('.table-view .filter-container .card.columns-filter .card-content .fancycheckbox .check')
+				.contains('Priority')
+				.click()
+			cy.get('.table-view .filter-container .card.columns-filter .card-content .fancycheckbox .check')
+				.contains('Done')
+				.click()
+
+			cy.get('.table-view table.table th')
+				.contains('Priority')
+				.should('exist')
+			cy.get('.table-view table.table th')
+				.contains('Done')
+				.should('not.exist')
+		})
+
+		it('Should navigate to the task when the title is clicked', () => {
+			const tasks = TaskFactory.create(5, {
+				id: '{increment}',
+				list_id: 1,
+			})
+			cy.visit('/lists/1/table')
+
+			cy.get('.table-view table.table')
+				.contains(tasks[0].title)
+				.click()
+
+			cy.url()
+				.should('contain', `/tasks/${tasks[0].id}`)
+		})
+	})
+
+	describe('Gantt View', () => {
+		it('Hides tasks with no dates', () => {
+			const tasks = TaskFactory.create(1)
+			cy.visit('/lists/1/gantt')
+
+			cy.get('.gantt-chart-container .gantt-chart .tasks')
+				.should('not.contain', tasks[0].title)
+		})
+
+		it('Shows tasks from the current and next month', () => {
+			const now = new Date()
+			const nextMonth = now
+			nextMonth.setDate(1)
+			nextMonth.setMonth(now.getMonth() + 1)
+
+			cy.visit('/lists/1/gantt')
+
+			cy.get('.gantt-chart-container .gantt-chart .months')
+				.should('contain', format(now, 'MMMM'))
+				.should('contain', format(nextMonth, 'MMMM'))
+		})
+
+		it('Shows tasks with dates', () => {
+			const now = new Date()
+			const tasks = TaskFactory.create(1, {
+				start_date: formatISO(now),
+				end_date: formatISO(now.setDate(now.getDate() + 4))
+			})
+			cy.visit('/lists/1/gantt')
+
+			cy.get('.gantt-chart-container .gantt-chart .tasks')
+				.should('not.be.empty')
+			cy.get('.gantt-chart-container .gantt-chart .tasks')
+				.should('contain', tasks[0].title)
+		})
+
+		it('Shows tasks with no dates after enabling them', () => {
+			TaskFactory.create(1, {
+				start_date: null,
+				end_date: null,
+			})
+			cy.visit('/lists/1/gantt')
+
+			cy.get('.gantt-chart-container .gantt-options .fancycheckbox')
+				.contains('Show tasks which don\'t have dates set')
+				.click()
+
+			cy.get('.gantt-chart-container .gantt-chart .tasks')
+				.should('not.be.empty')
+			cy.get('.gantt-chart-container .gantt-chart .tasks .task.nodate')
+				.should('exist')
+		})
+
+		it('Drags a task around', () => {
+			const now = new Date()
+			TaskFactory.create(1, {
+				start_date: formatISO(now),
+				end_date: formatISO(now.setDate(now.getDate() + 4))
+			})
+			cy.visit('/lists/1/gantt')
+
+			cy.get('.gantt-chart-container .gantt-chart .tasks .task')
+				.first()
+				.trigger('mousedown', {which: 1})
+				.trigger('mousemove', {clientX: 500, clientY: 0})
+				.trigger('mouseup', {force: true})
+		})
+	})
+
+	describe('Kanban', () => {
+		let buckets
+
+		beforeEach(() => {
+			buckets = BucketFactory.create(2)
+		})
+
+		it('Shows all buckets with their tasks', () => {
+			const data = TaskFactory.create(10, {
+				list_id: 1,
+				bucket_id: 1,
+			})
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket .title')
+				.contains(buckets[0].title)
+				.should('exist')
+			cy.get('.kanban .bucket .title')
+				.contains(buckets[1].title)
+				.should('exist')
+			cy.get('.kanban .bucket')
+				.first()
+				.should('contain', data[0].title)
+		})
+
+		it('Can add a new task to a bucket', () => {
+			const data = TaskFactory.create(2, {
+				list_id: 1,
+				bucket_id: 1,
+			})
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket')
+				.contains(buckets[0].title)
+				.get('.bucket-footer .button')
+				.contains('Add another task')
+				.click()
+			cy.get('.kanban .bucket')
+				.contains(buckets[0].title)
+				.get('.bucket-footer .field .control input.input')
+				.type('New Task{enter}')
+
+			cy.get('.kanban .bucket')
+				.first()
+				.should('contain', 'New Task')
+		})
+
+		it('Can create a new bucket', () => {
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket.new-bucket .button')
+				.click()
+			cy.get('.kanban .bucket.new-bucket input.input')
+				.type('New Bucket{enter}')
+
+			cy.wait(1000) // Wait for the request to finish
+			cy.get('.kanban .bucket .title')
+				.contains('New Bucket')
+				.should('exist')
+		})
+
+		it('Can set a bucket limit', () => {
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
+				.first()
+				.click()
+			cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item')
+				.contains('Limit: Not Set')
+				.click()
+			cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item .field input.input')
+				.first()
+				.type(3)
+			cy.get('[data-cy="setBucketLimit"]')
+				.first()
+				.click()
+
+			cy.get('.kanban .bucket .bucket-header span.limit')
+				.contains('0/3')
+				.should('exist')
+		})
+
+		it('Can rename a bucket', () => {
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket .bucket-header .title')
+				.first()
+				.type('{selectall}New Bucket Title{enter}')
+			cy.get('.kanban .bucket .bucket-header .title')
+				.first()
+				.should('contain', 'New Bucket Title')
+		})
+
+		it('Can delete a bucket', () => {
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-trigger')
+				.first()
+				.click()
+			cy.get('.kanban .bucket .bucket-header .dropdown.options .dropdown-menu .dropdown-item')
+				.contains('Delete')
+				.click()
+			cy.get('.modal-mask .modal-container .modal-content .header')
+				.should('contain', 'Delete the bucket')
+			cy.get('.modal-mask .modal-container .modal-content .actions .button')
+				.contains('Do it!')
+				.click()
+
+			cy.get('.kanban .bucket .title')
+				.contains(buckets[0].title)
+				.should('not.exist')
+			cy.get('.kanban .bucket .title')
+				.contains(buckets[1].title)
+				.should('exist')
+		})
+
+		it('Can drag tasks around', () => {
+			const tasks = TaskFactory.create(2, {
+				list_id: 1,
+				bucket_id: 1,
+			})
+			cy.visit('/lists/1/kanban')
+
+			cy.get('.kanban .bucket .tasks .task')
+				.contains(tasks[0].title)
+				.first()
+				.drag('.kanban .bucket:nth-child(2) .tasks .dropper')
+			
+			cy.get('.kanban .bucket:nth-child(2) .tasks')
+				.should('contain', tasks[0].title)
+			cy.get('.kanban .bucket:nth-child(1) .tasks')
+				.should('not.contain', tasks[0].title)
+		})
+
+		it('Should navigate to the task when the task card is clicked', () => {
+			const tasks = TaskFactory.create(5, {
+				id: '{increment}',
+				list_id: 1,
+				bucket_id: 1,
+			})
+			cy.visit('/lists/1/kanban')
+
+			cy.getSettled('.kanban .bucket .tasks .task')
+				.contains(tasks[0].title)
+				.should('be.visible')
+				.click()
+
+			cy.url()
+				.should('contain', `/tasks/${tasks[0].id}`)
+		})
+
+		it('Should remove a task from the kanban board when moving it to another list', () => {
+			const lists = ListFactory.create(2)
+			BucketFactory.create(2, {
+				list_id: '{increment}',
+			})
+			const tasks = TaskFactory.create(5, {
+				id: '{increment}',
+				list_id: 1,
+				bucket_id: 1,
+			})
+			const task = tasks[0]
+			cy.visit('/lists/1/kanban')
+
+			cy.getSettled('.kanban .bucket .tasks .task')
+				.contains(task.title)
+				.should('be.visible')
+				.click()
+
+			cy.get('.task-view .action-buttons .button')
+				.contains('Move task')
+				.click()
+			cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
+				.type(`${lists[1].title}{enter}`)
+			// 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.
+			cy.get('.task-view .content.details .field .multiselect.control .search-results')
+				.children()
+				.first()
+				.click()
+
+			cy.get('.global-notification', { timeout: 1000 })
+				.should('contain', 'Success')
+			cy.go('back')
+			cy.get('.kanban .bucket')
+				.should('not.contain', task.title)
+		})
+	})
+
+	describe('List history', () => {
+		it('should show a list history on the home page', () => {
+			const lists = ListFactory.create(6)
+
+			cy.visit('/')
+			cy.get('h3')
+				.contains('Last viewed')
+				.should('not.exist')
+
+			cy.visit(`/lists/${lists[0].id}`)
+			cy.visit(`/lists/${lists[1].id}`)
+			cy.visit(`/lists/${lists[2].id}`)
+			cy.visit(`/lists/${lists[3].id}`)
+			cy.visit(`/lists/${lists[4].id}`)
+			cy.visit(`/lists/${lists[5].id}`)
+
+			cy.visit('/')
+			cy.get('h3')
+				.contains('Last viewed')
+				.should('exist')
+			cy.get('.list-cards-wrapper-2-rows')
+				.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)
+		})
+	})
+})

cypress/integration/list/namespaces.spec.js

@@ -63,7 +63,7 @@ describe('Namepaces', () => {
 			.should('equal', newNamespaces[0].title) // wait until the namespace data is loaded
 		cy.get('#namespacetext')
 			.type(`{selectall}${newNamespaceName}`)
-		cy.get('footer.card-footer .button')
+		cy.get('footer.modal-card-foot .button')
 			.contains('Save')
 			.click()
 

cypress/integration/task/task.spec.js

@@ -6,57 +6,21 @@ import {TaskCommentFactory} from '../../factories/task_comment'
 import {UserFactory} from '../../factories/user'
 import {NamespaceFactory} from '../../factories/namespace'
 import {UserListFactory} from '../../factories/users_list'
+
+import '../../support/authenticateUser'
 import {TaskAssigneeFactory} from '../../factories/task_assignee'
 import {LabelFactory} from '../../factories/labels'
 import {LabelTaskFactory} from '../../factories/label_task'
 import {BucketFactory} from '../../factories/bucket'
 
-import '../../support/authenticateUser'
-import {TaskAttachmentFactory} from '../../factories/task_attachments'
-
-function addLabelToTaskAndVerify(labelTitle: string) {
-	cy.get('.task-view .action-buttons .button')
-		.contains('Add Labels')
-		.click()
-	cy.get('.task-view .details.labels-list .multiselect input')
-		.type(labelTitle)
-	cy.get('.task-view .details.labels-list .multiselect .search-results')
-		.children()
-		.first()
-		.click()
-
-	cy.get('.global-notification', { timeout: 4000 })
-		.should('contain', 'Success')
-	cy.get('.task-view .details.labels-list .multiselect .input-wrapper span.tag')
-		.should('exist')
-		.should('contain', labelTitle)
-}
-
-function uploadAttachmentAndVerify(taskId: number) {
-	cy.intercept(`${Cypress.env('API_URL')}/tasks/${taskId}/attachments`).as('uploadAttachment')
-	cy.get('.task-view .action-buttons .button')
-		.contains('Add Attachments')
-		.click()
-	cy.get('input[type=file]', {timeout: 1000})
-		.selectFile('cypress/fixtures/image.jpg', {force: true}) // The input is not visible, but on purpose
-	cy.wait('@uploadAttachment')
-
-	cy.get('.attachments .attachments .files a.attachment')
-		.should('exist')
-}
-
 describe('Task', () => {
 	let namespaces
 	let lists
-	let buckets
 
 	beforeEach(() => {
 		UserFactory.create(1)
 		namespaces = NamespaceFactory.create(1)
 		lists = ListFactory.create(1)
-		buckets = BucketFactory.create(1, {
-			list_id: lists[0].id,
-		})
 		TaskFactory.truncate()
 		UserListFactory.truncate()
 	})
@@ -116,7 +80,6 @@ describe('Task', () => {
 	describe('Task Detail View', () => {
 		beforeEach(() => {
 			TaskCommentFactory.truncate()
-			LabelTaskFactory.truncate()
 		})
 
 		it('Shows all task details', () => {
@@ -153,7 +116,6 @@ describe('Task', () => {
 				.should('be.visible')
 				.should('contain', 'Done')
 			cy.get('.task-view .action-buttons p.created')
-				.scrollIntoView()
 				.should('be.visible')
 				.should('contain', 'Done')
 		})
@@ -166,7 +128,7 @@ describe('Task', () => {
 			cy.visit(`/tasks/${tasks[0].id}`)
 
 			cy.get('.task-view .action-buttons .button')
-				.contains('Mark task done!')
+				.contains('Done!')
 				.click()
 
 			cy.get('.task-view .heading .is-done')
@@ -202,7 +164,7 @@ describe('Task', () => {
 			})
 			cy.visit(`/tasks/${tasks[0].id}`)
 
-			cy.get('.task-view .details.content.description .editor button')
+			cy.get('.task-view .details.content.description .editor a')
 				.click()
 			cy.get('.task-view .details.content.description .editor .vue-easymde .EasyMDEContainer .CodeMirror-scroll')
 				.type('{selectall}New Description')
@@ -247,7 +209,7 @@ describe('Task', () => {
 			cy.visit(`/tasks/${tasks[0].id}`)
 
 			cy.get('.task-view .action-buttons .button')
-				.contains('Move')
+				.contains('Move task')
 				.click()
 			cy.get('.task-view .content.details .field .multiselect.control .input-wrapper input')
 				.type(`${lists[1].title}{enter}`)
@@ -274,7 +236,7 @@ describe('Task', () => {
 
 			cy.get('.task-view .action-buttons .button')
 				.should('be.visible')
-				.contains('Delete')
+				.contains('Delete task')
 				.click()
 			cy.get('.modal-mask .modal-container .modal-content .header')
 				.should('contain', 'Delete this task')
@@ -334,7 +296,7 @@ describe('Task', () => {
 			cy.visit(`/tasks/${tasks[0].id}`)
 
 			cy.get('.task-view .column.assignees .multiselect .input-wrapper span.assignee')
-				.get('.remove-assignee')
+				.get('a.remove-assignee')
 				.click()
 
 			cy.get('.global-notification')
@@ -354,7 +316,7 @@ describe('Task', () => {
 			cy.visit(`/tasks/${tasks[0].id}`)
 
 			cy.get('.task-view .action-buttons .button')
-				.contains('Add Labels')
+				.contains('Add labels')
 				.should('be.visible')
 				.click()
 			cy.get('.task-view .details.labels-list .multiselect input')
@@ -377,35 +339,24 @@ describe('Task', () => {
 				list_id: 1,
 			})
 			const labels = LabelFactory.create(1)
-			LabelTaskFactory.truncate()
 
 			cy.visit(`/tasks/${tasks[0].id}`)
 
-			addLabelToTaskAndVerify(labels[0].title)
-		})
-		
-		it('Can add a label to a task and it shows up on the kanban board afterwards', () => {
-			const tasks = TaskFactory.create(1, {
-				id: 1,
-				list_id: lists[0].id,
-				bucket_id: buckets[0].id,
-			})
-			const labels = LabelFactory.create(1)
-			LabelTaskFactory.truncate()
-			
-			cy.visit(`/lists/${lists[0].id}/kanban`)
-			
-			cy.get('.bucket .task')
-				.contains(tasks[0].title)
+			cy.get('.task-view .action-buttons .button')
+				.contains('Add labels')
 				.click()
-			
-			addLabelToTaskAndVerify(labels[0].title)
-			
-			cy.get('.modal-content .close')
+			cy.get('.task-view .details.labels-list .multiselect input')
+				.type(labels[0].title)
+			cy.get('.task-view .details.labels-list .multiselect .search-results')
+				.children()
+				.first()
 				.click()
-			
-			cy.get('.bucket .task')
-				.should('contain.text', labels[0].title)
+
+			cy.get('.global-notification', { timeout: 4000 })
+				.should('contain', 'Success')
+			cy.get('.task-view .details.labels-list .multiselect .input-wrapper span.tag')
+				.should('exist')
+				.should('contain', labels[0].title)
 		})
 
 		it('Can remove a label from a task', () => {
@@ -421,13 +372,13 @@ describe('Task', () => {
 
 			cy.visit(`/tasks/${tasks[0].id}`)
 
-			cy.getSettled('.task-view .details.labels-list .multiselect .input-wrapper')
+			cy.get('.task-view .details.labels-list .multiselect .input-wrapper')
 				.should('be.visible')
 				.should('contain', labels[0].title)
-			cy.getSettled('.task-view .details.labels-list .multiselect .input-wrapper')
+			cy.get('.task-view .details.labels-list .multiselect .input-wrapper')
 				.children()
 				.first()
-				.get('[data-cy="taskDetail.removeLabel"]')
+				.get('a.delete')
 				.click()
 
 			cy.get('.global-notification')
@@ -450,7 +401,7 @@ describe('Task', () => {
 				.contains('Due Date')
 				.get('.date-input .datepicker .show')
 				.click()
-			cy.get('.datepicker .datepicker-popup button')
+			cy.get('.datepicker .datepicker-popup a')
 				.contains('Tomorrow')
 				.click()
 			cy.get('[data-cy="closeDatepicker"]')
@@ -464,87 +415,5 @@ describe('Task', () => {
 			cy.get('.global-notification')
 				.should('contain', 'Success')
 		})
-		
-		it('Can set a priority for a task', () => {
-			const tasks = TaskFactory.create(1, {
-				id: 1,
-			})
-			cy.visit(`/tasks/${tasks[0].id}`)
-
-			cy.get('.task-view .action-buttons .button')
-				.contains('Set Priority')
-				.click()
-			cy.get('.task-view .columns.details .column')
-				.contains('Priority')
-				.get('.select select')
-				.select('Urgent')
-			cy.get('.global-notification')
-				.should('contain', 'Success')
-
-			cy.get('.task-view .columns.details .column')
-				.contains('Priority')
-				.get('.select select')
-				.should('have.value', '4')
-		})
-
-		it('Can set the progress for a task', () => {
-			const tasks = TaskFactory.create(1, {
-				id: 1,
-			})
-			cy.visit(`/tasks/${tasks[0].id}`)
-
-			cy.get('.task-view .action-buttons .button')
-				.contains('Set Progress')
-				.click()
-			cy.get('.task-view .columns.details .column')
-				.contains('Progress')
-				.get('.select select')
-				.select('50%')
-			cy.get('.global-notification')
-				.should('contain', 'Success')
-			
-			cy.wait(200)
-
-			cy.get('.task-view .columns.details .column')
-				.contains('Progress')
-				.get('.select select')
-				.should('be.visible')
-				.should('have.value', '0.5')
-		})
-		
-		it('Can add an attachment to a task', () => {
-			TaskAttachmentFactory.truncate()
-			const tasks = TaskFactory.create(1, {
-				id: 1,
-			})
-			cy.visit(`/tasks/${tasks[0].id}`)
-
-			uploadAttachmentAndVerify(tasks[0].id)
-		})
-
-		it('Can add an attachment to a task and see it appearing on kanban', () => {
-			TaskAttachmentFactory.truncate()
-			const tasks = TaskFactory.create(1, {
-				id: 1,
-				list_id: lists[0].id,
-				bucket_id: buckets[0].id,
-			})
-			const labels = LabelFactory.create(1)
-			LabelTaskFactory.truncate()
-
-			cy.visit(`/lists/${lists[0].id}/kanban`)
-
-			cy.get('.bucket .task')
-				.contains(tasks[0].title)
-				.click()
-
-			uploadAttachmentAndVerify(tasks[0].id)
-
-			cy.get('.modal-content .close')
-				.click()
-
-			cy.get('.bucket .task .footer .icon svg.fa-paperclip')
-				.should('exist')
-		})
 	})
 })

cypress/integration/user/logout.spec.js

@@ -0,0 +1,16 @@
+import '../../support/authenticateUser'
+
+describe('Log out', () => {
+	it('Logs the user out', () => {
+		cy.visit('/')
+
+		cy.get('.navbar .user .username')
+			.click()
+		cy.get('.navbar .user .dropdown-menu a.dropdown-item')
+			.contains('Logout')
+			.click()
+
+		cy.url()
+			.should('contain', '/login')
+	})
+})

cypress/integration/user/registration.spec.js

@@ -25,6 +25,7 @@ context('Registration', () => {
 		cy.get('#username').type(fixture.username)
 		cy.get('#email').type(fixture.email)
 		cy.get('#password').type(fixture.password)
+		cy.get('#passwordValidation').type(fixture.password)
 		cy.get('#register-submit').click()
 		cy.url().should('include', '/')
 		cy.clock(1625656161057) // 13:00
@@ -42,6 +43,7 @@ context('Registration', () => {
 		cy.get('#username').type(fixture.username)
 		cy.get('#email').type(fixture.email)
 		cy.get('#password').type(fixture.password)
+		cy.get('#passwordValidation').type(fixture.password)
 		cy.get('#register-submit').click()
 		cy.get('div.message.danger').contains('A user with this username already exists.')
 	})

cypress/integration/user/settings.spec.js

@@ -8,14 +8,12 @@ describe('User Settings', () => {
 	})
 
 	it('Changes the user avatar', () => {
-		cy.intercept(`${Cypress.env('API_URL')}/user/settings/avatar/upload`).as('uploadAvatar')
-		
 		cy.visit('/user/settings/avatar')
 
 		cy.get('input[name=avatarProvider][value=upload]')
 			.click()
-		cy.get('input[type=file]', {timeout: 1000})
-			.selectFile('cypress/fixtures/image.jpg', {force: true}) // The input is not visible, but on purpose
+		cy.get('input[type=file]', { timeout: 1000 })
+			.attachFile('image.jpg')
 		cy.get('.vue-handler-wrapper.vue-handler-wrapper--south .vue-simple-handler.vue-simple-handler--south')
 			.trigger('mousedown', {which: 1})
 			.trigger('mousemove', {clientY: 100})
@@ -24,7 +22,7 @@ describe('User Settings', () => {
 			.contains('Upload Avatar')
 			.click()
 
-		cy.wait('@uploadAvatar')
+		cy.wait(3000) // Wait for the request to finish
 		cy.get('.global-notification')
 			.should('contain', 'Success')
 	})

cypress/plugins/index.js

@@ -0,0 +1,21 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

cypress/support/commands.js

@@ -0,0 +1,33 @@
+/**
+ * Recursively gets an element, returning only after it's determined to be attached to the DOM for good.
+ *
+ * Source: https://github.com/cypress-io/cypress/issues/7306#issuecomment-850621378
+ */
+Cypress.Commands.add('getSettled', (selector, opts = {}) => {
+	const retries = opts.retries || 3
+	const delay = opts.delay || 100
+
+	const isAttached = (resolve, count = 0) => {
+		const el = Cypress.$(selector)
+
+		// is element attached to the DOM?
+		count = Cypress.dom.isAttached(el) ? count + 1 : 0
+
+		// hit our base case, return the element
+		if (count >= retries) {
+			return resolve(el)
+		}
+
+		// retry after a bit of a delay
+		setTimeout(() => isAttached(resolve, count), delay)
+	}
+
+	// wrap, so we can chain cypress commands off the result
+	return cy.wrap(null).then(() => {
+		return new Cypress.Promise((resolve) => {
+			return isAttached(resolve, 0)
+		}).then((el) => {
+			return cy.wrap(el)
+		})
+	})
+})

cypress/support/commands.ts

@@ -1,71 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//
-// declare global {
-//   namespace Cypress {
-//     interface Chainable {
-//       login(email: string, password: string): Chainable<void>
-//       drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
-//     }
-//   }
-// }
-
-/**
- * Recursively gets an element, returning only after it's determined to be attached to the DOM for good.
- *
- * Source: https://github.com/cypress-io/cypress/issues/7306#issuecomment-850621378
- */
-Cypress.Commands.add('getSettled', (selector, opts = {}) => {
-	const retries = opts.retries || 3
-	const delay = opts.delay || 100
-
-	const isAttached = (resolve, count = 0) => {
-		const el = Cypress.$(selector)
-
-		// is element attached to the DOM?
-		count = Cypress.dom.isAttached(el) ? count + 1 : 0
-
-		// hit our base case, return the element
-		if (count >= retries) {
-			return resolve(el)
-		}
-
-		// retry after a bit of a delay
-		setTimeout(() => isAttached(resolve, count), delay)
-	}
-
-	// wrap, so we can chain cypress commands off the result
-	return cy.wrap(null).then(() => {
-		return new Cypress.Promise((resolve) => {
-			return isAttached(resolve, 0)
-		}).then((el) => {
-			return cy.wrap(el)
-		})
-	})
-})

cypress/support/component.index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>Components App</title>
-  </head>
-  <body>
-    <div data-cy-root></div>
-  </body>
-</html>

cypress/support/component.ts

@@ -1,29 +0,0 @@
-// ***********************************************************
-// This example support/component.ts is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-import { mount } from 'cypress/vue'
-// Ensure global styles are loaded
-import '../../src/styles/global.scss';
-
-Cypress.Commands.add('mount', mount)
-
-// Example use:
-// cy.mount(MyComponent)

cypress/support/index.js

@@ -1,5 +1,6 @@
 
 import './commands'
+import 'cypress-file-upload'
 import '@4tw/cypress-drag-drop'
 
 // see https://github.com/cypress-io/cypress/issues/702#issuecomment-587127275

cypress/support/updateUserSettings.js

@@ -1,26 +0,0 @@
-
-export function updateUserSettings(settings) {
-	const token = `Bearer ${window.localStorage.getItem('token')}`
-	
-	return cy.request({
-		method: 'GET',
-		url: `${Cypress.env('API_URL')}/user`,
-		headers: {
-			'Authorization': token,
-		},
-	})
-		.its('body')
-		.then(oldSettings => {
-			return cy.request({
-				method: 'POST',
-				url: `${Cypress.env('API_URL')}/user/settings/general`,
-				headers: {
-					'Authorization': token,
-				},
-				body: {
-					...oldSettings,
-					...settings,
-				},
-			})
-		})
-}

cypress/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["./integration/**/*", "./support/**/*"],
-  "compilerOptions": {
-    "isolatedModules": false,
-    "target": "es5",
-    "lib": ["es5", "dom"],
-    "types": ["cypress"]
-  }
-}

env.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="vite/client" />
-/// <reference types="vite-svg-loader" />
-/// <reference types="cypress" />

flake.lock

@@ -1,25 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1664753041,
-        "narHash": "sha256-0ogaD8PaGHluARFeupofvk1Nq9gpVeZdlFM0Kcwguys=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62844b302507c7531ad68a86cb7aa54704c9cb4",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,10 +0,0 @@
-{
-  description = "Vikunja frontend dev environment";
-
-  outputs = { self, nixpkgs }:
-    let pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in {
-      defaultPackage.x86_64-linux =
-        pkgs.mkShell { buildInputs = [ pkgs.nodePackages.pnpm pkgs.cypress ]; };
-    };
-}

index.html

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<title>Vikunja</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<meta name="description" content="Vikunja (/vɪˈkuːnjə/) - The to-do app to organize your life.">
 	<meta name="theme-color" content="#1973ff"/>
 

netlify.toml

@@ -1,6 +1,6 @@
 [build]
-  command = "pnpm run build"
-  publish = "dist-preview"
+  command = "yarn build"
+  publish = "dist"
 
 [[redirects]]
   from = "/*"

nginx.conf

@@ -6,110 +6,79 @@ pid        /var/run/nginx.pid;
 
 
 events {
-	worker_connections  1024;
+    worker_connections  1024;
 }
 
 
 http {
-	include       /etc/nginx/mime.types;
-	default_type  application/octet-stream;
+    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"';
 
-	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;
 
-	access_log  /var/log/nginx/access.log  main;
+    sendfile        on;
+    #tcp_nopush     on;
 
-	sendfile        on;
-	#tcp_nopush     on;
+    keepalive_timeout  65;
 
-	keepalive_timeout  65;
+    gzip  on;
+    gzip_disable "msie6";
 
-	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;
 
-	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_hash_max_size 128;
-	map_hash_bucket_size 128;
+    # Expires map
+    map $sent_http_content_type $expires {
+        default                       off;
+        text/html                     max;
+        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;
+        ~image/                       max;
+        ~font/                        max;
+    }
 
-	# 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 {
-		listen 80;
-		listen 81  default_server http2 proxy_protocol; ## Needed when behind HAProxy with SSL termination + HTTP/2 support
+        server_name  _;
 
-		server_name  _;
+        expires $expires;
 
-		expires $expires;
+        location ~* .(txt|webmanifest|css|js|mjs|map|svg|jpg|jpeg|png|ico|ttf|woff|woff2|wav)$ {
+            root   /usr/share/nginx/html;
+            try_files $uri $uri/ =404;
+        }
 
-		root   /usr/share/nginx/html;
+        location / {
+            root   /usr/share/nginx/html;
+            try_files $uri $uri/ /index.html;
+            index  index.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 {
-		}
-	}
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   /usr/share/nginx/html;
+        }
+    }
 }

package.json

@@ -5,106 +5,144 @@
   "scripts": {
     "serve": "vite",
     "serve:dist-dev": "node scripts/serve-dist.js",
-    "serve:dist": "vite preview --port 4173",
+    "serve:dist": "vite preview",
     "build": "vite build && workbox copyLibraries dist/",
     "build:modern-only": "BUILD_MODERN_ONLY=true vite build && workbox copyLibraries dist/",
     "build:dev": "vite build -m development --outDir dist-dev/",
     "lint": "eslint --ignore-pattern '*.test.*' ./src --ext .vue,.js,.ts",
+    "lint:markup": "vue-tsc --noEmit",
     "cypress:open": "cypress open",
-    "test:unit": "vitest --run",
-    "test:unit-watch": "vitest watch",
+    "test:unit": "vitest run",
     "test:frontend": "cypress run",
-    "typecheck": "vue-tsc --noEmit && vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
     "browserslist:update": "npx browserslist@latest --update-db"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.2.0",
-    "@fortawesome/free-regular-svg-icons": "6.2.0",
-    "@fortawesome/free-solid-svg-icons": "6.2.0",
-    "@fortawesome/vue-fontawesome": "3.0.1",
-    "@github/hotkey": "2.0.1",
-    "@kyvg/vue3-notification": "2.4.1",
-    "@sentry/tracing": "7.16.0",
-    "@sentry/vue": "7.16.0",
-    "@types/is-touch-device": "1.0.0",
-    "@types/lodash.clonedeep": "4.5.7",
-    "@types/sortablejs": "1.15.0",
-    "@vueuse/core": "9.3.1",
-    "@vueuse/router": "9.3.1",
-    "axios": "0.27.2",
-    "blurhash": "2.0.3",
+    "@github/hotkey": "1.6.1",
+    "@kyvg/vue3-notification": "2.3.4",
+    "@sentry/tracing": "6.16.1",
+    "@sentry/vue": "6.16.1",
+    "@vue/compat": "3.2.26",
+    "@vueuse/core": "7.5.2",
+    "@vueuse/router": "7.5.2",
     "bulma-css-variables": "0.9.33",
     "camel-case": "4.1.2",
-    "codemirror": "5.65.9",
-    "date-fns": "2.29.3",
-    "dompurify": "2.4.0",
-    "easymde": "2.18.0",
-    "flatpickr": "4.6.13",
+    "codemirror": "5.65.0",
+    "copy-to-clipboard": "3.3.1",
+    "date-fns": "2.28.0",
+    "dompurify": "2.3.4",
+    "easymde": "2.15.0",
+    "flatpickr": "4.6.9",
     "flexsearch": "0.7.21",
-    "floating-vue": "2.0.0-beta.20",
-    "highlight.js": "11.6.0",
+    "highlight.js": "11.3.1",
     "is-touch-device": "1.0.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.debounce": "4.0.8",
-    "marked": "4.1.1",
-    "minimist": "1.2.7",
-    "pinia": "2.0.23",
+    "marked": "4.0.8",
     "register-service-worker": "1.7.2",
     "snake-case": "3.0.4",
-    "sortablejs": "1.15.0",
-    "ufo": "0.8.6",
-    "vue": "3.2.41",
-    "vue-advanced-cropper": "2.8.6",
+    "ufo": "0.7.9",
+    "v-tooltip": "4.0.0-beta.6",
+    "vue": "3.2.26",
+    "vue-advanced-cropper": "2.7.0",
     "vue-drag-resize": "2.0.3",
-    "vue-flatpickr-component": "9.0.8",
-    "vue-i18n": "9.2.2",
-    "vue-router": "4.1.5",
-    "workbox-precaching": "6.5.4",
-    "zhyswan-vuedraggable": "4.1.3"
+    "vue-flatpickr-component": "9.0.5",
+    "vue-i18n": "9.2.0-beta.26",
+    "vue-router": "4.0.12",
+    "vuedraggable": "4.1.0",
+    "vuex": "4.0.2",
+    "workbox-precaching": "6.4.2"
   },
   "devDependencies": {
-    "@4tw/cypress-drag-drop": "2.2.1",
-    "@cypress/vite-dev-server": "3.3.1",
-    "@cypress/vue": "4.2.1",
-    "@faker-js/faker": "7.6.0",
-    "@rushstack/eslint-patch": "1.2.0",
-    "@types/dompurify": "2.3.4",
-    "@types/flexsearch": "0.7.3",
-    "@types/lodash.debounce": "4.0.7",
-    "@types/marked": "4.0.7",
-    "@types/node": "16.11.68",
-    "@types/postcss-preset-env": "7.7.0",
-    "@typescript-eslint/eslint-plugin": "5.40.1",
-    "@typescript-eslint/parser": "5.40.1",
-    "@vitejs/plugin-legacy": "2.2.0",
-    "@vitejs/plugin-vue": "3.1.2",
-    "@vue/eslint-config-typescript": "11.0.2",
-    "@vue/test-utils": "2.1.0",
-    "@vue/tsconfig": "0.1.3",
-    "autoprefixer": "10.4.12",
-    "browserslist": "4.21.4",
-    "caniuse-lite": "1.0.30001420",
-    "cypress": "10.10.0",
-    "esbuild": "0.15.11",
-    "eslint": "8.25.0",
-    "eslint-plugin-vue": "9.6.0",
-    "express": "4.18.2",
-    "happy-dom": "7.5.12",
-    "netlify-cli": "12.0.9",
-    "postcss": "8.4.18",
-    "postcss-preset-env": "7.8.2",
-    "rollup": "3.2.3",
-    "rollup-plugin-visualizer": "5.8.3",
-    "sass": "1.55.0",
-    "typescript": "4.8.4",
-    "vite": "3.1.8",
-    "vite-plugin-pwa": "0.13.1",
-    "vite-svg-loader": "3.6.0",
-    "vitest": "0.24.3",
-    "vue-tsc": "1.0.8",
-    "wait-on": "6.0.1",
-    "workbox-cli": "6.5.4"
+    "@4tw/cypress-drag-drop": "2.1.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
+    "@fortawesome/free-regular-svg-icons": "5.15.4",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/vue-fontawesome": "3.0.0-5",
+    "@types/flexsearch": "0.7.2",
+    "@typescript-eslint/eslint-plugin": "5.9.0",
+    "@typescript-eslint/parser": "5.9.0",
+    "@vitejs/plugin-legacy": "1.6.4",
+    "@vitejs/plugin-vue": "2.0.1",
+    "@vue/eslint-config-typescript": "10.0.0",
+    "autoprefixer": "10.4.1",
+    "axios": "0.24.0",
+    "browserslist": "4.19.1",
+    "caniuse-lite": "1.0.30001296",
+    "cypress": "9.2.0",
+    "cypress-file-upload": "5.0.8",
+    "esbuild": "0.14.10",
+    "eslint": "8.6.0",
+    "eslint-plugin-vue": "8.2.0",
+    "express": "4.17.2",
+    "faker": "5.5.3",
+    "netlify-cli": "8.6.4",
+    "happy-dom": "2.25.1",
+    "postcss": "8.4.5",
+    "postcss-preset-env": "7.2.0",
+    "rollup": "2.63.0",
+    "rollup-plugin-visualizer": "5.5.2",
+    "sass": "1.45.2",
+    "slugify": "1.6.5",
+    "typescript": "4.5.4",
+    "vite": "2.7.10",
+    "vite-plugin-pwa": "0.11.12",
+    "vite-svg-loader": "3.1.1",
+    "vitest": "0.0.132",
+    "vue-tsc": "0.30.2",
+    "wait-on": "6.0.0",
+    "workbox-cli": "6.4.2"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "browser": true,
+      "es2021": true,
+      "node": true,
+      "vue/setup-compiler-macros": true
+    },
+    "extends": [
+      "eslint:recommended",
+      "plugin:vue/vue3-essential",
+      "@vue/typescript"
+    ],
+    "rules": {
+      "vue/html-quotes": [
+        "error",
+        "double"
+      ],
+      "quotes": [
+        "error",
+        "single"
+      ],
+      "comma-dangle": [
+        "error",
+        "always-multiline"
+      ],
+      "semi": [
+        "error",
+        "never"
+      ],
+      "vue/script-setup-uses-vars": "error",
+      "vue/multi-word-component-names": 0
+    },
+    "parser": "vue-eslint-parser",
+    "parserOptions": {
+      "parser": "@typescript-eslint/parser",
+      "ecmaVersion": 2021
+    },
+    "ignorePatterns": [
+      "*.test.*",
+      "cypress/*"
+    ],
+    "globals": {
+      "defineProps": "readonly"
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
   },
   "license": "AGPL-3.0-or-later",
-  "packageManager": "pnpm@7.13.5"
+  "packageManager": "yarn@1.22.17"
 }

renovate.json

@@ -3,28 +3,5 @@
   "labels": ["dependencies"],
   "extends": [
     "config:base"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["netlify-cli", "happy-dom"],
-      "extends": ["schedule:weekly"]
-    },
-    {
-      "groupName": "caniuse-and-related",
-      "matchPackageNames": ["caniuse-lite", "browserslist"],
-      "extends": ["schedule:weekly"]
-    },
-    {
-      "groupName": "vueuse",
-      "matchPackagePrefixes": [
-        "@vueuse/"
-      ]
-    },
-    {
-      "matchDepTypes": ["devDependencies"],
-      "automerge": true,
-      "automergeStrategy": "squash",
-      "automergeType": "pr"
-    }
   ]
 }

run.sh

@@ -16,7 +16,7 @@ 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/\.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

scripts/deploy-preview-netlify.js

@@ -1,24 +1,20 @@
+const slugify = require('slugify')
 const {exec} = require('child_process')
 const axios = require('axios')
 
 const BOT_USER_ID = 513
 const giteaToken = process.env.GITEA_TOKEN
 const siteId = process.env.NETLIFY_SITE_ID
-const branchSlug = String(process.env.DRONE_SOURCE_BRANCH)
-						.trim()
-						.normalize('NFKD')
-						.toLowerCase()
-						.replace(/[.\s/]/g, '-')
-						.replace(/[^A-Za-z\d-]/g, '')
+const branchSlug = slugify(process.env.DRONE_SOURCE_BRANCH)
 const prNumber = process.env.DRONE_PULL_REQUEST
 
 const prIssueCommentsUrl = `https://kolaente.dev/api/v1/repos/vikunja/frontend/issues/${prNumber}/comments`
-const alias = `${prNumber}-${branchSlug}`.substring(0,37)
+const alias = `${prNumber}-${branchSlug}`
 const fullPreviewUrl = `https://${alias}--vikunja-frontend-preview.netlify.app`
 
 const promiseExec = cmd => {
 	return new Promise((resolve, reject) => {
-		exec(cmd, (error, stdout) => {
+		exec(cmd, (error, stdout, stderr) => {
 			if (error) {
 				reject(error)
 				return

scripts/deploy-preview-netlify.js.sha384

@@ -1 +1 @@
-bb46342a0a08105b340ba7976cff9d80ef89901120ec0639669caa70bb7d2dbc43e78b1f635a7654ab2456e8358c98a4  ./scripts/deploy-preview-netlify.js
+55ce0faaa2c1919341617ccfaeccbb6029ac12107964ff488985cff13dd952f1a991df3ab0d4b0705deb761e508e6434  ./scripts/deploy-preview-netlify.js

scripts/serve-dist.js

@@ -3,7 +3,7 @@ const express = require('express')
 const app = express()
 
 const p = path.join(__dirname, '..', 'dist-dev')
-const port = 4173
+const port = 5000
 
 app.use(express.static(p))
 // Handle urls set by the frontend

src/App.vue

@@ -1,7 +1,7 @@
 <template>
 	<ready>
 		<template v-if="authUser">
-			<TheNavigation/>
+			<top-navigation/>
 			<content-auth/>
 		</template>
 		<content-link-share v-else-if="authLinkShare"/>
@@ -10,21 +10,24 @@
 		</no-auth-wrapper>
 		<Notification/>
 
-		<keyboard-shortcuts v-if="keyboardShortcutsActive"/>
+		<transition name="fade">
+			<keyboard-shortcuts v-if="keyboardShortcutsActive"/>
+		</transition>
 	</ready>
 </template>
 
 <script lang="ts" setup>
-import {computed, watch, type Ref} from 'vue'
+import {computed, watch, Ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {useRouteQuery} from '@vueuse/router'
+import {useStore} from 'vuex'
 import {useI18n} from 'vue-i18n'
 import isTouchDevice from 'is-touch-device'
 import {success} from '@/message'
 
 import Notification from '@/components/misc/notification.vue'
 import KeyboardShortcuts from './components/misc/keyboard-shortcuts/index.vue'
-import TheNavigation from '@/components/home/TheNavigation.vue'
+import TopNavigation from './components/home/topNavigation.vue'
 import ContentAuth from './components/home/contentAuth.vue'
 import ContentLinkShare from './components/home/contentLinkShare.vue'
 import NoAuthWrapper from '@/components/misc/no-auth-wrapper.vue'
@@ -33,22 +36,19 @@ import Ready from '@/components/misc/ready.vue'
 import {setLanguage} from './i18n'
 import AccountDeleteService from '@/services/accountDelete'
 
-import {useBaseStore} from '@/stores/base'
 import {useColorScheme} from '@/composables/useColorScheme'
 import {useBodyClass} from '@/composables/useBodyClass'
-import {useAuthStore} from './stores/auth'
 
-const baseStore = useBaseStore()
-const authStore = useAuthStore()
+const store = useStore()
 const router = useRouter()
 
-useBodyClass('is-touch', isTouchDevice())
-const keyboardShortcutsActive = computed(() => baseStore.keyboardShortcutsActive)
+useBodyClass('is-touch', isTouchDevice)
+const keyboardShortcutsActive = computed(() => store.state.keyboardShortcutsActive)
 
-const authUser = computed(() => authStore.authUser)
-const authLinkShare = computed(() => authStore.authLinkShare)
+const authUser = computed(() => store.getters['auth/authUser'])
+const authLinkShare = computed(() => store.getters['auth/authLinkShare'])
 
-const {t} = useI18n({useScope: 'global'})
+const {t} = useI18n()
 
 // setup account deletion verification
 const accountDeletionConfirm = useRouteQuery('accountDeletionConfirm') as Ref<null | string>
@@ -60,10 +60,10 @@ watch(accountDeletionConfirm, async (accountDeletionConfirm) => {
 	const accountDeletionService = new AccountDeleteService()
 	await accountDeletionService.confirm(accountDeletionConfirm)
 	success({message: t('user.deletion.confirmSuccess')})
-	authStore.refreshUserInfo()
+	store.dispatch('auth/refreshUserInfo')
 }, { immediate: true })
 
-// setup password reset redirect
+// setup passwort reset redirect
 const userPasswordReset = useRouteQuery('userPasswordReset') as Ref<null | string>
 watch(userPasswordReset, (userPasswordReset) => {
 	if (userPasswordReset === null) {

src/components/base/BaseButton.vue

@@ -5,14 +5,16 @@
 		:class="{ 'base-button--type-button': isButton }"
 		v-bind="elementBindings"
 		:disabled="disabled || undefined"
-		ref="button"
 	>
-		<slot/>
+		<slot />
 	</component>
 </template>
 
 <script lang="ts">
-export default { inheritAttrs: false }
+// see https://v3.vuejs.org/api/sfc-script-setup.html#usage-alongside-normal-script
+export default {
+  inheritAttrs: false,
+}
 </script>
 
 <script lang="ts" setup>
@@ -25,11 +27,11 @@ export default { inheritAttrs: false }
 
 // NOTE: Do NOT use buttons with @click to push routes. => Use router-links instead!
 
-import { ref, watchEffect, computed, useAttrs, type PropType } from 'vue'
+import { ref, watchEffect, computed, useAttrs, PropType } from 'vue'
 
-const BASE_BUTTON_TYPES_MAP = Object.freeze({
-	button: 'button',
-	submit: 'submit',
+const BASE_BUTTON_TYPES_MAP =  Object.freeze({
+  button: 'button',
+  submit: 'submit',
 })
 
 type BaseButtonTypes = keyof typeof BASE_BUTTON_TYPES_MAP
@@ -47,11 +49,9 @@ const props = defineProps({
 
 
 const componentNodeName = ref<Node['nodeName']>('button')
-
 interface ElementBindings {
 	type?: string;
-	rel?: string;
-	target?: string;
+	rel?: string,
 }
 
 const elementBindings = ref({})
@@ -69,13 +69,10 @@ watchEffect(() => {
 	}
 
 	// if there is a href we assume the user wants an external link via a link element
-	// we also set a predefined value for the attribute rel, but make it possible to overwrite this by the user.
+	// we also set the attribute rel to "noopener" but make it possible to overwrite this by the user.
 	if ('href' in attrs) {
 		nodeName = 'a'
-		bindings = {
-			rel: 'noreferrer noopener nofollow',
-			target: '_blank',
-		}
+		bindings = {rel: 'noopener'}
 	}
 
 	componentNodeName.value = nodeName
@@ -86,16 +83,6 @@ watchEffect(() => {
 })
 
 const isButton = computed(() => componentNodeName.value === 'button')
-
-const button = ref()
-
-function focus() {
-	button.value.focus()
-}
-
-defineExpose({
-	focus,
-})
 </script>
 
 <style lang="scss">
@@ -114,13 +101,13 @@ defineExpose({
 
 :where(.base-button) {
 	cursor: pointer;
-	display: inline-block;
+	display: block;
 	color: inherit;
 	font: inherit;
 	user-select: none;
 	pointer-events: auto; // disable possible resets
 
-	&:focus, &.is-focused {
+	&:focus {
 		outline: transparent;
 	}
 

src/components/date/dateRanges.ts

@@ -1,21 +0,0 @@
-export const DATE_RANGES = {
-	// Format: 
-	// Key is the title, as a translation string, the first entry of the value array 
-	// is the "from" date, the second one is the "to" date.
-	'today': ['now/d', 'now/d+1d'],
-
-	'lastWeek': ['now/w-1w', 'now/w-2w'],
-	'thisWeek': ['now/w', 'now/w+1w'],
-	'restOfThisWeek': ['now', 'now/w+1w'],
-	'nextWeek': ['now/w+1w', 'now/w+2w'],
-	'next7Days': ['now', 'now+7d'],
-
-	'lastMonth': ['now/M-1M', 'now/M-2M'],
-	'thisMonth': ['now/M', 'now/M+1M'],
-	'restOfThisMonth': ['now', 'now/M+1M'],
-	'nextMonth': ['now/M+1M', 'now/M+2M'],
-	'next30Days': ['now', 'now+30d'],
-	
-	'thisYear': ['now/y', 'now/y+1y'],
-	'restOfThisYear': ['now', 'now/y+1y'],
-}

src/components/date/datemathHelp.vue

@@ -1,131 +0,0 @@
-<template>
-	<card
-		class="has-no-shadow how-it-works-modal"
-		:title="$t('input.datemathHelp.title')">
-		<p>
-			{{ $t('input.datemathHelp.intro') }}
-		</p>
-		<p>
-			<i18n-t keypath="input.datemathHelp.expression" scope="global">
-				<code>now</code>
-				<code>||</code>
-			</i18n-t>
-		</p>
-		<p>
-			<i18n-t keypath="input.datemathHelp.similar" scope="global">
-				<BaseButton
-					href="https://grafana.com/docs/grafana/latest/dashboards/time-range-controls/"
-					target="_blank">
-					Grafana
-				</BaseButton>
-				<BaseButton
-					href="https://www.elastic.co/guide/en/elasticsearch/reference/7.3/common-options.html#date-math"
-					target="_blank">
-					Elasticsearch
-				</BaseButton>
-			</i18n-t>
-		</p>
-		<p>{{ $t('misc.forExample') }}</p>
-		<ul>
-			<li><code>+1d</code>{{ $t('input.datemathHelp.add1Day') }}</li>
-			<li><code>-1d</code>{{ $t('input.datemathHelp.minus1Day') }}</li>
-			<li><code>/d</code>{{ $t('input.datemathHelp.roundDay') }}</li>
-		</ul>
-		<p>{{ $t('input.datemathHelp.supportedUnits') }}</p>
-		<table class="table">
-			<tbody>
-			<tr>
-				<td><code>s</code></td>
-				<td>{{ $t('input.datemathHelp.units.seconds') }}</td>
-			</tr>
-			<tr>
-				<td><code>m</code></td>
-				<td>{{ $t('input.datemathHelp.units.minutes') }}</td>
-			</tr>
-			<tr>
-				<td><code>h</code></td>
-				<td>{{ $t('input.datemathHelp.units.hours') }}</td>
-			</tr>
-			<tr>
-				<td><code>H</code></td>
-				<td>{{ $t('input.datemathHelp.units.hours') }}</td>
-			</tr>
-			<tr>
-				<td><code>d</code></td>
-				<td>{{ $t('input.datemathHelp.units.days') }}</td>
-			</tr>
-			<tr>
-				<td><code>w</code></td>
-				<td>{{ $t('input.datemathHelp.units.weeks') }}</td>
-			</tr>
-			<tr>
-				<td><code>M</code></td>
-				<td>{{ $t('input.datemathHelp.units.months') }}</td>
-			</tr>
-			<tr>
-				<td><code>y</code></td>
-				<td>{{ $t('input.datemathHelp.units.years') }}</td>
-			</tr>
-			</tbody>
-		</table>
-
-		<p>{{ $t('input.datemathHelp.someExamples') }}</p>
-		<table class="table">
-			<tbody>
-			<tr>
-				<td><code>now</code></td>
-				<td>{{ $t('input.datemathHelp.examples.now') }}</td>
-			</tr>
-			<tr>
-				<td><code>now+24h</code></td>
-				<td>{{ $t('input.datemathHelp.examples.in24h') }}</td>
-			</tr>
-			<tr>
-				<td><code>now/d</code></td>
-				<td>{{ $t('input.datemathHelp.examples.today') }}</td>
-			</tr>
-			<tr>
-				<td><code>now/w</code></td>
-				<td>{{ $t('input.datemathHelp.examples.beginningOfThisWeek') }}</td>
-			</tr>
-			<tr>
-				<td><code>now/w+1w</code></td>
-				<td>{{ $t('input.datemathHelp.examples.endOfThisWeek') }}</td>
-			</tr>
-			<tr>
-				<td><code>now+30d</code></td>
-				<td>{{ $t('input.datemathHelp.examples.in30Days') }}</td>
-			</tr>
-			<tr>
-				<td><code>{{ exampleDate }}||+1M/d</code></td>
-				<td>
-					<i18n-t keypath="input.datemathHelp.examples.datePlusMonth" scope="global">
-						<code>{{ exampleDate }}</code>
-					</i18n-t>
-				</td>
-			</tr>
-			</tbody>
-		</table>
-	</card>
-</template>
-
-<script lang="ts" setup>
-import { formatDate } from '@/helpers/time/formatDate'
-import BaseButton from '@/components/base/BaseButton.vue'
-
-const exampleDate = formatDate(new Date(), 'yyyy-MM-dd')
-</script>
-
-<style scoped>
-.how-it-works-modal {
-	font-size: 1rem;
-}
-
-p {
-	display: inline-block !important;
-}
-
-.base-button {
-	display: inline;
-}
-</style>

src/components/date/datepickerWithRange.vue

@@ -1,275 +0,0 @@
-<template>
-	<div class="datepicker-with-range-container">
-		<popup>
-			<template #trigger="{toggle}">
-				<slot name="trigger" :toggle="toggle" :buttonText="buttonText"></slot>
-			</template>
-			<template #content="{isOpen}">
-				<div class="datepicker-with-range" :class="{'is-open': isOpen}">
-					<div class="selections">
-						<BaseButton @click="setDateRange(null)" :class="{'is-active': customRangeActive}">
-							{{ $t('misc.custom') }}
-						</BaseButton>
-						<BaseButton
-							v-for="(value, text) in DATE_RANGES"
-							:key="text"
-							@click="setDateRange(value)"
-							:class="{'is-active': from === value[0] && to === value[1]}">
-							{{ $t(`input.datepickerRange.ranges.${text}`) }}
-						</BaseButton>
-					</div>
-					<div class="flatpickr-container input-group">
-						<label class="label">
-							{{ $t('input.datepickerRange.from') }}
-							<div class="field has-addons">
-								<div class="control is-fullwidth">
-									<input class="input" type="text" v-model="from"/>
-								</div>
-								<div class="control">
-									<x-button icon="calendar" variant="secondary" data-toggle/>
-								</div>
-							</div>
-						</label>
-						<label class="label">
-							{{ $t('input.datepickerRange.to') }}
-							<div class="field has-addons">
-								<div class="control is-fullwidth">
-									<input class="input" type="text" v-model="to"/>
-								</div>
-								<div class="control">
-									<x-button icon="calendar" variant="secondary" data-toggle/>
-								</div>
-							</div>
-						</label>
-						<flat-pickr
-							:config="flatPickerConfig"
-							v-model="flatpickrRange"
-						/>
-
-						<p>
-							{{ $t('input.datemathHelp.canuse') }}
-							<BaseButton class="has-text-primary" @click="showHowItWorks = true">
-								{{ $t('input.datemathHelp.learnhow') }}
-							</BaseButton>
-						</p>
-
-						<modal
-							@close="() => showHowItWorks = false"
-							:enabled="showHowItWorks"
-							transition-name="fade"
-							:overflow="true"
-							variant="hint-modal"
-						>
-							<DatemathHelp/>
-						</modal>
-					</div>
-				</div>
-			</template>
-		</popup>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import {computed, ref, watch} from 'vue'
-import {useI18n} from 'vue-i18n'
-
-import flatPickr from 'vue-flatpickr-component'
-import 'flatpickr/dist/flatpickr.css'
-
-import Popup from '@/components/misc/popup.vue'
-import {DATE_RANGES} from '@/components/date/dateRanges'
-import BaseButton from '@/components/base/BaseButton.vue'
-import DatemathHelp from '@/components/date/datemathHelp.vue'
-import {useAuthStore} from '@/stores/auth'
-
-const authStore = useAuthStore()
-const {t} = useI18n({useScope: 'global'})
-
-const emit = defineEmits(['update:modelValue'])
-const props = defineProps({
-	modelValue: {
-		required: false,
-	},
-})
-
-// FIXME: This seems to always contain the default value - that breaks the picker
-const weekStart = computed(() => authStore.settings.weekStart ?? 0)
-const flatPickerConfig = computed(() => ({
-	altFormat: t('date.altFormatLong'),
-	altInput: true,
-	dateFormat: 'Y-m-d H:i',
-	enableTime: false,
-	wrap: true,
-	mode: 'range',
-	locale: {
-		firstDayOf7Days: weekStart.value,
-	},
-}))
-
-const showHowItWorks = ref(false)
-
-const flatpickrRange = ref('')
-
-const from = ref('')
-const to = ref('')
-
-watch(
-	() => props.modelValue,
-	newValue => {
-		from.value = newValue.dateFrom
-		to.value = newValue.dateTo
-		// Only set the date back to flatpickr when it's an actual date.
-		// Otherwise flatpickr runs in an endless loop and slows down the browser.
-		const dateFrom = new Date(from.value)
-		const dateTo = new Date(to.value)
-		if (dateTo.getTime() === dateTo.getTime() && dateFrom.getTime() === dateFrom.getTime()) {
-			flatpickrRange.value = `${from.value} to ${to.value}`
-		}
-	},
-)
-
-function emitChanged() {
-	const args = {
-		dateFrom: from.value === '' ? null : from.value,
-		dateTo: to.value === '' ? null : to.value,
-	}
-	emit('update:modelValue', args)
-}
-
-watch(
-	() => flatpickrRange.value,
-	(newVal: string | null) => {
-		if (newVal === null) {
-			return
-		}
-
-		const [fromDate, toDate] = newVal.split(' to ')
-
-		if (typeof fromDate === 'undefined' || typeof toDate === 'undefined') {
-			return
-		}
-
-		from.value = fromDate
-		to.value = toDate
-
-		emitChanged()
-	},
-)
-watch(() => from.value, emitChanged)
-watch(() => to.value, emitChanged)
-
-function setDateRange(range: string[] | null) {
-	if (range === null) {
-		from.value = ''
-		to.value = ''
-
-		return
-	}
-
-	from.value = range[0]
-	to.value = range[1]
-}
-
-const customRangeActive = computed<boolean>(() => {
-	return !Object.values(DATE_RANGES).some(range => from.value === range[0] && to.value === range[1])
-})
-
-const buttonText = computed<string>(() => {
-	if (from.value !== '' && to.value !== '') {
-		return t('input.datepickerRange.fromto', {
-			from: from.value,
-			to: to.value,
-		})
-	}
-
-	return t('task.show.select')
-})
-</script>
-
-<style lang="scss" scoped>
-.datepicker-with-range-container {
-	position: relative;
-}
-
-:deep(.popup) {
-	z-index: 10;
-	margin-top: 1rem;
-	border-radius: $radius;
-	border: 1px solid var(--grey-200);
-	background-color: var(--white);
-	box-shadow: $shadow;
-
-	&.is-open {
-		width: 500px;
-		height: 320px;
-	}
-}
-
-.datepicker-with-range {
-	display: flex;
-	width: 100%;
-	height: 100%;
-	position: absolute;
-}
-
-:deep(.flatpickr-calendar) {
-	margin: 0 auto 8px;
-	box-shadow: none;
-}
-
-.flatpickr-container {
-	width: 70%;
-	border-left: 1px solid var(--grey-200);
-	padding: 1rem;
-	font-size: .9rem;
-
-	// Flatpickr has no option to use it without an input field so we're hiding it instead
-	:deep(input.form-control.input) {
-		height: 0;
-		padding: 0;
-		border: 0;
-	}
-
-	.field .control :deep(.button) {
-		border: 1px solid var(--input-border-color);
-		height: 2.25rem;
-
-		&:hover {
-			border: 1px solid var(--input-hover-border-color);
-		}
-	}
-
-	.label, .input, :deep(.button) {
-		font-size: .9rem;
-	}
-}
-
-.selections {
-	width: 30%;
-	display: flex;
-	flex-direction: column;
-	padding-top: .5rem;
-	overflow-y: scroll;
-
-	button {
-		display: block;
-		width: 100%;
-		text-align: left;
-		padding: .5rem 1rem;
-		transition: $transition;
-		font-size: .9rem;
-		color: var(--text);
-		background: transparent;
-		border: 0;
-		cursor: pointer;
-
-		&.is-active {
-			color: var(--primary);
-		}
-
-		&:hover, &.is-active {
-			background-color: var(--grey-100);
-		}
-	}
-}
-</style>

src/components/home/Logo.vue

@@ -1,12 +1,9 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import { useNow } from '@vueuse/core'
-
 import LogoFull from '@/assets/logo-full.svg?component'
 import LogoFullPride from '@/assets/logo-full-pride.svg?component'
 
-const now = useNow()
-const Logo = computed(() => now.value.getMonth() === 5 ? LogoFullPride : LogoFull)
+const Logo = computed(() => new Date().getMonth() === 5 ? LogoFullPride : LogoFull)
 </script>
 
 <template>

src/components/home/MenuButton.vue

@@ -1,22 +1,20 @@
 <template>
-	<BaseButton
+	<button
+		type="button"
+		@click="$store.commit('toggleMenu')"
 		class="menu-show-button"
-		@click="baseStore.toggleMenu()"
-		@shortkey="() => baseStore.toggleMenu()"
+		@shortkey="() => $store.commit('toggleMenu')"
 		v-shortcut="'Control+e'"
 		:title="$t('keyboardShortcuts.toggleMenu')"
 		:aria-label="menuActive ? $t('misc.hideMenu') : $t('misc.showMenu')"
 	/>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import {computed} from 'vue'
-import {useBaseStore} from '@/stores/base'
+import {store} from '@/store'
 
-import BaseButton from '@/components/base/BaseButton.vue'
-
-const baseStore = useBaseStore()
-const menuActive = computed(() => baseStore.menuActive)
+const menuActive = computed(() => store.menuActive)
 </script>
 
 <style lang="scss" scoped>
@@ -24,6 +22,11 @@ $lineWidth: 2rem;
 $size: $lineWidth + 1rem;
 
 .menu-show-button {
+	// FIXME: create general button component
+	appearance: none;
+	background-color: transparent;
+	border: 0;
+
 	min-height: $size;
 	width: $size;
 

src/components/home/PoweredByLink.vue

@@ -1,11 +1,10 @@
 <template>
-    <BaseButton class="menu-bottom-link" :href="poweredByUrl" target="_blank">
+    <a class="menu-bottom-link" :href="poweredByUrl" target="_blank" rel="noreferrer noopener nofollow">
         {{ $t('misc.poweredBy') }}
-    </BaseButton>
+    </a>
 </template>
 
 <script setup lang="ts">
-import BaseButton from '@/components/base/BaseButton.vue'
 import {POWERED_BY as poweredByUrl} from '@/urls'
 </script>
 

src/components/home/contentAuth.vue

@@ -1,93 +1,68 @@
 <template>
-	<div class="content-auth">
-		<BaseButton
-			v-if="menuActive"
-			@click="baseStore.setMenuActive(false)"
-			class="menu-hide-button d-print-none"
-		>
-			<icon icon="times"/>
-		</BaseButton>
+	<div>
+		<a @click="$store.commit('menuActive', false)" class="menu-hide-button" v-if="menuActive">
+			<icon icon="times" />
+		</a>
 		<div
-			:class="{'has-background': background || blurHash}"
-			:style="{'background-image': blurHash && `url(${blurHash})`}"
+			:class="{'has-background': background}"
+			:style="{'background-image': background && `url(${background})`}"
 			class="app-container"
 		>
+			<navigation/>
 			<div
-				:class="{'is-visible': background}"
-				class="app-container-background background-fade-in d-print-none"
-				:style="{'background-image': background && `url(${background})`}"></div>
-			<navigation class="d-print-none"/>
-			<main
 				:class="[
 					{ 'is-menu-enabled': menuActive },
 					$route.name,
 				]"
 				class="app-content"
 			>
-				<BaseButton
-					v-if="menuActive"
-					@click="baseStore.setMenuActive(false)"
-					class="mobile-overlay d-print-none"
-				/>
+				<a @click="$store.commit('menuActive', false)" class="mobile-overlay" v-if="menuActive"></a>
 
 				<quick-actions/>
 
-				<router-view :route="routeWithModal" v-slot="{ Component }">
-					<keep-alive :include="['list.list', 'list.gantt', 'list.table', 'list.kanban']">
-						<component :is="Component"/>
-					</keep-alive>
+				<router-view/>
+
+				<router-view name="popup" v-slot="{ Component }">
+					<transition name="modal">
+						<component :is="Component" />
+					</transition>
 				</router-view>
 
-				<modal
-					v-if="currentModal"
-					@close="closeModal()"
-					variant="scrolling"
-					class="task-detail-view-modal"
-				>
-					<component :is="currentModal"/>
-				</modal>
-
-				<BaseButton
-					class="keyboard-shortcuts-button d-print-none"
+				<a
+					class="keyboard-shortcuts-button"
 					@click="showKeyboardShortcuts()"
 					v-shortcut="'?'"
 				>
 					<icon icon="keyboard"/>
-				</BaseButton>
-			</main>
+				</a>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script lang="ts" setup>
 import {watch, computed} from 'vue'
-import {useRoute} from 'vue-router'
+import {useStore} from 'vuex'
+import {useRoute, useRouter} from 'vue-router'
+import {useEventListener} from '@vueuse/core'
 
+import {CURRENT_LIST, KEYBOARD_SHORTCUTS_ACTIVE, MENU_ACTIVE} from '@/store/mutation-types'
 import Navigation from '@/components/home/navigation.vue'
 import QuickActions from '@/components/quick-actions/quick-actions.vue'
-import BaseButton from '@/components/base/BaseButton.vue'
 
-import {useBaseStore} from '@/stores/base'
-import {useLabelStore} from '@/stores/labels'
+const store = useStore()
 
-import {useRouteWithModal} from '@/composables/useRouteWithModal'
-import {useRenewTokenOnFocus} from '@/composables/useRenewTokenOnFocus'
-
-const {routeWithModal, currentModal, closeModal} = useRouteWithModal()
-
-const baseStore = useBaseStore()
-const background = computed(() => baseStore.background)
-const blurHash = computed(() => baseStore.blurHash)
-const menuActive = computed(() => baseStore.menuActive)
+const background = computed(() => store.state.background)
+const menuActive = computed(() => store.state.menuActive)
 
 function showKeyboardShortcuts() {
-	baseStore.setKeyboardShortcutsActive(true)
+	store.commit(KEYBOARD_SHORTCUTS_ACTIVE, true)
 }
 
 const route = useRoute()
 
 // hide menu on mobile
-watch(() => route.fullPath, () => window.innerWidth < 769 && baseStore.setMenuActive(false))
+watch(() => route.fullPath, () => window.innerWidth < 769 && store.commit(MENU_ACTIVE, false))
 
 // FIXME: this is really error prone
 // Reset the current list highlight in menu if the current route is not list related.
@@ -105,20 +80,52 @@ watch(() => route.name as string, (routeName) => {
 				'migrate.start',
 				'migrate.wunderlist',
 				'namespaces.index',
-			].includes(routeName) ||
+			].includes(routeName) || 
 			routeName.startsWith('user.settings')
 		)
 	) {
-		baseStore.handleSetCurrentList({list: null})
+		store.dispatch(CURRENT_LIST, null)
 	}
 })
 
 // TODO: Reset the title if the page component does not set one itself
 
-useRenewTokenOnFocus()
+function useRenewTokenOnFocus() {
+	const router = useRouter()
+	
+	const userInfo = computed(() => store.state.auth.info)
+	const authenticated = computed(() => store.state.auth.authenticated)
 
-const labelStore = useLabelStore()
-labelStore.loadAllLabels()
+	// Try renewing the token every time vikunja is loaded initially
+	// (When opening the browser the focus event is not fired)
+	store.dispatch('auth/renewToken')
+
+	// Check if the token is still valid if the window gets focus again to maybe renew it
+	useEventListener('focus', () => {
+		if (!authenticated.value) {
+			return
+		}
+
+		const expiresIn = (userInfo.value !== null ? userInfo.value.exp : 0) - +new Date() / 1000
+
+		// If the token expiry is negative, it is already expired and we have no choice but to redirect
+		// the user to the login page
+		if (expiresIn < 0) {
+			store.dispatch('auth/checkAuth')
+			router.push({name: 'user.login'})
+			return
+		}
+
+		// Check if the token is valid for less than 60 hours and renew if thats the case
+		if (expiresIn < 60 * 3600) {
+			store.dispatch('auth/renewToken')
+			console.debug('renewed token')
+		}
+	})
+}
+
+useRenewTokenOnFocus()
+store.dispatch('labels/loadAllLabels')
 </script>
 
 <style lang="scss" scoped>
@@ -149,47 +156,40 @@ labelStore.loadAllLabels()
 }
 
 .app-container {
-	min-height: calc(100vh - 65px);
+  min-height: calc(100vh - 65px);
 
-	@media screen and (max-width: $tablet) {
-		padding-top: $navbar-height;
+  @media screen and (max-width: $tablet) {
+    padding-top: $navbar-height;
+  }
+
+  .app-content {
+    padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem;
+    z-index: 2;
+
+    @media screen and (max-width: $tablet) {
+      margin-left: 0;
+      padding-top: 1.5rem;
+      min-height: calc(100vh - 4rem);
+    }
+
+    &.is-menu-enabled {
+      margin-left: $navbar-width;
+
+      @media screen and (max-width: $tablet) {
+        min-width: 100%;
+        margin-left: 0;
+      }
+    }
+
+	&.task\.detail {
+		padding-left: 0;
+		padding-right: 0;
 	}
 
-	.app-content {
-		z-index: 10;
-		position: relative;
-		padding-top: 1rem;
-
-		@media screen {
-			padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem;
-		}
-
-		// Used to make sure the spinner is always in the middle while loading
-		> .loader-container {
-			min-height: calc(100vh - #{$navbar-height + 1.5rem + 1rem});
-		}
-
-		@media screen and (max-width: $tablet) {
-			margin-left: 0;
-			padding-top: 1.5rem;
-			min-height: calc(100vh - 4rem);
-		}
-
-		@media screen {
-			&.is-menu-enabled {
-				margin-left: $navbar-width;
-
-				@media screen and (max-width: $tablet) {
-					min-width: 100%;
-					margin-left: 0;
-				}
-			}
-		}
-
-		.card {
-			background: var(--white);
-		}
-	}
+    .card {
+      background: var(--white);
+    }
+  }
 }
 
 .mobile-overlay {
@@ -199,9 +199,7 @@ labelStore.loadAllLabels()
 	bottom: 0;
 	left: 0;
 	right: 0;
-	height: 100vh;
-	width: 100vw;
-	background: hsla(var(--grey-100-hsl), 0.8);
+	background: rgba(250, 250, 250, 0.8);
 	z-index: 5;
 	opacity: 0;
 	transition: all $transition;
@@ -220,21 +218,9 @@ labelStore.loadAllLabels()
 
 	color: var(--grey-500);
 	transition: color $transition;
-
+	
 	@media screen and (max-width: $tablet) {
 		display: none;
 	}
 }
-
-.content-auth {
-	position: relative;
-	z-index: 1;
-}
-
-.is-touch .content-auth,
-.content-auth.z-unset {
-	z-index: unset;
-}
-
-@include modal-transition();
 </style>

src/components/home/contentLinkShare.vue

@@ -1,21 +1,20 @@
 <template>
 	<div
-		:class="[background ? 'has-background' : '', $route.name as string +'-view']"
+		:class="[background ? 'has-background' : '', $route.name+'-view']"
 		:style="{'background-image': `url(${background})`}"
 		class="link-share-container"
 	>
 		<div class="container has-text-centered link-share-view">
 			<div class="column is-10 is-offset-1">
-				<Logo class="logo" v-if="logoVisible"/>
+				<Logo class="logo" />
 				<h1
-					:class="{'m-0': !logoVisible}"
 					:style="{ 'opacity': currentList.title === '' ? '0': '1' }"
 					class="title">
 					{{ currentList.title === '' ? $t('misc.loading') : currentList.title }}
 				</h1>
 				<div class="box has-text-left view">
 					<router-view/>
-					<PoweredByLink/>
+					<PoweredByLink />
 				</div>
 			</div>
 		</div>
@@ -24,29 +23,26 @@
 
 <script lang="ts" setup>
 import {computed} from 'vue'
-
-import {useBaseStore} from '@/stores/base'
+import {useStore} from 'vuex'
 
 import Logo from '@/components/home/Logo.vue'
 import PoweredByLink from './PoweredByLink.vue'
 
-const baseStore = useBaseStore()
-const currentList = computed(() => baseStore.currentList)
-const background = computed(() => baseStore.background)
-const logoVisible = computed(() => baseStore.logoVisible)
+const store = useStore()
+const currentList = computed(() => store.state.currentList)
+const background = computed(() => store.state.background)
 </script>
 
 <style lang="scss" scoped>
 .link-share-container.has-background .view {
-	background-color: transparent;
-	border: none;
+  background-color: transparent;
+  border: none;
 }
 
 .logo {
 	max-width: 300px;
 	width: 90%;
 	margin: 2rem 0 1.5rem;
-	height: 100px;
 }
 
 .column {
@@ -59,6 +55,6 @@ const logoVisible = computed(() => baseStore.logoVisible)
 
 // FIXME: this should be defined somewhere deep
 .link-share-view .card {
-	background-color: var(--white);
+    background-color: var(--white);
 }
 </style>

src/components/home/navigation.vue

@@ -1,12 +1,12 @@
 <template>
-	<aside :class="{'is-active': menuActive}" class="namespace-container">
-		<nav class="menu top-menu">
+	<div :class="{'is-active': menuActive}" class="namespace-container">
+		<div class="menu top-menu">
 			<router-link :to="{name: 'home'}" class="logo">
-				<Logo width="164" height="48"/>
+				<Logo width="164" height="48" />
 			</router-link>
 			<ul class="menu-list">
 				<li>
-					<router-link :to="{ name: 'home'}" v-shortcut="'g o'">
+					<router-link :to="{ name: 'home'}">
 						<span class="icon">
 							<icon icon="calendar"/>
 						</span>
@@ -14,7 +14,7 @@
 					</router-link>
 				</li>
 				<li>
-					<router-link :to="{ name: 'tasks.range'}" v-shortcut="'g u'">
+					<router-link :to="{ name: 'tasks.range'}">
 						<span class="icon">
 							<icon :icon="['far', 'calendar-alt']"/>
 						</span>
@@ -22,7 +22,7 @@
 					</router-link>
 				</li>
 				<li>
-					<router-link :to="{ name: 'namespaces.index'}" v-shortcut="'g n'">
+					<router-link :to="{ name: 'namespaces.index'}">
 						<span class="icon">
 							<icon icon="layer-group"/>
 						</span>
@@ -30,7 +30,7 @@
 					</router-link>
 				</li>
 				<li>
-					<router-link :to="{ name: 'labels.index'}" v-shortcut="'g a'">
+					<router-link :to="{ name: 'labels.index'}">
 						<span class="icon">
 							<icon icon="tags"/>
 						</span>
@@ -38,7 +38,7 @@
 					</router-link>
 				</li>
 				<li>
-					<router-link :to="{ name: 'teams.index'}" v-shortcut="'g m'">
+					<router-link :to="{ name: 'teams.index'}">
 						<span class="icon">
 							<icon icon="users"/>
 						</span>
@@ -46,54 +46,56 @@
 					</router-link>
 				</li>
 			</ul>
-		</nav>
+		</div>
 
-		<nav class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}">
-			<template v-for="(n, nk) in namespaces" :key="n.id">
+		<aside class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}">
+			<template v-for="(n, nk) in namespaces" :key="n.id" >
 				<div class="namespace-title" :class="{'has-menu': n.id > 0}">
-					<BaseButton
+					<span
 						@click="toggleLists(n.id)"
 						class="menu-label"
-						v-tooltip="namespaceTitles[nk]"
-					>
-						<ColorBubble
-							v-if="n.hexColor !== ''"
-							:color="n.hexColor"
-							class="mr-1"
-						/>
-						<span class="name">{{ namespaceTitles[nk] }}</span>
-						<div
-							class="icon is-small toggle-lists-icon pl-2"
-							:class="{'active': typeof listsVisible[n.id] !== 'undefined' ? listsVisible[n.id] : true}"
-						>
-							<icon icon="chevron-down"/>
-						</div>
-						<span class="count" :class="{'ml-2 mr-0': n.id > 0}">
-							({{ namespaceListsCount[nk] }})
+						v-tooltip="namespaceTitles[nk]">
+						<span class="name">
+							<span
+								:style="{ backgroundColor: n.hexColor }"
+								class="color-bubble"
+								v-if="n.hexColor !== ''">
+							</span>
+							{{ namespaceTitles[nk] }}
 						</span>
-					</BaseButton>
+					</span>
+					<a
+						class="icon is-small toggle-lists-icon"
+						:class="{'active': typeof listsVisible[n.id] !== 'undefined' ? listsVisible[n.id] : true}"
+						@click="toggleLists(n.id)"
+					>
+						<icon icon="chevron-down"/>
+					</a>
 					<namespace-settings-dropdown :namespace="n" v-if="n.id > 0"/>
 				</div>
+				<div
+					v-if="listsVisible[n.id] ?? true"
+					:key="n.id + 'child'"
+					class="more-container"
+				>
 					<!--
 						NOTE: a v-model / computed setter is not possible, since the updateActiveLists function
 						triggered by the change needs to have access to the current namespace
-					-->
+					--> 
 					<draggable
-						v-if="listsVisible[n.id] ?? true"
 						v-bind="dragOptions"
 						:modelValue="activeLists[nk]"
 						@update:modelValue="(lists) => updateActiveLists(n, lists)"
-						group="namespace-lists"
+						:group="`namespace-${n.id}-lists`"
 						@start="() => drag = true"
-						@end="saveListPosition"
+						@end="e => saveListPosition(e, nk)"
 						handle=".handle"
-						:disabled="n.id < 0 || undefined"
-						tag="ul"
+						:disabled="n.id < 0 || null"
+						tag="transition-group"
 						item-key="id"
-						:data-namespace-id="n.id"
-						:data-namespace-index="nk"
 						:component-data="{
-							type: 'transition-group',
+							type: 'transition',
+							tag: 'ul',
 							name: !drag ? 'flip-list' : null,
 							class: [
 								'menu-list can-be-hidden',
@@ -103,174 +105,176 @@
 					>
 						<template #item="{element: l}">
 							<li
-								class="list-menu loader-container is-loading-small"
+								class="loader-container is-loading-small"
 								:class="{'is-loading': listUpdating[l.id]}"
 							>
-								<BaseButton
+								<router-link
 									:to="{ name: 'list.index', params: { listId: l.id} }"
-									class="list-menu-link"
-									:class="{'router-link-exact-active': currentList.id === l.id}"
+									v-slot="{ href, navigate, isActive }"
+									custom
 								>
-									<span class="icon handle">
-										<icon icon="grip-lines"/>
-									</span>
-									<ColorBubble
-											v-if="l.hexColor !== ''"
-										:color="l.hexColor"
-										class="mr-1"
-									/>
-									<span class="list-menu-title">{{ getListTitle(l) }}</span>
-								</BaseButton>
-								<BaseButton
-									class="favorite"
-									:class="{'is-favorite': l.isFavorite}"
-									@click="listStore.toggleListFavorite(l)"
-								>
-									<icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/>
-								</BaseButton>
+									<a
+										@click="navigate"
+										:href="href"
+										class="list-menu-link"
+										:class="{'router-link-exact-active': isActive || currentList?.id === l.id}"
+									>
+										<span class="icon handle">
+											<icon icon="grip-lines"/>
+										</span>
+										<span
+											:style="{ backgroundColor: l.hexColor }"
+											class="color-bubble"
+											v-if="l.hexColor !== ''">
+										</span>
+										<span class="list-menu-title">
+											{{ getListTitle(l) }}
+										</span>
+										<span
+											:class="{'is-favorite': l.isFavorite}"
+											@click.prevent.stop="toggleFavoriteList(l)"
+											class="favorite">
+											<icon :icon="l.isFavorite ? 'star' : ['far', 'star']" />
+										</span>
+									</a>
+								</router-link>
 								<list-settings-dropdown :list="l" v-if="l.id > 0"/>
 								<span class="list-setting-spacer" v-else></span>
 							</li>
 						</template>
 					</draggable>
+				</div>
 			</template>
-		</nav>
-		<PoweredByLink/>
-	</aside>
+		</aside>
+		<PoweredByLink />
+	</div>
 </template>
 
-<script setup lang="ts">
-import {ref, computed, onMounted, onBeforeMount} from 'vue'
-import draggable from 'zhyswan-vuedraggable'
-import type {SortableEvent} from 'sortablejs'
+<script>
+import {mapState} from 'vuex'
+import draggable from 'vuedraggable'
 
-import BaseButton from '@/components/base/BaseButton.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
 import NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue'
 import PoweredByLink from '@/components/home/PoweredByLink.vue'
 import Logo from '@/components/home/Logo.vue'
 
+import {CURRENT_LIST, MENU_ACTIVE, LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import {calculateItemPosition} from '@/helpers/calculateItemPosition'
-import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
-import {getListTitle} from '@/helpers/getListTitle'
-import {useEventListener} from '@vueuse/core'
-import type {IList} from '@/modelTypes/IList'
-import type {INamespace} from '@/modelTypes/INamespace'
-import ColorBubble from '@/components/misc/colorBubble.vue'
-
-import {useBaseStore} from '@/stores/base'
-import {useListStore} from '@/stores/lists'
-import {useNamespaceStore} from '@/stores/namespaces'
-
-const drag = ref(false)
-const dragOptions = {
-	animation: 100,
-	ghostClass: 'ghost',
-}
-
-const baseStore = useBaseStore()
-const namespaceStore = useNamespaceStore()
-const currentList = computed(() => baseStore.currentList)
-const menuActive = computed(() => baseStore.menuActive)
-const loading = computed(() => namespaceStore.isLoading)
 
 
-const namespaces = computed(() => {
-	return namespaceStore.namespaces.filter(n => !n.isArchived)
-})
-const activeLists = computed(() => {
-	return namespaces.value.map(({lists}) => {
-		return lists?.filter(item => {
-			return typeof item !== 'undefined' && !item.isArchived
-		})
-	})
-})
+export default {
+	name: 'navigation',
 
-const namespaceTitles = computed(() => {
-	return namespaces.value.map((namespace) => getNamespaceTitle(namespace))
-})
+	components: {
+		ListSettingsDropdown,
+		NamespaceSettingsDropdown,
+		draggable,
+		Logo,
+		PoweredByLink,
+	},
 
-const namespaceListsCount = computed(() => {
-	return namespaces.value.map((_, index) => activeLists.value[index]?.length ?? 0)
-})
-
-
-useEventListener('resize', resize)
-onMounted(() => resize())
-
-const listStore = useListStore()
-
-function resize() {
-	// Hide the menu by default on mobile
-	baseStore.setMenuActive(window.innerWidth >= 770)
-}
-
-function toggleLists(namespaceId: INamespace['id']) {
-	listsVisible.value[namespaceId] = !listsVisible.value[namespaceId]
-}
-
-const listsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
-// FIXME: async action will be unfinished when component mounts
-onBeforeMount(async () => {
-	const namespaces = await namespaceStore.loadNamespaces()
-	namespaces.forEach(n => {
-		if (typeof listsVisible.value[n.id] === 'undefined') {
-			listsVisible.value[n.id] = true
+	data() {
+		return {
+			listsVisible: {},
+			drag: false,
+			dragOptions: {
+				animation: 100,
+				ghostClass: 'ghost',
+			},
+			listUpdating: {},
 		}
-	})
-})
+	},
+	computed: {
+		...mapState({
+			namespaces: state => state.namespaces.namespaces.filter(n => !n.isArchived),
+			currentList: CURRENT_LIST,
+			background: 'background',
+			menuActive: MENU_ACTIVE,
+			loading: state => state[LOADING] && state[LOADING_MODULE] === 'namespaces',
+		}),
+		activeLists() {
+			return this.namespaces.map(({lists}) => lists?.filter(item => !item.isArchived))
+		},
+		namespaceTitles() {
+			return this.namespaces.map((namespace, index) => {
+				const title = this.getNamespaceTitle(namespace)
+				return `${title} (${this.activeLists[index]?.length ?? 0})`
+			})
+		},
+	},
+	beforeCreate() {
+		// FIXME: async action in beforeCreate, might be unfinished when component mounts
+		this.$store.dispatch('namespaces/loadNamespaces')
+			.then(namespaces => {
+				namespaces.forEach(n => {
+					if (typeof this.listsVisible[n.id] === 'undefined') {
+						this.listsVisible[n.id] = true
+					}
+				})
+			})
+	},
+	created() {
+		window.addEventListener('resize', this.resize)
+	},
+	mounted() {
+		this.resize()
+	},
+	methods: {
+		toggleFavoriteList(list) {
+			// The favorites pseudo list is always favorite
+			// Archived lists cannot be marked favorite
+			if (list.id === -1 || list.isArchived) {
+				return
+			}
+			this.$store.dispatch('lists/toggleListFavorite', list)
+		},
+		resize() {
+			// Hide the menu by default on mobile
+			this.$store.commit(MENU_ACTIVE, window.innerWidth >= 770)
+		},
+		toggleLists(namespaceId) {
+			this.listsVisible[namespaceId] = !this.listsVisible[namespaceId]
+		},
+		updateActiveLists(namespace, activeLists) {
+			// 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.
+			// instead we iterate over the non archived items in the old list and replace them with the ones in their new order
+			const lists = namespace.lists.map((item) => {
+				if (item.isArchived) {
+					return item
+				}
+				return activeLists.shift()
+			})
 
-function updateActiveLists(namespace: INamespace, activeLists: IList[]) {
-	// 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.
-	// To work around this, we merge the active lists 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 
-	// later when showing them anyway, and it makes the merging happening here a lot easier.
-	const lists = [
-		...activeLists,
-		...namespace.lists.filter(l => l.isArchived),
-	]
+			const newNamespace = {
+				...namespace,
+				lists,
+			}
 
-	namespaceStore.setNamespaceById({
-		...namespace,
-		lists,
-	})
-}
+			this.$store.commit('namespaces/setNamespaceById', newNamespace)
+		},
 
-const listUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
+		async saveListPosition(e, namespaceIndex) {
+			const listsActive = this.activeLists[namespaceIndex]
+			const list = listsActive[e.newIndex]
+			const listBefore = listsActive[e.newIndex - 1] ?? null
+			const listAfter = listsActive[e.newIndex + 1] ?? null
+			this.listUpdating[list.id] = true
 
-async function saveListPosition(e: SortableEvent) {
-	if (!e.newIndex && e.newIndex !== 0) return
+			const position = calculateItemPosition(listBefore !== null ? listBefore.position : null, listAfter !== null ? listAfter.position : null)
 
-	const namespaceId = parseInt(e.to.dataset.namespaceId as string)
-	const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string)
-
-	const listsActive = activeLists.value[newNamespaceIndex]
-	// If the list was dragged to the last position, Safari will report e.newIndex as the size of the listsActive
-	// array instead of using the position. Because the index is wrong in that case, dragging the list will fail.
-	// 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 list = listsActive[newIndex]
-	const listBefore = listsActive[newIndex - 1] ?? null
-	const listAfter = listsActive[newIndex + 1] ?? null
-	listUpdating.value[list.id] = true
-
-	const position = calculateItemPosition(
-		listBefore !== null ? listBefore.position : null,
-		listAfter !== null ? listAfter.position : null,
-	)
-
-	try {
-		// create a copy of the list in order to not violate pinia manipulation
-		await listStore.updateList({
-			...list,
-			position,
-			namespaceId,
-		})
-	} finally {
-		listUpdating.value[list.id] = false
-	}
+			try {
+				// create a copy of the list in order to not violate vuex mutations
+				await this.$store.dispatch('lists/updateList', {
+					...list,
+					position,
+				})
+			} finally {
+				this.listUpdating[list.id] = false
+			}
+		},
+	},
 }
 </script>
 
@@ -281,6 +285,7 @@ $vikunja-nav-color: var(--grey-700);
 $vikunja-nav-selected-width: 0.4rem;
 
 .namespace-container {
+	z-index: 6;
 	background: $vikunja-nav-background;
 	color: $vikunja-nav-color;
 	padding: 0 0 1rem;
@@ -293,10 +298,10 @@ $vikunja-nav-selected-width: 0.4rem;
 	overflow-x: auto;
 	width: $navbar-width;
 
+
 	@media screen and (max-width: $tablet) {
 		top: 0;
 		width: 70vw;
-		z-index: 20;
 	}
 
 	&.is-active {
@@ -320,7 +325,7 @@ $vikunja-nav-selected-width: 0.4rem;
 		}
 
 		.menu-label,
-		.menu-list .list-menu-link,
+		.menu-list span.list-menu-link,
 		.menu-list a {
 			display: flex;
 			align-items: center;
@@ -338,28 +343,30 @@ $vikunja-nav-selected-width: 0.4rem;
 				flex: 0 0 12px;
 			}
 
-		}
-		.favorite {
-			margin-left: .25rem;
-			transition: opacity $transition, color $transition;
-			opacity: 0;
+			.favorite {
+				margin-left: .25rem;
+				transition: opacity $transition, color $transition;
+				opacity: 0;
 
-			&:hover,
-			&.is-favorite {
-				color: var(--warning);
+				&:hover {
+					color: var(--warning);
+				}
+
+				&.is-favorite {
+					opacity: 1;
+					color: var(--warning);
+				}
 			}
-		}
 
-		.favorite.is-favorite,
-		.list-menu:hover .favorite {
-			opacity: 1;
+			&:hover .favorite {
+				opacity: 1;
+			}
 		}
 
 		.menu-label {
 			.color-bubble {
-				width: 14px;
-				height: 14px;
-				flex-basis: auto;
+				width: 14px !important;
+				height: 14px !important;
 			}
 
 			.is-archived {
@@ -371,8 +378,6 @@ $vikunja-nav-selected-width: 0.4rem;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			color: $vikunja-nav-color;
-			padding: 0 .25rem;
 
 			.menu-label {
 				margin-bottom: 0;
@@ -382,13 +387,12 @@ $vikunja-nav-selected-width: 0.4rem;
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
-					margin-right: auto;
 				}
+			}
 
-				.count {
-					color: var(--grey-500);
-					margin-right: .5rem;
-				}
+			a:not(.dropdown-item) {
+				color: $vikunja-nav-color;
+				padding: 0 .25rem;
 			}
 
 			:deep(.dropdown-trigger) {
@@ -420,7 +424,7 @@ $vikunja-nav-selected-width: 0.4rem;
 
 		.menu-label,
 		.nsettings,
-		.menu-list .list-menu-link,
+		.menu-list span.list-menu-link,
 		.menu-list a {
 			color: $vikunja-nav-color;
 		}
@@ -463,7 +467,7 @@ $vikunja-nav-selected-width: 0.4rem;
 				background: transparent;
 			}
 
-			.list-menu-link, li > a {
+			span.list-menu-link, li > a {
 				padding: 0.75rem .5rem 0.75rem ($navbar-padding * 1.5 - 1.75rem);
 				transition: all 0.2s ease;
 
@@ -478,7 +482,7 @@ $vikunja-nav-selected-width: 0.4rem;
 					height: 1rem;
 					vertical-align: middle;
 					padding-right: 0.5rem;
-
+					
 					&.handle {
 						opacity: 0;
 						transition: opacity $transition;
@@ -486,7 +490,7 @@ $vikunja-nav-selected-width: 0.4rem;
 						cursor: grab;
 					}
 				}
-
+				
 				&:hover .icon.handle {
 					opacity: 1;
 				}
@@ -509,9 +513,8 @@ $vikunja-nav-selected-width: 0.4rem;
 		.logo {
 			display: block;
 
-			padding-left: 1rem;
+			padding-left: 2rem;
 			margin-right: 1rem;
-			margin-bottom: 1rem;
 
 			@media screen and (min-width: $tablet) {
 				display: none;
@@ -536,10 +539,10 @@ $vikunja-nav-selected-width: 0.4rem;
 				font-family: $vikunja-font;
 			}
 
-			.list-menu-link, li > a {
+			span.list-menu-link, li > a {
 				padding-left: 2rem;
 				display: inline-block;
-
+				
 				.icon {
 					padding-bottom: .25rem;
 				}
@@ -549,7 +552,7 @@ $vikunja-nav-selected-width: 0.4rem;
 }
 
 .list-setting-spacer {
-	width: 2.5rem;
+	width: 32px;
 	flex-shrink: 0;
 }
 

src/components/home/topNavigation.vue

@@ -1,8 +1,9 @@
 <template>
-	<header
-		:class="{'has-background': background, 'menu-active': menuActive}"
+	<nav
+		:class="{'has-background': background}"
 		aria-label="main navigation"
-		class="navbar main-theme is-fixed-top d-print-none"
+		class="navbar main-theme is-fixed-top"
+		role="navigation"
 	>
 		<router-link :to="{name: 'home'}" class="logo-link">
 			<Logo width="164" height="48"/>
@@ -16,126 +17,121 @@
 					{{ currentList.title === '' ? $t('misc.loading') : getListTitle(currentList) }}
 				</h1>
 
-				<BaseButton :to="{name: 'list.info', params: {listId: currentList.id}}" class="info-button">
-					<icon icon="circle-info"/>
-				</BaseButton>
-
 				<list-settings-dropdown v-if="canWriteCurrentList && currentList.id !== -1" :list="currentList"/>
 			</template>
 		</div>
 
 		<div class="navbar-end">
 			<update/>
-			<BaseButton
+			<a
 				@click="openQuickActions"
 				class="trigger-button pr-0"
 				v-shortcut="'Control+k'"
 				:title="$t('keyboardShortcuts.quickSearch')"
 			>
 				<icon icon="search"/>
-			</BaseButton>
+			</a>
 			<notifications/>
 			<div class="user">
+				<img :src="userAvatar" alt="" class="avatar" width="40" height="40"/>
 				<dropdown class="is-right" ref="usernameDropdown">
-					<template #trigger="{toggleOpen}">
+					<template #trigger>
 						<x-button
-							class="username-dropdown-trigger"
-							@click="toggleOpen()"
 							variant="secondary"
-							:shadow="false"
-						>
-							<img :src="authStore.avatarUrl" alt="" class="avatar" width="40" height="40"/>
-							<span class="username">{{ authStore.userDisplayName }}</span>
+							:shadow="false">
+							<span class="username">{{ userInfo.name !== '' ? userInfo.name : userInfo.username }}</span>
 							<span class="icon is-small">
 								<icon icon="chevron-down"/>
 							</span>
 						</x-button>
 					</template>
 
-					<dropdown-item
-						:to="{name: 'user.settings'}"
-					>
+					<router-link :to="{name: 'user.settings'}" class="dropdown-item">
 						{{ $t('user.settings.title') }}
-					</dropdown-item>
-					<dropdown-item
-						v-if="imprintUrl"
+					</router-link>
+					<a
 						:href="imprintUrl"
-					>
+						class="dropdown-item"
+						target="_blank"
+						rel="noreferrer noopener nofollow"
+						v-if="imprintUrl">
 						{{ $t('navigation.imprint') }}
-					</dropdown-item>
-					<dropdown-item
-						v-if="privacyPolicyUrl"
+					</a>
+					<a
 						:href="privacyPolicyUrl"
-					>
+						class="dropdown-item"
+						target="_blank"
+						rel="noreferrer noopener nofollow"
+						v-if="privacyPolicyUrl">
 						{{ $t('navigation.privacy') }}
-					</dropdown-item>
-					<dropdown-item
-						@click="baseStore.setKeyboardShortcutsActive(true)"
-					>
+					</a>
+					<a @click="$store.commit('keyboardShortcutsActive', true)" class="dropdown-item">
 						{{ $t('keyboardShortcuts.title') }}
-					</dropdown-item>
-					<dropdown-item
-						:to="{name: 'about'}"
-					>
+					</a>
+					<router-link :to="{name: 'about'}" class="dropdown-item">
 						{{ $t('about.title') }}
-					</dropdown-item>
-					<dropdown-item
-						@click="authStore.logout()"
-					>
+					</router-link>
+					<a @click="logout()" class="dropdown-item">
 						{{ $t('user.auth.logout') }}
-					</dropdown-item>
+					</a>
 				</dropdown>
 			</div>
 		</div>
-	</header>
+	</nav>
 </template>
 
-<script setup lang="ts">
-import {ref, computed, onMounted, nextTick} from 'vue'
-
-import {RIGHTS as Rights} from '@/constants/rights'
-
+<script>
+import {mapState} from 'vuex'
+import {CURRENT_LIST, QUICK_ACTIONS_ACTIVE} from '@/store/mutation-types'
+import Rights from '@/models/constants/rights.json'
 import Update from '@/components/home/update.vue'
 import ListSettingsDropdown from '@/components/list/list-settings-dropdown.vue'
 import Dropdown from '@/components/misc/dropdown.vue'
-import DropdownItem from '@/components/misc/dropdown-item.vue'
 import Notifications from '@/components/notifications/notifications.vue'
 import Logo from '@/components/home/Logo.vue'
-import BaseButton from '@/components/base/BaseButton.vue'
 import MenuButton from '@/components/home/MenuButton.vue'
 
-import {getListTitle} from '@/helpers/getListTitle'
+export default {
+	name: 'topNavigation',
+	components: {
+		Notifications,
+		Dropdown,
+		ListSettingsDropdown,
+		Update,
+		Logo,
+		MenuButton,
+	},
+	computed: {
+		...mapState({
+			userInfo: state => state.auth.info,
+			userAvatar: state => state.auth.avatarUrl,
+			userAuthenticated: state => state.auth.authenticated,
+			currentList: CURRENT_LIST,
+			background: 'background',
+			imprintUrl: state => state.config.legal.imprintUrl,
+			privacyPolicyUrl: state => state.config.legal.privacyPolicyUrl,
+			canWriteCurrentList: state => state.currentList.maxRight > Rights.READ,
+		}),
+	},
+	mounted() {
+		this.$nextTick(() => {
+			if (typeof this.$refs.usernameDropdown === 'undefined' || typeof this.$refs.listTitle === 'undefined') {
+				return
+			}
 
-import {useBaseStore} from '@/stores/base'
-import {useConfigStore} from '@/stores/config'
-import {useAuthStore} from '@/stores/auth'
-
-const baseStore = useBaseStore()
-const currentList = computed(() => baseStore.currentList)
-const background = computed(() => baseStore.background)
-const canWriteCurrentList = computed(() => baseStore.currentList.maxRight > Rights.READ)
-const menuActive = computed(() => baseStore.menuActive)
-
-const authStore = useAuthStore()
-
-const configStore = useConfigStore()
-const imprintUrl = computed(() => configStore.legal.imprintUrl)
-const privacyPolicyUrl = computed(() => configStore.legal.privacyPolicyUrl)
-
-const usernameDropdown = ref()
-const listTitle = ref()
-onMounted(async () => {
-	await nextTick()
-	if (typeof usernameDropdown.value === 'undefined' || typeof listTitle.value === 'undefined') {
-		return
-	}
-
-	const usernameWidth = usernameDropdown.value.$el.clientWidth
-	listTitle.value.style.setProperty('--nav-username-width', `${usernameWidth}px`)
-})
-
-function openQuickActions() {
-	baseStore.setQuickActionsActive(true)
+			const usernameWidth = this.$refs.usernameDropdown.$el.clientWidth
+			this.$refs.listTitle.style.setProperty('--nav-username-width', `${usernameWidth}px`)
+		})
+	},
+	methods: {
+		logout() {
+			this.$store.dispatch('auth/logout')
+			this.$router.push({name: 'user.login'})
+		},
+		openQuickActions() {
+			this.$store.commit(QUICK_ACTIONS_ACTIVE, true)
+		},
+	},
 }
 </script>
 
@@ -146,6 +142,10 @@ $user-dropdown-width-mobile: 5rem;
 $hamburger-menu-icon-spacing: 1rem;
 $hamburger-menu-icon-width: 28px;
 
+.navbar {
+	z-index: 4 !important;
+}
+
 .logo-link {
 	display: none;
 	padding: 0.5rem 0.75rem;
@@ -170,6 +170,7 @@ $hamburger-menu-icon-width: 28px;
 
 .navbar.main-theme {
 	background: var(--site-background);
+	z-index: 5 !important;
 	justify-content: space-between;
 	align-items: center;
 
@@ -193,20 +194,21 @@ $hamburger-menu-icon-width: 28px;
 	}
 
 	@media screen and (max-width: $tablet) {
-		&.menu-active {
-			z-index: 0;
-		}
-
 		.user {
 			width: $user-dropdown-width-mobile;
+			display: flex;
+			align-items: center;
 
-			.username-dropdown-trigger {
+			:deep(.dropdown-trigger) {
 				line-height: 1;
-				padding: 0 0.25rem;
-				height: 1rem;
 
-				.icon {
-					width: .5rem;
+				.button {
+					padding: 0 0.25rem;
+					height: 1rem;
+
+					.icon {
+						width: .5rem;
+					}
 				}
 			}
 
@@ -245,10 +247,9 @@ $hamburger-menu-icon-width: 28px;
 			border-radius: 100%;
 			vertical-align: middle;
 			height: 40px;
-			margin-right: .5rem;
 		}
 
-		.username-dropdown-trigger {
+		:deep(.dropdown-trigger .button) {
 			background: none;
 
 			&:focus:not(:active), &:active {
@@ -283,21 +284,10 @@ $hamburger-menu-icon-width: 28px;
 
 	:deep(.dropdown-trigger) {
 		color: var(--grey-400);
-		margin-left: .5rem;
+		margin-left: 1rem;
 		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>

src/components/home/update.vue

@@ -1,61 +1,72 @@
 <template>
 	<div class="update-notification" v-if="updateAvailable">
 		<p>{{ $t('update.available') }}</p>
-		<x-button @click="refreshApp()" :shadow="false" class="has-no-text-wrap">
+		<x-button @click="refreshApp()" :shadow="false">
 			{{ $t('update.do') }}
 		</x-button>
 	</div>
 </template>
 
-<script lang="ts" setup>
-import {ref} from 'vue'
+<script>
+export default {
+	name: 'update',
+	data() {
+		return {
+			updateAvailable: false,
+			registration: null,
+			refreshing: false,
+		}
+	},
+	created() {
+		document.addEventListener('swUpdated', this.showRefreshUI, {once: true})
 
-const updateAvailable = ref(false)
-const registration = ref(null)
-const refreshing = ref(false)
-
-document.addEventListener('swUpdated', showRefreshUI, {once: true})
-
-if (navigator && navigator.serviceWorker) {
-	navigator.serviceWorker.addEventListener(
-		'controllerchange', () => {
-			if (refreshing.value) return
-			refreshing.value = true
-			window.location.reload()
+		if (navigator && navigator.serviceWorker) {
+			navigator.serviceWorker.addEventListener(
+				'controllerchange', () => {
+					if (this.refreshing) return
+					this.refreshing = true
+					window.location.reload()
+				},
+			)
+		}
+	},
+	methods: {
+		showRefreshUI(e) {
+			console.log('recieved refresh event', e)
+			this.registration = e.detail
+			this.updateAvailable = true
 		},
-	)
-}
-
-function showRefreshUI(e) {
-	console.log('recieved refresh event', e)
-	registration.value = e.detail
-	updateAvailable.value = true
-}
-
-function refreshApp() {
-	if (!registration.value || !registration.value.waiting) {
-		return
-	}
-	// Notify the service worker to actually do the update
-	registration.value.waiting.postMessage('skipWaiting')
+		refreshApp() {
+			this.updateExists = false
+			if (!this.registration || !this.registration.waiting) {
+				return
+			}
+			// Notify the service worker to actually do the update
+			this.registration.waiting.postMessage('skipWaiting')
+		},
+	},
 }
 </script>
 
 <style lang="scss" scoped>
 .update-notification {
+	margin: 1rem;
 	display: flex;
 	align-items: center;
 	background: $warning;
-	padding: .5rem;
+	padding: 0 0 0 .5rem;
 	border-radius: $radius;
 	font-size: .9rem;
 	color: var(--grey-900);
 	justify-content: space-between;
 
-	position: fixed;
-	bottom: 1rem;
-	width: 450px;
-	left: calc(50vw - 225px);
+	@media screen and (max-width: $desktop) {
+		position: fixed;
+		bottom: 1rem;
+		margin: 0;
+		width: 450px;
+		left: calc(50vw - 225px);
+	}
 
 	@media screen and (max-width: $tablet) {
 		position: fixed;
@@ -74,8 +85,4 @@ function refreshApp() {
 		margin-left: .5rem;
 	}
 }
-
-.dark .update-notification {
-	color: var(--grey-200);
-}
 </style>

src/components/input/button.vue

@@ -9,27 +9,22 @@
 			}
 		]"
 	>
-		<icon 
-			v-if="showIconOnly"
-			:icon="icon"
-			:style="{'color': iconColor !== '' ? iconColor : false}"
-		/>
+		<icon :icon="icon" v-if="showIconOnly"/>
 		<span class="icon is-small" v-else-if="icon !== ''">
-			<icon 
-				:icon="icon"
-				:style="{'color': iconColor !== '' ? iconColor : false}"
-			/>
+			<icon :icon="icon"/>
 		</span>
 		<slot />
 	</BaseButton>
 </template>
 
 <script lang="ts">
-export default { name: 'x-button' }
+export default {
+	name: 'x-button',
+}
 </script>
 
 <script setup lang="ts">
-import {computed, useSlots, type PropType} from 'vue'
+import {computed, useSlots, PropType} from 'vue'
 import BaseButton from '@/components/base/BaseButton.vue'
 
 const BUTTON_TYPES_MAP =  Object.freeze({
@@ -46,11 +41,6 @@ const props = defineProps({
 		default: 'primary',
 	},
 	icon: {
-		type: [String, Array],
-		default: '',
-	},
-	iconColor: {
-		type: String,
 		default: '',
 	},
 	loading: {
@@ -76,11 +66,9 @@ const showIconOnly = computed(() => props.icon !== '' && typeof slots.default ==
   text-transform: uppercase;
   font-size: 0.85rem;
   font-weight: bold;
-  height: auto;
-  min-height: $button-height;
+  height: $button-height;
   box-shadow: var(--shadow-sm);
   display: inline-flex;
-  white-space: break-spaces;
 
   &:hover {
     box-shadow: var(--shadow-md);

src/components/input/colorPicker.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="color-picker-container">
 		<datalist :id="colorListID">
-			<option v-for="defaultColor in defaultColors" :key="defaultColor" :value="defaultColor" />
+			<option v-for="color in defaultColors" :key="color" :value="color" />
 		</datalist>
 		
 		<div class="picker">
@@ -34,8 +34,7 @@
 	</div>
 </template>
 
-<script setup lang="ts">
-import {computed, ref, toRef, watch} from 'vue'
+<script>
 import {createRandomID} from '@/helpers/randomId'
 
 const DEFAULT_COLORS = [
@@ -47,56 +46,65 @@ const DEFAULT_COLORS = [
 	'#00db60',
 ]
 
-const color = ref('')
-const lastChangeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
-const defaultColors = ref(DEFAULT_COLORS)
-const colorListID = ref(createRandomID())
-
-const props = defineProps({
-	modelValue: {
-		type: String,
-		required: true,
+export default {
+	name: 'colorPicker',
+	data() {
+		return {
+			color: '',
+			lastChangeTimeout: null,
+			defaultColors: DEFAULT_COLORS,
+			colorListID: createRandomID(),
+		}
 	},
-	menuPosition: {
-		type: String,
-		default: 'top',
+	props: {
+		modelValue: {
+			required: true,
+		},
+		menuPosition: {
+			type: String,
+			default: 'top',
+		},
 	},
-})
-
-const emit = defineEmits(['update:modelValue'])
-
-const modelValue = toRef(props, 'modelValue')
-watch(
-	modelValue,
-	(newValue) => {
-		color.value = newValue
+	emits: ['update:modelValue', 'change'],
+	watch: {
+		modelValue: {
+			handler(modelValue) {
+				this.color = modelValue
+			},
+			immediate: true,
+		},
+		color() {
+			this.update()
+		},
 	},
-	{immediate: true},
-)
+	computed: {
+		isEmpty() {
+			return this.color === '#000000' || this.color === ''
+		},
+	},
+	methods: {
+		update(force = false) {
 
-watch(color, () => update())
+			if(this.isEmpty && !force) {
+				return
+			}
 
-const isEmpty = computed(() => color.value === '#000000' || color.value === '')
+			if (this.lastChangeTimeout !== null) {
+				clearTimeout(this.lastChangeTimeout)
+			}
 
-function update(force = false) {
-	if(isEmpty.value && !force) {
-		return
-	}
-
-	if (lastChangeTimeout.value !== null) {
-		clearTimeout(lastChangeTimeout.value)
-	}
-
-	lastChangeTimeout.value = setTimeout(() => {
-		emit('update:modelValue', color.value)
-	}, 500)
-}
-
-function reset() {
-	// FIXME: I havn't found a way to make it clear to the user the color war reset.
-	//  Not sure if verte is capable of this - it does not show the change when setting this.color = ''
-	color.value = ''
-	update(true)
+			this.lastChangeTimeout = setTimeout(() => {
+				this.$emit('update:modelValue', this.color)
+				this.$emit('change')
+			}, 500)
+		},
+		reset() {
+			// FIXME: I havn't found a way to make it clear to the user the color war reset.
+			//  Not sure if verte is capable of this - it does not show the change when setting this.color = ''
+			this.color = ''
+			this.update(true)
+		},
+	},
 }
 </script>
 

src/components/input/datepicker.vue

@@ -1,73 +1,95 @@
 <template>
-	<div class="datepicker">
-		<BaseButton @click.stop="toggleDatePopup" class="show" :disabled="disabled || undefined">
-			{{ date === null ? chooseDateLabel : formatDateShort(date) }}
-		</BaseButton>
+	<div class="datepicker" :class="{'disabled': disabled}">
+		<a @click.stop="toggleDatePopup" class="show">
+			<template v-if="date === null">
+				{{ chooseDateLabel }}
+			</template>
+			<template v-else>
+				{{ formatDateShort(date) }}
+			</template>
+		</a>
 
 		<transition name="fade">
 			<div v-if="show" class="datepicker-popup" ref="datepickerPopup">
 
-				<BaseButton
-					v-if="(new Date()).getHours() < 21"
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('today')"
-				>
-					<span class="icon"><icon :icon="['far', 'calendar-alt']"/></span>
-					<span class="text">
-						<span>{{ $t('input.datepicker.today') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('today') }}</span>
+				<a @click.stop="() => setDate('today')" v-if="(new Date()).getHours() < 21">
+					<span class="icon">
+						<icon :icon="['far', 'calendar-alt']"/>
 					</span>
-				</BaseButton>
-				<BaseButton
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('tomorrow')"
-				>
-					<span class="icon"><icon :icon="['far', 'sun']"/></span>
 					<span class="text">
-						<span>{{ $t('input.datepicker.tomorrow') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('tomorrow') }}</span>
+						<span>
+							{{ $t('input.datepicker.today') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('today') }}
+						</span>
+					</span>
+				</a>
+				<a @click.stop="() => setDate('tomorrow')">
+					<span class="icon">
+						<icon :icon="['far', 'sun']"/>
 					</span>
-				</BaseButton>
-				<BaseButton
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('nextMonday')"
-				>
-					<span class="icon"><icon icon="coffee"/></span>
 					<span class="text">
-						<span>{{ $t('input.datepicker.nextMonday') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('nextMonday') }}</span>
+						<span>
+							{{ $t('input.datepicker.tomorrow') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('tomorrow') }}
+						</span>
+					</span>
+				</a>
+				<a @click.stop="() => setDate('nextMonday')">
+					<span class="icon">
+						<icon icon="coffee"/>
 					</span>
-				</BaseButton>
-				<BaseButton
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('thisWeekend')"
-				>
-					<span class="icon"><icon icon="cocktail"/></span>
 					<span class="text">
-						<span>{{ $t('input.datepicker.thisWeekend') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('thisWeekend') }}</span>
+						<span>
+							{{ $t('input.datepicker.nextMonday') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('nextMonday') }}
+						</span>
+					</span>
+				</a>
+				<a @click.stop="() => setDate('thisWeekend')">
+					<span class="icon">
+						<icon icon="cocktail"/>
 					</span>
-				</BaseButton>
-				<BaseButton
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('laterThisWeek')"
-				>
-					<span class="icon"><icon icon="chess-knight"/></span>
 					<span class="text">
-						<span>{{ $t('input.datepicker.laterThisWeek') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('laterThisWeek') }}</span>
+						<span>
+							{{ $t('input.datepicker.thisWeekend') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('thisWeekend') }}
+						</span>
+					</span>
+				</a>
+				<a @click.stop="() => setDate('laterThisWeek')">
+					<span class="icon">
+						<icon icon="chess-knight"/>
 					</span>
-				</BaseButton>
-				<BaseButton
-					class="datepicker__quick-select-date"
-					@click.stop="setDate('nextWeek')"
-				>
-					<span class="icon"><icon icon="forward"/></span>
 					<span class="text">
-						<span>{{ $t('input.datepicker.nextWeek') }}</span>
-						<span class="weekday">{{ getWeekdayFromStringInterval('nextWeek') }}</span>
+						<span>
+							{{ $t('input.datepicker.laterThisWeek') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('laterThisWeek') }}
+						</span>
 					</span>
-				</BaseButton>
+				</a>
+				<a @click.stop="() => setDate('nextWeek')">
+					<span class="icon">
+						<icon icon="forward"/>
+					</span>
+					<span class="text">
+						<span>
+							{{ $t('input.datepicker.nextWeek') }}
+						</span>
+						<span class="weekday">
+							{{ getWeekdayFromStringInterval('nextWeek') }}
+						</span>
+					</span>
+				</a>
 
 				<flat-pickr
 					:config="flatPickerConfig"
@@ -76,7 +98,7 @@
 				/>
 
 				<x-button
-					class="datepicker__close-button"
+					class="is-fullwidth"
 					:shadow="false"
 					@click="close"
 					v-cy="'closeDatepicker'"
@@ -88,151 +110,138 @@
 	</div>
 </template>
 
-<script setup lang="ts">
-import {ref, onMounted, onBeforeUnmount, toRef, watch, computed, type PropType} from 'vue'
+<script>
 import flatPickr from 'vue-flatpickr-component'
 import 'flatpickr/dist/flatpickr.css'
+import { i18n } from '@/i18n'
 
-import BaseButton from '@/components/base/BaseButton.vue'
-
-import {formatDate, formatDateShort} from '@/helpers/time/formatDate'
+import {format} from 'date-fns'
 import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
 import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {createDateFromString} from '@/helpers/time/createDateFromString'
-import {useAuthStore} from '@/stores/auth'
-import {useI18n} from 'vue-i18n'
 
-const props = defineProps({
-	modelValue: {
-		type: [Date, null, String] as PropType<Date | null | string>,
-		validator: prop => prop instanceof Date || prop === null || typeof prop === 'string',
-		default: null,
+export default {
+	name: 'datepicker',
+	data() {
+		return {
+			date: null,
+			show: false,
+			changed: false,
+
+			// Since flatpickr dates are strings, we need to convert them to native date objects.
+			// To make that work, we need a separate variable since flatpickr does not have a change event.
+			flatPickrDate: null,
+		}
 	},
-	chooseDateLabel: {
-		type: String,
-		default() {
-			const {t} = useI18n({useScope: 'global'})
-			return t('input.datepicker.chooseDate')
+	components: {
+		flatPickr,
+	},
+	props: {
+		modelValue: {
+			validator: prop => prop instanceof Date || prop === null || typeof prop === 'string',
+		},
+		chooseDateLabel: {
+			type: String,
+			default() {
+				return i18n.global.t('input.datepicker.chooseDate')
+			},
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
 		},
 	},
-	disabled: {
-		type: Boolean,
-		default: false,
+	emits: ['update:modelValue', 'change', 'close', 'close-on-change'],
+	mounted() {
+		document.addEventListener('click', this.hideDatePopup)
 	},
-})
-
-const emit = defineEmits(['update:modelValue', 'close', 'close-on-change'])
-
-const {t} = useI18n({useScope: 'global'})
-
-const date = ref<Date | null>()
-const show = ref(false)
-const changed = ref(false)
-
-onMounted(() => document.addEventListener('click', hideDatePopup))
-onBeforeUnmount(() =>document.removeEventListener('click', hideDatePopup))
-
-const modelValue = toRef(props, 'modelValue')
-watch(
-	modelValue,
-	setDateValue,
-	{immediate: true},
-)
-
-const authStore = useAuthStore()
-const weekStart = computed(() => authStore.settings.weekStart)
-const flatPickerConfig = computed(() => ({
-	altFormat: t('date.altFormatLong'),
-	altInput: true,
-	dateFormat: 'Y-m-d H:i',
-	enableTime: true,
-	time_24hr: true,
-	inline: true,
-	locale: {
-		firstDayOfWeek: weekStart.value,
+	beforeUnmount() {
+		document.removeEventListener('click', this.hideDatePopup)
 	},
-}))
-
-// Since flatpickr dates are strings, we need to convert them to native date objects.
-// To make that work, we need a separate variable since flatpickr does not have a change event.
-const flatPickrDate = computed({
-	set(newValue: string | Date) {
-		date.value = createDateFromString(newValue)
-		updateData()
+	watch: {
+		modelValue: {
+			handler: 'setDateValue',
+			immediate: true,
+		},
+		flatPickrDate(newVal) {
+			this.date = createDateFromString(newVal)
+			this.updateData()
+		},
 	},
-	get() {
-		if (!date.value) {
-			return ''
-		}
-
-		return formatDate(date.value, 'yyy-LL-dd H:mm')
+	computed: {
+		flatPickerConfig() {
+			return {
+				altFormat: this.$t('date.altFormatLong'),
+				altInput: true,
+				dateFormat: 'Y-m-d H:i',
+				enableTime: true,
+				time_24hr: true,
+				inline: true,
+				locale: {
+					firstDayOfWeek: this.$store.state.auth.settings.weekStart,
+				},
+			}
+		},
 	},
-})
+	methods: {
+		setDateValue(newVal) {
+			if(newVal === null) {
+				this.date = null
+				return
+			}
+			this.date = createDateFromString(newVal)
+		},
+		updateData() {
+			this.changed = true
+			this.$emit('update:modelValue', this.date)
+			this.$emit('change', this.date)
+		},
+		toggleDatePopup() {
+			if(this.disabled) {
+				return
+			}
 
+			this.show = !this.show
+		},
+		hideDatePopup(e) {
+			if (this.show) {
+				closeWhenClickedOutside(e, this.$refs.datepickerPopup, this.close)
+			}
+		},
+		close() {
+			this.show = false
+			this.$emit('close', this.changed)
+			if(this.changed) {
+				this.changed = false
+				this.$emit('close-on-change', this.changed)
+			}
+		},
+		setDate(date) {
+			if (this.date === null) {
+				this.date = new Date()
+			}
 
-function setDateValue(dateString: string | Date | null) {
-	if (dateString === null) {
-		date.value = null
-		return
-	}
-	date.value = createDateFromString(dateString)
-}
-
-function updateData() {
-	changed.value = true
-	emit('update:modelValue', date.value)
-}
-
-function toggleDatePopup() {
-	if (props.disabled) {
-		return
-	}
-
-	show.value = !show.value
-}
-
-const datepickerPopup = ref<HTMLElement | null>(null)
-function hideDatePopup(e) {
-	if (show.value) {
-		closeWhenClickedOutside(e, datepickerPopup.value, close)
-	}
-}
-
-function close() {
-	// Kind of dirty, but the timeout allows us to enter a time and click on "confirm" without
-	// having to click on another input field before it is actually used.
-	setTimeout(() => {
-		show.value = false
-		emit('close', changed.value)
-		if (changed.value) {
-			changed.value = false
-			emit('close-on-change', changed.value)
-		}
-	}, 200)
-}
-
-function setDate(dateString: string) {
-	if (date.value === null) {
-		date.value = new Date()
-	}
-
-	const interval = calculateDayInterval(dateString)
-	const newDate = new Date()
-	newDate.setDate(newDate.getDate() + interval)
-	newDate.setHours(calculateNearestHours(newDate))
-	newDate.setMinutes(0)
-	newDate.setSeconds(0)
-	date.value = newDate
-	flatPickrDate.value = newDate
-	updateData()
-}
-
-function getWeekdayFromStringInterval(dateString: string) {
-	const interval = calculateDayInterval(dateString)
-	const newDate = new Date()
-	newDate.setDate(newDate.getDate() + interval)
-	return formatDate(newDate, 'E')
+			const interval = calculateDayInterval(date)
+			const newDate = new Date()
+			newDate.setDate(newDate.getDate() + interval)
+			newDate.setHours(calculateNearestHours(newDate))
+			newDate.setMinutes(0)
+			newDate.setSeconds(0)
+			this.date = newDate
+			this.flatPickrDate = newDate
+			this.updateData()
+		},
+		getDayIntervalFromString(date) {
+			return calculateDayInterval(date)
+		},
+		getWeekdayFromStringInterval(date) {
+			const interval = calculateDayInterval(date)
+			const newDate = new Date()
+			newDate.setDate(newDate.getDate() + interval)
+			return format(newDate, 'E')
+		},
+	},
 }
 </script>
 
@@ -241,64 +250,68 @@ function getWeekdayFromStringInterval(dateString: string) {
 	input.input {
 		display: none;
 	}
-}
 
-.datepicker-popup {
-	position: absolute;
-	z-index: 99;
-	width: 320px;
-	background: var(--white);
-	border-radius: $radius;
-	box-shadow: $shadow;
-
-	@media screen and (max-width: ($tablet)) {
-		width: calc(100vw - 5rem);
-	}
-}
-
-.datepicker__quick-select-date {
-	display: flex;
-	align-items: center;
-	padding: 0 .5rem;
-	width: 100%;
-	height: 2.25rem;
-	color: var(--text);
-	transition: all $transition;
-
-	&:first-child {
-		border-radius: $radius $radius 0 0;
+	&.disabled a {
+		cursor: default;
 	}
 
-	&:hover {
-		background: var(--grey-100);
-	}
+	.datepicker-popup {
+		position: absolute;
+		z-index: 99;
+		width: 320px;
+		background: var(--white);
+		border-radius: $radius;
+		box-shadow: $shadow;
 
-	.text {
-		width: 100%;
-		font-size: .85rem;
-		display: flex;
-		justify-content: space-between;
-		padding-right: .25rem;
+		@media screen and (max-width: ($tablet)) {
+			width: calc(100vw - 5rem);
+		}
 
-		.weekday {
-			color: var(--text-light);
-			text-transform: capitalize;
+		a:not(.button) {
+			display: flex;
+			align-items: center;
+			padding: 0 .5rem;
+			width: 100%;
+			height: 2.25rem;
+			color: var(--text);
+			transition: all $transition;
+
+			&:first-child {
+				border-radius: $radius $radius 0 0;
+			}
+
+			&:hover {
+				background: var(--light);
+			}
+
+			.text {
+				width: 100%;
+				font-size: .85rem;
+				display: flex;
+				justify-content: space-between;
+				padding-right: .25rem;
+
+				.weekday {
+					color: var(--text-light);
+					text-transform: capitalize;
+				}
+			}
+
+			.icon {
+				width: 2rem;
+				text-align: center;
+			}
+		}
+			
+		a.button {
+			margin: 1rem;
+			width: calc(100% - 2rem);
+		}
+
+		:deep(.flatpickr-calendar) {
+			margin: 0 auto 8px;
+			box-shadow: none;
 		}
 	}
-
-	.icon {
-		width: 2rem;
-		text-align: center;
-	}
-}
-	
-.datepicker__close-button {
-	margin: 1rem;
-	width: calc(100% - 2rem);
-}
-
-:deep(.flatpickr-calendar) {
-	margin: 0 auto 8px;
-	box-shadow: none;
 }
 </style>

src/components/input/editor.vue

@@ -1,10 +1,10 @@
 <template>
 	<div class="editor">
 		<div class="clear"></div>
-
+		
 		<vue-easymde
 			:configs="config"
-			@change="() => bubble()"
+			@change="bubble"
 			@update:modelValue="handleInput"
 			class="content"
 			v-if="isEditActive"
@@ -16,301 +16,304 @@
 		<p class="has-text-centered has-text-grey is-italic my-5" v-if="showPreviewText">
 			{{ emptyText }}
 			<template v-if="isEditEnabled">
-				<ButtonLink
-					@click="toggleEdit"
-					v-shortcut="editShortcut"
-					class="d-print-none">
-					{{ $t('input.editor.edit') }}
-				</ButtonLink>.
+				<a @click="toggleEdit">{{ $t('input.editor.edit') }}</a>.
 			</template>
 		</p>
 
-		<ul class="actions d-print-none" v-if="bottomActions.length > 0">
+		<ul class="actions" v-if="bottomActions.length > 0">
 			<li v-if="isEditEnabled && !showPreviewText && showSave">
-				<BaseButton
-					v-if="showEditButton"
-					@click="toggleEdit"
-					v-shortcut="editShortcut">
-					{{ $t('input.editor.edit') }}
-				</BaseButton>
-				<BaseButton
-					v-else-if="isEditActive"
-					@click="toggleEdit"
-					class="done-edit">
-					{{ $t('misc.save') }}
-				</BaseButton>
+				<a v-if="showEditButton" @click="toggleEdit">{{ $t('input.editor.edit') }}</a>
+				<a v-else-if="isEditActive" @click="toggleEdit" class="done-edit">{{ $t('misc.save') }}</a>
 			</li>
 			<li v-for="(action, k) in bottomActions" :key="k">
-				<BaseButton @click="action.action">{{ action.title }}</BaseButton>
+				<a @click="action.action">{{ action.title }}</a>
 			</li>
 		</ul>
 		<template v-else-if="isEditEnabled && showSave">
-			<ul v-if="showEditButton" class="actions d-print-none">
+			<ul v-if="showEditButton" class="actions">
 				<li>
-					<BaseButton
-						@click="toggleEdit"
-						v-shortcut="editShortcut">
-						{{ $t('input.editor.edit') }}
-					</BaseButton>
+					<a @click="toggleEdit">{{ $t('input.editor.edit') }}</a>
 				</li>
 			</ul>
-			<x-button
-				v-else-if="isEditActive"
-				@click="toggleEdit"
-				variant="secondary"
-				:shadow="false"
-				v-cy="'saveEditor'">
+			<x-button v-else-if="isEditActive" @click="toggleEdit" variant="secondary" :shadow="false" v-cy="'saveEditor'">
 				{{ $t('misc.save') }}
 			</x-button>
 		</template>
 	</div>
 </template>
 
-<script setup lang="ts">
-import {computed, nextTick, onMounted, ref, toRefs, watch} from 'vue'
-
-import VueEasymde from './vue-easymde.vue'
+<script>
+import VueEasymde from './vue-easymde/vue-easymde.vue'
 import {marked} from 'marked'
 import DOMPurify from 'dompurify'
+import hljs from 'highlight.js/lib/common'
 
 import {createEasyMDEConfig} from './editorConfig'
 
-import AttachmentModel from '@/models/attachment'
-import AttachmentService from '@/services/attachment'
-
-import {setupMarkdownRenderer} from '@/helpers/markdownRenderer'
-import {findCheckboxesInText} from '@/helpers/checklistFromText'
+import AttachmentModel from '../../models/attachment'
+import AttachmentService from '../../services/attachment'
+import {findCheckboxesInText} from '../../helpers/checklistFromText'
 import {createRandomID} from '@/helpers/randomId'
 
-import BaseButton from '@/components/base/BaseButton.vue'
-import ButtonLink from '@/components/misc/ButtonLink.vue'
-import type { IAttachment } from '@/modelTypes/IAttachment'
-import type { ITask } from '@/modelTypes/ITask'
+export default {
+	name: 'editor',
+	components: {
+		VueEasymde,
+	},
+	props: {
+		modelValue: {
+			type: String,
+			default: '',
+		},
+		placeholder: {
+			type: String,
+			default: '',
+		},
+		uploadEnabled: {
+			type: Boolean,
+			default: false,
+		},
+		uploadCallback: {
+			type: Function,
+		},
+		hasPreview: {
+			type: Boolean,
+			default: true,
+		},
+		previewIsDefault: {
+			type: Boolean,
+			default: true,
+		},
+		isEditEnabled: {
+			default: true,
+		},
+		bottomActions: {
+			default: () => [],
+		},
+		emptyText: {
+			type: String,
+			default: '',
+		},
+		showSave: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	emits: ['update:modelValue', 'change'],
+	computed: {
+		showPreviewText() {
+			return this.isPreviewActive && this.text === '' && this.emptyText !== ''
+		},
+		showEditButton() {
+			return !this.isEditActive && this.text !== ''
+		},
+	},
+	data() {
+		return {
+			text: '',
+			changeTimeout: null,
+			isEditActive: false,
+			isPreviewActive: true,
 
-const props = defineProps({
-	modelValue: {
-		type: String,
-		default: '',
+			preview: '',
+			attachmentService: null,
+			loadedAttachments: {},
+			config: createEasyMDEConfig({
+				placeholder: this.placeholder,
+				uploadImage: this.uploadEnabled,
+				imageUploadFunction: this.uploadCallback,
+			}),
+			checkboxId: createRandomID(),
+		}
 	},
-	placeholder: {
-		type: String,
-		default: '',
+	watch: {
+		modelValue(modelValue) {
+			this.text = modelValue
+			this.$nextTick(this.renderPreview)
+		},
+		text(newVal, oldVal) {
+			// Only bubble the new value if it actually changed, but not if the component just got mounted and the text changed from the outside.
+			if (oldVal === '' && this.text === this.modelValue) {
+				return
+			}
+			this.bubble()
+		},
 	},
-	uploadEnabled: {
-		type: Boolean,
-		default: false,
-	},
-	uploadCallback: {
-		type: Function,
-	},
-	hasPreview: {
-		type: Boolean,
-		default: true,
-	},
-	previewIsDefault: {
-		type: Boolean,
-		default: true,
-	},
-	isEditEnabled: {
-		default: true,
-	},
-	bottomActions: {
-		default: () => [],
-	},
-	emptyText: {
-		type: String,
-		default: '',
-	},
-	showSave: {
-		type: Boolean,
-		default: false,
-	},
-	// If a key is passed the editor will go in "edit" mode when the key is pressed.
-	// Disabled if an empty string is passed.
-	editShortcut: {
-		type: String,
-		default: '',
-	},
-})
+	mounted() {
+		if (this.modelValue !== '') {
+			this.text = this.modelValue
+		}
 
-const emit = defineEmits(['update:modelValue'])
-
-const text = ref('')
-const changeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
-const isEditActive = ref(false)
-const isPreviewActive = ref(true)
-
-const showPreviewText = computed(() => isPreviewActive.value && text.value === '' && props.emptyText !== '')
-const showEditButton = computed(() => !isEditActive.value && text.value !== '')
-
-const preview = ref('')
-const attachmentService = new AttachmentService()
-
-type CacheKey = `${ITask['id']}-${IAttachment['id']}`
-const loadedAttachments = ref<{[key: CacheKey]: string}>({})
-const config = ref(createEasyMDEConfig({
-	placeholder: props.placeholder,
-	uploadImage: props.uploadEnabled,
-	imageUploadFunction: props.uploadCallback,
-}))
-
-const checkboxId = ref(createRandomID())
-
-const {modelValue} = toRefs(props)
-
-watch(
-	modelValue,
-	async (value) => {
-		text.value = value
-		await nextTick()
-		renderPreview()
-	},
-)
-
-watch(
-	text,
-	(newVal, oldVal) => {
-		// Only bubble the new value if it actually changed, but not if the component just got mounted and the text changed from the outside.
-		if (oldVal === '' && text.value === modelValue.value) {
+		if (this.previewIsDefault && this.hasPreview) {
+			this.$nextTick(this.renderPreview)
 			return
 		}
-		bubble()
+
+		this.isPreviewActive = false
+		this.isEditActive = true
 	},
-)
+	methods: {
+		// This gets triggered when only pasting content into the editor.
+		// A change event would not get generated by that, an input event does.
+		// Therefore, we're using this handler to catch paste events.
+		// But because this also gets triggered when typing into the editor, we give
+		// it a higher timeout to make the timouts cancel each other in that case so
+		// that in the end, only one change event is triggered to the outside per change.
+		handleInput(val) {
+			// Don't bubble if the text is up to date
+			if (val === this.text) {
+				return
+			}
 
+			this.text = val
+			this.bubble(1000)
+		},
+		bubble(timeout = 500) {
+			if (this.changeTimeout !== null) {
+				clearTimeout(this.changeTimeout)
+			}
 
-onMounted(() => {
-	if (modelValue.value !== '') {
-		text.value = modelValue.value
-	}
+			this.changeTimeout = setTimeout(() => {
+				this.$emit('update:modelValue',this.text)
+				this.$emit('change', this.text)
+			}, timeout)
+		},
+		replaceAt(str, index, replacement) {
+			return str.substr(0, index) + replacement + str.substr(index + replacement.length)
+		},
+		findNthIndex(str, n) {
+			const checkboxes = findCheckboxesInText(str)
+			return checkboxes[n]
+		},
+		renderPreview() {
+			const renderer = new marked.Renderer()
+			const linkRenderer = renderer.link
 
-	if (props.previewIsDefault && props.hasPreview) {
-		nextTick(() => renderPreview())
-		return
-	}
+			let checkboxNum = -1
+			marked.use({
+				renderer: {
+					image: (src, title, text) => {
 
-	isPreviewActive.value = false
-	isEditActive.value = true
-})
+						title = title ? ` title="${title}` : ''
 
+						// If the url starts with the api url, the image is likely an attachment and
+						// we'll need to download and parse it properly.
+						if (src.substr(0, window.API_URL.length + 7) === `${window.API_URL}/tasks/`) {
+							return `<img data-src="${src}" alt="${text}" ${title} class="attachment-image"/>`
+						}
 
-// This gets triggered when only pasting content into the editor.
-// A change event would not get generated by that, an input event does.
-// Therefore, we're using this handler to catch paste events.
-// But because this also gets triggered when typing into the editor, we give
-// it a higher timeout to make the timouts cancel each other in that case so
-// that in the end, only one change event is triggered to the outside per change.
-function handleInput(val: string) {
-	// Don't bubble if the text is up to date
-	if (val === text.value) {
-		return
-	}
+						return `<img src="${src}" alt="${text}" ${title}/>`
+					},
+					checkbox: (checked) => {
+						if (checked) {
+							checked = ' checked="checked"'
+						}
 
-	text.value = val
-	bubble(1000)
-}
+						checkboxNum++
+						return `<input type="checkbox" data-checkbox-num="${checkboxNum}" ${checked} class="text-checkbox-${this.checkboxId}"/>`
+					},
+					link: (href, title, text) => {
+						const isLocal = href.startsWith(`${location.protocol}//${location.hostname}`)
+						const html = linkRenderer.call(renderer, href, title, text)
+						return isLocal ? html : html.replace(/^<a /, '<a target="_blank" rel="noreferrer noopener nofollow" ')
+					},
+				},
+				highlight: function (code, language) {
+					const validLanguage = hljs.getLanguage(language) ? language : 'plaintext'
+					return hljs.highlight(code, {language: validLanguage}).value
+				},
+			})
 
-function bubble(timeout = 500) {
-	if (changeTimeout.value !== null) {
-		clearTimeout(changeTimeout.value)
-	}
+			this.preview = DOMPurify.sanitize(marked(this.text), {ADD_ATTR: ['target']})
 
-	changeTimeout.value = setTimeout(() => {
-		emit('update:modelValue', text.value)
-	}, timeout)
-}
+			// Since the render function is synchronous, we can't do async http requests in it.
+			// Therefore, we can't resolve the blob url at (markdown) compile time.
+			// To work around this, we modify the url after rendering it in the vue component.
+			// We're doing the whole thing in the next tick to ensure the image elements are available in the
+			// dom tree. If we're calling this right after setting this.preview it could be the images were
+			// not already made available.
+			// Some docs at https://stackoverflow.com/q/62865160/10924593
+			this.$nextTick(async () => {
+				const attachmentImage = document.getElementsByClassName('attachment-image')
+				if (attachmentImage) {
+					for (const img of attachmentImage) {
+						// The url is something like /tasks/<id>/attachments/<id>
+						const parts = img.dataset.src.substr(window.API_URL.length + 1).split('/')
+						const taskId = parseInt(parts[1])
+						const attachmentId = parseInt(parts[3])
+						const cacheKey = `${taskId}-${attachmentId}`
 
-function replaceAt(str: string, index: number, replacement: string) {
-	return str.slice(0, index) + replacement + str.slice(index + replacement.length)
-}
+						if (typeof this.loadedAttachments[cacheKey] !== 'undefined') {
+							img.src = this.loadedAttachments[cacheKey]
+							continue
+						}
 
-function findNthIndex(str: string, n: number) {
-	const checkboxes = findCheckboxesInText(str)
-	return checkboxes[n]
-}
+						const attachment = new AttachmentModel({taskId: taskId, id: attachmentId})
 
-function renderPreview() {
-	setupMarkdownRenderer(checkboxId.value)
+						if (this.attachmentService === null) {
+							this.attachmentService = new AttachmentService()
+						}
 
-	preview.value = DOMPurify.sanitize(marked(text.value), {ADD_ATTR: ['target']})
-
-	// Since the render function is synchronous, we can't do async http requests in it.
-	// Therefore, we can't resolve the blob url at (markdown) compile time.
-	// To work around this, we modify the url after rendering it in the vue component.
-	// We're doing the whole thing in the next tick to ensure the image elements are available in the
-	// dom tree. If we're calling this right after setting this.preview it could be the images were
-	// not already made available.
-	// Some docs at https://stackoverflow.com/q/62865160/10924593
-	nextTick().then(async () => {
-		const attachmentImage = document.querySelectorAll<HTMLImageElement>('.attachment-image')
-		if (attachmentImage) {
-			Array.from(attachmentImage).forEach(async (img) => {
-				// The url is something like /tasks/<id>/attachments/<id>
-				const parts = img.dataset.src?.slice(window.API_URL.length + 1).split('/')
-				const taskId = Number(parts[1])
-				const attachmentId = Number(parts[3])
-				const cacheKey: CacheKey = `${taskId}-${attachmentId}`
-
-				if (typeof loadedAttachments.value[cacheKey] !== 'undefined') {
-					img.src = loadedAttachments.value[cacheKey]
-					return
+						const url = await this.attachmentService.getBlobUrl(attachment)
+						img.src = url
+						this.loadedAttachments[cacheKey] = url
+					}
 				}
 
-				const attachment = new AttachmentModel({taskId: taskId, id: attachmentId})
-
-				const url = await attachmentService.getBlobUrl(attachment)
-				img.src = url
-				loadedAttachments.value[cacheKey] = url
+				const textCheckbox = document.getElementsByClassName(`text-checkbox-${this.checkboxId}`)
+				if (textCheckbox) {
+					for (const check of textCheckbox) {
+						check.removeEventListener('change', this.handleCheckboxClick)
+						check.addEventListener('change', this.handleCheckboxClick)
+						check.parentElement.classList.add('has-checkbox')
+					}
+				}
 			})
-		}
+		},
+		handleCheckboxClick(e) {
+			// Find the original markdown checkbox this is targeting
+			const checked = e.target.checked
+			const numMarkdownCheck = parseInt(e.target.dataset.checkboxNum)
 
-		const textCheckbox = document.querySelectorAll<HTMLInputElement>(`.text-checkbox-${checkboxId.value}`)
-		if (textCheckbox) {
-			Array.from(textCheckbox).forEach(check => {
-				check.removeEventListener('change', handleCheckboxClick)
-				check.addEventListener('change', handleCheckboxClick)
-				check.parentElement?.classList.add('has-checkbox')
-			})
-		}
-	})
-}
+			const index = this.findNthIndex(this.text, numMarkdownCheck)
+			if (index < 0 || typeof index === 'undefined') {
+				console.debug('no index found')
+				return
+			}
+			console.debug(index, this.text.substr(index, 9))
 
-function handleCheckboxClick(e: Event) {
-	// Find the original markdown checkbox this is targeting
-	const checked = (e.target as HTMLInputElement).checked
-	const numMarkdownCheck = Number((e.target as HTMLInputElement).dataset.checkboxNum)
+			const listPrefix = this.text.substr(index, 1)
 
-	const index = findNthIndex(text.value, numMarkdownCheck)
-	if (index < 0 || typeof index === 'undefined') {
-		console.debug('no index found')
-		return
-	}
-	console.debug(index, text.value.slice(index, 9))
-
-	const listPrefix = text.value.slice(index, 1)
-
-	text.value = replaceAt(text.value, index, `${listPrefix} ${checked ? '[x]' : '[ ]'} `)
-	bubble()
-	renderPreview()
-}
-
-function toggleEdit() {
-	if (isEditActive.value) {
-		isPreviewActive.value = true
-		isEditActive.value = false
-		renderPreview()
-		bubble(0) // save instantly
-	} else {
-		isPreviewActive.value = false
-		isEditActive.value = true
-	}
+			if (checked) {
+				this.text = this.replaceAt(this.text, index, `${listPrefix} [x] `)
+			} else {
+				this.text = this.replaceAt(this.text, index, `${listPrefix} [ ] `)
+			}
+			this.bubble()
+			this.renderPreview()
+		},
+		toggleEdit() {
+			if (this.isEditActive) {
+				this.isPreviewActive = true
+				this.isEditActive = false
+				this.renderPreview()
+				this.bubble(0) // save instantly
+			} else {
+				this.isPreviewActive = false
+				this.isEditActive = true
+			}
+		},
+	},
 }
 </script>
 
 <style lang="scss">
 @import 'codemirror/lib/codemirror.css';
+@import './vue-easymde/vue-easymde.css';
 @import 'highlight.js/scss/base16/equilibrium-gray-light';
 
+$editor-border-color: #ddd;
+
 .editor {
 	.clear {
 		clear: both;
@@ -318,8 +321,6 @@ function toggleEdit() {
 
 	.preview.content {
 		margin-bottom: .5rem;
-		overflow-wrap: anywhere; // Safari does not understand "break-word" so we put that first to make sure it at least is able to show it somewhat properly there.
-		overflow-wrap: break-word;
 
 		ul li {
 			input[type="checkbox"] {
@@ -327,7 +328,7 @@ function toggleEdit() {
 			}
 
 			&.has-checkbox {
-				margin-left: -1.25rem;
+				margin-left: -2em;
 				list-style: none;
 			}
 		}
@@ -336,7 +337,7 @@ function toggleEdit() {
 
 .CodeMirror {
 	padding: .5rem;
-	border: 1px solid var(--grey-200) !important;
+	border: 1px solid $editor-border-color;
 	background: var(--white);
 
 	&-lines pre {
@@ -347,10 +348,6 @@ function toggleEdit() {
 		color: var(--grey-400) !important;
 		font-style: italic;
 	}
-
-	&-cursor {
-		border-color: var(--grey-700);
-	}
 }
 
 .editor-preview {
@@ -362,17 +359,12 @@ function toggleEdit() {
 }
 
 .editor-toolbar {
-	background: var(--grey-50);
-	border: 1px solid var(--grey-200);
-	border-bottom: none;
+	background: #ffffff;
+	border-top: 1px solid $editor-border-color;
+	border-left: 1px solid $editor-border-color;
+	border-right: 1px solid $editor-border-color;
 
 	button {
-		color: var(--grey-700);
-
-		&.active {
-			background: var(--grey-200);
-		}
-
 		svg {
 			vertical-align: middle;
 
@@ -387,15 +379,6 @@ function toggleEdit() {
 			top: 24px;
 			margin-left: -3px;
 		}
-
-		&:hover {
-			background: var(--grey-200);
-			border-color: var(--grey-300);
-		}
-	}
-
-	i.separator {
-		border-color: var(--grey-200) !important;
 	}
 }
 

src/components/input/editorConfig.js

@@ -0,0 +1,134 @@
+import EasyMDE from 'easymde'
+import {i18n} from '@/i18n'
+
+export function createEasyMDEConfig({ placeholder, uploadImage, imageUploadFunction }) {
+    return {
+        autoDownloadFontAwesome: false,
+        spellChecker: false,
+        placeholder,
+        uploadImage,
+        imageUploadFunction,
+        minHeight: '150px',
+        toolbar: [
+            {
+                name: 'heading-1',
+                action: EasyMDE.toggleHeading1,
+                title: i18n.global.t('input.editor.heading1'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+            },
+            {
+                name: 'heading-2',
+                action: EasyMDE.toggleHeading2,
+                title: i18n.global.t('input.editor.heading2'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+            },
+            {
+                name: 'heading-3',
+                action: EasyMDE.toggleHeading3,
+                title: i18n.global.t('input.editor.heading3'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+            },
+            {
+                name: 'heading-smaller',
+                action: EasyMDE.toggleHeadingSmaller,
+                title: i18n.global.t('input.editor.headingSmaller'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+            },
+            {
+                name: 'heading-bigger',
+                action: EasyMDE.toggleHeadingBigger,
+                title: i18n.global.t('input.editor.headingBigger'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
+            },
+            '|',
+            {
+                name: 'bold',
+                action: EasyMDE.toggleBold,
+                title: i18n.global.t('input.editor.bold'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 3H6.5H15.25C18.15 3 20.5 5.36 20.5 8.25C20.5 9.8 19.81 11.19 18.73 12.15C20.37 13.04 21.5 14.76 21.5 16.75C21.5 19.64 19.15 22 16.25 22H6.5H3.5C2.95 22 2.5 21.55 2.5 21C2.5 20.45 2.95 20 3.5 20H5.5V5H3.5C2.95 5 2.5 4.55 2.5 4C2.5 3.45 2.95 3 3.5 3ZM7.5 20H16.25C18.04 20 19.5 18.54 19.5 16.75C19.5 14.96 18.04 13.5 16.25 13.5H7.5V20ZM7.5 11.5H15.25C17.04 11.5 18.5 10.04 18.5 8.25C18.5 6.46 17.04 5 15.25 5H7.5V11.5Z"/></svg>',
+            },
+            {
+                name: 'italic',
+                action: EasyMDE.toggleItalic,
+                title: i18n.global.t('input.editor.italic'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14.0967 4.2H17.0001C17.3301 4.2 17.6001 3.93 17.6001 3.6C17.6001 3.27 17.3301 3 17.0001 3H10.2001C9.8701 3 9.6001 3.27 9.6001 3.6C9.6001 3.93 9.8701 4.2 10.2001 4.2H12.8748L9.90335 19.8H6.9999C6.6699 19.8 6.3999 20.07 6.3999 20.4C6.3999 20.73 6.6699 21 6.9999 21H13.7999C14.1299 21 14.3999 20.73 14.3999 20.4C14.3999 20.07 14.1299 19.8 13.7999 19.8H11.1253L14.0967 4.2Z"/></svg>',
+            },
+            {
+                name: 'strikethrough',
+                action: EasyMDE.toggleStrikethrough,
+                title: i18n.global.t('input.editor.strikethrough'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.25 7.17005C18.25 7.50005 17.98 7.77005 17.65 7.77005C17.32 7.77005 17.05 7.50005 17.05 7.17005V5.96005C15.97 5.12005 14.17 4.56005 12.79 4.31005C11.1 4.00005 9.51 4.30005 8.41 5.12005C7.2 6.03005 6.67 7.67005 7.19 8.88005C7.56 9.73005 8.37 10.31 8.98 10.64C9.57215 10.9644 10.1961 11.2013 10.8465 11.3999H20.4C20.73 11.3999 21 11.6699 21 11.9999C21 12.3299 20.73 12.5999 20.4 12.5999H15.3012C16.6583 13.0929 17.5255 13.7765 17.95 14.69C18.73 16.36 17.74 18.33 16.36 19.41C15.05 20.4401 13.35 21 11.54 21H11.16C9.78 20.9401 8.34 20.5301 6.95 19.85V20.3601C6.95 20.6901 6.68 20.96 6.35 20.96C6.02 20.96 5.75 20.6901 5.75 20.3601V17.36C5.75 17.03 6.02 16.76 6.35 16.76C6.68 16.76 6.95 17.03 6.95 17.36V18.5C8.35 19.2801 9.81 19.74 11.21 19.8C12.86 19.89 14.46 19.39 15.62 18.48C16.6 17.71 17.37 16.3 16.86 15.21C16.55 14.54 15.8 14.0201 14.58 13.63C13.9711 13.4331 13.3222 13.2762 12.6906 13.1235C12.6168 13.1056 12.5432 13.0878 12.47 13.07C12.4313 13.0607 12.3925 13.0514 12.3537 13.0421C11.7861 12.9055 11.2108 12.767 10.6413 12.5999H3.6C3.27 12.5999 3 12.3299 3 11.9999C3 11.6699 3.27 11.3999 3.6 11.3999H7.90288C7.04984 10.8343 6.42752 10.1363 6.09 9.36005C5.34 7.63005 6.03 5.40005 7.69 4.16005C9.05 3.15005 10.99 2.77005 13 3.13005C13.64 3.25005 15.53 3.66005 17.05 4.53005V4.17005C17.05 3.84005 17.32 3.57005 17.65 3.57005C17.98 3.57005 18.25 3.84005 18.25 4.17005V7.17005Z"/></svg>',
+            },
+            {
+                name: 'code',
+                action: EasyMDE.toggleCodeBlock,
+                title: i18n.global.t('input.editor.code'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.57 20.9601C8.64 20.9901 8.71 21.0001 8.78 21.0001C9.02 21.0001 9.24 20.8501 9.34 20.6101L15.79 3.81005C15.9 3.50005 15.75 3.15005 15.44 3.03005C15.14 2.92005 14.79 3.07005 14.67 3.38005L8.22 20.1801C8.11 20.4901 8.26 20.8401 8.57 20.9601ZM7.00007 18.0001C6.85007 18.0001 6.69007 17.9401 6.58007 17.8201L1.18007 12.4201C0.950068 12.1901 0.950068 11.8101 1.18007 11.5701L6.58007 6.17006C6.81007 5.94006 7.19007 5.94006 7.43007 6.17006C7.66007 6.40006 7.66007 6.78006 7.43007 7.02006L2.45007 12.0001L7.43007 16.9801C7.66007 17.2101 7.66007 17.5901 7.43007 17.8301C7.31007 17.9401 7.15007 18.0001 7.00007 18.0001ZM17 18.0001C16.85 18.0001 16.69 17.9401 16.58 17.8201C16.35 17.5901 16.35 17.2101 16.58 16.9701L21.55 12.0001L16.57 7.02006C16.34 6.79006 16.34 6.41006 16.57 6.17006C16.81 5.94006 17.19 5.94006 17.42 6.17006L22.82 11.5701C23.05 11.8001 23.05 12.1801 22.82 12.4201L17.42 17.8201C17.31 17.9401 17.15 18.0001 17 18.0001Z"/></svg>',
+            },
+            {
+                name: 'quote',
+                action: EasyMDE.toggleBlockquote,
+                title: i18n.global.t('input.editor.quote'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19.373 5.16357H5.62695C4.79102 5.16357 4.11133 5.84326 4.11133 6.6792V16.2095C4.11133 17.0464 4.79102 17.7261 5.62695 17.7261H6.8877V21.1245C6.8877 21.3667 7.0332 21.5854 7.25684 21.6782C7.33203 21.7095 7.41016 21.7241 7.4873 21.7241C7.64258 21.7241 7.7959 21.6636 7.91113 21.5493L11.748 17.7261H19.373C20.209 17.7261 20.8887 17.0464 20.8887 16.2095V6.6792C20.8887 5.84326 20.209 5.16357 19.373 5.16357ZM19.6895 16.2095C19.6895 16.3843 19.5469 16.5269 19.373 16.5269H11.5C11.3408 16.5269 11.1895 16.5894 11.0762 16.7017L8.08691 19.6802V17.1265C8.08691 16.7954 7.81836 16.5269 7.4873 16.5269H5.62695C5.45312 16.5269 5.31055 16.3843 5.31055 16.2095V6.6792C5.31055 6.50537 5.45312 6.36279 5.62695 6.36279H19.373C19.5469 6.36279 19.6895 6.50537 19.6895 6.6792V16.2095ZM10.3431 8.45264C9.46326 8.45264 8.75 9.16589 8.75 10.0458C8.75 10.9257 9.46326 11.639 10.3431 11.639C10.4775 11.639 10.6058 11.6173 10.7305 11.5861V11.6195C10.7305 12.1322 10.3135 12.5492 9.75586 12.5492C9.4248 12.5492 9.17871 12.8177 9.17871 13.1488C9.17871 13.4799 9.46973 13.7484 9.80078 13.7484C10.9746 13.7484 11.9297 12.7933 11.9297 11.6195V10.1176L11.9294 10.1165L11.9292 10.1155C11.9297 10.1049 11.9312 10.0946 11.9326 10.0843L11.9326 10.0843C11.9345 10.0716 11.9363 10.059 11.9363 10.0458C11.9363 9.16589 11.223 8.45264 10.3431 8.45264ZM13.0637 10.0458C13.0637 9.16589 13.7771 8.45264 14.657 8.45264C15.5369 8.45264 16.2501 9.16589 16.2501 10.0458C16.2501 10.0584 16.2484 10.0706 16.2466 10.0828C16.2452 10.0929 16.2437 10.103 16.2433 10.1134C16.2433 10.1149 16.2441 10.1161 16.2441 10.1176V11.6195C16.2441 12.7933 15.2891 13.7484 14.1152 13.7484C13.7842 13.7484 13.4922 13.4799 13.4922 13.1488C13.4922 12.8177 13.7383 12.5492 14.0693 12.5492C14.6279 12.5492 15.0449 12.1322 15.0449 11.6195V11.5858C14.9202 11.6173 14.7915 11.639 14.657 11.639C13.7771 11.639 13.0637 10.9257 13.0637 10.0458Z"/></svg>',
+            },
+            {
+                name: 'unordered-list',
+                action: EasyMDE.toggleUnorderedList,
+                title: i18n.global.t('input.editor.unorderedList'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.5281 3.7002H3.5281C3.1981 3.7002 2.9281 3.9702 2.9281 4.3002V7.3002C2.9281 7.6302 3.1981 7.9002 3.5281 7.9002H6.5281C6.8581 7.9002 7.1281 7.6302 7.1281 7.3002V4.3002C7.1281 3.9702 6.8581 3.7002 6.5281 3.7002ZM5.9281 6.7002H4.1281V4.9002H5.9281V6.7002ZM3.5281 9.90015H6.5281C6.8581 9.90015 7.1281 10.1701 7.1281 10.5001V13.5001C7.1281 13.8301 6.8581 14.1001 6.5281 14.1001H3.5281C3.1981 14.1001 2.9281 13.8301 2.9281 13.5001V10.5001C2.9281 10.1701 3.1981 9.90015 3.5281 9.90015ZM4.1281 12.9001H5.9281V11.1001H4.1281V12.9001ZM3.5281 16.1001H6.5281C6.8581 16.1001 7.1281 16.3701 7.1281 16.7001V19.7001C7.1281 20.0301 6.8581 20.3001 6.5281 20.3001H3.5281C3.1981 20.3001 2.9281 20.0301 2.9281 19.7001V16.7001C2.9281 16.3701 3.1981 16.1001 3.5281 16.1001ZM4.1281 19.1001H5.9281V17.3001H4.1281V19.1001ZM9.72817 6.4002H20.7282C21.0582 6.4002 21.3282 6.1302 21.3282 5.8002C21.3282 5.4702 21.0582 5.2002 20.7282 5.2002H9.72817C9.39817 5.2002 9.12817 5.4702 9.12817 5.8002C9.12817 6.1302 9.39817 6.4002 9.72817 6.4002ZM9.72817 11.4001H20.7282C21.0582 11.4001 21.3282 11.6701 21.3282 12.0001C21.3282 12.3301 21.0582 12.6001 20.7282 12.6001H9.72817C9.39817 12.6001 9.12817 12.3301 9.12817 12.0001C9.12817 11.6701 9.39817 11.4001 9.72817 11.4001ZM9.72817 17.6001H20.7282C21.0582 17.6001 21.3282 17.8701 21.3282 18.2001C21.3282 18.5301 21.0582 18.8001 20.7282 18.8001H9.72817C9.39817 18.8001 9.12817 18.5301 9.12817 18.2001C9.12817 17.8701 9.39817 17.6001 9.72817 17.6001Z"/></svg>',
+            },
+            {
+                name: 'ordered-list',
+                action: EasyMDE.toggleOrderedList,
+                title: i18n.global.t('input.editor.orderedList'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4.19494 8.29994H5.99494C6.26494 8.29994 6.49494 8.07995 6.49494 7.79994C6.49494 7.51995 6.27494 7.29994 5.99494 7.29994H5.59494V3.79994C5.59494 3.62994 5.50494 3.46994 5.36494 3.37994C5.22494 3.28994 5.04494 3.26994 4.89494 3.33994L3.89494 3.76994C3.64494 3.87994 3.52494 4.17994 3.63494 4.42994C3.74494 4.67994 4.03494 4.79994 4.29494 4.68994L4.59494 4.55994V7.29994H4.19494C3.91494 7.29994 3.69494 7.51995 3.69494 7.79994C3.69494 8.07995 3.91494 8.29994 4.19494 8.29994ZM20.195 6.39995H9.19497C8.86497 6.39995 8.59497 6.12995 8.59497 5.79995C8.59497 5.46995 8.86497 5.19995 9.19497 5.19995H20.195C20.525 5.19995 20.795 5.46995 20.795 5.79995C20.795 6.12995 20.525 6.39995 20.195 6.39995ZM3.78486 14.36H6.37486C6.65486 14.36 6.87486 14.14 6.87486 13.86C6.87486 13.58 6.65486 13.36 6.37486 13.36H4.88486C5.00486 13.23 5.12486 13.09 5.23486 12.95C5.26626 12.9151 5.29645 12.8802 5.32626 12.8458L5.32629 12.8457C5.38192 12.7814 5.43627 12.7186 5.49486 12.66C5.73486 12.4 5.98486 12.12 6.17486 11.79C6.47486 11.25 6.41486 10.63 6.01486 10.17C5.57486 9.66 4.86486 9.5 4.24486 9.74C3.74486 9.95 3.39486 10.35 3.22486 10.91C3.14486 11.18 3.29486 11.46 3.56486 11.54C3.82486 11.61 4.10486 11.46 4.18486 11.2C4.29486 10.85 4.48486 10.73 4.62486 10.67C4.88486 10.57 5.13486 10.68 5.26486 10.82C5.38486 10.96 5.40486 11.12 5.30486 11.29C5.17595 11.5202 4.99618 11.7165 4.80458 11.9257L4.75486 11.98C4.67298 12.0801 4.58283 12.1801 4.49946 12.2727L4.49945 12.2727L4.47486 12.3C4.12486 12.72 3.76486 13.13 3.40486 13.53C3.27486 13.68 3.23486 13.9 3.32486 14.07C3.41486 14.24 3.58486 14.36 3.78486 14.36ZM3.68486 20.3699C4.04486 20.5899 4.46486 20.6999 4.87486 20.6999C5.13486 20.6999 5.38486 20.6499 5.61486 20.5499C6.31486 20.2799 6.73486 19.5599 6.60486 18.8799C6.53486 18.5499 6.35486 18.2899 6.12486 18.0899C6.32486 17.8999 6.45486 17.6499 6.50486 17.3799C6.57486 17.0099 6.49486 16.6299 6.27486 16.3099C5.85486 15.6899 5.07486 15.5199 4.10486 15.8299C3.83486 15.9199 3.69486 16.1999 3.77486 16.4599C3.86486 16.7299 4.14486 16.8699 4.40486 16.7899C4.70486 16.6999 5.24486 16.5799 5.45486 16.8899C5.51486 16.9899 5.54486 17.0999 5.52486 17.1999C5.51486 17.2699 5.47486 17.3599 5.36486 17.4299C5.26486 17.4999 5.12486 17.5399 4.95486 17.5799L4.77486 17.6299C4.54486 17.6999 4.40486 17.9099 4.41486 18.1499C4.42486 18.3899 4.61486 18.5799 4.84486 18.6099C5.20486 18.6599 5.58486 18.8299 5.63486 19.0799C5.67486 19.2999 5.46486 19.5499 5.25486 19.6299C4.94486 19.7599 4.52486 19.7099 4.21486 19.5199C3.97486 19.3699 3.67486 19.4399 3.52486 19.6799C3.37486 19.9199 3.44486 20.2299 3.68486 20.3699ZM20.195 18.7999H9.19497C8.86497 18.7999 8.59497 18.5299 8.59497 18.1999C8.59497 17.8699 8.86497 17.5999 9.19497 17.5999H20.195C20.525 17.5999 20.795 17.8699 20.795 18.1999C20.795 18.5299 20.525 18.7999 20.195 18.7999ZM9.19497 12.5999H20.195C20.525 12.5999 20.795 12.3299 20.795 11.9999C20.795 11.6699 20.525 11.3999 20.195 11.3999H9.19497C8.86497 11.3999 8.59497 11.6699 8.59497 11.9999C8.59497 12.3299 8.86497 12.5999 9.19497 12.5999Z"/></svg>',
+            },
+            '|',
+            {
+                name: 'clean-block',
+                action: EasyMDE.cleanBlock,
+                title: i18n.global.t('input.editor.cleanBlock'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M9.25989 6.18384H20.4513C20.7823 6.18384 21.0509 6.45239 21.0509 6.78345V17.9749C21.0509 18.3059 20.7823 18.5745 20.4513 18.5745H9.25989C9.0929 18.5745 8.93469 18.5061 8.82043 18.384L3.6095 12.7883C3.39563 12.5579 3.39563 12.2004 3.6095 11.97L8.82043 6.37427C8.93469 6.2522 9.0929 6.18384 9.25989 6.18384ZM9.52063 17.3752H19.8517V7.38306H9.52063L4.86926 12.3792L9.52063 17.3752ZM12.7755 15.0686C12.6222 15.0686 12.4679 15.01 12.3517 14.8928C12.1173 14.6584 12.1173 14.2786 12.3517 14.0452L14.0503 12.3469L12.3517 10.6487C12.1173 10.4153 12.1173 10.0354 12.3517 9.80103C12.5841 9.56665 12.965 9.56665 13.1993 9.80103L14.8981 11.4994L16.5968 9.80103C16.8312 9.56665 17.212 9.56665 17.4445 9.80103C17.6788 10.0354 17.6788 10.4153 17.4445 10.6487L15.7458 12.3469L17.4445 14.0452C17.6788 14.2786 17.6788 14.6584 17.4445 14.8928C17.3282 15.01 17.174 15.0686 17.0206 15.0686C16.8673 15.0686 16.714 15.01 16.5968 14.8928L14.8981 13.1945L13.1993 14.8928C13.0822 15.01 12.9288 15.0686 12.7755 15.0686Z"/></svg>',
+            },
+            {
+                name: 'link',
+                action: EasyMDE.drawLink,
+                title: i18n.global.t('input.editor.link'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M11.4399 15.3452C11.4999 15.3652 11.5699 15.3752 11.6299 15.3752C11.8799 15.3752 12.1199 15.2152 12.1999 14.9652C12.2999 14.6452 12.1299 14.3052 11.8199 14.2052C11.3499 14.0452 10.9299 13.7852 10.5699 13.4152C10.1999 13.0552 9.9399 12.6452 9.7799 12.1552C9.6599 11.8252 9.5999 11.4652 9.5999 11.0952C9.5999 10.2152 9.9399 9.38518 10.5699 8.75518L15.1599 4.15518C16.4499 2.87518 18.5399 2.87518 19.8299 4.15518C20.4499 4.78518 20.7899 5.61518 20.7899 6.49518C20.7899 7.37518 20.4499 8.20518 19.8299 8.82518L16.7399 11.9052C16.5099 12.1452 16.5099 12.5252 16.7399 12.7552C16.9799 12.9852 17.3599 12.9852 17.5899 12.7552L20.6799 9.67518C21.5299 8.83518 21.9999 7.69518 21.9999 6.49518C21.9999 5.29518 21.5299 4.16518 20.6899 3.30518C18.9299 1.55518 16.0799 1.55518 14.3199 3.30518L9.7299 7.90518C8.8699 8.75518 8.3999 9.88518 8.3999 11.0952C8.3999 11.6152 8.4899 12.1152 8.6499 12.5552C8.8599 13.1952 9.2399 13.7952 9.7199 14.2652C10.1999 14.7552 10.7999 15.1352 11.4399 15.3452ZM3.32 20.6851C4.2 21.5551 5.35 21.9951 6.5 21.9951C7.65 21.9951 8.81 21.5551 9.69 20.7051L14.28 16.1051C15.14 15.2551 15.61 14.1251 15.61 12.9151C15.61 12.4551 15.54 11.9951 15.4 11.5551C15.17 10.8651 14.8 10.2551 14.28 9.73509C13.76 9.21509 13.15 8.84509 12.46 8.61509C12.14 8.51509 11.8 8.68509 11.7 8.99509C11.6 9.30509 11.77 9.64509 12.1 9.75509C12.61 9.91509 13.06 10.1951 13.44 10.5751C13.82 10.9551 14.09 11.4051 14.26 11.9151C14.36 12.2351 14.41 12.5651 14.41 12.9051C14.41 13.7951 14.06 14.6251 13.43 15.2451L8.84 19.8451C7.55 21.1251 5.46 21.1251 4.17 19.8451C3.55 19.2151 3.21 18.3951 3.21 17.5051C3.21 16.6151 3.55 15.7851 4.17 15.1651L7.35 11.9851C7.58 11.7451 7.59 11.3651 7.35 11.1351C7.11 10.9051 6.73 10.9051 6.5 11.1351L3.32 14.3151C2.47 15.1551 2 16.2851 2 17.4951C2 18.7051 2.47 19.8351 3.32 20.6851Z"/></svg>',
+            },
+            {
+                name: 'image',
+                action: EasyMDE.drawImage,
+                title: i18n.global.t('input.editor.image'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M4 4C2.89543 4 2 4.89543 2 6V16V17.5152V18C2 19.1046 2.89543 20 4 20H20C21.0528 20 21.9156 19.1866 21.9942 18.1539L22 18.1632V18V16V6C22 4.89543 21.1046 4 20 4H4ZM3.2 17.7V16.5642L6.78192 13.7254C6.8616 13.6622 6.97597 13.6689 7.04776 13.7409L10.3126 17.0146C10.7026 17.4056 11.3357 17.4065 11.7268 17.0165C11.7606 16.9827 11.792 16.9465 11.8207 16.9083L16.736 10.352C16.8023 10.2636 16.9277 10.2457 17.016 10.312C17.0355 10.3265 17.0521 10.3445 17.0651 10.365L20.8 16.2669V17.7C20.8 18.3075 20.3075 18.8 19.7 18.8H4.3C3.69249 18.8 3.2 18.3075 3.2 17.7ZM17.3865 8.61836L20.8 14.08V6.3C20.8 5.69249 20.3075 5.2 19.7 5.2H4.3C3.69249 5.2 3.2 5.69249 3.2 6.3V15.04L6.65054 12.2796C6.84949 12.1204 7.13629 12.1363 7.31645 12.3164L10.8369 15.8369C10.915 15.915 11.0417 15.915 11.1198 15.8369C11.1265 15.8302 16.5625 8.58336 16.5625 8.58336C16.7282 8.36245 17.0416 8.31768 17.2625 8.48336C17.3118 8.52034 17.3538 8.56611 17.3865 8.61836ZM8 8.5C8 9.32843 7.32843 10 6.5 10C5.67157 10 5 9.32843 5 8.5C5 7.67157 5.67157 7 6.5 7C7.32843 7 8 7.67157 8 8.5Z"/></svg>',
+            },
+            {
+                name: 'table',
+                action: EasyMDE.drawTable,
+                title: i18n.global.t('input.editor.table'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.18524 3.08496H19.4152C20.6752 3.08496 21.7152 4.11496 21.7152 5.38496V18.615C21.7152 19.885 20.6852 20.915 19.4152 20.915H6.18524C4.91524 20.915 3.88525 19.885 3.88525 18.615V5.38496C3.88525 4.11496 4.91524 3.08496 6.18524 3.08496ZM19.4052 19.705C20.0152 19.705 20.5052 19.215 20.5052 18.605H20.5153V5.38496C20.5153 4.77496 20.0252 4.28496 19.4152 4.28496H6.18524C5.57524 4.28496 5.08521 4.77496 5.08521 5.38496V18.605C5.08521 19.215 5.57524 19.705 6.18524 19.705H19.4052ZM17.4453 9.15503H8.15527C7.82527 9.15503 7.5553 9.42503 7.5553 9.75503C7.5553 10.085 7.82527 10.355 8.15527 10.355H17.4453C17.7753 10.355 18.0453 10.085 18.0453 9.75503C18.0453 9.42503 17.7753 9.15503 17.4453 9.15503ZM17.4453 13.635H8.15527C7.82527 13.635 7.5553 13.905 7.5553 14.235C7.5553 14.565 7.82527 14.835 8.15527 14.835H17.4453C17.7753 14.835 18.0453 14.565 18.0453 14.235C18.0453 13.905 17.7753 13.635 17.4453 13.635Z"/></svg>',
+            },
+            {
+                name: 'horizontal-rule',
+                action: EasyMDE.drawHorizontalRule,
+                title: i18n.global.t('input.editor.horizontalRule'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 13H3C2.45 13 2 12.55 2 12C2 11.45 2.45 11 3 11H21C21.55 11 22 11.45 22 12C22 12.55 21.55 13 21 13Z"/></svg>',
+            },
+            '|',
+            {
+                name: 'side-by-side',
+                action: EasyMDE.toggleSideBySide,
+                title: i18n.global.t('input.editor.sideBySide'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.4787 14.58C18.3587 14.69 18.2987 14.85 18.2987 15C18.2987 15.15 18.3587 15.31 18.4787 15.42C18.7187 15.65 19.0987 15.65 19.3287 15.42L22.3287 12.42C22.5587 12.18 22.5587 11.8 22.3287 11.57L19.3287 8.56996C19.0887 8.33996 18.7087 8.33996 18.4787 8.56996C18.2487 8.80996 18.2487 9.18996 18.4787 9.41996L20.451 11.3999L14.4487 11.3999L14.4487 4.6C14.4487 4.27 14.1787 4 13.8487 4C13.5187 4 13.2487 4.27 13.2487 4.6L13.2487 19.4C13.2487 19.73 13.5187 20 13.8487 20C14.1787 20 14.4487 19.73 14.4487 19.4L14.4487 12.5999L20.4511 12.5999L18.4787 14.58ZM9.54878 19.4L9.54878 12.5999L3.5486 12.5999L5.52867 14.58C5.75867 14.81 5.75867 15.19 5.52867 15.43C5.29867 15.66 4.91867 15.66 4.67867 15.43L1.67867 12.43C1.63274 12.384 1.5956 12.3323 1.56725 12.2774C1.53058 12.2077 1.50724 12.1299 1.50068 12.0477C1.49934 12.0317 1.49867 12.0158 1.49867 12C1.49867 11.9841 1.49933 11.9682 1.50067 11.9522C1.51454 11.778 1.60365 11.6242 1.73526 11.5234L4.67867 8.57997C4.90867 8.34997 5.28867 8.34997 5.52867 8.57997C5.75867 8.80997 5.75867 9.18997 5.52867 9.42997L3.55107 11.3999L9.54878 11.3999L9.54878 4.6C9.54878 4.27 9.81878 4 10.1488 4C10.4788 4 10.7488 4.27 10.7488 4.6L10.7488 11.9999L10.7488 19.4C10.7488 19.73 10.4788 20 10.1488 20C9.81878 20 9.54878 19.73 9.54878 19.4Z"/></svg>',
+            },
+            {
+                name: 'guide',
+                action() {
+                    window.open('https://www.markdownguide.org/basic-syntax/', '_blank')
+                },
+                title: i18n.global.t('input.editor.guide'),
+                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19.4999 2.3999H6.4999C5.0699 2.3999 3.8999 3.5699 3.8999 4.9999V18.9999C3.8999 20.4299 5.0699 21.5999 6.4999 21.5999H19.4999C19.8299 21.5999 20.0999 21.3299 20.0999 20.9999V16.9999V2.9999C20.0999 2.6699 19.8299 2.3999 19.4999 2.3999ZM5.0999 4.9999V16.8118C5.50468 16.5513 5.98546 16.3999 6.4999 16.3999H18.8999V3.5999H6.4999C5.7299 3.5999 5.0999 4.2299 5.0999 4.9999ZM6.4999 17.5999H18.8999V20.3999H6.4999C5.7299 20.3999 5.0999 19.7699 5.0999 18.9999C5.0999 18.2299 5.7299 17.5999 6.4999 17.5999ZM8.4999 8.5999H15.4999C15.8299 8.5999 16.0999 8.3299 16.0999 7.9999C16.0999 7.6699 15.8299 7.3999 15.4999 7.3999H8.4999C8.1699 7.3999 7.8999 7.6699 7.8999 7.9999C7.8999 8.3299 8.1699 8.5999 8.4999 8.5999ZM15.4999 11.3999H8.4999C8.1699 11.3999 7.8999 11.6699 7.8999 11.9999C7.8999 12.3299 8.1699 12.5999 8.4999 12.5999H15.4999C15.8299 12.5999 16.0999 12.3299 16.0999 11.9999C16.0999 11.6699 15.8299 11.3999 15.4999 11.3999Z"/></svg>',
+            },
+        ],
+    }
+}

src/components/input/editorConfig.ts

@@ -1,134 +0,0 @@
-import EasyMDE from 'easymde'
-import {i18n} from '@/i18n'
-
-export function createEasyMDEConfig({ placeholder, uploadImage, imageUploadFunction }) {
-    return {
-        autoDownloadFontAwesome: false,
-        spellChecker: false,
-        placeholder,
-        uploadImage,
-        imageUploadFunction,
-        minHeight: '150px',
-        toolbar: [
-            {
-                name: 'heading-1',
-                action: EasyMDE.toggleHeading1,
-                title: i18n.global.t('input.editor.heading1'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
-            },
-            {
-                name: 'heading-2',
-                action: EasyMDE.toggleHeading2,
-                title: i18n.global.t('input.editor.heading2'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
-            },
-            {
-                name: 'heading-3',
-                action: EasyMDE.toggleHeading3,
-                title: i18n.global.t('input.editor.heading3'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
-            },
-            {
-                name: 'heading-smaller',
-                action: EasyMDE.toggleHeadingSmaller,
-                title: i18n.global.t('input.editor.headingSmaller'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
-            },
-            {
-                name: 'heading-bigger',
-                action: EasyMDE.toggleHeadingBigger,
-                title: i18n.global.t('input.editor.headingBigger'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.2773 19.25L12.5773 4.34995C12.5773 4.34995 12.5773 4.24995 12.4773 4.24995C12.4773 4.24995 12.4773 4.14995 12.3773 4.14995C12.3773 4.14995 12.2773 4.14995 12.2773 4.04995L12.1773 3.94995H12.0773H11.9773C11.8773 3.94995 11.8773 3.94995 11.8773 3.94995H11.7773C11.6773 4.04995 11.6773 4.14995 11.5773 4.14995C11.5773 4.14995 11.5773 4.14995 11.4773 4.14995C11.4773 4.14995 11.4773 4.24995 11.3773 4.24995L11.2773 4.34995L5.67733 19.25C5.57733 19.55 5.67733 19.95 5.97733 20.05C6.07733 20.05 6.07733 20.05 6.17733 20.05C6.37733 20.05 6.67733 19.95 6.77733 19.65L7.87733 16.85H16.1773L17.2773 19.65C17.3773 19.85 17.5773 20.05 17.8773 20.05C17.9773 20.05 17.9773 20.05 18.0773 20.05C18.2773 19.85 18.4773 19.55 18.2773 19.25ZM8.27733 15.65L11.9773 6.24995L15.6773 15.65H8.27733Z"/></svg>',
-            },
-            '|',
-            {
-                name: 'bold',
-                action: EasyMDE.toggleBold,
-                title: i18n.global.t('input.editor.bold'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M3.5 3H6.5H15.25C18.15 3 20.5 5.36 20.5 8.25C20.5 9.8 19.81 11.19 18.73 12.15C20.37 13.04 21.5 14.76 21.5 16.75C21.5 19.64 19.15 22 16.25 22H6.5H3.5C2.95 22 2.5 21.55 2.5 21C2.5 20.45 2.95 20 3.5 20H5.5V5H3.5C2.95 5 2.5 4.55 2.5 4C2.5 3.45 2.95 3 3.5 3ZM7.5 20H16.25C18.04 20 19.5 18.54 19.5 16.75C19.5 14.96 18.04 13.5 16.25 13.5H7.5V20ZM7.5 11.5H15.25C17.04 11.5 18.5 10.04 18.5 8.25C18.5 6.46 17.04 5 15.25 5H7.5V11.5Z"/></svg>',
-            },
-            {
-                name: 'italic',
-                action: EasyMDE.toggleItalic,
-                title: i18n.global.t('input.editor.italic'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M14.0967 4.2H17.0001C17.3301 4.2 17.6001 3.93 17.6001 3.6C17.6001 3.27 17.3301 3 17.0001 3H10.2001C9.8701 3 9.6001 3.27 9.6001 3.6C9.6001 3.93 9.8701 4.2 10.2001 4.2H12.8748L9.90335 19.8H6.9999C6.6699 19.8 6.3999 20.07 6.3999 20.4C6.3999 20.73 6.6699 21 6.9999 21H13.7999C14.1299 21 14.3999 20.73 14.3999 20.4C14.3999 20.07 14.1299 19.8 13.7999 19.8H11.1253L14.0967 4.2Z"/></svg>',
-            },
-            {
-                name: 'strikethrough',
-                action: EasyMDE.toggleStrikethrough,
-                title: i18n.global.t('input.editor.strikethrough'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.25 7.17005C18.25 7.50005 17.98 7.77005 17.65 7.77005C17.32 7.77005 17.05 7.50005 17.05 7.17005V5.96005C15.97 5.12005 14.17 4.56005 12.79 4.31005C11.1 4.00005 9.51 4.30005 8.41 5.12005C7.2 6.03005 6.67 7.67005 7.19 8.88005C7.56 9.73005 8.37 10.31 8.98 10.64C9.57215 10.9644 10.1961 11.2013 10.8465 11.3999H20.4C20.73 11.3999 21 11.6699 21 11.9999C21 12.3299 20.73 12.5999 20.4 12.5999H15.3012C16.6583 13.0929 17.5255 13.7765 17.95 14.69C18.73 16.36 17.74 18.33 16.36 19.41C15.05 20.4401 13.35 21 11.54 21H11.16C9.78 20.9401 8.34 20.5301 6.95 19.85V20.3601C6.95 20.6901 6.68 20.96 6.35 20.96C6.02 20.96 5.75 20.6901 5.75 20.3601V17.36C5.75 17.03 6.02 16.76 6.35 16.76C6.68 16.76 6.95 17.03 6.95 17.36V18.5C8.35 19.2801 9.81 19.74 11.21 19.8C12.86 19.89 14.46 19.39 15.62 18.48C16.6 17.71 17.37 16.3 16.86 15.21C16.55 14.54 15.8 14.0201 14.58 13.63C13.9711 13.4331 13.3222 13.2762 12.6906 13.1235C12.6168 13.1056 12.5432 13.0878 12.47 13.07C12.4313 13.0607 12.3925 13.0514 12.3537 13.0421C11.7861 12.9055 11.2108 12.767 10.6413 12.5999H3.6C3.27 12.5999 3 12.3299 3 11.9999C3 11.6699 3.27 11.3999 3.6 11.3999H7.90288C7.04984 10.8343 6.42752 10.1363 6.09 9.36005C5.34 7.63005 6.03 5.40005 7.69 4.16005C9.05 3.15005 10.99 2.77005 13 3.13005C13.64 3.25005 15.53 3.66005 17.05 4.53005V4.17005C17.05 3.84005 17.32 3.57005 17.65 3.57005C17.98 3.57005 18.25 3.84005 18.25 4.17005V7.17005Z"/></svg>',
-            },
-            {
-                name: 'code',
-                action: EasyMDE.toggleCodeBlock,
-                title: i18n.global.t('input.editor.code'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M8.57 20.9601C8.64 20.9901 8.71 21.0001 8.78 21.0001C9.02 21.0001 9.24 20.8501 9.34 20.6101L15.79 3.81005C15.9 3.50005 15.75 3.15005 15.44 3.03005C15.14 2.92005 14.79 3.07005 14.67 3.38005L8.22 20.1801C8.11 20.4901 8.26 20.8401 8.57 20.9601ZM7.00007 18.0001C6.85007 18.0001 6.69007 17.9401 6.58007 17.8201L1.18007 12.4201C0.950068 12.1901 0.950068 11.8101 1.18007 11.5701L6.58007 6.17006C6.81007 5.94006 7.19007 5.94006 7.43007 6.17006C7.66007 6.40006 7.66007 6.78006 7.43007 7.02006L2.45007 12.0001L7.43007 16.9801C7.66007 17.2101 7.66007 17.5901 7.43007 17.8301C7.31007 17.9401 7.15007 18.0001 7.00007 18.0001ZM17 18.0001C16.85 18.0001 16.69 17.9401 16.58 17.8201C16.35 17.5901 16.35 17.2101 16.58 16.9701L21.55 12.0001L16.57 7.02006C16.34 6.79006 16.34 6.41006 16.57 6.17006C16.81 5.94006 17.19 5.94006 17.42 6.17006L22.82 11.5701C23.05 11.8001 23.05 12.1801 22.82 12.4201L17.42 17.8201C17.31 17.9401 17.15 18.0001 17 18.0001Z"/></svg>',
-            },
-            {
-                name: 'quote',
-                action: EasyMDE.toggleBlockquote,
-                title: i18n.global.t('input.editor.quote'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M19.373 5.16357H5.62695C4.79102 5.16357 4.11133 5.84326 4.11133 6.6792V16.2095C4.11133 17.0464 4.79102 17.7261 5.62695 17.7261H6.8877V21.1245C6.8877 21.3667 7.0332 21.5854 7.25684 21.6782C7.33203 21.7095 7.41016 21.7241 7.4873 21.7241C7.64258 21.7241 7.7959 21.6636 7.91113 21.5493L11.748 17.7261H19.373C20.209 17.7261 20.8887 17.0464 20.8887 16.2095V6.6792C20.8887 5.84326 20.209 5.16357 19.373 5.16357ZM19.6895 16.2095C19.6895 16.3843 19.5469 16.5269 19.373 16.5269H11.5C11.3408 16.5269 11.1895 16.5894 11.0762 16.7017L8.08691 19.6802V17.1265C8.08691 16.7954 7.81836 16.5269 7.4873 16.5269H5.62695C5.45312 16.5269 5.31055 16.3843 5.31055 16.2095V6.6792C5.31055 6.50537 5.45312 6.36279 5.62695 6.36279H19.373C19.5469 6.36279 19.6895 6.50537 19.6895 6.6792V16.2095ZM10.3431 8.45264C9.46326 8.45264 8.75 9.16589 8.75 10.0458C8.75 10.9257 9.46326 11.639 10.3431 11.639C10.4775 11.639 10.6058 11.6173 10.7305 11.5861V11.6195C10.7305 12.1322 10.3135 12.5492 9.75586 12.5492C9.4248 12.5492 9.17871 12.8177 9.17871 13.1488C9.17871 13.4799 9.46973 13.7484 9.80078 13.7484C10.9746 13.7484 11.9297 12.7933 11.9297 11.6195V10.1176L11.9294 10.1165L11.9292 10.1155C11.9297 10.1049 11.9312 10.0946 11.9326 10.0843L11.9326 10.0843C11.9345 10.0716 11.9363 10.059 11.9363 10.0458C11.9363 9.16589 11.223 8.45264 10.3431 8.45264ZM13.0637 10.0458C13.0637 9.16589 13.7771 8.45264 14.657 8.45264C15.5369 8.45264 16.2501 9.16589 16.2501 10.0458C16.2501 10.0584 16.2484 10.0706 16.2466 10.0828C16.2452 10.0929 16.2437 10.103 16.2433 10.1134C16.2433 10.1149 16.2441 10.1161 16.2441 10.1176V11.6195C16.2441 12.7933 15.2891 13.7484 14.1152 13.7484C13.7842 13.7484 13.4922 13.4799 13.4922 13.1488C13.4922 12.8177 13.7383 12.5492 14.0693 12.5492C14.6279 12.5492 15.0449 12.1322 15.0449 11.6195V11.5858C14.9202 11.6173 14.7915 11.639 14.657 11.639C13.7771 11.639 13.0637 10.9257 13.0637 10.0458Z"/></svg>',
-            },
-            {
-                name: 'unordered-list',
-                action: EasyMDE.toggleUnorderedList,
-                title: i18n.global.t('input.editor.unorderedList'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M6.5281 3.7002H3.5281C3.1981 3.7002 2.9281 3.9702 2.9281 4.3002V7.3002C2.9281 7.6302 3.1981 7.9002 3.5281 7.9002H6.5281C6.8581 7.9002 7.1281 7.6302 7.1281 7.3002V4.3002C7.1281 3.9702 6.8581 3.7002 6.5281 3.7002ZM5.9281 6.7002H4.1281V4.9002H5.9281V6.7002ZM3.5281 9.90015H6.5281C6.8581 9.90015 7.1281 10.1701 7.1281 10.5001V13.5001C7.1281 13.8301 6.8581 14.1001 6.5281 14.1001H3.5281C3.1981 14.1001 2.9281 13.8301 2.9281 13.5001V10.5001C2.9281 10.1701 3.1981 9.90015 3.5281 9.90015ZM4.1281 12.9001H5.9281V11.1001H4.1281V12.9001ZM3.5281 16.1001H6.5281C6.8581 16.1001 7.1281 16.3701 7.1281 16.7001V19.7001C7.1281 20.0301 6.8581 20.3001 6.5281 20.3001H3.5281C3.1981 20.3001 2.9281 20.0301 2.9281 19.7001V16.7001C2.9281 16.3701 3.1981 16.1001 3.5281 16.1001ZM4.1281 19.1001H5.9281V17.3001H4.1281V19.1001ZM9.72817 6.4002H20.7282C21.0582 6.4002 21.3282 6.1302 21.3282 5.8002C21.3282 5.4702 21.0582 5.2002 20.7282 5.2002H9.72817C9.39817 5.2002 9.12817 5.4702 9.12817 5.8002C9.12817 6.1302 9.39817 6.4002 9.72817 6.4002ZM9.72817 11.4001H20.7282C21.0582 11.4001 21.3282 11.6701 21.3282 12.0001C21.3282 12.3301 21.0582 12.6001 20.7282 12.6001H9.72817C9.39817 12.6001 9.12817 12.3301 9.12817 12.0001C9.12817 11.6701 9.39817 11.4001 9.72817 11.4001ZM9.72817 17.6001H20.7282C21.0582 17.6001 21.3282 17.8701 21.3282 18.2001C21.3282 18.5301 21.0582 18.8001 20.7282 18.8001H9.72817C9.39817 18.8001 9.12817 18.5301 9.12817 18.2001C9.12817 17.8701 9.39817 17.6001 9.72817 17.6001Z"/></svg>',
-            },
-            {
-                name: 'ordered-list',
-                action: EasyMDE.toggleOrderedList,
-                title: i18n.global.t('input.editor.orderedList'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4.19494 8.29994H5.99494C6.26494 8.29994 6.49494 8.07995 6.49494 7.79994C6.49494 7.51995 6.27494 7.29994 5.99494 7.29994H5.59494V3.79994C5.59494 3.62994 5.50494 3.46994 5.36494 3.37994C5.22494 3.28994 5.04494 3.26994 4.89494 3.33994L3.89494 3.76994C3.64494 3.87994 3.52494 4.17994 3.63494 4.42994C3.74494 4.67994 4.03494 4.79994 4.29494 4.68994L4.59494 4.55994V7.29994H4.19494C3.91494 7.29994 3.69494 7.51995 3.69494 7.79994C3.69494 8.07995 3.91494 8.29994 4.19494 8.29994ZM20.195 6.39995H9.19497C8.86497 6.39995 8.59497 6.12995 8.59497 5.79995C8.59497 5.46995 8.86497 5.19995 9.19497 5.19995H20.195C20.525 5.19995 20.795 5.46995 20.795 5.79995C20.795 6.12995 20.525 6.39995 20.195 6.39995ZM3.78486 14.36H6.37486C6.65486 14.36 6.87486 14.14 6.87486 13.86C6.87486 13.58 6.65486 13.36 6.37486 13.36H4.88486C5.00486 13.23 5.12486 13.09 5.23486 12.95C5.26626 12.9151 5.29645 12.8802 5.32626 12.8458L5.32629 12.8457C5.38192 12.7814 5.43627 12.7186 5.49486 12.66C5.73486 12.4 5.98486 12.12 6.17486 11.79C6.47486 11.25 6.41486 10.63 6.01486 10.17C5.57486 9.66 4.86486 9.5 4.24486 9.74C3.74486 9.95 3.39486 10.35 3.22486 10.91C3.14486 11.18 3.29486 11.46 3.56486 11.54C3.82486 11.61 4.10486 11.46 4.18486 11.2C4.29486 10.85 4.48486 10.73 4.62486 10.67C4.88486 10.57 5.13486 10.68 5.26486 10.82C5.38486 10.96 5.40486 11.12 5.30486 11.29C5.17595 11.5202 4.99618 11.7165 4.80458 11.9257L4.75486 11.98C4.67298 12.0801 4.58283 12.1801 4.49946 12.2727L4.49945 12.2727L4.47486 12.3C4.12486 12.72 3.76486 13.13 3.40486 13.53C3.27486 13.68 3.23486 13.9 3.32486 14.07C3.41486 14.24 3.58486 14.36 3.78486 14.36ZM3.68486 20.3699C4.04486 20.5899 4.46486 20.6999 4.87486 20.6999C5.13486 20.6999 5.38486 20.6499 5.61486 20.5499C6.31486 20.2799 6.73486 19.5599 6.60486 18.8799C6.53486 18.5499 6.35486 18.2899 6.12486 18.0899C6.32486 17.8999 6.45486 17.6499 6.50486 17.3799C6.57486 17.0099 6.49486 16.6299 6.27486 16.3099C5.85486 15.6899 5.07486 15.5199 4.10486 15.8299C3.83486 15.9199 3.69486 16.1999 3.77486 16.4599C3.86486 16.7299 4.14486 16.8699 4.40486 16.7899C4.70486 16.6999 5.24486 16.5799 5.45486 16.8899C5.51486 16.9899 5.54486 17.0999 5.52486 17.1999C5.51486 17.2699 5.47486 17.3599 5.36486 17.4299C5.26486 17.4999 5.12486 17.5399 4.95486 17.5799L4.77486 17.6299C4.54486 17.6999 4.40486 17.9099 4.41486 18.1499C4.42486 18.3899 4.61486 18.5799 4.84486 18.6099C5.20486 18.6599 5.58486 18.8299 5.63486 19.0799C5.67486 19.2999 5.46486 19.5499 5.25486 19.6299C4.94486 19.7599 4.52486 19.7099 4.21486 19.5199C3.97486 19.3699 3.67486 19.4399 3.52486 19.6799C3.37486 19.9199 3.44486 20.2299 3.68486 20.3699ZM20.195 18.7999H9.19497C8.86497 18.7999 8.59497 18.5299 8.59497 18.1999C8.59497 17.8699 8.86497 17.5999 9.19497 17.5999H20.195C20.525 17.5999 20.795 17.8699 20.795 18.1999C20.795 18.5299 20.525 18.7999 20.195 18.7999ZM9.19497 12.5999H20.195C20.525 12.5999 20.795 12.3299 20.795 11.9999C20.795 11.6699 20.525 11.3999 20.195 11.3999H9.19497C8.86497 11.3999 8.59497 11.6699 8.59497 11.9999C8.59497 12.3299 8.86497 12.5999 9.19497 12.5999Z"/></svg>',
-            },
-            '|',
-            {
-                name: 'clean-block',
-                action: EasyMDE.cleanBlock,
-                title: i18n.global.t('input.editor.cleanBlock'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M9.25989 6.18384H20.4513C20.7823 6.18384 21.0509 6.45239 21.0509 6.78345V17.9749C21.0509 18.3059 20.7823 18.5745 20.4513 18.5745H9.25989C9.0929 18.5745 8.93469 18.5061 8.82043 18.384L3.6095 12.7883C3.39563 12.5579 3.39563 12.2004 3.6095 11.97L8.82043 6.37427C8.93469 6.2522 9.0929 6.18384 9.25989 6.18384ZM9.52063 17.3752H19.8517V7.38306H9.52063L4.86926 12.3792L9.52063 17.3752ZM12.7755 15.0686C12.6222 15.0686 12.4679 15.01 12.3517 14.8928C12.1173 14.6584 12.1173 14.2786 12.3517 14.0452L14.0503 12.3469L12.3517 10.6487C12.1173 10.4153 12.1173 10.0354 12.3517 9.80103C12.5841 9.56665 12.965 9.56665 13.1993 9.80103L14.8981 11.4994L16.5968 9.80103C16.8312 9.56665 17.212 9.56665 17.4445 9.80103C17.6788 10.0354 17.6788 10.4153 17.4445 10.6487L15.7458 12.3469L17.4445 14.0452C17.6788 14.2786 17.6788 14.6584 17.4445 14.8928C17.3282 15.01 17.174 15.0686 17.0206 15.0686C16.8673 15.0686 16.714 15.01 16.5968 14.8928L14.8981 13.1945L13.1993 14.8928C13.0822 15.01 12.9288 15.0686 12.7755 15.0686Z"/></svg>',
-            },
-            {
-                name: 'link',
-                action: EasyMDE.drawLink,
-                title: i18n.global.t('input.editor.link'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M11.4399 15.3452C11.4999 15.3652 11.5699 15.3752 11.6299 15.3752C11.8799 15.3752 12.1199 15.2152 12.1999 14.9652C12.2999 14.6452 12.1299 14.3052 11.8199 14.2052C11.3499 14.0452 10.9299 13.7852 10.5699 13.4152C10.1999 13.0552 9.9399 12.6452 9.7799 12.1552C9.6599 11.8252 9.5999 11.4652 9.5999 11.0952C9.5999 10.2152 9.9399 9.38518 10.5699 8.75518L15.1599 4.15518C16.4499 2.87518 18.5399 2.87518 19.8299 4.15518C20.4499 4.78518 20.7899 5.61518 20.7899 6.49518C20.7899 7.37518 20.4499 8.20518 19.8299 8.82518L16.7399 11.9052C16.5099 12.1452 16.5099 12.5252 16.7399 12.7552C16.9799 12.9852 17.3599 12.9852 17.5899 12.7552L20.6799 9.67518C21.5299 8.83518 21.9999 7.69518 21.9999 6.49518C21.9999 5.29518 21.5299 4.16518 20.6899 3.30518C18.9299 1.55518 16.0799 1.55518 14.3199 3.30518L9.7299 7.90518C8.8699 8.75518 8.3999 9.88518 8.3999 11.0952C8.3999 11.6152 8.4899 12.1152 8.6499 12.5552C8.8599 13.1952 9.2399 13.7952 9.7199 14.2652C10.1999 14.7552 10.7999 15.1352 11.4399 15.3452ZM3.32 20.6851C4.2 21.5551 5.35 21.9951 6.5 21.9951C7.65 21.9951 8.81 21.5551 9.69 20.7051L14.28 16.1051C15.14 15.2551 15.61 14.1251 15.61 12.9151C15.61 12.4551 15.54 11.9951 15.4 11.5551C15.17 10.8651 14.8 10.2551 14.28 9.73509C13.76 9.21509 13.15 8.84509 12.46 8.61509C12.14 8.51509 11.8 8.68509 11.7 8.99509C11.6 9.30509 11.77 9.64509 12.1 9.75509C12.61 9.91509 13.06 10.1951 13.44 10.5751C13.82 10.9551 14.09 11.4051 14.26 11.9151C14.36 12.2351 14.41 12.5651 14.41 12.9051C14.41 13.7951 14.06 14.6251 13.43 15.2451L8.84 19.8451C7.55 21.1251 5.46 21.1251 4.17 19.8451C3.55 19.2151 3.21 18.3951 3.21 17.5051C3.21 16.6151 3.55 15.7851 4.17 15.1651L7.35 11.9851C7.58 11.7451 7.59 11.3651 7.35 11.1351C7.11 10.9051 6.73 10.9051 6.5 11.1351L3.32 14.3151C2.47 15.1551 2 16.2851 2 17.4951C2 18.7051 2.47 19.8351 3.32 20.6851Z"/></svg>',
-            },
-            {
-                name: 'image',
-                action: EasyMDE.drawImage,
-                title: i18n.global.t('input.editor.image'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M4 4C2.89543 4 2 4.89543 2 6V16V17.5152V18C2 19.1046 2.89543 20 4 20H20C21.0528 20 21.9156 19.1866 21.9942 18.1539L22 18.1632V18V16V6C22 4.89543 21.1046 4 20 4H4ZM3.2 17.7V16.5642L6.78192 13.7254C6.8616 13.6622 6.97597 13.6689 7.04776 13.7409L10.3126 17.0146C10.7026 17.4056 11.3357 17.4065 11.7268 17.0165C11.7606 16.9827 11.792 16.9465 11.8207 16.9083L16.736 10.352C16.8023 10.2636 16.9277 10.2457 17.016 10.312C17.0355 10.3265 17.0521 10.3445 17.0651 10.365L20.8 16.2669V17.7C20.8 18.3075 20.3075 18.8 19.7 18.8H4.3C3.69249 18.8 3.2 18.3075 3.2 17.7ZM17.3865 8.61836L20.8 14.08V6.3C20.8 5.69249 20.3075 5.2 19.7 5.2H4.3C3.69249 5.2 3.2 5.69249 3.2 6.3V15.04L6.65054 12.2796C6.84949 12.1204 7.13629 12.1363 7.31645 12.3164L10.8369 15.8369C10.915 15.915 11.0417 15.915 11.1198 15.8369C11.1265 15.8302 16.5625 8.58336 16.5625 8.58336C16.7282 8.36245 17.0416 8.31768 17.2625 8.48336C17.3118 8.52034 17.3538 8.56611 17.3865 8.61836ZM8 8.5C8 9.32843 7.32843 10 6.5 10C5.67157 10 5 9.32843 5 8.5C5 7.67157 5.67157 7 6.5 7C7.32843 7 8 7.67157 8 8.5Z"/></svg>',
-            },
-            {
-                name: 'table',
-                action: EasyMDE.drawTable,
-                title: i18n.global.t('input.editor.table'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M6.18524 3.08496H19.4152C20.6752 3.08496 21.7152 4.11496 21.7152 5.38496V18.615C21.7152 19.885 20.6852 20.915 19.4152 20.915H6.18524C4.91524 20.915 3.88525 19.885 3.88525 18.615V5.38496C3.88525 4.11496 4.91524 3.08496 6.18524 3.08496ZM19.4052 19.705C20.0152 19.705 20.5052 19.215 20.5052 18.605H20.5153V5.38496C20.5153 4.77496 20.0252 4.28496 19.4152 4.28496H6.18524C5.57524 4.28496 5.08521 4.77496 5.08521 5.38496V18.605C5.08521 19.215 5.57524 19.705 6.18524 19.705H19.4052ZM17.4453 9.15503H8.15527C7.82527 9.15503 7.5553 9.42503 7.5553 9.75503C7.5553 10.085 7.82527 10.355 8.15527 10.355H17.4453C17.7753 10.355 18.0453 10.085 18.0453 9.75503C18.0453 9.42503 17.7753 9.15503 17.4453 9.15503ZM17.4453 13.635H8.15527C7.82527 13.635 7.5553 13.905 7.5553 14.235C7.5553 14.565 7.82527 14.835 8.15527 14.835H17.4453C17.7753 14.835 18.0453 14.565 18.0453 14.235C18.0453 13.905 17.7753 13.635 17.4453 13.635Z"/></svg>',
-            },
-            {
-                name: 'horizontal-rule',
-                action: EasyMDE.drawHorizontalRule,
-                title: i18n.global.t('input.editor.horizontalRule'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M21 13H3C2.45 13 2 12.55 2 12C2 11.45 2.45 11 3 11H21C21.55 11 22 11.45 22 12C22 12.55 21.55 13 21 13Z"/></svg>',
-            },
-            '|',
-            {
-                name: 'side-by-side',
-                action: EasyMDE.toggleSideBySide,
-                title: i18n.global.t('input.editor.sideBySide'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M18.4787 14.58C18.3587 14.69 18.2987 14.85 18.2987 15C18.2987 15.15 18.3587 15.31 18.4787 15.42C18.7187 15.65 19.0987 15.65 19.3287 15.42L22.3287 12.42C22.5587 12.18 22.5587 11.8 22.3287 11.57L19.3287 8.56996C19.0887 8.33996 18.7087 8.33996 18.4787 8.56996C18.2487 8.80996 18.2487 9.18996 18.4787 9.41996L20.451 11.3999L14.4487 11.3999L14.4487 4.6C14.4487 4.27 14.1787 4 13.8487 4C13.5187 4 13.2487 4.27 13.2487 4.6L13.2487 19.4C13.2487 19.73 13.5187 20 13.8487 20C14.1787 20 14.4487 19.73 14.4487 19.4L14.4487 12.5999L20.4511 12.5999L18.4787 14.58ZM9.54878 19.4L9.54878 12.5999L3.5486 12.5999L5.52867 14.58C5.75867 14.81 5.75867 15.19 5.52867 15.43C5.29867 15.66 4.91867 15.66 4.67867 15.43L1.67867 12.43C1.63274 12.384 1.5956 12.3323 1.56725 12.2774C1.53058 12.2077 1.50724 12.1299 1.50068 12.0477C1.49934 12.0317 1.49867 12.0158 1.49867 12C1.49867 11.9841 1.49933 11.9682 1.50067 11.9522C1.51454 11.778 1.60365 11.6242 1.73526 11.5234L4.67867 8.57997C4.90867 8.34997 5.28867 8.34997 5.52867 8.57997C5.75867 8.80997 5.75867 9.18997 5.52867 9.42997L3.55107 11.3999L9.54878 11.3999L9.54878 4.6C9.54878 4.27 9.81878 4 10.1488 4C10.4788 4 10.7488 4.27 10.7488 4.6L10.7488 11.9999L10.7488 19.4C10.7488 19.73 10.4788 20 10.1488 20C9.81878 20 9.54878 19.73 9.54878 19.4Z"/></svg>',
-            },
-            {
-                name: 'guide',
-                action() {
-                    window.open('https://www.markdownguide.org/basic-syntax/', '_blank')
-                },
-                title: i18n.global.t('input.editor.guide'),
-                icon: '<svg viewBox="0 0 24 24"><rect fill="none" rx="0" ry="0"/><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M19.4999 2.3999H6.4999C5.0699 2.3999 3.8999 3.5699 3.8999 4.9999V18.9999C3.8999 20.4299 5.0699 21.5999 6.4999 21.5999H19.4999C19.8299 21.5999 20.0999 21.3299 20.0999 20.9999V16.9999V2.9999C20.0999 2.6699 19.8299 2.3999 19.4999 2.3999ZM5.0999 4.9999V16.8118C5.50468 16.5513 5.98546 16.3999 6.4999 16.3999H18.8999V3.5999H6.4999C5.7299 3.5999 5.0999 4.2299 5.0999 4.9999ZM6.4999 17.5999H18.8999V20.3999H6.4999C5.7299 20.3999 5.0999 19.7699 5.0999 18.9999C5.0999 18.2299 5.7299 17.5999 6.4999 17.5999ZM8.4999 8.5999H15.4999C15.8299 8.5999 16.0999 8.3299 16.0999 7.9999C16.0999 7.6699 15.8299 7.3999 15.4999 7.3999H8.4999C8.1699 7.3999 7.8999 7.6699 7.8999 7.9999C7.8999 8.3299 8.1699 8.5999 8.4999 8.5999ZM15.4999 11.3999H8.4999C8.1699 11.3999 7.8999 11.6699 7.8999 11.9999C7.8999 12.3299 8.1699 12.5999 8.4999 12.5999H15.4999C15.8299 12.5999 16.0999 12.3299 16.0999 11.9999C16.0999 11.6699 15.8299 11.3999 15.4999 11.3999Z"/></svg>',
-            },
-        ],
-    }
-}

src/components/input/fancycheckbox.vue

@@ -2,11 +2,10 @@
 	<div :class="{'is-disabled': disabled}" class="fancycheckbox">
 		<input
 			:checked="checked"
-			:disabled="disabled || undefined"
+			:disabled="disabled || null"
 			:id="checkBoxId"
-			@change="(event: Event) => updateData((event.target as HTMLInputElement).checked)"
-			type="checkbox"
-		/>
+			@change="(event) => updateData(event.target.checked)"
+			type="checkbox"/>
 		<label :for="checkBoxId" class="check">
 			<svg height="18px" viewBox="0 0 18 18" width="18px">
 				<path
@@ -20,41 +19,44 @@
 	</div>
 </template>
 
-<script setup lang="ts">
-import {ref, toRef, watch} from 'vue'
-
+<script>
 import {createRandomID} from '@/helpers/randomId'
 
-const checked = ref(false)
-const checkBoxId = `fancycheckbox_${createRandomID()}`
-
-const props = defineProps({
-	modelValue: {
-		type: Boolean,
-		required: false,
+export default {
+	name: 'fancycheckbox',
+	data() {
+		return {
+			checked: false,
+			checkBoxId: `fancycheckbox_${createRandomID()}`,
+		}
 	},
-	disabled: {
-		type: Boolean,
-		required: false,
-		default: false,
+	props: {
+		modelValue: {
+			required: false,
+		},
+		disabled: {
+			type: Boolean,
+			required: false,
+			default: false,
+		},
 	},
-})
-const emit = defineEmits(['update:modelValue', 'change'])
+	emits: ['update:modelValue', 'change'],
+	watch: {
+		modelValue: {
+			handler(modelValue) {
+				this.checked = modelValue
 
-const modelValue = toRef(props, 'modelValue')
-
-watch(
-	modelValue,
-	newValue => {
-		checked.value = newValue
+			},
+			immediate: true,
+		},
+	},
+	methods: {
+		updateData(checked) {
+			this.checked = checked
+			this.$emit('update:modelValue', checked)
+			this.$emit('change', checked)
+		},
 	},
-	{immediate: true},
-)
-
-function updateData(newChecked: boolean) {
-	checked.value = newChecked
-	emit('update:modelValue', newChecked)
-	emit('change', newChecked)
 }
 </script>