Fix ci config

(Cherry-picked from 4ceeb877b1)

.dockerignore

@@ -1,9 +0,0 @@
-files/
-dist/
-logs/
-
-Dockerfile
-docker-manifest.tmpl
-docker-manifest-unstable.tmpl
-*.db
-*.zip

.drone1.yml

@@ -1,102 +1,46 @@
----
 kind: pipeline
-type: docker
 name: testing
 
 workspace:
   base: /go
   path: src/code.vikunja.io/api
 
-volumes:
-  - name: tmp-sqlite-unit
-    temp:
-      medium: memory
-  - name: tmp-sqlite-integration
-    temp:
-      medium: memory
-  - name: tmp-sqlite-migration
-    temp:
-      medium: memory
-  - name: tmp-mysql-unit
-    temp:
-      medium: memory
-  - name: tmp-mysql-integration
-    temp:
-      medium: memory
-  - name: tmp-mysql-migration
-    temp:
-      medium: memory
-  - name: tmp-postgres-unit
-    temp:
-      medium: memory
-  - name: tmp-postgres-integration
-    temp:
-      medium: memory
-  - name: tmp-postgres-migration
-    temp:
-      medium: memory
-      
-
 services:
   - name: test-mysql-unit
     image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: vikunjatest
       MYSQL_DATABASE: vikunjatest
-    volumes:
-      - name: tmp-mysql-unit
-        path: /var/lib/mysql
   - name: test-mysql-integration
     image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: vikunjatest
       MYSQL_DATABASE: vikunjatest
-    volumes:
-      - name: tmp-mysql-integration
-        path: /var/lib/mysql
   - name: test-mysql-migration
     image: mariadb:10
     environment:
       MYSQL_ROOT_PASSWORD: vikunjatest
       MYSQL_DATABASE: vikunjatest
-    volumes:
-      - name: tmp-mysql-migration
-        path: /var/lib/mysql
   - name: test-postgres-unit
-    image: postgres:14
+    image: postgres:12
     environment:
       POSTGRES_PASSWORD: vikunjatest
       POSTGRES_DB: vikunjatest
-    volumes:
-      - name: tmp-postgres-unit
-        path: /var/lib/postgresql/data
-    commands:
-      - docker-entrypoint.sh -c fsync=off -c full_page_writes=off # turns of wal
   - name: test-postgres-integration
-    image: postgres:14
+    image: postgres:12
     environment:
       POSTGRES_PASSWORD: vikunjatest
       POSTGRES_DB: vikunjatest
-    volumes:
-      - name: tmp-postgres-integration
-        path: /var/lib/postgresql/data
-    commands:
-      - docker-entrypoint.sh -c fsync=off -c full_page_writes=off # turns of wal
   - name: test-postgres-migration
-    image: postgres:14
+    image: postgres:12
     environment:
       POSTGRES_PASSWORD: vikunjatest
       POSTGRES_DB: vikunjatest
-    volumes:
-      - name: tmp-postgres-migration
-        path: /var/lib/postgresql/data
-    commands:
-      - docker-entrypoint.sh -c fsync=off -c full_page_writes=off # turns of wal
 
 trigger:
   branch:
     include:
-      - main
+      - master
   event:
     include:
       - push
@@ -112,18 +56,17 @@ steps:
   # compiling the same magefile at the same time. It's also faster if each step does not need to compile it first.
   - name: mage
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
       - mage -compile ./mage-static
-      - env
     when:
       event: [ push, tag, pull_request ]
 
   - name: build
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     depends_on: [ mage ]
@@ -133,49 +76,46 @@ steps:
       event: [ push, tag, pull_request ]
 
   - name: lint
-    image: golang:1.19-alpine
-    pull: always
+    image: vikunja/golang-build:latest
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     depends_on: [ build ]
     commands:
-      - export "GOROOT=$(go env GOROOT)"
-      - apk --no-cache add build-base git
-      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
-      - ./mage-static check:all
+      - ./mage-static build:generate
+      - ./mage-static check:got-swag
+      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
+      - ./mage-static check:golangci
     when:
       event: [ push, tag, pull_request ]
 
   - name: test-migration-prepare
     image: kolaente/toolbox:latest
-    pull: always
+    pull: true
     commands:
       # Get the latest version
-      - wget https://dl.vikunja.io/api/unstable/vikunja-unstable-linux-amd64-full.zip -q -O vikunja-latest.zip
-      - unzip vikunja-latest.zip vikunja-unstable-linux-amd64
+      - wget https://dl.vikunja.io/api/master/vikunja-master-linux-amd64-full.zip -q -O vikunja-latest.zip
+      - unzip vikunja-latest.zip vikunja-master-linux-amd64
 
   - name: test-migration-sqlite
-    image: vikunja/golang-build:latest
-    pull: always
+    image: kolaente/toolbox:latest
+    pull: true
     depends_on: [ test-migration-prepare, build ]
     environment:
       VIKUNJA_DATABASE_TYPE: sqlite
-      VIKUNJA_DATABASE_PATH: /db/vikunja-migration-test.db
+      VIKUNJA_DATABASE_PATH: ./vikunja-migration-test.db
       VIKUNJA_LOG_DATABASE: stdout
       VIKUNJA_LOG_DATABASELEVEL: debug
-    volumes:
-      - name: tmp-sqlite-migration
-        path: /db
     commands:
-      - ./vikunja-unstable-linux-amd64 migrate
+      - ./vikunja-master-linux-amd64 migrate
       # Run the migrations from the binary build in the step before
       - ./vikunja migrate
     when:
       event: [ push, tag, pull_request ]
 
   - name: test-migration-mysql
-    image: vikunja/golang-build:latest
-    pull: always
+    image: kolaente/toolbox:latest
+    pull: true
     depends_on: [ test-migration-prepare, build ]
     environment:
       VIKUNJA_DATABASE_TYPE: mysql
@@ -186,15 +126,15 @@ steps:
       VIKUNJA_LOG_DATABASE: stdout
       VIKUNJA_LOG_DATABASELEVEL: debug
     commands:
-      - ./vikunja-unstable-linux-amd64 migrate
+      - ./vikunja-master-linux-amd64 migrate
       # Run the migrations from the binary build in the step before
       - ./vikunja migrate
     when:
       event: [ push, tag, pull_request ]
 
   - name: test-migration-psql
-    image: vikunja/golang-build:latest
-    pull: always
+    image: kolaente/toolbox:latest
+    pull: true
     depends_on: [ test-migration-prepare, build ]
     environment:
       VIKUNJA_DATABASE_TYPE: postgres
@@ -206,7 +146,7 @@ steps:
       VIKUNJA_LOG_DATABASE: stdout
       VIKUNJA_LOG_DATABASELEVEL: debug
     commands:
-      - ./vikunja-unstable-linux-amd64 migrate
+      - ./vikunja-master-linux-amd64 migrate
       # Run the migrations from the binary build in the step before
       - ./vikunja migrate
     when:
@@ -214,10 +154,11 @@ steps:
 
   - name: test
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:unit
     depends_on: [ fetch-tags, mage ]
     when:
@@ -225,16 +166,13 @@ steps:
 
   - name: test-sqlite
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
       VIKUNJA_DATABASE_TYPE: sqlite
-      VIKUNJA_DATABASE_PATH: /db/vikunja-test.db
-    volumes:
-      - name: tmp-sqlite-unit
-        path: /db
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:unit
     depends_on: [ fetch-tags, mage ]
     when:
@@ -242,7 +180,7 @@ steps:
 
   - name: test-mysql
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
@@ -252,6 +190,7 @@ steps:
       VIKUNJA_DATABASE_PASSWORD: vikunjatest
       VIKUNJA_DATABASE_DATABASE: vikunjatest
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:unit
     depends_on: [ fetch-tags, mage ]
     when:
@@ -259,7 +198,7 @@ steps:
 
   - name: test-postgres
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
@@ -270,6 +209,7 @@ steps:
       VIKUNJA_DATABASE_DATABASE: vikunjatest
       VIKUNJA_DATABASE_SSLMODE: disable
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:unit
     depends_on: [ fetch-tags, mage ]
     when:
@@ -277,10 +217,11 @@ steps:
 
   - name: integration-test
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:integration
     depends_on: [ fetch-tags, mage ]
     when:
@@ -288,16 +229,13 @@ steps:
 
   - name: integration-test-sqlite
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
       VIKUNJA_DATABASE_TYPE: sqlite
-      VIKUNJA_DATABASE_PATH: /db/vikunja-test.db
-    volumes:
-      - name: tmp-sqlite-integration
-        path: /db
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:integration
     depends_on: [ fetch-tags, mage ]
     when:
@@ -305,7 +243,7 @@ steps:
 
   - name: integration-test-mysql
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
@@ -315,6 +253,7 @@ steps:
       VIKUNJA_DATABASE_PASSWORD: vikunjatest
       VIKUNJA_DATABASE_DATABASE: vikunjatest
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:integration
     depends_on: [ fetch-tags, mage ]
     when:
@@ -322,7 +261,7 @@ steps:
 
   - name: integration-test-postgres
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
       VIKUNJA_TESTS_USE_CONFIG: 1
@@ -333,6 +272,7 @@ steps:
       VIKUNJA_DATABASE_DATABASE: vikunjatest
       VIKUNJA_DATABASE_SSLMODE: disable
     commands:
+      - ./mage-static build:generate
       - ./mage-static test:integration
     depends_on: [ fetch-tags, mage ]
     when:
@@ -344,19 +284,18 @@ steps:
 ########
 
 kind: pipeline
-type: docker
 name: release
 
 depends_on:
   - testing
 
 workspace:
-  base: /source
-  path: /
+  base: /go
+  path: src/code.vikunja.io/api
 
 trigger:
   ref:
-    - refs/heads/main
+    - refs/heads/master
     - "refs/tags/**"
 
 steps:
@@ -370,7 +309,7 @@ steps:
   # compiling the same magefile at the same time. It's also faster if each step does not need to compile it first.
   - name: mage
     image: vikunja/golang-build:latest
-    pull: always
+    pull: true
     environment:
       GOPROXY: 'https://goproxy.kolaente.de'
     commands:
@@ -380,16 +319,17 @@ steps:
 
   - name: before-static-build
     image: techknowlogick/xgo:latest
-    pull: always
+    pull: true
     commands:
       - export PATH=$PATH:$GOPATH/bin
       - go install github.com/magefile/mage
+      - ./mage-static build:generate
       - ./mage-static release:dirs
     depends_on: [ fetch-tags, mage ]
 
   - name: static-build-windows
     image: techknowlogick/xgo:latest
-    pull: always
+    pull: true
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
       # Leaving this here until we know how to resolve this properly.
@@ -402,7 +342,7 @@ steps:
 
   - name: static-build-linux
     image: techknowlogick/xgo:latest
-    pull: always
+    pull: true
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
       # Leaving this here until we know how to resolve this properly.
@@ -415,7 +355,7 @@ steps:
 
   - name: static-build-darwin
     image: techknowlogick/xgo:latest
-    pull: always
+    pull: true
     environment:
       # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why.
       # Leaving this here until we know how to resolve this properly.
@@ -428,7 +368,7 @@ steps:
 
   - name: after-build-compress
     image: kolaente/upx
-    pull: always
+    pull: true
     depends_on:
       - static-build-windows
       - static-build-linux
@@ -438,7 +378,7 @@ steps:
 
   - name: after-build-static
     image: techknowlogick/xgo:latest
-    pull: always
+    pull: true
     depends_on:
       - after-build-compress
     commands:
@@ -450,7 +390,7 @@ steps:
 
   - name: sign-release
     image: plugins/gpgsign:1
-    pull: always
+    pull: true
     depends_on: [ after-build-static ]
     settings:
       key:
@@ -463,8 +403,8 @@ steps:
 
   # Push the releases to our pseudo-s3-bucket
   - name: release-latest
-    image: plugins/s3
-    pull: always
+    image: plugins/s3:1
+    pull: true
     settings:
       bucket: vikunja-releases
       access_key:
@@ -476,17 +416,17 @@ steps:
       path_style: true
       strip_prefix: dist/zip/
       source: dist/zip/*
-      target: /api/unstable/
+      target: /api/master/
     when:
       branch:
-        - main
+        - master
       event:
         - push
     depends_on: [ sign-release ]
 
   - name: release-version
-    image: plugins/s3
-    pull: always
+    image: plugins/s3:1
+    pull: true
     settings:
       bucket: vikunja-releases
       access_key:
@@ -505,40 +445,18 @@ steps:
     depends_on: [ sign-release ]
 
   # Build os packages and push it to our bucket
-  - name: build-os-packages-unstable
-    image: goreleaser/nfpm:v2.27.1
-    pull: always
+  - name: build-os-packages
+    image: goreleaser/nfpm
+    pull: true
     commands:
       - apk add git go
       - ./mage-static release:packages
-      - mv dist/os-packages/vikunja*.x86_64.rpm dist/os-packages/vikunja-unstable-x86_64.rpm
-      - mv dist/os-packages/vikunja*_amd64.deb dist/os-packages/vikunja-unstable-amd64.deb
-      - mv dist/os-packages/vikunja*_x86_64.apk dist/os-packages/vikunja-unstable-x86_64.apk
-    when:
-      branch:
-        - main
-      event:
-        - push
-    depends_on: [ after-build-compress ]
-
-  - name: build-os-packages-version
-    image: goreleaser/nfpm:v2.27.1
-    pull: always
-    commands:
-      - apk add git go
-      - ./mage-static release:packages
-      - mv dist/os-packages/vikunja*.x86_64.rpm dist/os-packages/vikunja-${DRONE_TAG##v}-x86_64.rpm
-      - mv dist/os-packages/vikunja*_amd64.deb dist/os-packages/vikunja-${DRONE_TAG##v}-amd64.deb
-      - mv dist/os-packages/vikunja*_x86_64.apk dist/os-packages/vikunja-${DRONE_TAG##v}-x86_64.apk
-    when:
-      event:
-        - tag
-    depends_on: [ after-build-compress ]
+    depends_on: [ static-build-linux ]
 
   # Push the os releases to our pseudo-s3-bucket
   - name: release-os-latest
-    image: plugins/s3
-    pull: always
+    image: plugins/s3:1
+    pull: true
     settings:
       bucket: vikunja-releases
       access_key:
@@ -550,17 +468,17 @@ steps:
       path_style: true
       strip_prefix: dist/os-packages/
       source: dist/os-packages/*
-      target: /api/unstable/
+      target: /api/master/
     when:
       branch:
-        - main
+        - master
       event:
         - push
-    depends_on: [ build-os-packages-unstable ]
+    depends_on: [ build-os-packages ]
 
   - name: release-os-version
-    image: plugins/s3
-    pull: always
+    image: plugins/s3:1
+    pull: true
     settings:
       bucket: vikunja-releases
       access_key:
@@ -576,11 +494,10 @@ steps:
     when:
       event:
         - tag
-    depends_on: [ build-os-packages-version ]
+    depends_on: [ build-os-packages ]
 
 ---
 kind: pipeline
-type: docker
 name: deploy-docs
 
 workspace:
@@ -594,21 +511,27 @@ trigger:
   event:
     - push
   branch:
-    - main
+    - master
 
 steps:
-  - name: theme
-    image: kolaente/toolbox
-    pull: always
+  - name: submodules
+    image: docker:git
+    commands:
+      - git submodule update --init
+      - git submodule update --recursive --remote
+
+  - name: theme
+    image: kolaente/yarn
+    pull: true
+    group: build-static
     commands:
-      - mkdir docs/themes/vikunja -p
       - cd docs/themes/vikunja
-      - wget https://dl.vikunja.io/theme/vikunja-theme.tar.gz
-      - tar -xzf vikunja-theme.tar.gz
+      - yarn --production=false
+      - ./node_modules/.bin/gulp prod
 
   - name: build
-    image: klakegg/hugo:0.107.0
-    pull: always
+    image: monachus/hugo:v0.54.0
+    pull: true
     commands:
       - cd docs
       - hugo
@@ -616,7 +539,7 @@ steps:
 
   - name: docker
     image: plugins/docker
-    pull: always
+    pull: true
     settings:
       username:
         from_secret: docker_username
@@ -629,14 +552,18 @@ steps:
 ---
 kind: pipeline
 type: docker
-name: docker-release
+name: docker-arm-release
 
 depends_on:
   - testing
 
+platform:
+  os: linux
+  arch: arm
+
 trigger:
   ref:
-    - refs/heads/main
+    - refs/heads/master
     - "refs/tags/**"
 
 steps:
@@ -644,60 +571,80 @@ steps:
     image: docker:git
     commands:
       - git fetch --tags
-
-  - name: docker-unstable
-    image: thegeeklab/drone-docker-buildx
-    privileged: true
-    pull: always
+  - name: docker
+    image: plugins/docker:linux-arm
+    pull: true
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
       repo: vikunja/api
-      tags: unstable
-      platforms:
-        - linux/386
-        - linux/amd64
-        - linux/arm/v6
-        - linux/arm/v7
-        - linux/arm64/v8
+      auto_tag: true
+      auto_tag_suffix: linux-arm
     depends_on: [ fetch-tags ]
-    when:
-      ref:
-        - refs/heads/main
 
-  - name: generate-tags
-    image: thegeeklab/docker-autotag
-    environment:
-      DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
-      DOCKER_AUTOTAG_EXTRA_TAGS: latest
-      DOCKER_AUTOTAG_OUTPUT_FILE: .tags
-    depends_on: [ fetch-tags ]
-    when:
-      ref:
-        - "refs/tags/**"
+---
+kind: pipeline
+type: docker
+name: docker-amd64-release
 
-  - name: docker-release
-    image: thegeeklab/drone-docker-buildx
-    privileged: true
-    pull: always
+depends_on:
+  - testing
+
+platform:
+  os: linux
+  arch: amd64
+
+trigger:
+  ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+steps:
+  - name: fetch-tags
+    image: docker:git
+    commands:
+      - git fetch --tags
+  - name: docker
+    image: plugins/docker:linux-amd64
+    pull: true
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
       repo: vikunja/api
-      platforms:
-        - linux/386
-        - linux/amd64
-        - linux/arm/v6
-        - linux/arm/v7
-        - linux/arm64/v8
-    depends_on: [ generate-tags ]
-    when:
-      ref:
-        - "refs/tags/**"
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+    depends_on: [ fetch-tags ]
+
+---
+kind: pipeline
+type: docker
+name: docker-manifest
+
+trigger:
+  ref:
+    - refs/heads/master
+    - "refs/tags/**"
+
+depends_on:
+  - docker-amd64-release
+  - docker-arm-release
+
+steps:
+  - name: manifest
+    pull: always
+    image: plugins/manifest
+    settings:
+      auto_tag: true
+      ignore_missing: true
+      spec: docker-manifest.tmpl
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
 
 ---
 kind: pipeline
@@ -706,31 +653,26 @@ name: notify
 
 trigger:
   ref:
-    - refs/heads/main
+    - refs/heads/master
     - "refs/tags/**"
 
 depends_on:
-  - testing
   - release
-  - deploy-docs
-  - docker-release
+  - docker-manifest
 
 steps:
-  - name: notify
-    image: plugins/matrix
+  - name: telegram
+    image: appleboy/drone-telegram:1-linux-amd64
     settings:
-      homeserver: https://matrix.org
-      roomid: WqBDCxzghKcNflkErL:matrix.org
-      username:
-        from_secret: matrix_username
-      password:
-        from_secret: matrix_password
+      token:
+        from_secret: TELEGRAM_TOKEN
+      to:
+        from_secret: TELEGRAM_TO
+      message: >
+        {{repo.owner}}/{{repo.name}}: \[{{build.status}}] Build {{build.number}}
+        {{commit.author}} pushed to {{commit.branch}} {{commit.sha}}: `{{commit.message}}`
+        Build started at {{datetime build.started "2006-Jan-02T15:04:05Z" "GMT+2"}} finished at {{datetime build.finished "2006-Jan-02T15:04:05Z" "GMT+2"}}.
     when:
       status:
         - success
         - failure
----
-kind: signature
-hmac: 166caa5ba66cd55bc0f1c5cb42be0a0a647fbadf66716778cf795fc084fc80fd
-
-...

.editorconfig

@@ -1,22 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-indent_style = tab
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = false
-insert_final_newline = false
-
-[*.go]
-indent_style = tab
-
-[*.{yaml,yml}]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 4

.gitea/pull_request_template.md

@@ -0,0 +1,11 @@
+# Description
+
+
+
+# Checklist
+
+* [ ] I added or improved tests
+* [ ] I added or improved docs for my feature
+  * [ ] Swagger (including `mage do-the-swag`)
+  * [ ] Error codes
+  * [ ] New config options (including adding them to `config.yml.saml` and running `mage generate-docs`)

.github/FUNDING.yml

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

.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: Frontend issues
-    url: https://code.vikunja.io/frontend/issues
-    about: This is the API repo. Please open frontend-related bug reports and discussions in the frontend repo. Not sure if you 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

@@ -4,9 +4,6 @@
 config.yml
 config.yaml
 !docs/config.yml
-!.github/ISSUE_TEMPLATE/config.yml
-!.gitea/ISSUE_TEMPLATE/config.yml
-docs/themes/
 *.db
 Run
 dist/
@@ -26,4 +23,3 @@ files/
 vikunja-dump*
 vendor/
 os-packages/
-mage_output_file.go

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs/themes/vikunja"]
+	path = docs/themes/vikunja
+	url = ../theme.git

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  timeout: 15m
+  timeout: 5m
   tests: true
 
 linters:
@@ -13,11 +13,10 @@ linters:
     - goheader
     - gofmt
     - goimports
-    - revive
+    - golint
     - misspell
   disable:
     - scopelint # Obsolete, using exportloopref instead
-    - durationcheck
   presets:
     - bugs
     - unused
@@ -36,7 +35,6 @@ issues:
       linters:
         - gocyclo
         - deadcode
-        - errorlint
     - path: pkg/integrations/*
       linters:
         - gocyclo
@@ -79,16 +77,6 @@ issues:
     - path: pkg/routes/api/v1/docs.go
       linters:
         - goheader
-        - misspell
     - text: "Missed string"
       linters:
         - goheader
-    - path: pkg/.*/error.go
-      linters:
-        - errorlint
-    - path: pkg/models/favorites\.go
-      linters:
-        - nilerr
-    - path: pkg/models/events\.go
-      linters:
-        - musttag

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "go.testEnvVars": {
-        "VIKUNJA_SERVICE_ROOTPATH": "${workspaceRoot}"
-    }
-}

Dockerfile

@@ -1,42 +1,51 @@
-# syntax=docker/dockerfile:1
-#  ┬─┐┬ ┐o┬  ┬─┐
-#  │─││ │││  │ │
-#  ┘─┘┘─┘┘┘─┘┘─┘
 
-FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.20.x AS builder
+##############
+# Build stage
+FROM golang:1-alpine3.12 AS build-env
 
-RUN go install github.com/magefile/mage@latest && \
-    mv /go/bin/mage /usr/local/go/bin
+ARG VIKUNJA_VERSION
+ENV TAGS "sqlite"
+ENV GO111MODULE=on
 
-WORKDIR /go/src/code.vikunja.io/api
-COPY . ./
+# Build deps
+RUN apk --no-cache add build-base git
 
-ARG TARGETOS TARGETARCH TARGETVARIANT
+# Setup repo
+COPY . ${GOPATH}/src/code.vikunja.io/api
+WORKDIR ${GOPATH}/src/code.vikunja.io/api
 
-RUN mage build:clean && \
-    mage release:xgo "${TARGETOS}/${TARGETARCH}/${TARGETVARIANT}"
-
-#  ┬─┐┬ ┐┌┐┐┌┐┐┬─┐┬─┐
-#  │┬┘│ │││││││├─ │┬┘
-#  ┘└┘┘─┘┘└┘┘└┘┴─┘┘└┘
+# Checkout version if set
+RUN if [ -n "${VIKUNJA_VERSION}" ]; then git checkout "${VIKUNJA_VERSION}"; fi \
+ && go install github.com/magefile/mage \
+ && mage build:clean build:build
 
+###################
 # The actual image
 # Note: I wanted to use the scratch image here, but unfortunatly the go-sqlite bindings require cgo and
 # because of this, the container would not start when I compiled the image without cgo.
-FROM alpine:3.16 AS runner
+FROM alpine:3.12
 LABEL maintainer="maintainers@vikunja.io"
-WORKDIR /app/vikunja
-ENTRYPOINT [ "/sbin/tini", "-g", "--", "/entrypoint.sh" ]
-EXPOSE 3456
 
+WORKDIR /app/vikunja/
+COPY --from=build-env /go/src/code.vikunja.io/api/vikunja .
 ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
+
+# Dynamic permission changing stuff
 ENV PUID 1000
 ENV PGID 1000
+RUN apk --no-cache add shadow && \
+  addgroup -g ${PGID} vikunja && \
+  adduser -s /bin/sh -D -G vikunja -u ${PUID} vikunja -h /app/vikunja -H && \
+  chown vikunja -R /app/vikunja
+COPY run.sh /run.sh
 
-RUN apk --update --no-cache add tzdata tini shadow && \
-    addgroup vikunja && \
-    adduser -s /bin/sh -D -G vikunja vikunja -h /app/vikunja -H
-COPY docker/entrypoint.sh /entrypoint.sh
-RUN chmod 0755 /entrypoint.sh && mkdir files
+# Fix time zone settings not working
+RUN apk --no-cache add tzdata
 
-COPY --from=builder /build/vikunja-* vikunja
+# Files permissions
+RUN mkdir /app/vikunja/files && \
+  chown -R vikunja /app/vikunja/files
+VOLUME /app/vikunja/files
+
+CMD ["/run.sh"]
+EXPOSE 3456

README.md

@@ -2,10 +2,10 @@
 
 [![Build Status](https://drone.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone.kolaente.de/vikunja/api)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.20.4-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.16.1-brightgreen.svg)](https://dl.vikunja.io)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
-[![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/api)](https://goreportcard.com/report/kolaente.dev/vikunja/api)
+[![Go Report Card](https://goreportcard.com/badge/git.kolaente.de/vikunja/api)](https://goreportcard.com/report/git.kolaente.de/vikunja/api)
 
 # Vikunja API
 
@@ -13,22 +13,17 @@
 
 # Table of contents
 
-* [Security Reports](#security-reports)
 * [Features](#features)
 * [Docs](#docs)
 * [Roadmap](#roadmap)
 * [Contributing](#contributing)
 * [License](#license)
 
-## Security Reports
-
-If you find any security-related issues you don't want to disclose publicly, please use [the contact information on our website](https://vikunja.io/contact/#security).
-
 ## Features
 
 * Create TODO lists with tasks
   * Reminder for tasks
-* Namespaces: A "group" which bundles multiple lists
+* Namespaces: A "group" which bundels multiple lists
 * Share lists and namespaces with teams and users with granular permissions
 * Plenty of details for tasks
 
@@ -40,22 +35,23 @@ try it on [try.vikunja.io](https://try.vikunja.io)!
 * [Installing](https://vikunja.io/docs/installing/)
 * [Build from source](https://vikunja.io/docs/build-from-sources/)
 * [Development setup](https://vikunja.io/docs/development/)
-* [Magefile](https://vikunja.io/docs/magefile/)
+* [Magefile](https://vikunja.io/docs/mage/)
 * [Testing](https://vikunja.io/docs/testing/)
 
-All docs can be found on [the Vikunja home page](https://vikunja.io/docs/).
+All docs can be found on [the vikunja home page](https://vikunja.io/docs/).
 
 ### Roadmap
 
 See [the roadmap](https://my.vikunja.cloud/share/QFyzYEmEYfSyQfTOmIRSwLUpkFjboaBqQCnaPmWd/auth) (hosted on Vikunja!) for more!
 
-* [ ] [Mobile apps](https://code.vikunja.io/app) (separate repo) *In Progress*
-* [ ] [Webapp](https://code.vikunja.io/frontend) (separate repo) *In Progress*
+* [ ] [Mobile apps](https://code.vikunja.io/app) (seperate repo) *In Progress*
+* [ ] [Webapp](https://code.vikunja.io/frontend) (seperate repo) *In Progress*
 
 ## Contributing
 
-Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more info.
+Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more infos.
 
 ## License
 
 This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text.
+

build/after-install.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-systemctl enable vikunja.service
-
 # Fix the config to contain proper values
 NEW_SECRET=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
 sed -i "s/<jwt-secret>/$NEW_SECRET/g" /etc/vikunja/config.yml

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
-]
-

code-header-template.txt

@@ -1,5 +1,5 @@
 Vikunja is a to-do list application to facilitate your life.
-Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public Licensee as published by

config.yml.sample

@@ -3,40 +3,30 @@ service:
   # Default is a random token which will be generated at each startup of vikunja.
   # (This means all already issued tokens will be invalid once you restart vikunja)
   JWTSecret: "<jwt-secret>"
-  # The duration of the issed JWT tokens in seconds.
-  # The default is 259200 seconds (3 Days).
-  jwtttl: 259200
-  # The duration of the "remember me" time in seconds. When the login request is made with 
-  # the long param set, the token returned will be valid for this period.
-  # The default is 2592000 seconds (30 Days).
-  jwtttllong: 2592000
   # The interface on which to run the webserver
   interface: ":3456"
-  # Path to Unix socket. If set, it will be created and used instead of tcp
-  unixsocket:
-  # Permission bits for the Unix socket. Note that octal values must be prefixed by "0o", e.g. 0o660
-  unixsocketmode:
   # The URL of the frontend, used to send password reset emails.
   frontendurl: ""
   # The base path on the file system where the binary and assets are.
   # Vikunja will also look in this path for a config file, so you could provide only this variable to point to a folder
   # with a config file which will then be used.
   rootpath: <rootpath>
-  # Path on the file system to serve static files from. Set to the path of the frontend files to host frontend alongside the api.
-  staticpath: ""
   # The max number of items which can be returned per page
   maxitemsperpage: 50
+  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about the system
+  # You'll need to use redis for this in order to enable common metrics over multiple nodes
+  enablemetrics: false
   # Enable the caldav endpoint, see the docs for more details
   enablecaldav: true
   # Set the motd message, available from the /info endpoint
   motd: ""
-  # Enable sharing of project via a link
+  # Enable sharing of lists via a link
   enablelinksharing: true
   # Whether to let new users registering themselves or not
   enableregistration: true
   # Whether to enable task attachments or not
   enabletaskattachments: true
-  # The time zone all timestamps are in. Please note that time zones have to use [the official tz database names](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). UTC or GMT offsets won't work.
+  # The time zone all timestamps are in
   timezone: GMT
   # Whether task comments should be enabled or not
   enabletaskcomments: true
@@ -52,24 +42,17 @@ service:
   # If enabled, vikunja will send an email to everyone who is either assigned to a task or created it when a task reminder
   # is due.
   enableemailreminders: true
-  # If true, will allow users to request the complete deletion of their account. When using external authentication methods 
-  # it may be required to coordinate with them in order to delete the account. This setting will not affect the cli commands
-  # for user deletion.
-  enableuserdeletion: true
-  # The maximum size clients will be able to request for user avatars.
-  # If clients request a size bigger than this, it will be changed on the fly.
-  maxavatarsize: 1024
 
 database:
   # Database type to use. Supported types are mysql, postgres and sqlite.
   type: "sqlite"
   # Database user which is used to connect to the database.
   user: "vikunja"
-  # Database password
+  # Databse password
   password: ""
-  # Database host
+  # Databse host
   host: "localhost"
-  # Database to use
+  # Databse to use
   database: "vikunja"
   # When using sqlite, this is the path where to store the data
   path: "./vikunja.db"
@@ -82,14 +65,6 @@ database:
   # Secure connection mode. Only used with postgres.
   # (see https://pkg.go.dev/github.com/lib/pq?tab=doc#hdr-Connection_String_Parameters)
   sslmode: disable
-  # The path to the client cert. Only used with postgres.
-  sslcert: ""
-  # The path to the client key. Only used with postgres.
-  sslkey: ""
-  # The path to the ca cert. Only used with postgres.
-  sslrootcert: ""
-  # Enable SSL/TLS for mysql connections. Options: false, true, skip-verify, preferred
-  tls: false
 
 cache:
   # If cache is enabled or not
@@ -127,11 +102,8 @@ mailer:
   enabled: false
   # SMTP Host
   host: ""
-  # SMTP Host port.
-  # **NOTE:** If you're unable to send mail and the only error you see in the logs is an `EOF`, try setting the port to `25`.
+  # SMTP Host port
   port: 587
-  # SMTP Auth Type. Can be either `plain`, `login` or `cram-md5`.
-  authtype: "plain"
   # SMTP username
   username: "user"
   # SMTP password
@@ -162,16 +134,8 @@ log:
   databaselevel: "WARNING"
   # Whether to log http requests or not. Possible values are stdout, stderr, file or off to disable http logging.
   http: "stdout"
-  # Echo has its own logging which usually is unnecessary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
+  # Echo has its own logging which usually is unnessecary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
   echo: "off"
-  # Whether or not to log events. Useful for debugging. Possible values are stdout, stderr, file or off to disable events logging.
-  events: "off"
-  # The log level for event log messages. Possible values (case-insensitive) are ERROR, INFO, DEBUG.
-  eventslevel: "info"
-  # Whether or not to log mail log messages. This will not log mail contents. Possible values are stdout, stderr, file or off to disable mail-related logging.
-  mail: "off"
-  # The log level for mail log messages. Possible values (case-insensitive) are ERROR, WARNING, INFO, DEBUG.
-  maillevel: "info"
 
 ratelimit:
   # whether or not to enable the rate limit
@@ -195,6 +159,21 @@ files:
   maxsize: 20MB
 
 migration:
+  # These are the settings for the wunderlist migrator
+  wunderlist:
+    # Wheter to enable the wunderlist migrator or not
+    enable: false
+    # The client id, required for making requests to the wunderlist api
+    # You need to register your vikunja instance at https://developer.wunderlist.com/apps/new to get this
+    clientid:
+    # The client secret, also required for making requests to the wunderlist api
+    clientsecret:
+    # The url where clients are redirected after they authorized Vikunja to access their wunderlist stuff.
+    # This needs to match the url you entered when registering your Vikunja instance at wunderlist.
+    # This is usually the frontend url where the frontend then makes a request to /migration/wunderlist/migrate
+    # with the code obtained from the wunderlist api.
+    # Note that the vikunja frontend expects this to be /migrate/wunderlist
+    redirecturl:
   todoist:
     # Wheter to enable the todoist migrator or not
     enable: false
@@ -208,7 +187,7 @@ migration:
     # This is usually the frontend url where the frontend then makes a request to /migration/todoist/migrate
     # with the code obtained from the todoist api.
     # Note that the vikunja frontend expects this to be /migrate/todoist
-    redirecturl: <frontend url>/migrate/todoist
+    redirecturl:
   trello:
     # Wheter to enable the trello migrator or not
     enable: false
@@ -242,14 +221,14 @@ avatar:
   gravatarexpiration: 3600
 
 backgrounds:
-  # Whether to enable backgrounds for projects at all.
+  # Whether to enable backgrounds for lists at all.
   enabled: true
   providers:
     upload:
-      # Whether to enable uploaded project backgrounds
+      # Whethere to enable uploaded list backgrounds
       enabled: true
     unsplash:
-      # Whether to enable setting backgrounds from unsplash as project backgrounds
+      # Whether to enable setting backgrounds from unsplash as list backgrounds
       enabled: false
       # You need to create an application for your installation at https://unsplash.com/oauth/applications/new
       # and set the access token below.
@@ -280,19 +259,15 @@ auth:
     enabled: true
   # OpenID configuration will allow users to authenticate through a third-party OpenID Connect compatible provider.<br/>
   # The provider needs to support the `openid`, `profile` and `email` scopes.<br/>
-  # **Note:** Some openid providers (like gitlab) only make the email of the user available through openid claims if they have set it to be publicly visible.
-  # If the email is not public in those cases, authenticating will fail.
-  # **Note 2:** The frontend expects to be redirected after authentication by the third party
+  # **Note:** The frontend expects to be redirected after authentication by the third party
   # to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
   # auth service accordingy if you're using the default vikunja frontend.
-  # Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
+  # Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/master/config.yml.sample) for more information about how to configure openid authentication.
   openid:
     # Enable or disable OpenID Connect authentication
     enabled: false
     # The url to redirect clients to. Defaults to the configured frontend url. If you're using Vikunja with the official
     # frontend, you don't need to change this value.
-    # **Note:** The redirect url must exactly match the configured redirect url with the third party provider.
-    # This includes all slashes at the end or protocols.
     redirecturl: <frontend url>
     # A list of enabled providers
     providers:
@@ -300,44 +275,7 @@ auth:
       - name:
         # The auth url to send users to if they want to authenticate using OpenID Connect.
         authurl:
-        # The oidc logouturl that users will be redirected to on logout.
-        # Leave empty or delete key, if you do not want to be redirected.
-        logouturl:
         # The client ID used to authenticate Vikunja at the OpenID Connect provider.
         clientid:
         # The client secret used to authenticate Vikunja at the OpenID Connect provider.
         clientsecret:
-
-# Prometheus metrics endpoint
-metrics:
-  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja.
-  enabled: false
-  # If set to a non-empty value the /metrics endpoint will require this as a username via basic auth in combination with the password below.
-  username:
-  # If set to a non-empty value the /metrics endpoint will require this as a password via basic auth in combination with the username below.
-  password:
-
-# Provide default settings for new users. When a new user is created, these settings will automatically be set for the user. If you change them in the config file afterwards they will not be changed back for existing users.
-defaultsettings:
-  # The avatar source for the user. Can be `gravatar`, `initials`, `upload` or `marble`. If you set this to `upload` you'll also need to specify `defaultsettings.avatar_file_id`.
-  avatar_provider: initials
-  # The id of the file used as avatar.
-  avatar_file_id: 0
-  # If set to true users will get task reminders via email.
-  email_reminders_enabled: false
-  # If set to true will allow other users to find this user when searching for parts of their name.
-  discoverable_by_name: false
-  # If set to true will allow other users to find this user when searching for their exact email.
-  discoverable_by_email: false
-  # If set to true will send an email every day with all overdue tasks at a configured time.
-  overdue_tasks_reminders_enabled: true
-  # When to send the overdue task reminder email.
-  overdue_tasks_reminders_time: 9:00
-  # The id of the default project. Make sure users actually have access to this project when setting this value.
-  default_project_id: 0
-  # Start of the week for the user. `0` is sunday, `1` is monday and so on.
-  week_start: 0
-  # The language of the user interface. Must be an ISO 639-1 language code. Will default to the browser language the user uses when signing up.
-  language: <unset>
-  # The time zone of each individual user. This will affect when users get reminders and overdue task emails.
-  timezone: <time zone set at service.timezone>

docker-manifest.tmpl

@@ -0,0 +1,18 @@
+image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    platform:
+      architecture: arm
+      os: linux

docker/entrypoint.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-if [ -n "$PUID" ] && [ "$PUID" -ne 0 ] && \
-   [ -n "$PGID" ] && [ "$PGID" -ne 0 ] ; then
-  echo "info: creating the new user vikunja with $PUID:$PGID"
-  groupmod -g "$PGID" -o vikunja
-  usermod -u "$PUID" -o vikunja
-  chown -R vikunja:vikunja ./files/
-  chown vikunja:vikunja .
-  exec su vikunja -c /app/vikunja/vikunja "$@"
-else
-  echo "info: creation of non-root user is skipped"
-  exec /app/vikunja/vikunja "$@"
-fi

docs/config.yml

@@ -2,7 +2,7 @@ baseurl: https://vikunja.io/docs/
 title: Vikunja
 theme: vikunja
 enableRobotsTXT: true
-canonifyURLs: false
+canonifyURLs: true
 
 pygmentsUseClasses: true
 
@@ -28,17 +28,14 @@ markup:
 menu:
   page:
     - name: Home
-      url: https://vikunja.io/
+      url: https://vikunja.io/en/
       weight: 10
     - name: Features
-      url: https://vikunja.io/features
+      url: https://vikunja.io/en/features
       weight: 20
     - name: Download
-      url: https://vikunja.io/download
+      url: https://vikunja.io/en/download
       weight: 30
-    - name: Blog
-      url: https://vikunja.io/blog/
-      weight: 35
     - name: Docs
       url: https://vikunja.io/docs
       weight: 40
@@ -48,9 +45,3 @@ menu:
     - name: Community
       url: https://community.vikunja.io/
       weight: 60
-    - name: Stickers
-      url: https://vikunja.cloud/stickers?utm_source=io&utm_medium=io&utm_campaign=menu
-      weight: 65
-    - name: Get it Hosted
-      url: https://vikunja.cloud/?utm_source=io&utm_medium=io&utm_campaign=menu
-      weight: 70

docs/content/doc/development/cli.md

@@ -1,6 +1,6 @@
 ---
 date: "2019-03-31:00:00+01:00"
-title: "Cli Commands"
+title: "Adding new cli commands"
 draft: false
 type: "doc"
 menu:

docs/content/doc/development/config.md

@@ -1,41 +0,0 @@
----
-date: "2019-02-12:00:00+02:00"
-title: "Configuration Options"
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Configuration options
-
-All configuration variables are declared in the `config` package.
-It uses [viper](https://github.com/spf13/viper) under the hood to handle setting defaults and parsing config files.
-Viper handles parsing all different configuration sources.
-
-## Adding new config options
-
-To make handling configuration parameters a bit easier, we introduced a `Key` string type in the `config` package which 
-you can call directly to get a config value.
-
-To add a new config option, you should add a new key const to `pkg/config/config.go` and possibly a default value.
-Default values should always enable the feature to work or turn it off completely if it always needs
-additional configuration.
-
-Make sure to also add the new config option to the default config file (`config.yml.sample` at the root of the repository) 
-with an explanatory comment to make sure it is well documented.
-Then run `mage generate-docs` to generate the configuration docs from the sample file.
-
-## Getting Configuration Values
-
-To retreive a configured value call the key with a getter for the type you need.
-For example:
-
-{{< highlight golang >}}
-if config.CacheEnabled.GetBool() {
-	// Do something with enabled caches
-}
-{{< /highlight >}}
-
-Take a look at the methods declared on the type to see what's available.

docs/content/doc/development/cron.md

@@ -1,35 +0,0 @@
----
-title: "Cron Tasks"
-date: 2021-07-13T23:21:52+02:00
-draft: false
-menu:
-  sidebar:
-    parent: "development"
----
-
-# How to add a cron job task
-
-Cron jobs are tasks which run on a predefined schedule.
-Vikunja uses these through a light wrapper package around the excellent [github.com/robfig/cron](https://github.com/robfig/cron) package.
-
-The package exposes a `cron.Schedule` method with two arguments: The first one to define the schedule when the cron task 
-should run, and the second one with the actual function to run at the schedule.
-You would then create a new function to register your the actual cron task in your package.
-
-A basic function to register a cron task looks like this:
-
-{{< highlight golang >}}
-func RegisterSomeCronTask() {
-	err := cron.Schedule("0 * * * *", func() {
-		// Do something every hour
-	}
-}
-{{< /highlight >}}
-
-Call the register method in the `FullInit()` method of the `init` package to actually register it.
-
-## Schedule Syntax
-
-The cron syntax uses the same on you may know from unix systems.
-
-It is described in detail [here](https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format).

docs/content/doc/development/database.md

@@ -1,40 +0,0 @@
----
-date: "2019-02-12:00:00+02:00"
-title: "Database"
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Database
-
-Vikunja uses [xorm](https://xorm.io/) as an abstraction layer to handle the database connection.
-Please refer to [their](https://xorm.io/docs/) documentation on how to exactly use it.
-
-{{< table_of_contents >}}
-
-## Using the database
-
-When using the common web handlers, you get an `xorm.Session` to do database manipulations.
-In other packages, use the `db.NewSession()` method to get a new database session.
-
-## Adding new database tables
-
-To add a new table to the database, create the struct and [add a migration for it]({{< ref "db-migrations.md" >}}).
-
-To learn more about how to configure your struct to create "good" tables, refer to [the xorm documentaion](https://xorm.io/docs/).
-
-In most cases you will also need to implement the `TableName() string` method on the new struct to make sure the table 
-name matches the rest of the tables - plural.
-
-## Adding data to test fixtures
-
-Adding data for test fixtures can be done via `yaml` files in `pkg/models/fixtures`.
-
-The name of the yaml file should match the table name in the database.
-Adding values to it is done via array definition inside it.
-
-**Note**: Table and column names need to be in snake_case as that's what is used internally in the database 
-and for mapping values from the database to xorm so your structs can use it.

docs/content/doc/development/db-migrations.md

@@ -1,6 +1,6 @@
 ---
 date: "2019-03-29:00:00+02:00"
-title: "Database Migrations"
+title: "Database migrations"
 draft: false
 type: "doc"
 menu:
@@ -37,11 +37,6 @@ All migrations are sorted before being executed, since `init()` does not guarant
 When you're adding a new struct, you also need to add it to the `models.GetTables()` function
 to ensure it will be created on new installations.
 
-### Generating a new migration stub
-
-You can easily generate a pre-filled migration stub by running `mage dev:make-migration`.
-It will ask you for a table name and generate an empty migration similar to the example shown below.
-
 ### Example
 
 {{< highlight golang >}}

docs/content/doc/development/development.md

@@ -1,5 +1,5 @@
 ---
-date: "2022-09-21:00:00+02:00"
+date: "2019-02-12:00:00+02:00"
 title: "Development"
 toc: true
 draft: false
@@ -12,44 +12,56 @@ menu:
 
 # Development
 
-{{< table_of_contents >}}
+We use go modules to vendor libraries for Vikunja, so you'll need at least go `1.11` to use these.
+If you don't intend to add new dependencies, go `1.9` and above should be fine.
 
-## General
-
-To contribute to Vikunja, fork the project and work on the main branch.
-Once you feel like your changes are ready, open a PR in the respective repo.
-A maintainer will take a look and give you feedback. Once everyone is happy, the PR gets merged and released.
-
-If you plan to do a bigger change, it is better to open an issue for discussion first.
-
-## API
-
-The code for the api is located at [code.vikunja.io/api](https://code.vikunja.io/api).
-
-We use go modules to manage third-party libraries for Vikunja, so you'll need at least go `1.17` to use these.
+To contribute to Vikunja, fork the project and work on the master branch.
 
 A lot of developing tasks are automated using a Magefile, so make sure to [take a look at it]({{< ref "mage.md">}}).
 
-Make sure to check the other doc articles for specific development tasks like [testing]({{< ref "test.md">}}),
-[database migrations]({{< ref "db-migrations.md" >}}) and the [project structure]({{< ref "structure.md" >}}).
+{{< table_of_contents >}}
 
-## Frontend requirements
+## Libraries
 
-The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
-More instructions can be found in the repo's README.
+We keep all libraries used for Vikunja around in the `vendor/` folder to still be able to build the project even if
+some maintainers take their libraries down like [it happened in the past](https://github.com/jteeuwen/go-bindata/issues/5).
 
-You need to have [pnpm](https://pnpm.io/) and nodejs in version 16 or 18 installed.
+## Tests
 
-## Git flow
+See [testing]({{< ref "test.md">}}).
 
-The `main` branch is the latest and bleeding edge branch with all changes. Unstable releases are automatically created from this branch.
+#### Development using go modules
 
-A release gets tagged from the main branch with the version name as tag name.
+If you're able to use go modules, you can clone the project wherever you want to and work from there.
 
-Backports and point-releases should go to a `release/version` branch, based on the tag they are building on top of.
+#### Development-setup without go modules
 
-## Conventional commits
+Some internal packages are referenced using their respective package URL. This can become problematic. 
+To “trick” the Go tool into thinking this is a clone from the official repository, download the source code 
+into `$GOPATH/code.vikunja.io/api`. Fork the Vikunja repository, it should then be possible to switch the source directory on the command line.
 
-We're using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) because they greatly simplify generating release notes.
+{{< highlight bash >}}
+cd $GOPATH/src/code.vikunja.io/api
+{{< /highlight >}}
 
-It is not required to use them when creating a PR, but appreciated.
+To be able to create pull requests, the forked repository should be added as a remote to the Vikunja sources, otherwise changes can’t be pushed.
+
+{{< highlight bash >}}
+git remote rename origin upstream
+git remote add origin git@git.kolaente.de:<USERNAME>/api.git
+git fetch --all --prune
+{{< /highlight >}}
+
+This should provide a working development environment for Vikunja. Take a look at the Magefile to get an overview about 
+the available tasks. The most common tasks should be `mage test:unit` which will start our test environment and `mage build:build` 
+which will build a vikunja binary into the working directory. Writing test cases is not mandatory to contribute, but it 
+is highly encouraged and helps developers sleep at night.
+
+That’s it! You are ready to hack on Vikunja. Test changes, push them to the repository, and open a pull request.
+
+## Static assets
+
+Each Vikunja release contains all static assets directly compiled into the binary.
+To prevent this during development, use the `dev` tag when developing.
+
+See the [mage docs](mage.md#statically-compile-all-templates-into-the-binary) about how to compile with static assets for a release.

docs/content/doc/development/events-and-listeners.md

@@ -1,211 +0,0 @@
----
-date: 2018-10-13T19:26:34+02:00
-title: "Events and Listeners"
-draft: false
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Events and Listeners
-
-Vikunja provides a simple observer pattern mechanism through events and listeners.
-The basic principle of events is always the same: Something happens (=An event is fired) and something reacts to it (=A listener is called).
-
-Vikunja supports this principle through the `events` package.
-It is built upon the excellent [watermill](https://watermill.io) library.
-
-Currently, it only supports dispatching events through Go Channels which makes it configuration-less.
-More methods of dispatching events (like kafka or rabbitmq) are available in watermill and could be enabled with a PR.
-
-This document explains how events and listeners work in Vikunja, how to use them and how to create new ones.
-
-{{< table_of_contents >}}
-
-## Events
-
-### Definition
-
-Each event has to implement this interface:
-
-{{< highlight golang >}}
-type Event interface {
-    Name() string
-}
-{{< /highlight >}}
-
-An event can contain whatever data you need.
-
-When an event is dispatched, all of the data it contains will be marshaled into json for dispatching.
-You then get the event with all its data back in the listener, see below.
-
-#### Naming Convention
-
-Event names should roughly have the entity they're dealing with on the left and the action on the right of the name, separated by `.`.
-There's no limit to how "deep" or specifig an event name can be.
-
-The name should have the most general concept it's describing at the left, getting more specific on the right of it.
-
-#### Location
-
-All events for a package should be declared in the `events.go` file of that package.
-
-### Creating a New Event
-
-The easiest way to create a new event is to generate it with mage:
-
-```
-mage dev:make-event <event-name> <package>
-```
-
-The function takes the name of the event as the first argument and the package where the event should be created as the second argument.
-Events will be appended to the `pkg/<module>/events.go` file.
-Both parameters are mandatory.
-
-The event type name is automatically camel-cased and gets the `Event` suffix if the provided name does not already have one.
-The event name is derived from the type name and stripped of the `.event` suffix.
-
-The generated event will look something like the example below.
-
-### Dispatching events
-
-To dispatch an event, simply call the `events.Dispatch` method and pass in the event as parameter.
-
-### Example
-
-The `TaskCreatedEvent` is declared in the `pkg/models/events.go` file as follows:
-
-{{< highlight golang >}}
-// TaskCreatedEvent represents an event where a task has been created
-type TaskCreatedEvent struct {
-    Task *Task
-    Doer web.Auth
-}
-
-// Name defines the name for TaskCreatedEvent
-func (t *TaskCreatedEvent) Name() string {
-    return "task.created"
-}
-{{< /highlight >}}
-
-It is dispatched in the `createTask` function of the `models` package:
-
-{{< highlight golang >}}
-func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err error) {
-
-    // ...
-    
-    err = events.Dispatch(&TaskCreatedEvent{
-        Task: t,
-        Doer: a,
-    })
-    
-    // ...
-}
-{{< /highlight >}}
-
-As you can see, the curent task and doer are injected into it.
-
-### Special Events
-
-#### `BootedEvent`
-
-Once Vikunja is fully initialized, right before the api web server is started, this event is fired.
-
-## Listeners
-
-A listener is a piece of code that gets executed asynchronously when an event is dispatched.
-
-A single event can have multiple listeners who are independent of each other.
-
-### Definition
-
-All listeners must implement this interface:
-
-{{< highlight golang >}}
-// Listener represents something that listens to events
-type Listener interface {
-    Handle(msg *message.Message) error
-    Name() string
-}
-{{< /highlight >}}
-
-The `Handle` method is executed when the event this listener listens on is dispatched. 
-* As the single parameter, it gets the payload of the event, which is the event struct when it was dispatched decoded as json object and passed as a slice of bytes.
-To use it you'll need to unmarshal it. Unfortunately there's no way to pass an already populated event object to the function because we would not know what type it has when parsing it.
-* If the handler returns an error, the listener is retried 5 times, with an exponentional back-off period in between retries.
-If it still fails after the fifth retry, the event is nack'd and it's up to the event dispatcher to resend it.
-You can learn more about this mechanism in the [watermill documentation](https://watermill.io/docs/middlewares/#retry).
-
-The `Name` method needs to return a unique listener name for this listener.
-It should follow the same convention as event names, see above.
-
-### Creating a New Listener
-
-The easiest way to create a new listener for an event is with mage:
-
-```
-mage dev:make-listener <listener-name> <event-name> <package>
-```
-
-This will create a new listener type in the `pkg/<package>/listners.go` file and implement the `Handle` and `Name` methods.
-It will also pre-generate some boilerplate code to unmarshal the event from the payload.
-
-Furthermore, it will register the listener for its event in the `RegisterListeners()` method of the same file.
-This function is called at startup and has to contain all events you want to listen for.
-
-### Listening for Events
-
-To listen for an event, you need to register the listener for the event it should be called for.
-This usually happens in the `RegisterListeners()` method in `pkg/<package>/listners.go` which is called at start up.
-
-The listener will never be executed if it hasn't been registered.
-
-See the example below.
-
-### Example
-
-{{< highlight golang >}}
-// RegisterListeners registers all event listeners
-func RegisterListeners() {
-    events.RegisterListener((&ListCreatedEvent{}).Name(), &IncreaseListCounter{})
-}
-
-// IncreaseTaskCounter represents a listener
-type IncreaseTaskCounter struct {}
-
-// Name defines the name for the IncreaseTaskCounter listener
-func (s *IncreaseTaskCounter) Name() string {
-    return "task.counter.increase"
-}
-
-// Hanlde is executed when the event IncreaseTaskCounter listens on is fired
-func (s *IncreaseTaskCounter) Handle(payload message.Payload) (err error) {
-    return keyvalue.IncrBy(metrics.TaskCountKey, 1)
-}
-{{< /highlight >}}
-
-## Testing
-
-When testing, you should call the `events.Fake()` method in the `TestMain` function of the package you want to test.
-This prevents any events from being fired and lets you assert an event has been dispatched like so:
-
-{{< highlight golang >}}
-events.AssertDispatched(t, &TaskCreatedEvent{})
-{{< /highlight >}}
-
-### Testing a listener
-
-You can call an event listener manually with the `events.TestListener` method like so:
-
-{{< highlight golang >}}
-ev := &TaskCommentCreatedEvent{
-	Task:    &task,
-	Doer:    u,
-	Comment: tc,
-}
-
-events.TestListener(t, ev, &SendTaskCommentNotification{})
-{{< /highlight >}}
-
-This will call the listener's `Handle` method and assert it did not return an error when calling.

docs/content/doc/development/mage.md

@@ -11,9 +11,9 @@ menu:
 # Mage
 
 Vikunja uses [Mage](https://magefile.org/) to script common development tasks and even releasing.
-Mage is a pure go solution which allows for greater flexibility and things like better parallelization.
+Mage is a pure go solution which allows for greater flexibility and things like better paralelization.
 
-This document explains what tasks are available and what they do.
+This document explains what taks are available and what they do.
 
 {{< table_of_contents >}}
 
@@ -39,7 +39,7 @@ There are multiple categories of subcommands in the magefile:
 
 ## CI
 
-These tasks are automatically run in our CI every time someone pushes to main or you update a pull request:
+These tasks are automatically run in our CI every time someone pushes to master or you update a pull request:
 
 * `mage check:lint`
 * `mage check:fmt`
@@ -57,13 +57,15 @@ These tasks are automatically run in our CI every time someone pushes to main or
 mage build:build
 {{< /highlight >}}
 
-or
+Builds a `vikunja`-binary in the root directory of the repo for the platform it is run on.
+
+### Statically compile all templates into the binary
 
 {{< highlight bash >}}
-mage build
+mage build:generate
 {{< /highlight >}}
 
-Builds a `vikunja`-binary in the root directory of the repo for the platform it is run on.
+This generates static code with all templates, meaning no template need to be referenced at runtime.
 
 ### clean
 
@@ -71,7 +73,7 @@ Builds a `vikunja`-binary in the root directory of the repo for the platform it
 mage build:clean
 {{< /highlight >}}
 
-Cleans all build and executable files
+Cleans all build, executable and bindata files
 
 ## Check
 
@@ -171,8 +173,6 @@ mage dev:create-migration
 Creates a new migration with the current date. 
 Will ask for the name of the struct you want to create a migration for.
 
-See also [migration docs]({{< ref "mage.md" >}}).
-
 ## Misc
 
 ### Format the code

docs/content/doc/development/migration.md

@@ -14,17 +14,7 @@ It is possible to migrate data from other to-do services to Vikunja.
 To make this easier, we have put together a few helpers which are documented on this page.
 
 In general, each migrator implements a migrator interface which is then called from a client.
-The interface makes it possible to use helper methods which handle http and focus only on the implementation of the migrator itself.
-
-There are two ways of migrating data from another service:
-1. Through the auth-based flow where the user gives you access to their data at the third-party service through an 
-   oauth flow. You can then call the service's api on behalf of your user to get all the data.
-   The Todoist, Trello and Microsoft To-Do Migrators use this pattern.
-2. A file migration where the user uploads a file obtained from some third-party service. In your migrator, you need
-   to parse the file and create the projects, tasks etc.
-   The Vikunja File Import uses this pattern.
-
-To differentiate the two, there are two different interfaces you must implement.
+The interface makes it possible to use helper methods which handle http an focus only on the implementation of the migrator itself.
 
 {{< table_of_contents >}}
 
@@ -33,16 +23,13 @@ To differentiate the two, there are two different interfaces you must implement.
 All migrator implementations live in their own package in `pkg/modules/migration/<name-of-the-service>`.
 When creating a new migrator, you should place all related code inside that module.
 
-## Migrator Interface
+## Migrator interface
 
 The migrator interface is defined as follows:
 
 ```go
 // Migrator is the basic migrator interface which is shared among all migrators
 type Migrator interface {
-	// Name holds the name of the migration.
-	// This is used to show the name to users and to keep track of users who already migrated.
-	Name() string
 	// Migrate is the interface used to migrate a user's tasks from another platform to vikunja.
 	// The user object is the user who's tasks will be migrated.
 	Migrate(user *models.User) error
@@ -50,20 +37,9 @@ type Migrator interface {
 	// The use case for this are Oauth flows, where the server token should remain hidden and not
 	// known to the frontend.
 	AuthURL() string
-}
-```
-
-## File Migrator Interface
-
-```go
-// FileMigrator handles importing Vikunja data from a file. The implementation of it determines the format.
-type FileMigrator interface {
 	// Name holds the name of the migration.
 	// This is used to show the name to users and to keep track of users who already migrated.
 	Name() string
-	// Migrate is the interface used to migrate a user's tasks, projects and other things from a file to vikunja.
-	// The user object is the user who's tasks will be migrated.
-	Migrate(user *user.User, file io.ReaderAt, size int64) error
 }
 ```
 
@@ -78,35 +54,23 @@ authUrl, Status and Migrate methods.
 ```go
 // This is an example for the Wunderlist migrator
 if config.MigrationWunderlistEnable.GetBool() {
-	wunderlistMigrationHandler := &migrationHandler.MigrationWeb{
+    wunderlistMigrationHandler := &migrationHandler.MigrationWeb{
 		MigrationStruct: func() migration.Migrator {
 			return &wunderlist.Migration{}
 		},
 	}
-	wunderlistMigrationHandler.RegisterRoutes(m)
+    wunderlistMigrationHandler.RegisterRoutes(m)
 }
 ```
 
-And for the file migrator:
-
-```go
-vikunjaFileMigrationHandler := &migrationHandler.FileMigratorWeb{
-	MigrationStruct: func() migration.FileMigrator {
-		return &vikunja_file.FileMigrator{}
-	},
-}
-vikunjaFileMigrationHandler.RegisterRoutes(m)
-```
-
-You should also document the routes with [swagger annotations]({{< ref "swagger-docs.md" >}}).
+You should also document the routes with [swagger annotations]({{< ref "../practical-instructions/swagger-docs.md" >}}).
 
 ## Insertion helper method
 
 There is a method available in the `migration` package which takes a fully nested Vikunja structure and creates it with all relations. 
-This means you start by adding a namespace, then add projects inside that namespace, then tasks in the lists and so on.
+This means you start by adding a namespace, then add lists inside of that namespace, then tasks in the lists and so on.
 
-The root structure must be present as `[]*models.NamespaceWithProjectsAndTasks`. It allows to represent all of Vikunja's 
-hierachie as a single data structure.
+The root structure must be present as `[]*models.NamespaceWithLists`.
 
 Then call the method like so:
 
@@ -121,16 +85,14 @@ err = migration.InsertFromStructure(fullVikunjaHierachie, user)
 
 ## Configuration
 
-If your migrator is an oauth-based one, you should add at least an option to enable or disable it.
+You should add at least an option to enable or disable the migration.
 Chances are, you'll need some more options for things like client ID and secret 
 (if the other service uses oAuth as an authentication flow).
 
 The easiest way to implement an on/off switch is to check whether your migration service is enabled or not when 
-registering the routes, and then simply don't registering the routes in case it is disabled.
-
-File based migrators can always be enabled.
+registering the routes, and then simply don't registering the routes in the case it is disabled.
 
 ### Making the migrator public in `/info` 
 
 You should make your migrator available in the `/info` endpoint so that frontends can display options to enable them or not.
-To do this, add an entry to the `AvailableMigrators` field in `pkg/routes/api/v1/info.go`.
+To do this, add an entry to `pkg/routes/api/v1/info.go`.

docs/content/doc/development/notifications.md

@@ -1,120 +0,0 @@
----
-date: 2021-02-07T19:26:34+02:00
-title: "Notifications"
-toc: true
-draft: false
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Notifications
-
-Vikunjs provides a simple abstraction to send notifications per mail and in the database.
-
-{{< table_of_contents >}}
-
-## Definition
-
-Each notification has to implement this interface:
-
-{{< highlight golang >}}
-type Notification interface {
-    ToMail() *Mail
-    ToDB() interface{}
-    Name() string
-}
-{{< /highlight >}}
-
-Both functions return the formatted messages for mail and database.
-
-A notification will only be sent or recorded for those of the two methods which don't return `nil`.
-For example, if your notification should not be recorded in the database but only sent out per mail, it is enough to let the `ToDB` function return `nil`.
-
-### Mail notifications
-
-A list of chainable functions is available to compose a mail:
-
-{{< highlight golang >}}
-mail := NewMail(). 
-    // The optional sender of the mail message.
-    From("test@example.com").
-	// The optional receipient of the mail message. Uses the mail address of the notifiable if omitted.
-    To("test@otherdomain.com").
-	// The subject of the mail to send.
-    Subject("Testmail").
-	// The greeting, or "intro" line of the mail.
-    Greeting("Hi there,").
-	// A line of text
-    Line("This is a line of text").
-	// An action can contain a title and a url. It gets rendered as a big button in the mail.
-	// Note that you can have only one action per mail.
-	// All lines added before an action will appearr in the mail before the button, all lines 
-	// added afterwards will appear after it.
-    Action("The Action", "https://example.com").
-	// Another line of text.
-    Line("This should be an outro line").
-{{< /highlight >}}
-
-If not provided, the `from` field of the mail contains the value configured in [`mailer.fromemail`](https://vikunja.io/docs/config-options/#fromemail).
-
-### Database notifications
-
-All data returned from the `ToDB()` method is serialized to json and saved into the database, along with the id of the 
-notifiable, the name of the notification and a time stamp.
-If you don't use the database notification, the `Name()` function can return an empty string.
-
-## Creating a new notification
-
-The easiest way to generate a mail is by using the `mage dev:make-notification` command.
-
-It takes the name of the notification and the package where the notification will be created.
-
-## Notifiables
-
-Notifiables can receive a notification.
-A notifiable is defined with this interface:
-
-{{< highlight golang >}}
-type Notifiable interface {
-    // Should return the email address this notifiable has.
-    RouteForMail() string
-    // Should return the id of the notifiable entity
-    RouteForDB() int64
-}
-{{< /highlight >}}
-
-The `User` type from the `user` package implements this interface.
-
-## Sending a notification
-
-Sending a notification is done with the `Notify` method from the `notifications` package.
-It takes a notifiable and a notification as input.
-
-For example, the email confirm notification when a new user registers is sent like this:
-
-{{< highlight golang >}}
-n := &EmailConfirmNotification{
-    User:  update.User,
-    IsNew: false,
-}
-
-err = notifications.Notify(update.User, n)
-return
-{{< /highlight >}}
-
-## Testing
-
-The `mail` package provides a `Fake()` method which you should call in the `MainTest` functions of your package.
-If it was called, no mails are being sent and you can instead assert they have been sent with the `AssertSent` method.
-
-When testing, you should call the `notifications.Fake()` method in the `TestMain` function of the package you want to test.
-This prevents any notifications from being sent and lets you assert a notifications has been sent like this:
-
-{{< highlight golang >}}
-notifications.AssertSent(t, &ReminderDueNotification{})
-{{< /highlight >}}
-
-## Example
-
-Take a look at the [pkg/user/notifications.go](https://code.vikunja.io/api/src/branch/main/pkg/user/notifications.go) file for a good example.

docs/content/doc/development/releasing.md

@@ -1,39 +0,0 @@
----
-title: "Releasing a new Vikunja version"
-date: 2022-10-28T13:06:05+02:00
-draft: false
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Releasing a new Vikunja version
-
-This checklist is a collection of all steps usually involved when releasing a new version of Vikunja.
-Not all steps are necessary for every release.
-
-* Website update :
-	* New Features: If there are new features worth mentioning the feature page should be updated.
-	* New Screenshots: If an overhaul of an existing feature happend so that it now looks different from the existing screenshot, a new one is required.
-* Generate changelogs: (with git-cliff)
-	* Frontend
-	* API
-	* Desktop
-* Tag a new version: Include the changelog for that version as the tag message
-	* Frontend
-	* API
-	* Desktop
-	* Once built: Prune the cloudflare cache so that the new versions show up at dl.vikunja.io
-* Release Highlights Blogpost:
-	* Include a section about Vikunja in general (totally fine to copy one from the earlier blog posts)
-	* New Features & Improvements: Mention bigger features, potentially with screenshots. Things like refactoring are sometimes also worth mentioneing.
-* Publish:
-	* Reddit
-	* Twitter
-	* Mastodon
-	* Chat
-	* Newsletter
-	* Forum
-	* If features in the release were sponsored, send an email to relevant stakeholders
-* Update Vikunja Cloud version and other instances
-

docs/content/doc/development/structure.md

@@ -1,6 +1,6 @@
 ---
 date: "2019-02-12:00:00+02:00"
-title: "Project Structure"
+title: "Project structure"
 draft: false
 type: "doc"
 menu:
@@ -10,7 +10,40 @@ menu:
 
 # Project structure
 
-This document explains what each package does.
+In general, this api repo has the following structure:
+
+* `docker`
+* `docs`
+* `pkg`
+  * `caldav`
+  * `cmd`
+  * `config`
+  * `db`
+    * `fixtures`
+  * `files`
+  * `integration`
+  * `log`
+  * `mail`
+  * `metrics`
+  * `migration`
+  * `models`
+  * `modules`
+    * `migration`
+      * `handler`
+      * `wunderlist`
+  * `red`
+  * `routes`
+    * `api/v1`
+  * `static`
+  * `swagger`
+  * `user`
+  * `utils`
+  * `version`
+* `REST-Tests`
+* `templates`
+* `vendor`
+
+This document will explain what these mean and what you can find where.
 
 {{< table_of_contents >}}
 
@@ -19,13 +52,18 @@ This document explains what each package does.
 The root directory is where [the config file]({{< ref "../setup/config.md">}}), [Magefile]({{< ref "mage.md">}}), license, drone config, 
 application entry point (`main.go`) and so on are located.
 
+## docker
+
+This directory holds additonal files needed to build and run the docker container, mainly service configuration to properly run Vikunja inside a docker 
+container.
+
 ## pkg
 
 This is where most of the magic happens. Most packages with actual code are located in this folder.
 
 ### caldav
 
-This folder holds a simple caldav implementation which is responsible for the caldav feature.
+This folder holds a simple caldav implementation which is responsible for returning the caldav feature.
 
 ### cmd
 
@@ -37,15 +75,10 @@ To learn more about how to use this cli, see [the cli usage docs]({{< ref "../us
 
 ### config
 
-This package configures handling of Vikunja's runtime configuration.
-It sets default values and sets up viper and tells it where to look for config files, how to interpret which env variables 
-for config etc.
+This package configures the config. It sets default values and sets up viper and tells it where to look for config files, 
+how to interpret which env variables for config etc.
 
-See also the [docs about adding a new configuration parameter]({{< ref "config.md" >}}).
-
-### cron
-
-See [how to add a cron task]({{< ref "cron.md" >}}).
+If you want to add a new config parameter, you should add default value in this package.
 
 ### db
 
@@ -69,17 +102,17 @@ This init is called in `main.go` after the config init is done.
 
 ### mail
 
-This package handles all mail sending. To learn how to send a mail, see [notifications]({{< ref "notifications.md" >}}).
+This package handles all mail sending. To learn how to send a mail, see [sending emails]({{< ref "../practical-instructions/mail.md">}}).
 
 ### metrics
 
 This package handles all metrics which are exposed to the prometheus endpoint.
-To learn how it works and how to add new metrics, take a look at [how metrics work]({{< ref "metrics.md">}}).
+To learn how it works and how to add new metrics, take a look at [how metrics work]({{< ref "../practical-instructions/metrics.md">}}).
 
 ### migration
 
 This package handles all migrations.
-All migrations are stored and executed in this package.
+All migrations are stored and executed here.
 
 To learn more, take a look at the [migrations docs]({{< ref "../development/db-migrations.md">}}).
 
@@ -90,35 +123,11 @@ When adding new features or upgrading existing ones, that most likely happens he
 
 Because this package is pretty huge, there are several documents and how-to's about it:
 
-* [Adding a feature]({{< ref "feature.md">}})
-* [Making calls to the database]({{< ref "database.md">}})
+* [Adding a feature]({{< ref "../practical-instructions/feature.md">}})
+* [Making calls to the database]({{< ref "../practical-instructions/database.md">}})
 
 ### modules
 
-Everything that can have multiple implementations (like a task migrator from a third-party task provider) lives in a 
-respective sub package in this package.
-
-#### auth
-
-Contains openid related authentication.
-
-#### avatar
-
-Contains all possible avatar providers a user can choose to set their avatar.
-
-#### background
-
-All project background providers are in sub-packages of this package.
-
-#### dump
-
-Handles everything related to the `dump` and `restore` commands of Vikunja.
-
-#### keyvalue
-
-A simple key-value store with an implementation for memory and redis. 
-Can be used to cache values.
-
 #### migration
 
 See [writing a migrator]({{< ref "migration.md" >}}).
@@ -133,19 +142,20 @@ to talk to redis.
 
 It uses the [go-redis](https://github.com/go-redis/redis) library, please see their configuration on how to use it.
 
-**Note**: Only use this package directly if you have to use a direct redis connection.
-In most cases, using the `keyvalue` package is a better fit.
-
 ### routes
 
 This package defines all routes which are available for vikunja clients to use.
-To add a new route, see [adding a new route]({{< ref "feature.md">}}).
+To add a new route, see [adding a new route]({{< ref "../practical-instructions/feature.md">}}).
 
 #### api/v1
 
 This is where all http-handler functions for the api are stored. 
 Every handler function which does not use the standard web handler should live here.
 
+### static
+
+All static files generated by `mage generate` live here.
+
 ### swagger
 
 This is where the [generated]({{< ref "mage.md#generate-swagger-definitions-from-code-comments">}} [api docs]({{< ref "../usage/api.md">}}) live. 
@@ -169,3 +179,23 @@ See their function definitions for instructions on how to use them.
 The single purpouse of this package is to hold the current vikunja version which gets overridden through build flags 
 each time `mage release` or `mage build` is run.
 It is a seperate package to avoid import cycles with other packages.
+
+## REST-Tests
+
+Holds all kinds of test files to directly test the api from inside of [jetbrains ide's](https://www.jetbrains.com/help/idea/http-client-in-product-code-editor.html).
+
+These files are currently more an experiment, maybe we will drop them in the future to use something we could integrate in the testing process with drone.
+Therefore, this has no claim to be complete yet even working, you're free to change whatever is needed to get it working for you.
+
+## templates
+
+Holds the email templates used to send plain text and html emails for new user registration and password changes.
+
+## vendor
+
+All libraries needed to build Vikunja. 
+
+We keep all libraries used for Vikunja around in the `vendor/` folder to still be able to build the project even if
+some maintainers take their libraries down like [it happened in the past](https://github.com/jteeuwen/go-bindata/issues/5).
+
+When adding a new  dependency, make sure to run `go mod vendor` to put it inside this directory.

docs/content/doc/development/swagger-docs.md

@@ -1,95 +0,0 @@
----
-date: "2019-02-12:00:00+02:00"
-title: "Modifying Swagger API Docs"
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Modifying swagger api docs
-
-The api documentation is generated using [swaggo](https://github.com/swaggo/swag) from comments.
-
-{{< table_of_contents >}}
-
-## Documenting structs
-
-You should always comment every field which will be exposed as a json in the api.
-These comments will show up in the documentation, it'll make it easier for developers using the api.
-
-As an example, this is the definition of a project with all comments:
-
-{{< highlight golang >}}
-type Project struct {
-	// The unique, numeric id of this project.
-	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"project"`
-	// The title of the project. You'll see this in the namespace overview.
-	Title string `xorm:"varchar(250) not null" json:"title" valid:"required,runelength(1|250)" minLength:"1" maxLength:"250"`
-	// The description of the project.
-	Description string `xorm:"longtext null" json:"description"`
-	// The unique project short identifier. Used to build task identifiers.
-	Identifier string `xorm:"varchar(10) null" json:"identifier" valid:"runelength(0|10)" minLength:"0" maxLength:"10"`
-	// The hex color of this project
-	HexColor string `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
-
-	OwnerID     int64 `xorm:"bigint INDEX not null" json:"-"`
-	NamespaceID int64 `xorm:"bigint INDEX not null" json:"namespace_id" param:"namespace"`
-
-	// The user who created this project.
-	Owner *user.User `xorm:"-" json:"owner" valid:"-"`
-
-	// Whether or not a project is archived.
-	IsArchived bool `xorm:"not null default false" json:"is_archived" query:"is_archived"`
-
-	// The id of the file this project has set as background
-	BackgroundFileID int64 `xorm:"null" json:"-"`
-	// Holds extra information about the background set since some background providers require attribution or similar. If not null, the background can be accessed at /projects/{projectID}/background
-	BackgroundInformation interface{} `xorm:"-" json:"background_information"`
-	// Contains a very small version of the project background to use as a blurry preview until the actual background is loaded. Check out https://blurha.sh/ to learn how it works.
-	BackgroundBlurHash string `xorm:"varchar(50) null" json:"background_blur_hash"`
-
-	// True if a project is a favorite. Favorite projects show up in a separate namespace. This value depends on the user making the call to the api.
-	IsFavorite bool `xorm:"-" json:"is_favorite"`
-
-	// The subscription status for the user reading this project. You can only read this property, use the subscription endpoints to modify it.
-	// Will only returned when retreiving one project.
-	Subscription *Subscription `xorm:"-" json:"subscription,omitempty"`
-
-	// The position this project has when querying all projects. See the tasks.position property on how to use this.
-	Position float64 `xorm:"double null" json:"position"`
-
-	// A timestamp when this project was created. You cannot change this value.
-	Created time.Time `xorm:"created not null" json:"created"`
-	// A timestamp when this project was last updated. You cannot change this value.
-	Updated time.Time `xorm:"updated not null" json:"updated"`
-
-	web.CRUDable `xorm:"-" json:"-"`
-	web.Rights   `xorm:"-" json:"-"`
-}
-{{< /highlight >}}
-
-## Documenting api Endpoints
-
-All api routes should be documented with a comment above the handler function.
-When generating the api docs with mage, the swagger cli will pick these up and put them in a neat document.
-
-A comment looks like this:
-
-{{< highlight golang >}}
-// @Summary Login
-// @Description Logs a user in. Returns a JWT-Token to authenticate further requests.
-// @tags user
-// @Accept json
-// @Produce json
-// @Param credentials body user.Login true "The login credentials"
-// @Success 200 {object} auth.Token
-// @Failure 400 {object} models.Message "Invalid user password model."
-// @Failure 412 {object} models.Message "Invalid totp passcode."
-// @Failure 403 {object} models.Message "Invalid username or password."
-// @Router /login [post]
-func Login(c echo.Context) error {
-	// Handler logic
-}
-{{< /highlight >}}

docs/content/doc/development/test.md

@@ -10,31 +10,32 @@ menu:
 
 # Testing
 
-{{< table_of_contents >}}
-
-## API Tests
-
-The following parts are about the kinds of tests in the API package and how to run them.
-
-### Prerequesites
-
-To run any kind of test, you need to specify Vikunja's [root path](https://vikunja.io/docs/config-options/#rootpath).
-This is required to make sure all test fixtures are correctly loaded.
-
-The easies way to do that is to set the environment variable `VIKUNJA_SERVICE_ROOTPATH` to the path where you cloned the working directory.
-
-### Unit tests
-
-To run unit tests with [mage]({{< ref "mage.md">}}), execute
+You can run unit tests with [our `Magefile`]({{< ref "mage.md">}}) with
 
 {{< highlight bash >}}
 mage test:unit
 {{< /highlight >}}
 
-In Vikunja, everything that is not an integration test counts as unit test - even if it accesses the db.
-This definition is a bit blurry, but we haven't found a better one yet.
+{{< table_of_contents >}}
 
-### Integration tests
+## Running tests with config
+
+You can run tests with all available config variables if you want, enabeling you to run tests for a lot of scenarios.
+
+To use the normal config set the enviroment variable `VIKUNJA_TESTS_USE_CONFIG=1`.
+
+## Show sql queries
+
+When `UNIT_TESTS_VERBOSE=1` is set, all sql queries will be shown when tests are run.
+
+## Fixtures
+
+All tests are run against a set of db fixtures.
+These fixtures are defined in `pkg/models/fixtures` in YAML-Files which represent the database structure.
+
+When you add a new test case which requires new database entries to test against, update these files.
+
+## Integration tests
 
 All integration tests live in `pkg/integrations`.
 You can run them by executing `mage test:integration`.
@@ -44,25 +45,7 @@ see at the beginning of this document.
 
 To run integration tests, use `mage test:integration`.
 
-### Running tests with config
-
-You can run tests with all available config variables if you want, enabeling you to run tests for a lot of scenarios.
-We use this in CI to run all tests with different databases.
-
-To use the normal config set the enviroment variable `VIKUNJA_TESTS_USE_CONFIG=1`.
-
-### Showing sql queries
-
-When the environment variable `UNIT_TESTS_VERBOSE=1` is set, all sql queries will be shown during the test run.
-
-### Fixtures
-
-All tests are run against a set of db fixtures.
-These fixtures are defined in `pkg/models/fixtures` in YAML-Files which represent the database structure.
-
-When you add a new test case which requires new database entries to test against, update these files.
-
-#### Initializing db fixtures when writing tests
+## Initializing db fixtures when writing tests
 
 All db fixtures for all tests live in the `pkg/db/fixtures/` folder as yaml files.
 Each file has the same name as the table the fixtures are for.
@@ -71,39 +54,19 @@ You should put new fixtures in this folder.
 When initializing db fixtures, you are responsible for defining which tables your package needs in your test init function.
 Usually, this is done as follows (this code snippet is taken from the `user` package):
 
-{{< highlight go >}}
+```go
 err = db.InitTestFixtures("users")
 if err != nil {
 	log.Fatal(err)
 }
-{{< /highlight >}}
+```
 
 In your actual tests, you then load the fixtures into the in-memory db like so:
 
-{{< highlight go >}}
+```go
 db.LoadAndAssertFixtures(t)
-{{< /highlight >}}
+```
 
 This will load all fixtures you defined in your test init method.
 You should always use this method to load fixtures, the only exception is when your package tests require extra test 
 fixtures other than db fixtures (like files).
-
-## Frontend tests
-
-The frontend has end to end tests with Cypress that use a Vikunja instance and drive a browser against it.
-Check out the docs [in the frontend repo](https://kolaente.dev/vikunja/frontend/src/branch/main/cypress/README.md) about how they work and how to get them running.
-
-### Unit Tests
-
-To run the frontend unit tests, run
-
-{{< highlight bash >}}
-pnpm run test:unit
-{{< /highlight >}}
-
-The frontend also has a watcher available that re-runs all unit tests every time you change something.
-To use it, simply run
-
-{{< highlight bash >}}
-pnpm run test:unit-watch
-{{< /highlight >}}

docs/content/doc/development/translation-instructions-german.md

@@ -1,76 +0,0 @@
----
-title: "German Translation Instructions"
-date: 2021-06-23T23:47:34+02:00
-draft: false
----
-
-# German Translation Instructions
-
-<div class="notification is-warning">
-<b>NOTE:</b> This document contains translation instructions specific to the german translation of Vikunja.
-For instructions applicable to all languages, check out the <a href="{{< ref "./translations.md">}}">general translation instructions</a>.
-</div>
-
-{{< table_of_contents >}}
-
-## Allgemein
-
-Anrede: Wenig förmlich:
-
-* “Du”-Form
-* Keine “Amtsdeusch“-Umschreibungen, einfach so als ob man den Nutzer direkt persönlich ansprechen würde
-
-Genauer definiert:
-
-* “falsch” anstatt “nicht korrekt/inkorrekt”
-* “Wende dich an …” anstatt “kontaktiere …”
-* In derselben Zeit übersetzen (sonst wird aus dem englischen “is“ das deutsche “war”)
-* Richtige Anführungszeichen verwenden. Also `„“` statt `''` oder `'` oder ` oder ´
-	* `„` für beginnende Anführungszeichen, `“` für schließende Anführungszeichen
-
-Es gelten Artikel und Worttrennungen aus dem [Duden](https://duden.de).
-
-## Formulierungen
-
-* `Account` statt `Konto`.
-* `TOTP` immer als ein Wort und Groß.
-* `CalDAV` immer so.
-* `löschen` oder `entfernen` je nach Kontext. Wenn etwas *gelöscht* wird, existiert das gelöschte Objekt und danach
-  nicht mehr und hat evtl. andere Objekte mitgelöscht (z.B. eine Aufgabe). Wird etwas *entfernt*, bezieht sich das
-  meistens auf die Beziehung zu einem anderen Objekt. Das entfernte Objekt existiert danach immernoch, z.B. beim
-  Entfernen eine:r Nutzer:in aus einem Team.
-* Analog zu `löschen` oder `entfernen` gilt ähnliches für `hinzufügen` oder `erstellen`. Eine Aufgabe wird *erstellt*,
-  aber ein:e Nutzer:in nur zu einem Team *hinzugefügt*.
-* `Anmeldename` anstatt `Benutzer:innenname`
-
-## Formulierungen in Modals und Buttons
-
-Es sollten die gleichen Formulierungen auf Buttons und Modals verwendet werden.
-
-Beispiel: Wenn der Button mit `löschen` beschriftet ist, sollte im Modal die Frage
-lauten `Willst du das wirklich löschen?` und nicht `Willst du das wirklich entfernen?`. Gleiches gilt für
-Erfolgs/Fehlermeldungen nach der Aktion.
-
-## Gendern
-
-Wo möglich, sollte eine geschlechtsneutrale Anrede verwendet werden. Falls diese sehr umständlich würden (siehe oben
-„Amtsdeutsch-Umschreibungen“), soll mit *Doppelpunkt* gegendert werden.
-
-Beispiel: „Benutzer:in“
-
-## Trennungen
-
-* E-Mail-Adresse (siehe Duden)
-
-## Wörter und Ausdrücke
-
-| Englisches Original | Verwendung in deutscher Übersetzung |
-| ------------------- | -------------------- |
-| Bucket | Spalte |
-| Namespace | Namespace |
-| Link Share | Linkfreigabe |
-| Username | Anmeldename |
-
-## Weiterführende Links
-
-* https://docs.translatehouse.org/projects/localization-guide/en/latest/guide/translation_guidelines_german.html

docs/content/doc/development/translations.md

@@ -1,54 +0,0 @@
----
-title: "Translations"
-date: 2021-06-23T22:52:06+02:00
-draft: false
-menu:
-  sidebar:
-    parent: "development"
----
-
-# Translations
-
-This document provides documentation about how to translate Vikunja.
-
-{{< table_of_contents >}}
-
-## Where to translate
-
-Translation happens at [crowdin](https://crowdin.com/project/vikunja).
-
-Currently, only the frontend (and by extension, the desktop app) is translatable.
-
-## Translation Instructions
-
-> These are the instructions for translating Vikunja in another language. 
-> For information about how to add new translation strings, see below.
-
-For all languages these translation guidelines should be applied when translating:
-
-* Use a less-formal style, as if you were talking to a friend.
-* If the source string contains characters like `&` or `…`, the translated string should contain them as well.
-
-More specific instructions for some languages can be found below.
-
-### Wrong translation strings
-
-If you encounter a wrong original translation string while translating, please don't correct it in the translation.
-Instead, translate it to reflect the original meaning in the translated string but add a comment under the source string to discuss potential changes.
-
-### Language-specific instructions
-
-* [German]({{< ref "./translation-instructions-german.md">}})
-
-## How to add new translation strings
-
-All translation strings are stored in `src/i18n/lang/`.
-New strings should be added only in the `en.json` file.
-Strings in other languages will be synced through weblate and should not be added directly as a PR/commit in the frontend repo.
-
-## Requesting a new language
-
-If you want to start translating Vikunja in a language not yet available in Vikunja, please request the language through the crowdin interface.
-If you have issues with this or need a discussion before doing so, please [contact us](https://vikunja.io/contact/) or [start a discussion in the forum](https://community.vikunja.io).
-
-Once at least 50% of all translation strings are translated and approved, they will be added and distributed with the Vikunja frontend for users to select and use Vikunja with them.

docs/content/doc/practical-instructions/database.md

@@ -0,0 +1,40 @@
+---
+date: "2019-02-12:00:00+02:00"
+title: "Database"
+draft: false
+type: "doc"
+menu:
+  sidebar:
+    parent: "practical instructions"
+---
+
+# Database
+
+Vikunja uses [xorm](http://xorm.io/) as an abstraction layer to handle the database connection.
+Please refer to [their](http://xorm.io/docs/) documentation on how to exactly use it.
+
+Inside the `models` package, a variable `x` is available which contains a pointer to an instance of `xorm.Engine`.
+This is used whenever you make a call to the database to get or update data.
+
+This xorm instance is set up and initialized every time vikunja is started.
+
+{{< table_of_contents >}}
+
+## Adding new database tables
+
+To add a new table to the database, add a an instance of your struct to the `tables` variable in the 
+init function in `pkg/models/models.go`. Xorm will sync them automatically.
+
+You also need to add a pointer to the `tablesWithPointer` slice to enable caching for all instances of this struct.
+
+To learn more about how to configure your struct to create "good" tables, refer to [the xorm documentaion](http://xorm.io/docs/).
+
+## Adding data to test fixtures
+
+Adding data for test fixtures is done in via `yaml` files insinde of `pkg/models/fixtures`.
+
+The name of the yaml file should equal the table name in the database.
+Adding values to it is done via array definition inside of the yaml file.
+
+**Note**: Table and column names need to be in snake_case as that's what is used internally in the database 
+and for mapping values from the database to xorm so your structs can use it.

docs/content/doc/practical-instructions/errors.md

@@ -5,7 +5,7 @@ draft: false
 type: "doc"
 menu:
   sidebar:
-    parent: "development"
+    parent: "practical instructions"
 ---
 
 # Custom Errors
@@ -49,7 +49,7 @@ func (err ErrUserDoesNotExist) Error() string {
 // This needs to be unique, so you should check whether the error code exists or not.
 // The general convention for error codes is as follows:
 // * Every "group" errors lives in a thousend something. For example all user issues are 1000-something, all 
-//   project errors are 3000-something and so on.
+//   list errors are 3000-something and so on.
 // * New error codes should be the current max error code + 1. Don't take free numbers to prevent old errors
 //   which are depricated and removed from being "new ones". For example, if there are error codes 1001, 1002, 1004,
 //   a new error should be 1005 and not 1003.

docs/content/doc/practical-instructions/feature.md

@@ -1,11 +1,11 @@
 ---
 date: "2019-02-12:00:00+02:00"
-title: "New API Endpoints"
+title: "Add a new api endpoint"
 draft: false
 type: "doc"
 menu:
   sidebar:
-    parent: "development"
+    parent: "practical instructions"
 ---
 
 # Add a new api endpoint/feature
@@ -26,8 +26,8 @@ It returns the `limit` (max-length) and `offset` parameters needed for SQL-Queri
 You can feed this function directly into xorm's `Limit`-Function like so:
 
 {{< highlight golang >}}
-projects := []*Project{}
-err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&projects)
+lists := []List{}
+err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&lists)
 {{< /highlight >}}
 
 // TODO: Add a full example from start to finish, like a tutorial on how to create a new endpoint?

docs/content/doc/practical-instructions/mail.md

@@ -0,0 +1,86 @@
+---
+date: "2019-02-12:00:00+02:00"
+title: "Mailer"
+draft: false
+type: "doc"
+menu:
+  sidebar:
+    parent: "practical instructions"
+---
+
+# Mailer
+
+This document explains how to use the mailer to send emails and what to do to create a new kind of email to be sent.
+
+{{< table_of_contents >}}
+
+## Sending emails
+
+**Note:** You should use mail templates whenever possible (see below).
+
+To send an email, use the function `mail.SendMail(options)`. The options are defined as follows:
+
+{{< highlight golang >}}
+type Opts struct {
+	To          string // The email address of the recipent
+	Subject     string // The subject of the mail
+	Message     string // The plaintext message in the mail
+	HTMLMessage string // The html message 
+	ContentType ContentType // The content type of the mail. Can be either mail.ContentTypePlain, mail.ContentTypeHTML, mail.ContentTypeMultipart. You should set this according to the kind of mail you want to send.
+	Boundary    string
+	Headers     []*header // Other headers to set in the mail.
+}
+{{< /highlight >}}
+
+### Sending emails based on a template
+
+For each mail with a template, there are two email templates: One for plaintext emails, one for html emails.
+
+These are located in the `templates/mail` folder and follow the conventions of `template-name.{plain|hmtl}.tmpl`,
+both the plaintext and html templates are in the same folder.
+
+To send a mail based on a template, use the function `mail.SendMailWithTemplate(to, subject, tpl string, data map[string]interface{})`.
+`to` and `subject` are pretty much self-explanatory, `tpl` is the name of the template, without `.html.tmpl` or `.plain.tmpl`. 
+`data` is a map you can pass additional data to your template.
+
+### Sending a mail with a template
+
+A basic html email template would look like this:
+
+{{< highlight go-html-template >}}
+{{template "mail-header.tmpl" .}}
+<p>
+    Hey there!<br/>
+    This is a minimal html email example.<br/>
+    {{.Something}}
+</p>
+{{template "mail-footer.tmpl"}}
+{{< /highlight >}}
+
+And the corresponding plaintext template:
+
+{{< highlight go-text-template >}}
+Hey there!
+
+This is a minimal html email example.
+
+{{.Something}}
+{{< /highlight >}}
+You would then call this like so:
+
+{{< highlight golang >}}
+data := make(map[string]interface{})
+data["Something"] = "I am some computed value"
+to := "test@example.com"
+subject := "A simple test mail"
+tpl := "demo" // Assuming you saved the templates as demo.plain.tmpl and demo.html.tmpl
+mail.SendMailWithTemplate(to, subject, tpl, data)
+{{< /highlight >}}
+
+The function does not return an error. If an error occures when sending a mail, it is logged but not returned because sending the mail happens asinchrounly.
+
+Notice the `mail-header.tmpl` and `mail-footer.tmpl` in the template. These populate some basic css, a box for your content and the vikunja logo.
+All that's left for you is to put the content in, which then will appear in a beautifully-styled box.
+
+Remeber, these are email templates. This is different from normal html/css, you cannot use whatever you want (because most of the clients are wayyy to outdated).
+

docs/content/doc/practical-instructions/metrics.md

@@ -5,7 +5,7 @@ draft: false
 type: "doc"
 menu:
   sidebar:
-    parent: "development"
+    parent: "practical instructions"
 ---
 
 # Metrics
@@ -17,7 +17,7 @@ The `metrics` package provides several functions to create and update metrics.
 
 {{< table_of_contents >}}
 
-## Exposing New Metrics
+## New metrics
 
 First, define a `const` with the metric key in redis. This is done in `pkg/metrics/metrics.go`.
 

docs/content/doc/practical-instructions/new-config-options.md

@@ -0,0 +1,31 @@
+---
+date: "2019-02-12:00:00+02:00"
+title: "Adding new   config options"
+draft: false
+type: "doc"
+menu:
+  sidebar:
+    parent: "practical instructions"
+---
+
+# Adding new config options
+
+Vikunja uses [viper](https://github.com/spf13/viper) to handle configuration options.
+It handles parsing all different configuration sources.
+
+The configuration is done in sections. These are represented with a `.` in viper.
+Take a look at `pkg/config/config.go` to understand how these are set.
+
+To add a new config option, you should add a default value to `pkg/config/config.go`.
+Default values should always enable the feature to work somehow, or turn it off completely if it always needs
+additional configuration.
+
+Make sure to add the new config option to [the config document]({{< ref "../setup/config.md">}}) and the default config file
+(`config.yml.sample` at the root of the repository) to make sure it is well documented.
+
+If you're using a computed value as a default, make sure to update the sample config file and debian
+post-install scripts to reflect that.
+
+To get a configured option, use `viper.Get("config.option")`.
+Take a look at [viper's documentation](https://github.com/spf13/viper#getting-values-from-viper) to learn of the 
+different ways available to get config options.

docs/content/doc/practical-instructions/swagger-docs.md

@@ -0,0 +1,47 @@
+---
+date: "2019-02-12:00:00+02:00"
+title: "Modifying swagger api docs"
+draft: false
+type: "doc"
+menu:
+  sidebar:
+    parent: "practical instructions"
+---
+
+# Adding/editing swagger api docs
+
+The api documentation is generated using [swaggo](https://github.com/swaggo/swag) from comments.
+
+## Documenting structs
+
+You should always comment every field which will be exposed as a json in the api.
+These comments will show up in the documentation, it'll make it easier for developers using the api.
+
+As an example, this is the definition of a list with all comments:
+
+{{< highlight golang >}}
+// List represents a list of tasks
+type List struct {
+	// The unique, numeric id of this list.
+	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"list"`
+	// The title of the list. You'll see this in the namespace overview.
+	Title string `xorm:"varchar(250)" json:"title" valid:"required,runelength(3|250)" minLength:"3" maxLength:"250"`
+	// The description of the list.
+	Description string `xorm:"varchar(1000)" json:"description" valid:"runelength(0|1000)" maxLength:"1000"`
+	OwnerID     int64  `xorm:"bigint INDEX" json:"-"`
+	NamespaceID int64  `xorm:"bigint INDEX" json:"-" param:"namespace"`
+
+	// The user who created this list.
+	Owner User `xorm:"-" json:"owner" valid:"-"`
+	// An array of tasks which belong to the list.
+	Tasks []*ListTask `xorm:"-" json:"tasks"`
+
+	// A unix timestamp when this list was created. You cannot change this value.
+	Created int64 `xorm:"created" json:"created"`
+	// A unix timestamp when this list was last updated. You cannot change this value.
+	Updated int64 `xorm:"updated" json:"updated"`
+
+	web.CRUDable `xorm:"-" json:"-"`
+	web.Rights   `xorm:"-" json:"-"`
+}
+{{< /highlight >}}

docs/content/doc/setup/backups.md

@@ -10,17 +10,12 @@ menu:
 
 # What to backup
 
-There are two parts you need to back up: The database and attachment files.
+Vikunja does not store any data outside of the database.
+So, all you need to backup are the contents of that database and maybe the config file.
 
 {{< table_of_contents >}}
 
-## Files
-
-To back up attachments and other files, it is enough to copy them [from the attachments folder]({{< ref "config.md" >}}#basepath) to some other place.
-
-## Database
-
-### MySQL
+## MySQL
 
 To create a backup from mysql use the `mysqldump` command:
 
@@ -36,7 +31,7 @@ To restore it, simply pipe it back into the `mysql` command:
 mysql -u <user> -p -h <db-host> <database> < vkunja-backup.sql
 {{< /highlight >}}
 
-### PostgreSQL
+## PostgreSQL
 
 To create a backup from PostgreSQL use the `pg_dump` command:
 
@@ -54,6 +49,6 @@ psql -U <user> -h <db-host> <database> < vikunja-backup.sql
 
 For more information, please visit the [relevant PostgreSQL documentation](https://www.postgresql.org/docs/12/backup-dump.html).
 
-### SQLite
+## SQLite
 
-To back up sqllite databases, it is enough to copy the [database file]({{< ref "config.md" >}}#path) to somwhere else.
+To backup sqllite databases, it is enough to copy the database elsewhere.

docs/content/doc/setup/build-from-source.md

@@ -1,5 +1,5 @@
 ---
-date: "2022-09-21:00:00+02:00"
+date: "2019-02-12:00:00+02:00"
 title: "Build from sources"
 draft: false
 type: "doc"
@@ -10,35 +10,20 @@ menu:
 
 # Build Vikunja from source
 
-To completely build Vikunja from source, you need to build the api and frontend.
+Vikunja being a go application, has no other dependencies than go itself. 
+All libraries are bundeled inside the repo in the `vendor/` folder, so all it boils down to are these steps:
 
-{{< table_of_contents >}}
-
-## API
-
-The Vikunja API has no other dependencies than go itself.
-That means compiling it boils down to these steps:
-
-1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.17`.
-2. Make sure [Mage](https://magefile.org) is properly installed on your system.
-3. Clone the repo with `git clone https://code.vikunja.io/api` and switch into the directory.
-4. Run `mage build:build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.
+1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.9`.
+2. Make sure [Mage](https://magefile) is properly installed on your system.
+3. Clone the repo with `git clone https://code.vikunja.io/api`
+3. Run `mage build:build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.
 
 *Note:* Static ressources such as email templates are built into the binary.
 For these to work, you may need to run `mage build:generate` before building the vikunja binary.
 When builing entirely with `mage`, you dont need to do this, `mage build:generate` will be run automatically when running `mage build:build`.
 
-### Build for different architectures
+# Build for different architectures
 
 To build for other platforms and architectures than the one you're currently on, simply run `mage release:release` or `mage release:{linux|windows|darwin}`.
 
-More options are available, please refer to the [magefile docs]({{< ref "../development/mage.md">}}) for more details.
-
-## Frontend
-
-The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
-
-1. Make sure you have [pnpm](https://pnpm.io/installation) properly installed on your system.
-2. Clone the repo with `git clone https://code.vikunja.io/frontend` and switch into the directory.
-3. Install all dependencies with `pnpm install`
-4. Build the frontend with `pnpm run build`. This will result in a static js bundle in the `dist/` folder which you can deploy.
+More options are available, please refer to the [magefile docs]({{< ref "../development/mage.md">}}) for more details.

docs/content/doc/setup/docker-start-to-finish.md

@@ -36,8 +36,6 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
       MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
       MYSQL_DATABASE: vikunja
     volumes:
       - ./db:/var/lib/mysql
@@ -46,12 +44,10 @@ services:
     image: vikunja/api
     environment:
       VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
+      VIKUNJA_DATABASE_PASSWORD: supersecret
       VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
+      VIKUNJA_DATABASE_USER: root
       VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes: 
       - ./files:/app/vikunja/files
     depends_on:
@@ -76,7 +72,7 @@ This defines four services, each with their own container:
 
 * An api service which runs the vikunja api. Most of the core logic lives here.
 * The frontend which will make vikunja actually usable for most people.
-* A database container which will store all projects, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
+* A database container which will store all lists, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
 * A proxy service which makes the frontend and api available on the same port, redirecting all requests to `/api` to the api container. 
 If you already have a proxy on your host, you may want to check out the [reverse proxy examples]() to use that.
 By default, it uses port 80 on the host.
@@ -201,6 +197,7 @@ You should see something like this:
   "max_file_size": "20MB",
   "registration_enabled": true,
   "available_migrators": [
+    "wunderlist",
     "todoist"
   ],
   "task_attachments_enabled": true

docs/content/doc/setup/full-docker-example.md

@@ -10,7 +10,7 @@ menu:
 
 # Full docker example
 
-This docker compose configuration will run Vikunja with backend and frontend with a mariadb database.
+This docker compose configuration will run Vikunja with backend and frontend with a mariadb as database.
 It uses an nginx container or traefik on the host to proxy backend and frontend into a single port.
 
 For all available configuration options, see [configuration]({{< ref "config.md">}}).
@@ -25,9 +25,6 @@ All examples on this page already reflect this and do not require additional wor
 
 ## Redis
 
-While Vikunja has support to use redis as a caching backend, you'll probably not need it unless you're using Vikunja 
-with more than a handful of users.
-
 To use redis, you'll need to add this to the config examples below:
 
 {{< highlight yaml >}}
@@ -47,85 +44,11 @@ services:
     image: redis
 {{< /highlight >}}
 
-## PostgreSQL
-
-Vikunja supports postgres, mysql and sqlite as a database backend. The examples on this page use mysql with a mariadb container.
-To use postgres as a database backend, change the `db` section of the examples to this:
-
-{{< highlight yaml >}}
-db:
-  image: postgres:13
-  environment:
-    POSTGRES_PASSWORD: secret
-    POSTGRES_USER: vikunja
-  volumes:
-    - ./db:/var/lib/postgresql/data
-  restart: unless-stopped
-{{< /highlight >}}
-
-You'll also need to change the `VIKUNJA_DATABASE_TYPE` to `postgres` on the api container declaration.
-
-<div class="notification is-warning">
-<b>NOTE:</b> The mariadb container can sometimes take a while to initialize, especially on the first run. 
-During this time, the api container will fail to start at all. It will automatically restart every few seconds.
-</div>
-
-## Example without any proxy
-
-This example lets you host Vikunja without any reverse proxy in front of it. This is the absolute minimum configuration 
-you need to get something up and running. If you want to host Vikunja on one single port instead of two different ones 
-or need tls termination, check out one of the other examples.
-
-Note that you need to change the `VIKUNJA_API_URL` environment variable to the ip (the docker host you're running this on) 
-is reachable at. Because the browser you'll use to access the Vikunja frontend uses that url to make the requests, it 
-has to be able to reach that ip + port from the outside. Putting everything in a private network won't work.
-
-{{< highlight yaml >}}
-version: '3'
-
-services:
-  db:
-    image: mariadb:10
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    environment:
-      MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
-      MYSQL_DATABASE: vikunja
-    volumes:
-      - ./db:/var/lib/mysql
-    restart: unless-stopped
-  api:
-    image: vikunja/api
-    environment:
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
-      VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
-      VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: http://<your public frontend url with slash>/
-    ports:
-      - 3456:3456
-    volumes:
-      - ./files:/app/vikunja/files
-    depends_on:
-      - db
-    restart: unless-stopped
-  frontend:
-    image: vikunja/frontend
-    ports:
-      - 80:80
-    environment:
-      VIKUNJA_API_URL: http://<your-ip-here>:3456/api/v1
-    restart: unless-stopped
-{{< /highlight >}}
-
 ## Example with traefik 2
 
 This example assumes [traefik](https://traefik.io) version 2 installed and configured to [use docker as a configuration provider](https://docs.traefik.io/providers/docker/).
 
-We also make a few assumptions here which you'll most likely need to adjust for your traefik setup:
+We also make a few assumtions here which you'll most likely need to adjust for your traefik setup:
 
 * Your domain is `vikunja.example.com`
 * The entrypoint you want to make vikunja available from is called `https`
@@ -143,8 +66,6 @@ services:
       VIKUNJA_DATABASE_TYPE: mysql
       VIKUNJA_DATABASE_USER: vikunja
       VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes: 
       - ./files:/app/vikunja/files
     networks:
@@ -155,7 +76,7 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && (PathPrefix(`/api/v1`) || PathPrefix(`/dav/`) || PathPrefix(`/.well-known/`))"
+      - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)"
       - "traefik.http.routers.vikunja-api.entrypoints=https"
       - "traefik.http.routers.vikunja-api.tls.certResolver=acme"
   frontend:
@@ -203,8 +124,6 @@ services:
       VIKUNJA_DATABASE_TYPE: mysql
       VIKUNJA_DATABASE_USER: vikunja
       VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes: 
       - ./files:/app/vikunja/files
     networks:
@@ -284,8 +203,6 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
       MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
       MYSQL_DATABASE: vikunja
     volumes:
       - ./db:/var/lib/mysql
@@ -294,12 +211,10 @@ services:
     image: vikunja/api
     environment:
       VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
+      VIKUNJA_DATABASE_PASSWORD: supersecret
       VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
+      VIKUNJA_DATABASE_USER: root
       VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes: 
       - ./files:/app/vikunja/files
     depends_on:
@@ -343,9 +258,7 @@ services:
     image: mariadb:10
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
-      MYSQL_ROOT_PASSWORD: supersecret 
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
+      MYSQL_ROOT_PASSWORD: supersecret
       MYSQL_DATABASE: vikunja
     volumes:
       - ./db:/var/lib/mysql
@@ -354,12 +267,10 @@ services:
     image: vikunja/api
     environment:
       VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
+      VIKUNJA_DATABASE_PASSWORD: supersecret
       VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
+      VIKUNJA_DATABASE_USER: root
       VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes: 
       - ./files:/app/vikunja/files
     depends_on:
@@ -380,83 +291,3 @@ services:
     volumes:
         - ./Caddyfile:/etc/caddy/Caddyfile:ro
 {{< /highlight >}}
-
-## Setup on a Synology NAS
-
-There is a proxy preinstalled in DSM, so if you want to access vikunja from outside,
-you can prepare 2 proxy rules:
-
-* a redirection rule for vikunja's api (see example screenshot using port 3456)
-* a similar redirection rule for vikunja's frontend (using port 4321)
-
-![Synology Proxy Settings](/docs/synology-proxy-1.png)
-
-You should also add 2 empty folders for mariadb and vikunja inside Synology's
-docker main folders:
-
-* Docker
-  * vikunja
-  * mariadb
-
-Synology has its own GUI for managing Docker containers... But it's easier via docker compose.
-
-To do that, you can
-
-* either activate SSH and paste the adapted compose file in a terminal (using Putty or similar)
-* without activating SSH as a "custom script" (go to Control Panel / Task Scheduler / Create / Scheduled Task / User-defined script)
-* without activating SSH, by using Portainer (you have to install first, check out [this tutorial](https://www.portainer.io/blog/how-to-install-portainer-on-a-synology-nas) for exmple):
-  1. Go to **Dashboard / Stacks** click the button **"Add Stack"**
-  2. Give it the name Vikunja and paste the adapted docker compose file 
-  3. Deploy the Stack with the "Deploy Stack" button: 
-
-![Portainer Stack deploy](/docs/synology-proxy-2.png)
-
-The docker-compose file we're going to use is very similar to the [example without any proxy](#example-without-any-proxy) above:
-
-{{< highlight yaml >}}
-version: '3'
-
-services:
-  db:
-    image: mariadb:10
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    environment:
-      MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
-      MYSQL_DATABASE: vikunja
-    volumes:
-      - ./db:/var/lib/mysql
-    restart: unless-stopped
-  api:
-    image: vikunja/api
-    environment:
-      VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
-      VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
-      VIKUNJA_DATABASE_DATABASE: vikunja
-      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
-    ports:
-      - 3456:3456
-    volumes:
-      - ./files:/app/vikunja/files
-    depends_on:
-      - db
-    restart: unless-stopped
-  frontend:
-    image: vikunja/frontend
-    ports:
-      - 4321:80
-    environment:
-      VIKUNJA_API_URL: http://vikunja-api-domain.tld/api/v1
-    restart: unless-stopped
-{{< /highlight >}}
-
-You may want to change the volumes to match the rest of your setup.
-
-Once deployed, you might want to change the [`PUID` and `GUID` settings]({{< ref "install-backend.md">}}#setting-user-and-group-id-of-the-user-running-vikunja) or [set the time zone]({{< ref "config.md">}}#timezone).
-
-After registering all your users, you might also want to [disable the user registration]({{<ref "config.md">}}#enableregistration).
-

docs/content/doc/setup/install-backend.md

@@ -28,7 +28,7 @@ wget <download-url>
 ### Verify the GPG signature
 
 Starting with version `0.7`, all releases are signed using pgp.
-Releases from `main` will always be signed.
+Releases from `master` will always be signed.
 
 To validate the downloaded zip file use the signiture file `.asc` and the key `FF054DACD908493A`:
 
@@ -52,7 +52,7 @@ ln -s /opt/vikunja/vikunja /usr/bin/vikunja
 
 ### Systemd service
 
-Save the following service file to `/etc/systemd/system/vikunja.service` and adapt it to your needs:
+Take the following `service` file and adapt it to your needs:
 
 {{< highlight service >}}
 [Unit]
@@ -83,7 +83,9 @@ WantedBy=multi-user.target
 
 If you've installed Vikunja to a directory other than `/opt/vikunja`, you need to adapt `WorkingDirectory` accordingly.
 
-After you made all necessary modifications, it's time to start the service:
+Save the file to `/etc/systemd/system/vikunja.service`
+
+After you made all nessecary modifications, it's time to start the service:
 
 {{< highlight bash >}}
 sudo systemctl enable vikunja
@@ -97,7 +99,7 @@ To build vikunja from source, see [building from source]({{< ref "build-from-sou
 ### Updating
 
 Simply replace the binary and templates with the new version, then restart Vikunja.
-It will automatically run all necessary database migrations.
+It will automatically run all nessecary database migrations.
 **Make sure to take a look at the changelog for the new version to not miss any manual steps the update may involve!**
 
 ## Docker
@@ -145,11 +147,10 @@ services:
     image: vikunja/api:latest
     environment:
       VIKUNJA_DATABASE_HOST: db
-      VIKUNJA_DATABASE_PASSWORD: secret
+      VIKUNJA_DATABASE_PASSWORD: supersecret
       VIKUNJA_DATABASE_TYPE: mysql
-      VIKUNJA_DATABASE_USER: vikunja
+      VIKUNJA_DATABASE_USER: root
       VIKUNJA_SERVICE_JWTSECRET: <generated secret>
-      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
     volumes:
       - ./files:/app/vikunja/files
   db:
@@ -157,8 +158,6 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
       MYSQL_ROOT_PASSWORD: supersecret
-      MYSQL_USER: vikunja
-      MYSQL_PASSWORD: secret
       MYSQL_DATABASE: vikunja
     volumes:
       - ./db:/var/lib/mysql
@@ -276,8 +275,3 @@ The API is now available through IP:
 ## Configuration
 
 See [available configuration options]({{< ref "config.md">}}).
-
-## Default Password
-
-After successfully installing Vikunja, there is no default user or password.
-You only need to register a new account and set all the details when creating it.

docs/content/doc/setup/install-frontend.md

@@ -35,7 +35,7 @@ Just open the file with a text editor - there are comments which will explain ho
 
 ## Docker
 
-The docker image is based on nginx and just contains all necessary files for the frontend.
+The docker image is based on nginx and just contains all nessecary files for the frontend.
 
 To run it, all you need is
 
@@ -47,7 +47,10 @@ which will run the docker image and expose port 80 on the host.
 
 See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.
 
-The docker container runs as an unprivileged user and does not mount anything.
+### Setting user and group id of the user running vikunja
+
+You can set the user and group id of the user running vikunja with the `PUID` and `PGID` evironment variables.
+This follows the pattern used by [the linuxserver.io](https://docs.linuxserver.io/general/understanding-puid-and-pgid) docker images.
 
 ### API URL configuration in docker
 
@@ -119,7 +122,7 @@ Put the following config in `cat /etc/apache2/sites-available/vikunja.conf`:
     ServerName localhost
     DocumentRoot /path/to/vikunja/static/frontend/files
     RewriteEngine On
- 	RewriteRule ^\/?(favicon\.ico|assets|audio|fonts|images|manifest\.webmanifest|robots\.txt|sw\.js|workbox-.*|api|dav|\.well-known) - [L]
+    RewriteRule ^\/?(config\.json|favicon\.ico|css|fonts|images|img|js) - [L]
     RewriteRule ^(.*)$ /index.html [QSA,L]
 </VirtualHost>
 {{< /highlight >}}

docs/content/doc/setup/install.md

@@ -11,20 +11,16 @@ menu:
 
 # Installing
 
-Vikunja consists of two parts: [API](https://code.vikunja.io/api) and [frontend](https://code.vikunja.io/frontend).
+Vikunja consists of two parts: [Backend](https://code.vikunja.io/api) and [frontend](https://code.vikunja.io/frontend).
+While the backend is required, the frontend is not.
+You don't neccesarily need to have a web-frontend, using Vikunja via the [mobile app](https://code.vikunja.io/app) is totally fine.
 
-You will always need to install at least the API.
-To actually use Vikunja you'll also need to somehow install a frontend to use it.
-You can either:
+However, using the web frontend is highly reccommended.
 
-* [Install the web frontend]({{< ref "install-frontend.md">}})
-* Use the desktop app, which is essentially a web frontend packaged for easy installation on desktop devices
-* Use the mobile app only, but as of right now it only supports the very basic features of Vikunja
-
-Vikunja can be installed in various ways. 
+Vikunja can be installed in various forms. 
 This document provides an overview and instructions for the different methods.
 
-* [API]({{< ref "install-backend.md">}})
+* [Backend]({{< ref "install-backend.md">}})
   * [Installing from binary]({{< ref "install-backend.md#install-from-binary">}})
     * [Verify the GPG signature]({{< ref "install-backend.md#verify-the-gpg-signature">}})
     * [Set it up]({{< ref "install-backend.md#set-it-up">}})
@@ -43,17 +39,3 @@ This document provides an overview and instructions for the different methods.
 * [Reverse proxies]({{< ref "reverse-proxies.md">}})
 * [Full docker example]({{< ref "full-docker-example.md">}})
 * [Backups]({{< ref "backups.md">}})
-
-## Installation on kubernetes
-
-A third-party Helm Chart is available from the k8s-at-home project [here](https://github.com/k8s-at-home/charts/tree/master/charts/stable/vikunja).
-
-## Other installation resources
-
-* [Docker Compose is MUCH Easier Than you Think - Let's Install Vikunja](https://www.youtube.com/watch?v=fGlz2PkXjuo) (Youtube)
-* [Setup Vikunja using Docker Compose - Homelab Wiki](https://thehomelab.wiki/books/docker/page/setup-vikunja-using-docker-compose)
-* [A Closer look at Vikunja - Email Notifications - Enable or Disable Registrations - Allow Attachments](https://www.youtube.com/watch?v=47wj9pRT6Gw) (Youtube)
-* [Install Vikunja in Docker for self-hosted Task Tracking](https://smarthomepursuits.com/install-vikunja-in-docker-for-self-hosted-task-tracking/)
-* [Self-Hosted To-Do List with Vikunja in Docker](https://www.youtube.com/watch?v=DqyqDWpEvKI) (Youtube)
-* [Vikunja self-hosted (step by step)](https://nguyenminhhung.com/vikunja-self-hosted-step-by-step/)
-* [How to Install Vikunja on Your Synology NAS](https://mariushosting.com/how-to-install-vikunja-on-your-synology-nas/)

docs/content/doc/setup/k8s.md

@@ -1,15 +0,0 @@
----
-title: "Hosting Vikunja with k8s"
-date: 2022-08-12T13:41:48+02:00
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "setup"
----
-
-There are two third-party Helm-Charts which can be used to host Vikunja with k8s:
-
-* [Truecharts](https://truecharts.org/charts/stable/vikunja/)
-* [k8s at Home](https://github.com/k8s-at-home/charts)
-

docs/content/doc/setup/openid-examples.md

@@ -1,68 +0,0 @@
----
-date: "2022-08-09:00:00+02:00"
-title: "OpenID example configurations"
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "setup"
----
-
-# OpenID example configurations
-
-On this page you will find examples about how to set up Vikunja with a third-party OpenID provider.
-To add another example, please [edit this document](https://kolaente.dev/vikunja/api/src/branch/main/docs/content/doc/setup/openid-examples.md) and send a PR.
-
-{{< table_of_contents >}}
-
-## Authelia
-
-Vikunja Config:
-
-```yaml
-openid:
-    enabled: true
-    redirecturl: https://vikunja.mydomain.com/auth/openid/  <---- slash at the end is important
-    providers:
-      - name: Authelia
-        authurl: https://login.mydomain.com
-        clientid: <vikunja-id>
-        clientsecret: <vikunja secret>
-```
-
-Authelia config:
-
-```yaml
-- id: <vikunja-id>
-description: Vikunja
-secret: <vikunja secret>
-redirect_uris:
-  - https://vikunja.mydomain.com/auth/openid/authelia
-scopes:
-  - openid
-  - email
-  - profile
-```
-
-## Google / Google Workspace
-
-Vikunja Config:
-
-```yaml
-openid:
-    enabled: true
-    redirecturl: https://vikunja.mydomain.com/auth/openid/  <---- slash at the end is important
-    providers:
-      - name: Google
-        authurl: https://accounts.google.com
-        clientid: <google-oauth-client-id>
-        clientsecret: <google-oauth-client-secret>
-```
-
-Google config:
-
-  - Navigate to https://console.cloud.google.com/apis/credentials in the target project
-  - Create a new OAuth client ID
-  - Configure an authorized redirect URI of https://vikunja.mydomain.com/auth/openid/google
-
-Note that there currently seems to be no way to stop creation of new users, even when enableregistration is false in the configuration. This means that this approach works well only with an "Internal Organization" app for Google Workspace, which limits the allowed users to organizational accounts only. External / public applications will potentially allow every Google user to register.

docs/content/doc/setup/reverse-proxies.md

@@ -80,22 +80,6 @@ server {
 <b>NOTE:</b> If you change the max upload size in Vikunja's settings, you'll need to also change the <code>client_max_body_size</code> in the nginx proxy config.
 </div>
 
-## NGINX Proxy Manager (NPM)
-
-1. Create a standard Proxy Host for the Vikunja Frontend within NPM and point it to the URL you plan to use. The next several steps will enable the Proxy Host to successfully navigate to the API (on port 3456).
-2. Verify that the page will pull up in your browser. (Do not bother trying to log in. It won't work. Trust me.)
-3. Now, we'll work with the NPM container, so you need to identify the container name for your NPM installation. e.g. NGINX-PM
-4. From the command line, enter `sudo docker exec -it [NGINX-PM container name] /bin/bash` and navigate to the proxy hosts folder where the `.conf` files are stashed. Probably `/data/nginx/proxy_host`. (This folder is a persistent folder created in the NPM container and mounted by NPM.)
-5. Locate the `.conf` file where the server_name inside the file matches your Vikunja Proxy Host. Once found, add the following code, unchanged, just above the existing location block in that file. (They are listed by number, not name.)  
-```
-location ~* ^/(api|dav|\.well-known)/ {
-        proxy_pass http://api:3456;
-        client_max_body_size 20M;
-    }
-```
-6. After saving the edited file, return to NPM's UI browser window and refresh the page to verify your Proxy Host for Vikunja is still online. 
-7. Now, switch over to your Vikunja browswer window and hit refresh. If you configured your URL correctly in original Vikunja container, you should be all set and the browser will correctly show Vikunja. If not, you'll need to adjust the address in the top of the login subscreen to match your proxy address.
-
 ## Apache
 
 Put the following config in `cat /etc/apache2/sites-available/vikunja.conf`:
@@ -117,11 +101,11 @@ Put the following config in `cat /etc/apache2/sites-available/vikunja.conf`:
 
     DocumentRoot /var/www/html
     RewriteEngine On
- 	RewriteRule ^\/?(favicon\.ico|assets|audio|fonts|images|manifest\.webmanifest|robots\.txt|sw\.js|workbox-.*|api|dav|\.well-known) - [L]
+    RewriteRule ^\/?(config\.json|favicon\.ico|css|fonts|images|img|js|api|dav|\.well-known) - [L]
     RewriteRule ^(.*)$ /index.html [QSA,L]
 </VirtualHost>
 {{< /highlight >}}
 
 **Note:** The apache modules `proxy`, `proxy_http` and `rewrite` must be enabled for this.
 
-For more details see the [frontend apache configuration]({{< ref "install-frontend.md#apache">}}).
+For more details see the [frontend apache configuration]({{< ref "install-frontend.md#apache">}}).

docs/content/doc/setup/subdirectory.md

@@ -1,51 +0,0 @@
----
-title: "Running Vikunja in a subdirectory"
-date: 2022-09-23T12:15:04+02:00
-draft: false
-menu:
-  sidebar:
-    parent: "setup"
----
-
-# Running Vikunja in a subdirectory
-
-Running Vikunja in a subdirectory is not supported out of the box.
-However, you can still run it in a subdirectory but need to build the frontend yourself.
-
-## Frontend
-
-First, make sure you're able to build the frontend from source.
-Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that.
-
-### Dynamicly set with build command
-
-Run the build with the `VIKUNJA_FRONTEND_BASE` variable specified.
-
-```
-VIKUNJA_FRONTEND_BASE=/SUBPATH/ pnpm run build
-```
-
-Where `SUBPATH` is the subdirectory you want to run Vikunja on.
-
-### Set via .env.local
-
-* Copy `.env.local.example` to `.env.local`
-* Uncomment `VIKUNJA_FRONTEND_BASE` and set `/subpath/` to the desired path.
-
-After saving, build Vikunja as normal.
-
-```
-pnpm run build
-```
-
-Once you have the build files you can deploy them as usual.
-Note that when deploying in docker you'll need to put the files in a web container yourself, you 
-can't use the `Dockerfile` in the repo without modifications.
-
-## API
-
-If you're not using a reverse proxy you're good to go.
-Simply configure the api url in the frontend as you normally would.
-
-If you're using a reverse proxy you'll need to adjust the paths so that the api is available at `/SUBPATH/api/v1`.
-You can check if everything is working correctly by opening `/SUBPATH/api/v1/info` in a browser.

docs/content/doc/setup/utf-8.md

@@ -12,7 +12,7 @@ menu:
 
 Vikunja itself is always fully capable of handling utf-8 characters.
 However, your database might be not. 
-Vikunja itself will work just fine until you want to use non-latin characters in your tasks/projects/etc.
+Vikunja itself will work just fine until you want to use non-latin characters in your tasks/lists/etc.
 
 On this page, you will find information about how to fully ensure non-latin characters like aüäß or emojis work 
 with your installation.

docs/content/doc/setup/versions.md

@@ -1,45 +0,0 @@
----
-date: "2022-07-07:00:00+02:00"
-title: "Versions"
-draft: false
-type: "doc"
-menu:
-  sidebar:
-    parent: "setup"
----
-
-# Vikunja Versions
-
-The Vikunja api and frontend are available in two different release flavors.
-
-{{< table_of_contents >}}
-
-## Stable
-
-Stable releases have a fixed version number like `0.18.2` and are published at irregular intervals whenever a new version is ready.
-They receive few bugfixes and security patches.
-
-We use [Semantic Versioning](#) for these releases.
-
-## Unstable
-
-Unstable versions are build every time a PR is merged or a commit to the main development branch is made.
-As such, they contain the current development code and are more likely to have bugs.
-There might be multiple new such builds a day.
-
-Versions contain the last stable version, the number of commits since then and the commit the currently running binary was built from.
-They look like this: `v0.18.1+269-5cc4927b9e`
-
-The demo instance at [try.vikunja.io](https://try.vikunja.io) automatically updates and always runs the last unstable build.
-
-## Switching between versions
-
-First you should create a backup of your current setup!
-
-Switching between versions is the same process as [upgrading]({{< ref install-backend.md >}}#updating).
-Simply replace the stable binary with an unstable one or vice-versa.
-
-For installations using docker, it is as simple as using the `unstable` or `latest` tag to switch between versions.
-
-**Note:** While switching from stable to unstable should work without any problem, switching back might work but is not recommended and might break your instance.
-To switch from unstable back to stable the best way is to wait for the next stable release after the used unstable build and then upgrade to that.

docs/content/doc/usage/api.md

@@ -11,7 +11,7 @@ menu:
 # API Documentation
 
 You can find the api docs under `http://vikunja.tld/api/v1/docs` of your instance. 
-A public instance is available on [try.vikunja.io](https://try.vikunja.io/api/v1/docs).
+A public instance is available on [try.vikunja.io](http://try.vikunja.io/api/v1/docs).
 
 These docs are autgenerated from annotations in the code with swagger.
 

docs/content/doc/usage/caldav.md

@@ -10,9 +10,9 @@ menu:
 
 # Caldav
 
-> **Warning:** The caldav integration is in an early alpha stage and has bugs.
+> **Warning:** The caldav integration is in an early alpha stage and has bugs. 
 > It works well with some clients while having issues with others.
-> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav])
+> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav]) 
 
 Vikunja supports managing tasks via the [caldav VTODO](https://tools.ietf.org/html/rfc5545#section-3.6.2) extension.
 
@@ -24,10 +24,10 @@ All urls are located under the `/dav` subspace.
 
 Urls are:
 
-* `/principals/<username>/`: Returns urls for project discovery. *Use this url to initially make connections to new clients.*
-* `/projects/`: Used to manage projects
-* `/projects/<List ID>/`: Used to manage a single project
-* `/projects/<List ID>/<Task UID>`: Used to manage a task on a project
+* `/principals/<username>/`: Returns urls for list discovery. *Use this url to initially make connections to new clients.*
+* `/lists/`: Used to manage lists
+* `/lists/<List ID>/`: Used to manage a single list
+* `/lists/<List ID>/<Task UID>`: Used to manage a task on a list
 
 ## Supported properties
 
@@ -37,33 +37,32 @@ Vikunja currently supports the following properties:
 * `SUMMARY`
 * `DESCRIPTION`
 * `PRIORITY`
-* `CATEGORIES`
 * `COMPLETED`
-* `CREATED` (only Vikunja -> Client)
 * `DUE`
-* `DURATION`
-* `DTSTAMP`
 * `DTSTART`
-* `LAST-MODIFIED` (only Vikunja -> Client)
-* `RRULE` (Recurrence) (only Vikunja -> Client)
-* `VALARM` (Reminders)
+* `DURATION`
+* `ORGANIZER`
+* `RELATED-TO`
+* `CREATED`
+* `DTSTAMP`
+* `LAST-MODIFIED`
 
 Vikunja **currently does not** support these properties:
 
 * `ATTACH`
+* `CATEGORIES`
 * `CLASS`
 * `COMMENT`
-* `CONTACT`
 * `GEO`
 * `LOCATION`
-* `ORGANIZER` (disabled)
 * `PERCENT-COMPLETE`
-* `RECURRENCE-ID`
-* `RELATED-TO`
 * `RESOURCES`
-* `SEQUENCE`
 * `STATUS`
+* `CONTACT`
+* `RECURRENCE-ID`
 * `URL`
+* Recurrence
+* `SEQUENCE`
 
 ## Tested Clients
 
@@ -76,7 +75,6 @@ Vikunja **currently does not** support these properties:
 ### Not working
 
 * [Thunderbird (68)](https://www.thunderbird.net/)
-* iOS calDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))
 
 ## Dev logs
 

docs/content/doc/usage/cli.md

@@ -26,15 +26,6 @@ If you don't specify a command, the [`web`](#web) command will be executed.
 
 All commands use the same standard [config file]({{< ref "../setup/config.md">}}).
 
-## Using the cli in docker
-
-When running Vikunja in docker, you'll need to execute all commands in the `api` container.
-Instead of running the `vikunja` binary directly, run it like this:
-
-```
-docker exec <name of the vikunja api container> /app/vikunja/vikunja <subcommand>
-```
-
 ### `dump`
 
 Creates a zip file with all vikunja-related files.
@@ -136,21 +127,6 @@ Flags:
 * `-p`, `--password`: The password of the new user. You will be asked to enter it if not provided through the flag.
 * `-u`, `--username`: The username of the new user.
 
-#### `user delete`
-
-Start the user deletion process. 
-If called without the `--now` flag, this command will only trigger an email to the user in order for them to confirm and start the deletion process (this is the same behavoir as if the user requested their deletion via the web interface).
-With the flag the user is deleted **immediately**. 
-
-**USE WITH CAUTION.**
-
-{{< highlight bash >}}
-$ vikunja user delete <id> <flags>
-{{< /highlight >}}
-
-Flags:
-* `-n`, `--now` If provided, deletes the user immediately instead of emailing them first.
-
 #### `user list`
 
 Shows a list of all users.

docs/content/doc/usage/errors.md

@@ -4,8 +4,8 @@ title: "Errors"
 draft: false
 type: "doc"
 menu:
-sidebar:
-parent: "usage"
+  sidebar:
+    parent: "usage"
 ---
 
 # Errors
@@ -24,26 +24,22 @@ This document describes the different errors Vikunja can return.
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 1001      | 400 | A user with this username already exists. |
-| 1002      | 400 | A user with this email address already exists. |
-| 1004      | 400 | No username and password specified. |
-| 1005      | 404 | The user does not exist. |
-| 1006      | 400 | Could not get the user id. |
-| 1008      | 412 | No password reset token provided. |
-| 1009      | 412 | Invalid password reset token. |
-| 1010      | 412 | Invalid email confirm token. |
-| 1011      | 412 | Wrong username or password. |
-| 1012      | 412 | Email address of the user not confirmed. |
-| 1013      | 412 | New password is empty. |
-| 1014      | 412 | Old password is empty. |
-| 1015      | 412 | Totp is already enabled for this user. |
-| 1016      | 412 | Totp is not enabled for this user. |
-| 1017      | 412 | The provided Totp passcode is invalid. |
-| 1018      | 412 | The provided user avatar provider type setting is invalid. |
-| 1019      | 412 | No openid email address was provided. |
-| 1020      | 412 | This user account is disabled. |
-| 1021      | 412 | This account is managed by a third-party authentication provider. |
-| 1021      | 412 | The username must not contain spaces. |
+| 1001 | 400 | A user with this username already exists. |
+| 1002 | 400 | A user with this email address already exists. |
+| 1004 | 400 | No username and password specified. |
+| 1005 | 404 | The user does not exist. |
+| 1006 | 400 | Could not get the user id. |
+| 1008 | 412 | No password reset token provided. |
+| 1009 | 412 | Invalid password reset token. |
+| 1010 | 412 | Invalid email confirm token. |
+| 1011 | 412 | Wrong username or password. |
+| 1012 | 412 | Email address of the user not confirmed. |
+| 1013 | 412 | New password is empty. |
+| 1014 | 412 | Old password is empty. |
+| 1015 | 412 | Totp is already enabled for this user. |
+| 1016 | 412 | Totp is not enabled for this user. |
+| 1017 | 412 | The provided Totp passcode is invalid. |
+| 1018 | 412 | The provided user avatar provider type setting is invalid. |
 
 ## Validation
 
@@ -52,26 +48,24 @@ This document describes the different errors Vikunja can return.
 | 2001 | 400 | ID cannot be empty or 0. |
 | 2002 | 400 | Some of the request data was invalid. The response contains an aditional array with all invalid fields. |
 
-## Project
+## List
 
-| ErrorCode | HTTP Status Code | Description                                                                                                                   |
-|-----------|------------------|-------------------------------------------------------------------------------------------------------------------------------|
-| 3001      | 404 | The project does not exist.                                                                                                      |
-| 3004      | 403 | The user needs to have read permissions on that project to perform that action.                                                  |
-| 3005      | 400 | The project title cannot be empty.                                                                                               |
-| 3006      | 404 | The project share does not exist.                                                                                                |
-| 3007      | 400 | A project with this identifier already exists.                                                                                   |
-| 3008      | 412 | The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project. |
-| 3009      | 412 | The project cannot belong to a dynamically generated namespace like "Favorites".                                                 |
-| 3010      | 412 | The project must belong to a namespace.                                                                                          |
+| ErrorCode | HTTP Status Code | Description |
+|-----------|------------------|-------------|
+| 3001 | 404 | The list does not exist. |
+| 3004 | 403 | The user needs to have read permissions on that list to perform that action. |
+| 3005 | 400 | The list title cannot be empty. |
+| 3006 | 404 | The list share does not exist. |
+| 3007 | 400 | A list with this identifier already exists. |
+| 3008 | 412 | The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list. |
 
 ## Task
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 4001 | 400 | The project task text cannot be empty. |
-| 4002 | 404 | The project task does not exist. |
-| 4003 | 403 | All bulk editing tasks must belong to the same project. |
+| 4001 | 400 | The list task text cannot be empty. |
+| 4002 | 404 | The list task does not exist. |
+| 4003 | 403 | All bulk editing tasks must belong to the same list. |
 | 4004 | 403 | Need at least one task when bulk editing tasks. |
 | 4005 | 403 | The user does not have the right to see the task. |
 | 4006 | 403 | The user tried to set a parent task as the task itself. |
@@ -84,13 +78,10 @@ This document describes the different errors Vikunja can return.
 | 4013 | 400 | The task sort param is invalid. |
 | 4014 | 400 | The task sort order is invalid. |
 | 4015 | 404 | The task comment does not exist. |
-| 4016 | 400 | Invalid task field. |
-| 4017 | 400 | Invalid task filter comparator. |
-| 4018 | 400 | Invalid task filter concatinator. |
-| 4019 | 400 | Invalid task filter value. |
-| 4020 | 400 | The provided attachment does not belong to that task. |
-| 4021 | 400 | This user is already assigned to that task. |
-| 4022 | 400 | The task has a relative reminder which does not specify relative to what. |
+| 4016 | 403 | Invalid task field. |
+| 4017 | 403 | Invalid task filter comparator. |
+| 4018 | 403 | Invalid task filter concatinator. |
+| 4019 | 403 | Invalid task filter value. |
 
 ## Namespace
 
@@ -110,17 +101,17 @@ This document describes the different errors Vikunja can return.
 |-----------|------------------|-------------|
 | 6001 | 400 | The team name cannot be emtpy. |
 | 6002 | 404 | The team does not exist. |
-| 6004 | 409 | The team already has access to that namespace or project. |
+| 6004 | 409 | The team already has access to that namespace or list. |
 | 6005 | 409 | The user is already a member of that team. |
 | 6006 | 400 | Cannot delete the last team member. |
-| 6007 | 403 | The team does not have access to the project to perform that action. |
+| 6007 | 403 | The team does not have access to the list to perform that action. |
 
-## User Project Access
+## User List Access
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 7002 | 409 | The user already has access to that project. |
-| 7003 | 403 | The user does not have access to that project. |
+| 7002 | 409 | The user already has access to that list. |
+| 7003 | 403 | The user does not have access to that list. |
 
 ## Label
 
@@ -140,11 +131,10 @@ This document describes the different errors Vikunja can return.
 
 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 10001 | 404 | The bucket does not exist. |
-| 10002 | 400 | The bucket does not belong to that project. |
-| 10003 | 412 | You cannot remove the last bucket on a project. |
-| 10004 | 412 | You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold. |
-| 10005 | 412 | There can be only one done bucket per project. |
+| 10001 | 404 | The bucket does not exist. | 
+| 10002 | 400 | The bucket does not belong to that list. | 
+| 10003 | 412 | You cannot remove the last bucket on a list. | 
+| 10004 | 412 | You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold. | 
 
 ## Saved Filters
 
@@ -152,17 +142,3 @@ This document describes the different errors Vikunja can return.
 |-----------|------------------|-------------|
 | 11001 | 404 | The saved filter does not exist. |
 | 11002 | 412 | Saved filters are not available for link shares. | 
-
-## Subscriptions
-
-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
-| 12001 | 412 | The subscription entity type is invalid. |
-| 12002 | 412 | The user is already subscribed to the entity itself or a parent entity. |
-
-## Link Shares
-
-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
-| 13001 | 412 | This link share requires a password for authentication, but none was provided. |
-| 13002 | 403 | The provided link share password was invalid. |

docs/content/doc/usage/rights.md

@@ -8,20 +8,20 @@ menu:
     parent: "usage"
 ---
 
-# Project and namespace rights for teams and users
+# List and namespace rights for teams and users
 
-Whenever you share a project or namespace with a user or team, you can specify a `rights` parameter. 
+Whenever you share a list or namespace with a user or team, you can specify a `rights` parameter. 
 This parameter controls the rights that team or user is going to have (or has, if you request the current sharing status).
 
 Rights are being specified using integers.
 
 The following values are possible:
 
-| Right (int) | Meaning                                                                                                       |
-|-------------|---------------------------------------------------------------------------------------------------------------|
-| 0 (Default) | Read only. Anything which is shared with this right cannot be edited.                                         |
-| 1 | Read and write. Namespaces or projects shared with this right can be read and written to by the team or user. |
-| 2 | Admin. Can do anything like read and write, but can additionally manage sharing options.                      |
+| Right (int) | Meaning |
+|-------------|---------|
+| 0 (Default) | Read only. Anything which is shared with this right cannot be edited. |
+| 1 | Read and write. Namespaces or lists shared with this right can be read and written to by the team or user. |
+| 2 | Admin. Can do anything like read and write, but can additionally manage sharing options. |
 
 ## Team admins
 

docs/nginx.conf

@@ -18,8 +18,4 @@ server {
     location /docs/contact {
         return 301 $scheme://vikunja.io/en/contact;
     }
-    
-    location /docs/docs {
-        return 301 $scheme://vikunja.io/docs;
-    }
 }

docs/themes/vikunja

@@ -0,0 +1 @@
+Subproject commit 958219fc84db455ed58d7a4380bbffc8d04fd5cf

go.mod

@@ -17,138 +17,94 @@
 module code.vikunja.io/api
 
 require (
-	code.vikunja.io/web v0.0.0-20210706160506-d85def955bd3
+	4d63.com/tz v1.2.0
+	code.vikunja.io/web v0.0.0-20201223143420-588abb73703a
+	dmitri.shuralyov.com/go/generated v0.0.0-20170818220700-b1254a446363 // indirect
 	gitea.com/xorm/xorm-redis-cache v0.2.0
-	github.com/ThreeDotsLabs/watermill v1.2.0
-	github.com/adlio/trello v1.10.0
-	github.com/arran4/golang-ical v0.0.0-20230318005454-19abf92700cc
+	github.com/adlio/trello v1.8.0
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
-	github.com/bbrks/go-blurhash v1.1.1
-	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b
-	github.com/coreos/go-oidc/v3 v3.5.0
+	github.com/beevik/etree v1.1.0 // indirect
+	github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2
+	github.com/client9/misspell v0.3.4
+	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cweill/gotests v1.6.0
 	github.com/d4l3k/messagediff v1.2.1
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/disintegration/imaging v1.6.2
 	github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
-	github.com/gabriel-vasile/mimetype v1.4.2
-	github.com/getsentry/sentry-go v0.20.0
-	github.com/go-sql-driver/mysql v1.7.0
-	github.com/go-testfixtures/testfixtures/v3 v3.8.1
-	github.com/gocarina/gocsv v0.0.0-20230325173030-9a18a846a479
-	github.com/golang-jwt/jwt/v4 v4.5.0
+	github.com/fzipp/gocyclo v0.3.1
+	github.com/gabriel-vasile/mimetype v1.1.2
+	github.com/getsentry/sentry-go v0.9.0
+	github.com/go-errors/errors v1.1.1
+	github.com/go-redis/redis/v8 v8.4.8
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/go-testfixtures/testfixtures/v3 v3.4.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/google/uuid v1.3.0
-	github.com/iancoleman/strcase v0.2.0
-	github.com/imdario/mergo v0.3.15
-	github.com/jinzhu/copier v0.3.5
-	github.com/labstack/echo-jwt/v4 v4.1.0
-	github.com/labstack/echo/v4 v4.10.2
-	github.com/labstack/gommon v0.4.0
-	github.com/lib/pq v1.10.7
-	github.com/magefile/mage v1.14.0
-	github.com/mattn/go-sqlite3 v1.14.16
-	github.com/olekukonko/tablewriter v0.0.5
+	github.com/golang/snappy v0.0.2 // indirect
+	github.com/gordonklaus/ineffassign v0.0.0-20210104184537-8eed68eb605f
+	github.com/iancoleman/strcase v0.1.2
+	github.com/imdario/mergo v0.3.11
+	github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3
+	github.com/kr/text v0.2.0 // indirect
+	github.com/labstack/echo/v4 v4.1.17
+	github.com/labstack/gommon v0.3.0
+	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef
+	github.com/lib/pq v1.9.0
+	github.com/magefile/mage v1.11.0
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-sqlite3 v1.14.6
+	github.com/mitchellh/mapstructure v1.3.2 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/olekukonko/tablewriter v0.0.4
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/pquerna/otp v1.4.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/redis/go-redis/v9 v9.0.2
+	github.com/pelletier/go-toml v1.8.0 // indirect
+	github.com/pquerna/cachecontrol v0.0.0-20200921180117-858c6e7e6b7e // indirect
+	github.com/pquerna/otp v1.3.0
+	github.com/prometheus/client_golang v1.9.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/samedi/caldav-go v3.0.0+incompatible
-	github.com/spf13/afero v1.9.5
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.2
-	github.com/swaggo/swag v1.8.12
-	github.com/tkuchiki/go-timezone v0.2.2
-	github.com/ulule/limiter/v3 v3.11.1
-	github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae
-	github.com/wneessen/go-mail v0.3.9
-	github.com/yuin/goldmark v1.5.4
-	golang.org/x/crypto v0.7.0
-	golang.org/x/image v0.6.0
-	golang.org/x/oauth2 v0.6.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.6.0
-	golang.org/x/term v0.6.0
-	gopkg.in/d4l3k/messagediff.v1 v1.2.1
-	gopkg.in/yaml.v3 v3.0.1
-	src.techknowlogick.com/xgo v1.7.1-0.20230307171022-b60708668fc7
-	src.techknowlogick.com/xormigrate v1.5.0
-	xorm.io/builder v0.3.12
-	xorm.io/xorm v1.3.2
-)
-
-require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/beevik/etree v1.1.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/garyburd/redigo v1.6.0 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-chi/chi/v5 v5.0.8 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/spec v0.20.4 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/goccy/go-json v0.9.11 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef // indirect
-	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
-	github.com/onsi/gomega v1.16.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
+	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
+	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
+	github.com/spf13/afero v1.5.1
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect
-	github.com/urfave/cli/v2 v2.3.0 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.2 // indirect
-	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.29.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/spf13/viper v1.7.1
+	github.com/stretchr/testify v1.6.1
+	github.com/swaggo/swag v1.7.0
+	github.com/ulule/limiter/v3 v3.8.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	golang.org/x/image v0.0.0-20201208152932-35266b937fa6
+	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
+	golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
+	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
+	golang.org/x/sys v0.0.0-20201223074533-0d417f636930 // indirect
+	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/d4l3k/messagediff.v1 v1.2.1
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	gopkg.in/ini.v1 v1.57.0 // indirect
+	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
+	honnef.co/go/tools v0.0.1-2020.1.5
+	src.techknowlogick.com/xgo v1.2.1-0.20201205054505-b97762e7a76b
+	src.techknowlogick.com/xormigrate v1.4.0
+	xorm.io/builder v0.3.7
+	xorm.io/core v0.7.3
+	xorm.io/xorm v1.0.5
 )
 
-replace github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
+replace (
+	github.com/adlio/trello => github.com/kolaente/trello v1.7.1-0.20201216234312-5c4ef79b531e
+	github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4
+	github.com/coreos/go-systemd => github.com/coreos/go-systemd/v22 v22.0.0
+	github.com/hpcloud/tail => github.com/jeffbean/tail v1.0.1 // See https://github.com/hpcloud/tail/pull/159
+	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
+	gopkg.in/fsnotify.v1 => github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048 // See https://github.com/fsnotify/fsnotify/issues/328 and https://github.com/golang/go/issues/26904
+)
 
-go 1.20
+go 1.13

magefile.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU Affero General Public Licensee
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-//go:build mage
 // +build mage
 
 package main
@@ -25,8 +24,8 @@ import (
 	"context"
 	"crypto/sha256"
 	"fmt"
-	"github.com/iancoleman/strcase"
 	"io"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -52,43 +51,28 @@ var (
 	Ldflags       = ""
 	Tags          = ""
 	VersionNumber = "dev"
-	Version       = "unstable" // This holds the built version, unstable by default, when building from a tag or release branch, their name
+	Version       = "master" // This holds the built version, master by default, when building from a tag or release branch, their name
 	BinLocation   = ""
-	PkgVersion    = "unstable"
+	PkgVersion    = "master"
 	ApiPackages   = []string{}
 	RootPath      = ""
 	GoFiles       = []string{}
 
 	// Aliases are mage aliases of targets
 	Aliases = map[string]interface{}{
-		"build":                 Build.Build,
-		"do-the-swag":           DoTheSwag,
-		"check:got-swag":        Check.GotSwag,
-		"release:os-package":    Release.OsPackage,
-		"dev:make-migration":    Dev.MakeMigration,
-		"dev:make-event":        Dev.MakeEvent,
-		"dev:make-listener":     Dev.MakeListener,
-		"dev:make-notification": Dev.MakeNotification,
-		"generate-docs":         GenerateDocs,
-		"check:golangci-fix":    Check.GolangciFix,
+		"build":                Build.Build,
+		"do-the-swag":          DoTheSwag,
+		"check:got-swag":       Check.GotSwag,
+		"release:os-package":   Release.OsPackage,
+		"dev:create-migration": Dev.CreateMigration,
+		"generate-docs":        GenerateDocs,
+		"check:golangci-fix":   Check.GolangciFix,
 	}
 )
 
-func runCmdWithOutput(name string, arg ...string) (output []byte, err error) {
-	cmd := exec.Command(name, arg...)
-	output, err = cmd.Output()
-	if err != nil {
-		if ee, is := err.(*exec.ExitError); is {
-			return nil, fmt.Errorf("error running command: %s, %s", string(ee.Stderr), err)
-		}
-		return nil, fmt.Errorf("error running command: %s", err)
-	}
-
-	return output, nil
-}
-
 func setVersion() {
-	version, err := runCmdWithOutput("git", "describe", "--tags", "--always", "--abbrev=10")
+	versionCmd := exec.Command("git", "describe", "--tags", "--always", "--abbrev=10")
+	version, err := versionCmd.Output()
 	if err != nil {
 		fmt.Printf("Error getting version: %s\n", err)
 		os.Exit(1)
@@ -102,10 +86,6 @@ func setVersion() {
 	} else if os.Getenv("DRONE_BRANCH") != "" {
 		Version = strings.Replace(os.Getenv("DRONE_BRANCH"), "release/v", "", 1)
 	}
-
-	if Version == "main" {
-		Version = "unstable"
-	}
 }
 
 func setBinLocation() {
@@ -117,7 +97,7 @@ func setBinLocation() {
 }
 
 func setPkgVersion() {
-	if Version == "unstable" {
+	if Version == "master" {
 		PkgVersion = VersionNumber
 	}
 }
@@ -129,7 +109,8 @@ func setExecutable() {
 }
 
 func setApiPackages() {
-	pkgs, err := runCmdWithOutput("go", "list", "all")
+	cmd := exec.Command("go", "list", "all")
+	pkgs, err := cmd.Output()
 	if err != nil {
 		fmt.Printf("Error getting packages: %s\n", err)
 		os.Exit(1)
@@ -156,7 +137,8 @@ func setRootPath() {
 
 func setGoFiles() {
 	// GOFILES := $(shell find . -name "*.go" -type f ! -path "*/bindata.go")
-	files, err := runCmdWithOutput("find", ".", "-name", "*.go", "-type", "f", "!", "-path", "*/bindata.go")
+	cmd := exec.Command("find", ".", "-name", "*.go", "-type", "f", "!", "-path", "*/bindata.go")
+	files, err := cmd.Output()
 	if err != nil {
 		fmt.Printf("Error getting go files: %s\n", err)
 		os.Exit(1)
@@ -180,6 +162,7 @@ func initVars() {
 	setVersion()
 	setBinLocation()
 	setPkgVersion()
+	setApiPackages()
 	setGoFiles()
 	Ldflags = `-X "` + PACKAGE + `/pkg/version.Version=` + VersionNumber + `" -X "main.Tags=` + Tags + `"`
 }
@@ -311,25 +294,6 @@ func moveFile(src, dst string) error {
 	return nil
 }
 
-func appendToFile(filename, content string) error {
-	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	_, err = f.WriteString(content)
-	return err
-}
-
-const InfoColor = "\033[1;32m%s\033[0m"
-
-func printSuccess(text string, args ...interface{}) {
-	text = fmt.Sprintf(text, args...)
-	fmt.Printf(InfoColor+"\n", text)
-}
-
 // Formats the code using go fmt
 func Fmt() {
 	mg.Deps(initVars)
@@ -349,9 +313,8 @@ type Test mg.Namespace
 // Runs all tests except integration tests
 func (Test) Unit() {
 	mg.Deps(initVars)
-	setApiPackages()
 	// We run everything sequentially and not in parallel to prevent issues with real test databases
-	args := append([]string{"test", Goflags[0], "-p", "1", "-coverprofile", "cover.out", "-timeout", "45m"}, ApiPackages...)
+	args := append([]string{"test", Goflags[0], "-p", "1"}, ApiPackages...)
 	runAndStreamOutput("go", args...)
 }
 
@@ -366,7 +329,7 @@ func (Test) Coverage() {
 func (Test) Integration() {
 	mg.Deps(initVars)
 	// We run everything sequentially and not in parallel to prevent issues with real test databases
-	runAndStreamOutput("go", "test", Goflags[0], "-p", "1", "-timeout", "45m", PACKAGE+"/pkg/integrations")
+	runAndStreamOutput("go", "test", Goflags[0], "-p", "1", PACKAGE+"/pkg/integrations")
 }
 
 type Check mg.Namespace
@@ -405,7 +368,7 @@ func checkGolangCiLintInstalled() {
 	mg.Deps(initVars)
 	if err := exec.Command("golangci-lint").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {
 		fmt.Println("Please manually install golangci-lint by running")
-		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1")
+		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0")
 		os.Exit(1)
 	}
 }
@@ -420,7 +383,7 @@ func (Check) GolangciFix() {
 	runAndStreamOutput("golangci-lint", "run", "--fix")
 }
 
-// Runs golangci and the swagger test in parralel
+// Runs fmt-check, lint, got-swag, misspell-check, ineffasign-check, gocyclo-check, static-check, gosec-check, goconst-check all in parallel
 func (Check) All() {
 	mg.Deps(initVars)
 	mg.Deps(
@@ -449,9 +412,16 @@ func (Build) Clean() error {
 	return nil
 }
 
+// Generates static content into the final binary
+func (Build) Generate() {
+	mg.Deps(initVars)
+	runAndStreamOutput("go", "generate", PACKAGE+"/pkg/static")
+}
+
 // Builds a vikunja binary, ready to run
 func (Build) Build() {
 	mg.Deps(initVars)
+	mg.Deps(Build.Generate)
 	runAndStreamOutput("go", "build", Goflags[0], "-tags", Tags, "-ldflags", "-s -w "+Ldflags, "-o", Executable)
 }
 
@@ -460,7 +430,8 @@ type Release mg.Namespace
 // Runs all steps in the right order to create release packages for various platforms
 func (Release) Release(ctx context.Context) error {
 	mg.Deps(initVars)
-	mg.Deps(Release.Dirs)
+	mg.Deps(Build.Generate, Release.Dirs)
+	mg.Deps(Release.Windows, Release.Linux, Release.Darwin)
 
 	// Run compiling in parallel to speed it up
 	errs, _ := errgroup.WithContext(ctx)
@@ -543,21 +514,7 @@ func (Release) Linux() error {
 
 // Builds binaries for darwin
 func (Release) Darwin() error {
-	return runXgo("darwin-10.15/*")
-}
-
-func (Release) Xgo(target string) error {
-	parts := strings.Split(target, "/")
-	if len(parts) < 2 {
-		return fmt.Errorf("invalid target")
-	}
-
-	variant := ""
-	if len(parts) > 2 && parts[2] != "" {
-		variant = "-" + strings.ReplaceAll(parts[2], "v", "")
-	}
-
-	return runXgo(parts[0] + "/" + parts[1] + variant)
+	return runXgo("darwin/*")
 }
 
 // Compresses the built binaries in dist/binaries/ to reduce their filesize
@@ -572,9 +529,7 @@ func (Release) Compress(ctx context.Context) error {
 			return nil
 		}
 		// No mips or s390x for you today
-		if strings.Contains(info.Name(), "mips") ||
-			strings.Contains(info.Name(), "s390x") ||
-			strings.Contains(info.Name(), "riscv64") { // not supported by upx
+		if strings.Contains(info.Name(), "mips") || strings.Contains(info.Name(), "s390x") {
 			return nil
 		}
 
@@ -678,7 +633,7 @@ func (Release) Zip() error {
 
 		fmt.Printf("Zipping %s...\n", info.Name())
 
-		c := exec.Command("zip", "-r", RootPath+"/"+DIST+"/zip/"+info.Name()+".zip", ".", "-i", "*")
+		c := exec.Command("zip", "-r", RootPath+"/"+DIST+"/zip/"+info.Name(), ".", "-i", "*")
 		c.Dir = path
 		out, err := c.Output()
 		fmt.Print(string(out))
@@ -703,7 +658,7 @@ func (Release) Packages() error {
 	binpath := "nfpm"
 	err = exec.Command(binpath).Run()
 	if err != nil && strings.Contains(err.Error(), "executable file not found") {
-		binpath = "/usr/bin/nfpm"
+		binpath = "/nfpm"
 		err = exec.Command(binpath).Run()
 	}
 	if err != nil && strings.Contains(err.Error(), "executable file not found") {
@@ -712,16 +667,16 @@ func (Release) Packages() error {
 		os.Exit(1)
 	}
 
-	// Because nfpm does not support templating, we replace the values in the config file and restore it after running
+	// Because nfpm does not  support templating, we replace the values in the config file and restore it after running
 	nfpmConfigPath := RootPath + "/nfpm.yaml"
-	nfpmconfig, err := os.ReadFile(nfpmConfigPath)
+	nfpmconfig, err := ioutil.ReadFile(nfpmConfigPath)
 	if err != nil {
 		return err
 	}
 
 	fixedConfig := strings.ReplaceAll(string(nfpmconfig), "<version>", VersionNumber)
 	fixedConfig = strings.ReplaceAll(fixedConfig, "<binlocation>", BinLocation)
-	if err := os.WriteFile(nfpmConfigPath, []byte(fixedConfig), 0); err != nil {
+	if err := ioutil.WriteFile(nfpmConfigPath, []byte(fixedConfig), 0); err != nil {
 		return err
 	}
 
@@ -734,13 +689,13 @@ func (Release) Packages() error {
 	runAndStreamOutput(binpath, "pkg", "--packager", "rpm", "--target", releasePath)
 	runAndStreamOutput(binpath, "pkg", "--packager", "apk", "--target", releasePath)
 
-	return os.WriteFile(nfpmConfigPath, nfpmconfig, 0)
+	return ioutil.WriteFile(nfpmConfigPath, nfpmconfig, 0)
 }
 
 type Dev mg.Namespace
 
 // Creates a new bare db migration skeleton in pkg/migration with the current date
-func (Dev) MakeMigration() error {
+func (Dev) CreateMigration() error {
 
 	reader := bufio.NewReader(os.Stdin)
 	fmt.Print("Enter the name of the struct: ")
@@ -750,7 +705,7 @@ func (Dev) MakeMigration() error {
 	date := time.Now().Format("20060102150405")
 
 	migration := `// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -792,175 +747,14 @@ func init() {
 	})
 }
 `
-	filename := "/pkg/migration/" + date + ".go"
-	f, err := os.Create(RootPath + filename)
+	f, err := os.Create(RootPath + "/pkg/migration/" + date + ".go")
 	defer f.Close()
 	if err != nil {
 		return err
 	}
 
-	if _, err := f.WriteString(migration); err != nil {
-		return err
-	}
-
-	printSuccess("Migration has been created at %s!", filename)
-
-	return nil
-}
-
-// Create a new event. Takes the name of the event as the first argument and the module where the event should be created as the second argument. Events will be appended to the pkg/<module>/events.go file.
-func (Dev) MakeEvent(name, module string) error {
-
-	name = strcase.ToCamel(name)
-
-	if !strings.HasSuffix(name, "Event") {
-		name += "Event"
-	}
-
-	eventName := strings.ReplaceAll(strcase.ToDelimited(name, '.'), ".event", "")
-
-	newEventCode := `
-// ` + name + ` represents a ` + name + ` event
-type ` + name + ` struct {
-}
-
-// Name defines the name for ` + name + `
-func (t *` + name + `) Name() string {
-	return "` + eventName + `"
-}
-`
-	filename := "./pkg/" + module + "/events.go"
-	if err := appendToFile(filename, newEventCode); err != nil {
-		return err
-	}
-
-	printSuccess("The new event has been created successfully! Head over to %s and adjust its content.", filename)
-
-	return nil
-}
-
-// Create a new listener for an event. Takes the name of the listener, the name of the event to listen to and the module where everything should be placed as parameters.
-func (Dev) MakeListener(name, event, module string) error {
-	name = strcase.ToCamel(name)
-	listenerName := strcase.ToDelimited(name, '.')
-	listenerCode := `
-// ` + name + `  represents a listener
-type ` + name + ` struct {
-}
-
-// Name defines the name for the ` + name + ` listener
-func (s *` + name + `) Name() string {
-	return "` + listenerName + `"
-}
-
-// Handle is executed when the event ` + name + ` listens on is fired
-func (s *` + name + `) Handle(msg *message.Message) (err error) {
-	event := &` + event + `{}
-	err = json.Unmarshal(msg.Payload, event)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-`
-	filename := "./pkg/" + module + "/listeners.go"
-
-	//////
-	// Register the listener
-
-	file, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-
-	scanner := bufio.NewScanner(file)
-	var idx int64 = 0
-	for scanner.Scan() {
-		if scanner.Text() == "}" {
-			//idx -= int64(len(scanner.Text()))
-			break
-		}
-		idx += int64(len(scanner.Bytes()) + 1)
-	}
-	file.Close()
-
-	registerListenerCode := `	events.RegisterListener((&` + event + `{}).Name(), &` + name + `{})
-`
-
-	f, err := os.OpenFile(filename, os.O_RDWR, 0600)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	if _, err := f.Seek(idx, 0); err != nil {
-		return err
-	}
-	remainder, err := io.ReadAll(f)
-	if err != nil {
-		return err
-	}
-	f.Seek(idx, 0)
-	f.Write([]byte(registerListenerCode))
-	f.Write(remainder)
-
-	///////
-	// Append the listener code
-	if err := appendToFile(filename, listenerCode); err != nil {
-		return err
-	}
-
-	printSuccess("The new listener has been created successfully! Head over to %s and adjust its content.", filename)
-
-	return nil
-}
-
-// Create a new notification. Takes the name of the notification as the first argument and the module where the notification should be created as the second argument. Notifications will be appended to the pkg/<module>/notifications.go file.
-func (Dev) MakeNotification(name, module string) error {
-
-	name = strcase.ToCamel(name)
-
-	if !strings.HasSuffix(name, "Notification") {
-		name += "Notification"
-	}
-
-	notficationName := strings.ReplaceAll(strcase.ToDelimited(name, '.'), ".notification", "")
-
-	newNotificationCode := `
-// ` + name + ` represents a ` + name + ` notification
-type ` + name + ` struct {
-}
-
-// ToMail returns the mail notification for ` + name + `
-func (n *` + name + `) ToMail() *notifications.Mail {
-	return notifications.NewMail().
-		Subject("").
-		Greeting("Hi ").
-		Line("").
-		Action("", "")
-}
-
-// ToDB returns the ` + name + ` notification in a format which can be saved in the db
-func (n *` + name + `) ToDB() interface{} {
-	return nil
-}
-
-// Name returns the name of the notification
-func (n *` + name + `) Name() string {
-	return "` + notficationName + `"
-}
-
-`
-	filename := "./pkg/" + module + "/notifications.go"
-	if err := appendToFile(filename, newNotificationCode); err != nil {
-		return err
-	}
-
-	printSuccess("The new notification has been created successfully! Head over to %s and adjust its content.", filename)
-
-	return nil
+	_, err = f.WriteString(migration)
+	return err
 }
 
 type configOption struct {
@@ -1021,20 +815,13 @@ func parseYamlConfigNode(node *yaml.Node) (config *configOption) {
 	return config
 }
 
-func printConfig(config []*configOption, level int, parent string) (rendered string) {
+func printConfig(config []*configOption, level int) (rendered string) {
 
 	// Keep track of what we already printed to prevent printing things twice
 	printed := make(map[string]bool)
 
 	for _, option := range config {
 
-		// FIXME: Not a good solution. Ideally this would work without the level check, but since generating config
-		// for more than two levels is currently broken anyway, I'll fix this after moving the config generation
-		// to a better format than yaml.
-		if level == 0 && option.key != "" {
-			parent = option.key
-		}
-
 		if option.key != "" {
 
 			// Filter out all config objects where the default value == key
@@ -1063,17 +850,12 @@ func printConfig(config []*configOption, level int, parent string) (rendered str
 				if option.defaultValue == "" {
 					rendered += "<empty>"
 				}
-				rendered += "`\n\n"
-
-				fullPath := parent + "." + option.key
-
-				rendered += "Full path: `" + fullPath + "`\n\n"
-				rendered += "Environment path: `VIKUNJA_" + strcase.ToScreamingSnake(strings.ToUpper(fullPath)) + "`\n\n"
+				rendered += "`\n"
 			}
 		}
 
 		printed[option.key] = true
-		rendered += "\n" + printConfig(option.children, level+1, parent)
+		rendered += "\n" + printConfig(option.children, level+1)
 	}
 
 	return
@@ -1084,10 +866,10 @@ const (
 	configInjectComment = `<!-- Generated config will be injected here -->`
 )
 
-// Generates the config docs from a commented config.yml.sample file in the repo root.
+// Generates the error docs from a commented config.yml.sample file in the repo root.
 func GenerateDocs() error {
 
-	config, err := os.ReadFile("config.yml.sample")
+	config, err := ioutil.ReadFile("config.yml.sample")
 	if err != nil {
 		return err
 	}
@@ -1107,7 +889,7 @@ func GenerateDocs() error {
 		}
 	}
 
-	renderedConfig := printConfig(conf, 0, "")
+	renderedConfig := printConfig(conf, 0)
 
 	// Rebuild the config
 	file, err := os.OpenFile(configDocPath, os.O_RDWR, 0)
@@ -1137,7 +919,7 @@ func GenerateDocs() error {
 
 	// We write the full file to prevent old content leftovers at the end
 	// I know, there are probably better ways to do this.
-	if err := os.WriteFile(configDocPath, []byte(fullConfig), 0); err != nil {
+	if err := ioutil.WriteFile(configDocPath, []byte(fullConfig), 0); err != nil {
 		return err
 	}
 

main.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

nfpm.yaml

@@ -8,8 +8,6 @@ homepage: "https://vikunja.io"
 section: "default"
 priority: "extra"
 license: "AGPLv3"
-depends:
-  - systemd
 contents:
   - src: <binlocation>
     dst: /opt/vikunja/vikunja
@@ -19,7 +17,5 @@ contents:
   - src: /opt/vikunja/vikunja
     dst: /usr/local/bin/vikunja
     type: "symlink"
-  - src: vikunja.service
-    dst: /usr/lib/systemd/system/vikunja.service
 scripts:
   postinstall: ./build/after-install.sh

pkg/caldav/caldav.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -17,13 +17,13 @@
 package caldav
 
 import (
+	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
-	"code.vikunja.io/api/pkg/models"
-
+	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 )
@@ -31,6 +31,19 @@ import (
 // DateFormat is the caldav date format
 const DateFormat = `20060102T150405`
 
+// Event holds a single caldav event
+type Event struct {
+	Summary     string
+	Description string
+	UID         string
+	Alarms      []Alarm
+	Color       string
+
+	Timestamp time.Time
+	Start     time.Time
+	End       time.Time
+}
+
 // Todo holds a single VTODO
 type Todo struct {
 	// Required
@@ -45,14 +58,11 @@ type Todo struct {
 	Priority     int64 // 0-9, 1 is highest
 	RelatedToUID string
 	Color        string
-	Categories   []string
-	Start        time.Time
-	End          time.Time
-	DueDate      time.Time
-	Duration     time.Duration
-	RepeatAfter  int64
-	RepeatMode   models.TaskRepeatMode
-	Alarms       []Alarm
+
+	Start    time.Time
+	End      time.Time
+	DueDate  time.Time
+	Duration time.Duration
 
 	Created time.Time
 	Updated time.Time // last-mod
@@ -61,8 +71,6 @@ type Todo struct {
 // Alarm holds infos about an alarm from a caldav event
 type Alarm struct {
 	Time        time.Time
-	Duration    time.Duration
-	RelativeTo  models.ReminderRelation
 	Description string
 }
 
@@ -90,13 +98,56 @@ X-OUTLOOK-COLOR:` + color + `
 X-FUNAMBOL-COLOR:` + color
 }
 
-func formatDuration(duration time.Duration) string {
-	seconds := duration.Seconds() - duration.Minutes()*60
-	minutes := duration.Minutes() - duration.Hours()*60
+// ParseEvents parses an array of caldav events and gives them back as string
+func ParseEvents(config *Config, events []*Event) (caldavevents string) {
+	caldavevents += `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:` + config.Name + `
+PRODID:-//` + config.ProdID + `//EN` + getCaldavColor(config.Color)
 
-	return strconv.FormatFloat(duration.Hours(), 'f', 0, 64) + `H` +
-		strconv.FormatFloat(minutes, 'f', 0, 64) + `M` +
-		strconv.FormatFloat(seconds, 'f', 0, 64) + `S`
+	for _, e := range events {
+
+		if e.UID == "" {
+			e.UID = makeCalDavTimeFromTimeStamp(e.Timestamp) + utils.Sha256(e.Summary)
+		}
+
+		formattedDescription := ""
+		if e.Description != "" {
+			re := regexp.MustCompile(`\r?\n`)
+			formattedDescription = re.ReplaceAllString(e.Description, "\\n")
+		}
+
+		caldavevents += `
+BEGIN:VEVENT
+UID:` + e.UID + `
+SUMMARY:` + e.Summary + getCaldavColor(e.Color) + `
+DESCRIPTION:` + formattedDescription + `
+DTSTAMP:` + makeCalDavTimeFromTimeStamp(e.Timestamp) + `
+DTSTART:` + makeCalDavTimeFromTimeStamp(e.Start) + `
+DTEND:` + makeCalDavTimeFromTimeStamp(e.End)
+
+		for _, a := range e.Alarms {
+			if a.Description == "" {
+				a.Description = e.Summary
+			}
+
+			caldavevents += `
+BEGIN:VALARM
+TRIGGER:` + calcAlarmDateFromReminder(e.Start, a.Time) + `
+ACTION:DISPLAY
+DESCRIPTION:` + a.Description + `
+END:VALARM`
+		}
+		caldavevents += `
+END:VEVENT`
+	}
+
+	caldavevents += `
+END:VCALENDAR` // Need a line break
+
+	return
 }
 
 // ParseTodos returns a caldav vcalendar string with todos
@@ -121,15 +172,11 @@ SUMMARY:` + t.Summary + getCaldavColor(t.Color)
 
 		if t.Start.Unix() > 0 {
 			caldavtodos += `
-DTSTART:` + makeCalDavTimeFromTimeStamp(t.Start)
-			if t.Duration != 0 && t.DueDate.Unix() == 0 {
-				caldavtodos += `
-DURATION:PT` + formatDuration(t.Duration)
-			}
+DTSTART: ` + makeCalDavTimeFromTimeStamp(t.Start)
 		}
 		if t.End.Unix() > 0 {
 			caldavtodos += `
-DTEND:` + makeCalDavTimeFromTimeStamp(t.End)
+DTEND: ` + makeCalDavTimeFromTimeStamp(t.End)
 		}
 		if t.Description != "" {
 			re := regexp.MustCompile(`\r?\n`)
@@ -162,29 +209,19 @@ DUE:` + makeCalDavTimeFromTimeStamp(t.DueDate)
 CREATED:` + makeCalDavTimeFromTimeStamp(t.Created)
 		}
 
+		if t.Duration != 0 {
+			caldavtodos += `
+DURATION:PT` + fmt.Sprintf("%.6f", t.Duration.Hours()) + `H` + fmt.Sprintf("%.6f", t.Duration.Minutes()) + `M` + fmt.Sprintf("%.6f", t.Duration.Seconds()) + `S`
+		}
+
 		if t.Priority != 0 {
 			caldavtodos += `
-PRIORITY:` + strconv.Itoa(mapPriorityToCaldav(t.Priority))
-		}
-
-		if t.RepeatAfter > 0 || t.RepeatMode == models.TaskRepeatModeMonth {
-			if t.RepeatMode == models.TaskRepeatModeMonth {
-				caldavtodos += `
-RRULE:FREQ=MONTHLY;BYMONTHDAY=` + t.DueDate.Format("02") // Day of the month
-			} else {
-				caldavtodos += `
-RRULE:FREQ=SECONDLY;INTERVAL=` + strconv.FormatInt(t.RepeatAfter, 10)
-			}
-		}
-
-		if len(t.Categories) > 0 {
-			caldavtodos += `
-CATEGORIES:` + strings.Join(t.Categories, ",")
+PRIORITY:` + strconv.Itoa(int(t.Priority))
 		}
 
 		caldavtodos += `
 LAST-MODIFIED:` + makeCalDavTimeFromTimeStamp(t.Updated)
-		caldavtodos += ParseAlarms(t.Alarms, t.Summary)
+
 		caldavtodos += `
 END:VTODO`
 	}
@@ -195,42 +232,19 @@ END:VCALENDAR` // Need a line break
 	return
 }
 
-func ParseAlarms(alarms []Alarm, taskDescription string) (caldavalarms string) {
-	for _, a := range alarms {
-		if a.Description == "" {
-			a.Description = taskDescription
-		}
-
-		caldavalarms += `
-BEGIN:VALARM`
-		switch a.RelativeTo {
-		case models.ReminderRelationStartDate:
-			caldavalarms += `
-TRIGGER;RELATED=START:` + makeCalDavDuration(a.Duration)
-		case models.ReminderRelationEndDate, models.ReminderRelationDueDate:
-			caldavalarms += `
-TRIGGER;RELATED=END:` + makeCalDavDuration(a.Duration)
-		default:
-			caldavalarms += `
-TRIGGER;VALUE=DATE-TIME:` + makeCalDavTimeFromTimeStamp(a.Time)
-		}
-		caldavalarms += `
-ACTION:DISPLAY
-DESCRIPTION:` + a.Description + `
-END:VALARM`
-	}
-	return caldavalarms
-}
-
 func makeCalDavTimeFromTimeStamp(ts time.Time) (caldavtime string) {
-	return ts.In(time.UTC).Format(DateFormat) + "Z"
+	return ts.In(config.GetTimeZone()).Format(DateFormat)
 }
 
-func makeCalDavDuration(duration time.Duration) (caldavtime string) {
-	if duration < 0 {
-		duration = duration.Abs()
-		caldavtime = "-"
+func calcAlarmDateFromReminder(eventStart, reminder time.Time) (alarmTime string) {
+	diff := reminder.Sub(eventStart)
+	diffStr := strings.ToUpper(diff.String())
+	if diff < 0 {
+		alarmTime += `-`
+		// We append the - at the beginning of the caldav flag, that would get in the way if the minutes
+		// themselves are also containing it
+		diffStr = diffStr[1:]
 	}
-	caldavtime += "PT" + strings.ToUpper(duration.Truncate(time.Millisecond).String())
+	alarmTime += `PT` + diffStr
 	return
 }

pkg/caldav/caldav_test.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -20,12 +20,279 @@ import (
 	"testing"
 	"time"
 
-	"code.vikunja.io/api/pkg/models"
-
 	"code.vikunja.io/api/pkg/config"
 	"github.com/stretchr/testify/assert"
 )
 
+func TestParseEvents(t *testing.T) {
+	type args struct {
+		config *Config
+		events []*Event
+	}
+	tests := []struct {
+		name             string
+		args             args
+		wantCaldavevents string
+	}{
+		{
+			name: "Test caldavparsing without reminders",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+					Color:  "ffffff",
+				},
+				events: []*Event{
+					{
+						Summary:     "Event #1",
+						Description: "Lorem Ipsum",
+						UID:         "randommduid",
+						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
+						Color:       "affffe",
+					},
+					{
+						Summary:   "Event #2",
+						UID:       "randommduidd",
+						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
+						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
+						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
+					},
+					{
+						Summary:   "Event #3 with empty uid",
+						UID:       "20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83",
+						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
+						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
+						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
+					},
+				},
+			},
+			wantCaldavevents: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+X-APPLE-CALENDAR-COLOR:#ffffffFF
+X-OUTLOOK-COLOR:#ffffffFF
+X-FUNAMBOL-COLOR:#ffffffFF
+BEGIN:VEVENT
+UID:randommduid
+SUMMARY:Event #1
+X-APPLE-CALENDAR-COLOR:#affffeFF
+X-OUTLOOK-COLOR:#affffeFF
+X-FUNAMBOL-COLOR:#affffeFF
+DESCRIPTION:Lorem Ipsum
+DTSTAMP:20181201T011204
+DTSTART:20181201T011204
+DTEND:20181201T013024
+END:VEVENT
+BEGIN:VEVENT
+UID:randommduidd
+SUMMARY:Event #2
+DESCRIPTION:
+DTSTAMP:20181202T045844
+DTSTART:20181202T045844
+DTEND:20181202T081844
+END:VEVENT
+BEGIN:VEVENT
+UID:20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
+SUMMARY:Event #3 with empty uid
+DESCRIPTION:
+DTSTAMP:20181202T050024
+DTSTART:20181202T050024
+DTEND:20181202T050320
+END:VEVENT
+END:VCALENDAR`,
+		},
+		{
+			name: "Test caldavparsing with reminders",
+			args: args{
+				config: &Config{
+					Name:   "test2",
+					ProdID: "RandomProdID which is not random",
+				},
+				events: []*Event{
+					{
+						Summary:     "Event #1",
+						Description: "Lorem Ipsum",
+						UID:         "randommduid",
+						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
+						Alarms: []Alarm{
+							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626024, 0)},
+						},
+					},
+					{
+						Summary:   "Event #2",
+						UID:       "randommduidd",
+						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
+						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
+						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
+						Alarms: []Alarm{
+							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
+						},
+					},
+					{
+						Summary:   "Event #3 with empty uid",
+						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
+						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
+						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
+						Alarms: []Alarm{
+							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
+							{Time: time.Unix(1543826824, 0).In(config.GetTimeZone())},
+						},
+					},
+					{
+						Summary:   "Event #4 without any",
+						Timestamp: time.Unix(1543726824, 0),
+						Start:     time.Unix(1543726824, 0),
+						End:       time.Unix(1543727000, 0),
+					},
+				},
+			},
+			wantCaldavevents: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test2
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VEVENT
+UID:randommduid
+SUMMARY:Event #1
+DESCRIPTION:Lorem Ipsum
+DTSTAMP:20181201T011204
+DTSTART:20181201T011204
+DTEND:20181201T013024
+BEGIN:VALARM
+TRIGGER:-PT3M20S
+ACTION:DISPLAY
+DESCRIPTION:Event #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT8M20S
+ACTION:DISPLAY
+DESCRIPTION:Event #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT11M40S
+ACTION:DISPLAY
+DESCRIPTION:Event #1
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:randommduidd
+SUMMARY:Event #2
+DESCRIPTION:
+DTSTAMP:20181202T045844
+DTSTART:20181202T045844
+DTEND:20181202T081844
+BEGIN:VALARM
+TRIGGER:-PT27H50M0S
+ACTION:DISPLAY
+DESCRIPTION:Event #2
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT27H55M0S
+ACTION:DISPLAY
+DESCRIPTION:Event #2
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT27H58M20S
+ACTION:DISPLAY
+DESCRIPTION:Event #2
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:20181202T0500242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
+SUMMARY:Event #3 with empty uid
+DESCRIPTION:
+DTSTAMP:20181202T050024
+DTSTART:20181202T050024
+DTEND:20181202T050320
+BEGIN:VALARM
+TRIGGER:-PT27H51M40S
+ACTION:DISPLAY
+DESCRIPTION:Event #3 with empty uid
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT27H56M40S
+ACTION:DISPLAY
+DESCRIPTION:Event #3 with empty uid
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT28H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Event #3 with empty uid
+END:VALARM
+BEGIN:VALARM
+TRIGGER:PT27H46M40S
+ACTION:DISPLAY
+DESCRIPTION:Event #3 with empty uid
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:20181202T050024ae7548ce9556df85038abe90dc674d4741a61ce74d1cf
+SUMMARY:Event #4 without any
+DESCRIPTION:
+DTSTAMP:20181202T050024
+DTSTART:20181202T050024
+DTEND:20181202T050320
+END:VEVENT
+END:VCALENDAR`,
+		},
+		{
+			name: "Test caldavparsing with multiline description",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+				},
+				events: []*Event{
+					{
+						Summary: "Event #1",
+						Description: `Lorem Ipsum
+Dolor sit amet`,
+						UID:       "randommduid",
+						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Start:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						End:       time.Unix(1543627824, 0).In(config.GetTimeZone()),
+					},
+				},
+			},
+			wantCaldavevents: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VEVENT
+UID:randommduid
+SUMMARY:Event #1
+DESCRIPTION:Lorem Ipsum\nDolor sit amet
+DTSTAMP:20181201T011204
+DTSTART:20181201T011204
+DTEND:20181201T013024
+END:VEVENT
+END:VCALENDAR`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotCaldavevents := ParseEvents(tt.args.config, tt.args.events)
+			assert.Equal(t, gotCaldavevents, tt.wantCaldavevents)
+		})
+	}
+}
+
 func TestParseTodos(t *testing.T) {
 	type args struct {
 		config *Config
@@ -66,13 +333,13 @@ X-OUTLOOK-COLOR:#ffffffFF
 X-FUNAMBOL-COLOR:#ffffffFF
 BEGIN:VTODO
 UID:randommduid
-DTSTAMP:20181201T011204Z
+DTSTAMP:20181201T011204
 SUMMARY:Todo #1
 X-APPLE-CALENDAR-COLOR:#affffeFF
 X-OUTLOOK-COLOR:#affffeFF
 X-FUNAMBOL-COLOR:#affffeFF
 DESCRIPTION:Lorem Ipsum\nDolor sit amet
-LAST-MODIFIED:00010101T000000Z
+LAST-MODIFIED:00010101T000000
 END:VTODO
 END:VCALENDAR`,
 		},
@@ -101,230 +368,12 @@ X-WR-CALNAME:test
 PRODID:-//RandomProdID which is not random//EN
 BEGIN:VTODO
 UID:randommduid
-DTSTAMP:20181201T011204Z
+DTSTAMP:20181201T011204
 SUMMARY:Todo #1
 DESCRIPTION:Lorem Ipsum
-COMPLETED:20181201T013024Z
+COMPLETED:20181201T013024
 STATUS:COMPLETED
-LAST-MODIFIED:00010101T000000Z
-END:VTODO
-END:VCALENDAR`,
-		},
-		{
-			name: "with priority",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				todos: []*Todo{
-					{
-						Summary:     "Todo #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Priority:    1,
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavtasks: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randommduid
-DTSTAMP:20181201T011204Z
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-PRIORITY:9
-LAST-MODIFIED:00010101T000000Z
-END:VTODO
-END:VCALENDAR`,
-		},
-		{
-			name: "with repeating monthly",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				todos: []*Todo{
-					{
-						Summary:     "Todo #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						RepeatMode:  models.TaskRepeatModeMonth,
-						DueDate:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavtasks: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randommduid
-DTSTAMP:20181201T011204Z
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-DUE:20181201T011204Z
-RRULE:FREQ=MONTHLY;BYMONTHDAY=01
-LAST-MODIFIED:00010101T000000Z
-END:VTODO
-END:VCALENDAR`,
-		},
-		{
-			name: "with repeat mode default",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				todos: []*Todo{
-					{
-						Summary:     "Todo #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						RepeatMode:  models.TaskRepeatModeDefault,
-						DueDate:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						RepeatAfter: 435,
-					},
-				},
-			},
-			wantCaldavtasks: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randommduid
-DTSTAMP:20181201T011204Z
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-DUE:20181201T011204Z
-RRULE:FREQ=SECONDLY;INTERVAL=435
-LAST-MODIFIED:00010101T000000Z
-END:VTODO
-END:VCALENDAR`,
-		},
-		{
-			name: "with categories",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-					Color:  "ffffff",
-				},
-				todos: []*Todo{
-					{
-						Summary:    "Todo #1",
-						UID:        "randommduid",
-						Timestamp:  time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Color:      "affffe",
-						Categories: []string{"label1", "label2"},
-					},
-				},
-			},
-			wantCaldavtasks: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-X-APPLE-CALENDAR-COLOR:#ffffffFF
-X-OUTLOOK-COLOR:#ffffffFF
-X-FUNAMBOL-COLOR:#ffffffFF
-BEGIN:VTODO
-UID:randommduid
-DTSTAMP:20181201T011204Z
-SUMMARY:Todo #1
-X-APPLE-CALENDAR-COLOR:#affffeFF
-X-OUTLOOK-COLOR:#affffeFF
-X-FUNAMBOL-COLOR:#affffeFF
-CATEGORIES:label1,label2
-LAST-MODIFIED:00010101T000000Z
-END:VTODO
-END:VCALENDAR`,
-		},
-		{
-			name: "with alarm",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				todos: []*Todo{
-					{
-						Summary:   "Todo #1",
-						UID:       "randommduid",
-						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{
-								Time: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-							},
-							{
-								Time:        time.Unix(1543626724, 0).In(config.GetTimeZone()),
-								Description: "alarm description",
-							},
-							{
-								Duration:   -2 * time.Hour,
-								RelativeTo: "due_date",
-							},
-							{
-								Duration:   1 * time.Hour,
-								RelativeTo: "start_date",
-							},
-							{
-								Duration:   time.Duration(0),
-								RelativeTo: "end_date",
-							},
-						},
-					},
-				},
-			},
-			wantCaldavtasks: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randommduid
-DTSTAMP:20181201T011204Z
-SUMMARY:Todo #1
-LAST-MODIFIED:00010101T000000Z
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20181201T011204Z
-ACTION:DISPLAY
-DESCRIPTION:Todo #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20181201T011204Z
-ACTION:DISPLAY
-DESCRIPTION:alarm description
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=END:-PT2H0M0S
-ACTION:DISPLAY
-DESCRIPTION:Todo #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=START:PT1H0M0S
-ACTION:DISPLAY
-DESCRIPTION:Todo #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=END:PT0S
-ACTION:DISPLAY
-DESCRIPTION:Todo #1
-END:VALARM
+LAST-MODIFIED:00010101T000000
 END:VTODO
 END:VCALENDAR`,
 		},
@@ -332,7 +381,7 @@ END:VCALENDAR`,
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			gotCaldavtasks := ParseTodos(tt.args.config, tt.args.todos)
-			assert.Equal(t, tt.wantCaldavtasks, gotCaldavtasks)
+			assert.Equal(t, gotCaldavtasks, tt.wantCaldavtasks)
 		})
 	}
 }

pkg/caldav/parsing.go

@@ -1,242 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public Licensee as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public Licensee for more details.
-//
-// You should have received a copy of the GNU Affero General Public Licensee
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package caldav
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-	"time"
-
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/api/pkg/utils"
-
-	ics "github.com/arran4/golang-ical"
-)
-
-func GetCaldavTodosForTasks(project *models.ProjectWithTasksAndBuckets, projectTasks []*models.TaskWithComments) string {
-
-	// Make caldav todos from Vikunja todos
-	var caldavtodos []*Todo
-	for _, t := range projectTasks {
-
-		duration := t.EndDate.Sub(t.StartDate)
-		var categories []string
-		for _, label := range t.Labels {
-			categories = append(categories, label.Title)
-		}
-		var alarms []Alarm
-		for _, reminder := range t.Reminders {
-			alarms = append(alarms, Alarm{
-				Time:       reminder.Reminder,
-				Duration:   time.Duration(reminder.RelativePeriod) * time.Second,
-				RelativeTo: reminder.RelativeTo,
-			})
-		}
-
-		caldavtodos = append(caldavtodos, &Todo{
-			Timestamp:   t.Updated,
-			UID:         t.UID,
-			Summary:     t.Title,
-			Description: t.Description,
-			Completed:   t.DoneAt,
-			// Organizer:     &t.CreatedBy, // Disabled until we figure out how this works
-			Categories:  categories,
-			Priority:    t.Priority,
-			Start:       t.StartDate,
-			End:         t.EndDate,
-			Created:     t.Created,
-			Updated:     t.Updated,
-			DueDate:     t.DueDate,
-			Duration:    duration,
-			RepeatAfter: t.RepeatAfter,
-			RepeatMode:  t.RepeatMode,
-			Alarms:      alarms,
-		})
-	}
-
-	caldavConfig := &Config{
-		Name:   project.Title,
-		ProdID: "Vikunja Todo App",
-	}
-
-	return ParseTodos(caldavConfig, caldavtodos)
-}
-
-func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
-	parsed, err := ics.ParseCalendar(strings.NewReader(content))
-	if err != nil {
-		return nil, err
-	}
-	vTodo, ok := parsed.Components[0].(*ics.VTodo)
-	if !ok {
-		return nil, errors.New("VTODO element not found")
-	}
-	// We put the vTodo details in a map to be able to handle them more easily
-	task := make(map[string]ics.IANAProperty)
-	for _, c := range vTodo.UnknownPropertiesIANAProperties() {
-		task[c.IANAToken] = c
-	}
-
-	// Parse the priority
-	var priority int64
-	if _, ok := task["PRIORITY"]; ok {
-		priorityParsed, err := strconv.ParseInt(task["PRIORITY"].Value, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		priority = parseVTODOPriority(priorityParsed)
-	}
-
-	// Parse the enddate
-	duration, _ := time.ParseDuration(task["DURATION"].Value)
-
-	description := strings.ReplaceAll(task["DESCRIPTION"].Value, "\\,", ",")
-	description = strings.ReplaceAll(description, "\\n", "\n")
-
-	var labels []*models.Label
-	if val, ok := task["CATEGORIES"]; ok {
-		categories := strings.Split(val.Value, ",")
-		labels = make([]*models.Label, 0, len(categories))
-		for _, category := range categories {
-			labels = append(labels, &models.Label{
-				Title: category,
-			})
-		}
-	}
-
-	vTask = &models.Task{
-		UID:         task["UID"].Value,
-		Title:       task["SUMMARY"].Value,
-		Description: description,
-		Priority:    priority,
-		Labels:      labels,
-		DueDate:     caldavTimeToTimestamp(task["DUE"]),
-		Updated:     caldavTimeToTimestamp(task["DTSTAMP"]),
-		StartDate:   caldavTimeToTimestamp(task["DTSTART"]),
-		DoneAt:      caldavTimeToTimestamp(task["COMPLETED"]),
-	}
-
-	if task["STATUS"].Value == "COMPLETED" {
-		vTask.Done = true
-	}
-
-	if duration > 0 && !vTask.StartDate.IsZero() {
-		vTask.EndDate = vTask.StartDate.Add(duration)
-	}
-
-	for _, vAlarm := range vTodo.SubComponents() {
-		if vAlarm, ok := vAlarm.(*ics.VAlarm); ok {
-			vTask = parseVAlarm(vAlarm, vTask)
-		}
-	}
-
-	return
-}
-
-func parseVAlarm(vAlarm *ics.VAlarm, vTask *models.Task) *models.Task {
-	for _, property := range vAlarm.UnknownPropertiesIANAProperties() {
-		if property.IANAToken != "TRIGGER" {
-			continue
-		}
-
-		if contains(property.ICalParameters["VALUE"], "DATE-TIME") {
-			// Example: TRIGGER;VALUE=DATE-TIME:20181201T011210Z
-			vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
-				Reminder: caldavTimeToTimestamp(property),
-			})
-			continue
-		}
-
-		duration := utils.ParseISO8601Duration(property.Value)
-
-		if contains(property.ICalParameters["RELATED"], "END") {
-			// Example: TRIGGER;RELATED=END:-P2D
-			if vTask.EndDate.IsZero() {
-				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
-					RelativePeriod: int64(duration.Seconds()),
-					RelativeTo:     models.ReminderRelationDueDate})
-			} else {
-				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
-					RelativePeriod: int64(duration.Seconds()),
-					RelativeTo:     models.ReminderRelationEndDate})
-			}
-			continue
-		}
-
-		// Example: TRIGGER;RELATED=START:-P2D
-		// Example: TRIGGER:-PT60M
-		vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
-			RelativePeriod: int64(duration.Seconds()),
-			RelativeTo:     models.ReminderRelationStartDate})
-	}
-	return vTask
-}
-
-func contains(array []string, str string) bool {
-	for _, value := range array {
-		if value == str {
-			return true
-		}
-	}
-	return false
-}
-
-// https://tools.ietf.org/html/rfc5545#section-3.3.5
-func caldavTimeToTimestamp(ianaProperty ics.IANAProperty) time.Time {
-	tstring := ianaProperty.Value
-	if tstring == "" {
-		return time.Time{}
-	}
-
-	format := DateFormat
-
-	if strings.HasSuffix(tstring, "Z") {
-		format = `20060102T150405Z`
-	}
-
-	if len(tstring) == 8 {
-		format = `20060102`
-	}
-
-	var t time.Time
-	var err error
-	tzParameter := ianaProperty.ICalParameters["TZID"]
-	if len(tzParameter) > 0 {
-		loc, err := time.LoadLocation(tzParameter[0])
-		if err != nil {
-			log.Warningf("Error while parsing caldav timezone %s: %s", tzParameter[0], err)
-		} else {
-			t, err = time.ParseInLocation(format, tstring, loc)
-			if err != nil {
-				log.Warningf("Error while parsing caldav time %s to TimeStamp: %s at location %s", tstring, loc, err)
-			} else {
-				t = t.In(config.GetTimeZone())
-				return t
-			}
-		}
-	}
-	t, err = time.Parse(format, tstring)
-	if err != nil {
-		log.Warningf("Error while parsing caldav time %s to TimeStamp: %s", tstring, err)
-		return time.Time{}
-	}
-	return t
-}

pkg/caldav/parsing_test.go

@@ -1,406 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public Licensee as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public Licensee for more details.
-//
-// You should have received a copy of the GNU Affero General Public Licensee
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package caldav
-
-import (
-	"testing"
-	"time"
-
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/models"
-	"gopkg.in/d4l3k/messagediff.v1"
-)
-
-func TestParseTaskFromVTODO(t *testing.T) {
-	type args struct {
-		content string
-	}
-	tests := []struct {
-		name      string
-		args      args
-		wantVTask *models.Task
-		wantErr   bool
-	}{
-		{
-			name: "normal",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011204
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-LAST-MODIFIED:00010101T000000
-END:VTODO
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Title:       "Todo #1",
-				UID:         "randomuid",
-				Description: "Lorem Ipsum",
-				Updated:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-			},
-		},
-		{
-			name: "With priority",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011204
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-PRIORITY:9
-LAST-MODIFIED:00010101T000000
-END:VTODO
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Title:       "Todo #1",
-				UID:         "randomuid",
-				Description: "Lorem Ipsum",
-				Priority:    1,
-				Updated:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-			},
-		},
-		{
-			name: "With categories",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011204
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-CATEGORIES:cat1,cat2
-LAST-MODIFIED:00010101T000000
-END:VTODO
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Title:       "Todo #1",
-				UID:         "randomuid",
-				Description: "Lorem Ipsum",
-				Labels: []*models.Label{
-					{
-						Title: "cat1",
-					},
-					{
-						Title: "cat2",
-					},
-				},
-				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-			},
-		},
-		{
-			name: "With alarm (time trigger)",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011204
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20181201T011210Z
-ACTION:DISPLAY
-END:VALARM
-END:VTODO
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Title:       "Todo #1",
-				UID:         "randomuid",
-				Description: "Lorem Ipsum",
-				Reminders: []*models.TaskReminder{
-					{
-						Reminder: time.Date(2018, 12, 1, 1, 12, 10, 0, config.GetTimeZone()),
-					},
-				},
-				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-			},
-		},
-		{
-			name: "With alarm (relative trigger)",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011204
-SUMMARY:Todo #1
-DESCRIPTION:Lorem Ipsum
-DTSTART:20230228T170000Z
-DUE:20230304T150000Z
-BEGIN:VALARM
-TRIGGER:PT0S
-ACTION:DISPLAY
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-PT60M
-ACTION:DISPLAY
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT61M
-ACTION:DISPLAY
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=START:-P1D
-ACTION:DISPLAY
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=END:-PT30M
-ACTION:DISPLAY
-END:VALARM
-END:VTODO
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Title:       "Todo #1",
-				UID:         "randomuid",
-				Description: "Lorem Ipsum",
-				StartDate:   time.Date(2023, 2, 28, 17, 0, 0, 0, config.GetTimeZone()),
-				DueDate:     time.Date(2023, 3, 4, 15, 0, 0, 0, config.GetTimeZone()),
-				Reminders: []*models.TaskReminder{
-					{
-						RelativeTo:     models.ReminderRelationStartDate,
-						RelativePeriod: 0,
-					},
-					{
-						RelativeTo:     models.ReminderRelationStartDate,
-						RelativePeriod: -3600,
-					},
-					{
-						RelativeTo:     models.ReminderRelationStartDate,
-						RelativePeriod: -3660,
-					},
-					{
-						RelativeTo:     models.ReminderRelationStartDate,
-						RelativePeriod: -86400,
-					},
-					{
-						RelativeTo:     models.ReminderRelationDueDate,
-						RelativePeriod: -1800,
-					},
-				},
-				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-			},
-		},
-		{
-			name: "example task from tasks.org app",
-			args: args{content: `BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:+//IDN tasks.org//android-130102//EN
-BEGIN:VTODO
-DTSTAMP:20230402T074158Z
-UID:4290517349243274514
-CREATED:20230402T060451Z
-LAST-MODIFIED:20230402T074154Z
-SUMMARY:Test with tasks.org
-PRIORITY:9
-CATEGORIES:Vikunja
-X-APPLE-SORT-ORDER:697384109
-DUE;TZID=Europe/Berlin:20230402T170001
-DTSTART;TZID=Europe/Berlin:20230401T090000
-BEGIN:VALARM
-TRIGGER;RELATED=END:PT0S
-ACTION:DISPLAY
-DESCRIPTION:Default Tasks.org description
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20230402T100000Z
-ACTION:DISPLAY
-DESCRIPTION:Default Tasks.org description
-END:VALARM
-END:VTODO
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-LAST-MODIFIED:20220816T024022Z
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR`,
-			},
-			wantVTask: &models.Task{
-				Updated:  time.Date(2023, 4, 2, 7, 41, 58, 0, config.GetTimeZone()),
-				UID:      "4290517349243274514",
-				Title:    "Test with tasks.org",
-				Priority: 1,
-				Labels: []*models.Label{
-					{
-						Title: "Vikunja",
-					},
-				},
-				DueDate:   time.Date(2023, 4, 2, 15, 0, 1, 0, config.GetTimeZone()),
-				StartDate: time.Date(2023, 4, 1, 7, 0, 0, 0, config.GetTimeZone()),
-				Reminders: []*models.TaskReminder{
-					{
-						RelativeTo:     models.ReminderRelationDueDate,
-						RelativePeriod: 0,
-					},
-					{
-						Reminder: time.Date(2023, 4, 2, 10, 0, 0, 0, config.GetTimeZone()),
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseTaskFromVTODO(tt.args.content)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseTaskFromVTODO() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if diff, equal := messagediff.PrettyDiff(got, tt.wantVTask); !equal {
-				t.Errorf("ParseTaskFromVTODO()\n gotVTask = %v\n want %v\n diff = %s", got, tt.wantVTask, diff)
-			}
-		})
-	}
-}
-
-func TestGetCaldavTodosForTasks(t *testing.T) {
-	type args struct {
-		list  *models.ProjectWithTasksAndBuckets
-		tasks []*models.TaskWithComments
-	}
-	tests := []struct {
-		name       string
-		args       args
-		wantCaldav string
-	}{
-		{
-			name: "Format single Task as Caldav",
-			args: args{
-				list: &models.ProjectWithTasksAndBuckets{
-					Project: models.Project{
-						Title: "List title",
-					},
-				},
-				tasks: []*models.TaskWithComments{
-					{
-						Task: models.Task{
-							Title:       "Task 1",
-							UID:         "randomuid",
-							Description: "Description",
-							Priority:    3,
-							Created:     time.Unix(1543626721, 0).In(config.GetTimeZone()),
-							DueDate:     time.Unix(1543626722, 0).In(config.GetTimeZone()),
-							StartDate:   time.Unix(1543626723, 0).In(config.GetTimeZone()),
-							EndDate:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-							Updated:     time.Unix(1543626725, 0).In(config.GetTimeZone()),
-							DoneAt:      time.Unix(1543626726, 0).In(config.GetTimeZone()),
-							RepeatAfter: 86400,
-							Labels: []*models.Label{
-								{
-									ID:    1,
-									Title: "label1",
-								},
-								{
-									ID:    2,
-									Title: "label2",
-								},
-							},
-							Reminders: []*models.TaskReminder{
-								{
-									Reminder: time.Unix(1543626730, 0).In(config.GetTimeZone()),
-								},
-								{
-									Reminder:       time.Unix(1543626731, 0).In(config.GetTimeZone()),
-									RelativePeriod: -3600,
-									RelativeTo:     models.ReminderRelationDueDate,
-								},
-							},
-						},
-					},
-				},
-			},
-			wantCaldav: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:List title
-PRODID:-//Vikunja Todo App//EN
-BEGIN:VTODO
-UID:randomuid
-DTSTAMP:20181201T011205Z
-SUMMARY:Task 1
-DTSTART:20181201T011203Z
-DTEND:20181201T011204Z
-DESCRIPTION:Description
-COMPLETED:20181201T011206Z
-STATUS:COMPLETED
-DUE:20181201T011202Z
-CREATED:20181201T011201Z
-PRIORITY:3
-RRULE:FREQ=SECONDLY;INTERVAL=86400
-CATEGORIES:label1,label2
-LAST-MODIFIED:20181201T011205Z
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20181201T011210Z
-ACTION:DISPLAY
-DESCRIPTION:Task 1
-END:VALARM
-BEGIN:VALARM
-TRIGGER;RELATED=END:-PT1H0M0S
-ACTION:DISPLAY
-DESCRIPTION:Task 1
-END:VALARM
-END:VTODO
-END:VCALENDAR`,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := GetCaldavTodosForTasks(tt.args.list, tt.args.tasks)
-			if diff, equal := messagediff.PrettyDiff(got, tt.wantCaldav); !equal {
-				t.Errorf("GetCaldavTodosForTasks() gotVTask = %v, want %v, diff = %s", got, tt.wantCaldav, diff)
-			}
-		})
-	}
-}

pkg/caldav/priority.go

@@ -1,66 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public Licensee as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public Licensee for more details.
-//
-// You should have received a copy of the GNU Affero General Public Licensee
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package caldav
-
-// In caldav, priority values are an int from 0 to 9 where 1 is the highest priority and 9 the lowest. 0 is "unset".
-// Vikunja only has priorites from 0 to 5 where 0 is unset and 5 is the highest
-// See https://icalendar.org/iCalendar-RFC-5545/3-8-1-9-priority.html
-func mapPriorityToCaldav(priority int64) (caldavPriority int) {
-	switch priority {
-	case 0:
-		return 0
-	case 1: // Low
-		return 9
-	case 2: // Medium
-		return 5
-	case 3: // High
-		return 3
-	case 4: // Urgent
-		return 2
-	case 5: // DO NOW
-		return 1
-	}
-	return 0
-}
-
-// See mapPriorityToCaldav
-func parseVTODOPriority(priority int64) (vikunjaPriority int64) {
-	switch priority {
-	case 0:
-		return 0
-	case 1:
-		return 5
-	case 2:
-		return 4
-	case 3:
-		return 3
-	case 4:
-		return 3
-	case 5:
-		return 2
-	case 6:
-		return 1
-	case 7:
-		return 1
-	case 8:
-		return 1
-	case 9:
-		return 1
-	}
-
-	return 0
-}

pkg/caldav/priority_test.go

@@ -1,131 +0,0 @@
-// Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public Licensee as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public Licensee for more details.
-//
-// You should have received a copy of the GNU Affero General Public Licensee
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package caldav
-
-import "testing"
-
-func Test_parseVTODOPriority(t *testing.T) {
-	tests := []struct {
-		name     string
-		priority int64
-		want     int64
-	}{
-		{
-			name:     "unset",
-			priority: 0,
-			want:     0,
-		},
-		{
-			name:     "DO NOW",
-			priority: 1,
-			want:     5,
-		},
-		{
-			name:     "urgent",
-			priority: 2,
-			want:     4,
-		},
-		{
-			name:     "high 1",
-			priority: 3,
-			want:     3,
-		},
-		{
-			name:     "high 2",
-			priority: 4,
-			want:     3,
-		},
-		{
-			name:     "medium",
-			priority: 5,
-			want:     2,
-		},
-		{
-			name:     "low 1",
-			priority: 6,
-			want:     1,
-		},
-		{
-			name:     "low 2",
-			priority: 7,
-			want:     1,
-		},
-		{
-			name:     "low 3",
-			priority: 8,
-			want:     1,
-		},
-		{
-			name:     "low 4",
-			priority: 9,
-			want:     1,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if gotVikunjaPriority := parseVTODOPriority(tt.priority); gotVikunjaPriority != tt.want {
-				t.Errorf("parseVTODOPriority() = %v, want %v", gotVikunjaPriority, tt.want)
-			}
-		})
-	}
-}
-
-func Test_mapPriorityToCaldav(t *testing.T) {
-	tests := []struct {
-		name               string
-		priority           int64
-		wantCaldavPriority int
-	}{
-		{
-			name:               "unset",
-			priority:           0,
-			wantCaldavPriority: 0,
-		},
-		{
-			name:               "low",
-			priority:           1,
-			wantCaldavPriority: 9,
-		},
-		{
-			name:               "medium",
-			priority:           2,
-			wantCaldavPriority: 5,
-		},
-		{
-			name:               "high",
-			priority:           3,
-			wantCaldavPriority: 3,
-		},
-		{
-			name:               "urgent",
-			priority:           4,
-			wantCaldavPriority: 2,
-		},
-		{
-			name:               "DO NOW",
-			priority:           5,
-			wantCaldavPriority: 1,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if gotCaldavPriority := mapPriorityToCaldav(tt.priority); gotCaldavPriority != tt.wantCaldavPriority {
-				t.Errorf("mapPriorityToCaldav() = %v, want %v", gotCaldavPriority, tt.wantCaldavPriority)
-			}
-		})
-	}
-}

pkg/cmd/cmd.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/cmd/dump.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/cmd/migrate.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/cmd/restore.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/cmd/testmail.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -17,11 +17,9 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/mail"
-	"code.vikunja.io/api/pkg/notifications"
 	"github.com/spf13/cobra"
 )
 
@@ -41,20 +39,8 @@ var testmailCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Info("Sending testmail...")
-		message := notifications.NewMail().
-			From("Vikunja <"+config.MailerFromEmail.GetString()+">").
-			To(args[0]).
-			Subject("Test from Vikunja").
-			Line("This is a test mail!").
-			Line("If you received this, Vikunja is correctly set up to send emails.").
-			Action("Go to your instance", config.ServiceFrontendurl.GetString())
-
-		opts, err := notifications.RenderMail(message)
-		if err != nil {
-			log.Errorf("Error sending test mail: %s", err.Error())
-			return
-		}
-		if err := mail.SendTestMail(opts); err != nil {
+		email := args[0]
+		if err := mail.SendTestMail(email); err != nil {
 			log.Errorf("Error sending test mail: %s", err.Error())
 			return
 		}

pkg/cmd/user.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -17,15 +17,12 @@
 package cmd
 
 import (
-	"bufio"
 	"fmt"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/asaskevich/govalidator"
-
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
@@ -45,7 +42,6 @@ var (
 	userFlagResetPasswordDirectly bool
 	userFlagEnableUser            bool
 	userFlagDisableUser           bool
-	userFlagDeleteNow             bool
 )
 
 func init() {
@@ -70,10 +66,7 @@ func init() {
 	userChangeEnabledCmd.Flags().BoolVarP(&userFlagDisableUser, "disable", "d", false, "Disable the user.")
 	userChangeEnabledCmd.Flags().BoolVarP(&userFlagEnableUser, "enable", "e", false, "Enable the user.")
 
-	// User deletion flags
-	userDeleteCmd.Flags().BoolVarP(&userFlagDeleteNow, "now", "n", false, "If provided, deletes the user immediately instead of sending them an email first.")
-
-	userCmd.AddCommand(userProjectCmd, userCreateCmd, userUpdateCmd, userResetPasswordCmd, userChangeEnabledCmd, userDeleteCmd)
+	userCmd.AddCommand(userListCmd, userCreateCmd, userUpdateCmd, userResetPasswordCmd, userChangeEnabledCmd)
 	rootCmd.AddCommand(userCmd)
 }
 
@@ -105,7 +98,7 @@ func getUserFromArg(s *xorm.Session, arg string) *user.User {
 		log.Fatalf("Invalid user id: %s", err)
 	}
 
-	u, err := user.GetUserWithEmail(s, &user.User{ID: id})
+	u, err := user.GetUserByID(s, id)
 	if err != nil {
 		log.Fatalf("Could not get user: %s", err)
 	}
@@ -117,9 +110,9 @@ var userCmd = &cobra.Command{
 	Short: "Manage users locally through the cli.",
 }
 
-var userProjectCmd = &cobra.Command{
-	Use:   "project",
-	Short: "Shows a project of all users.",
+var userListCmd = &cobra.Command{
+	Use:   "list",
+	Short: "Shows a list of all users.",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		initialize.FullInit()
 	},
@@ -127,7 +120,7 @@ var userProjectCmd = &cobra.Command{
 		s := db.NewSession()
 		defer s.Close()
 
-		users, err := user.ProjectAllUsers(s)
+		users, err := user.ListUsers(s, "")
 		if err != nil {
 			_ = s.Rollback()
 			log.Fatalf("Error getting users: %s", err)
@@ -142,7 +135,7 @@ var userProjectCmd = &cobra.Command{
 			"ID",
 			"Username",
 			"Email",
-			"Status",
+			"Active",
 			"Created",
 			"Updated",
 		})
@@ -152,7 +145,7 @@ var userProjectCmd = &cobra.Command{
 				strconv.FormatInt(u.ID, 10),
 				u.Username,
 				u.Email,
-				u.Status.String(),
+				strconv.FormatBool(u.IsActive),
 				u.Created.Format(time.RFC3339),
 				u.Updated.Format(time.RFC3339),
 			})
@@ -177,11 +170,6 @@ var userCreateCmd = &cobra.Command{
 			Email:    userFlagEmail,
 			Password: getPasswordFromFlagOrInput(),
 		}
-
-		if !govalidator.IsEmail(userFlagEmail) {
-			log.Fatalf("Provided email is invalid.")
-		}
-
 		newUser, err := user.CreateUser(s, u)
 		if err != nil {
 			_ = s.Rollback()
@@ -225,7 +213,7 @@ var userUpdateCmd = &cobra.Command{
 			u.AvatarProvider = userFlagAvatar
 		}
 
-		_, err := user.UpdateUser(s, u, false)
+		_, err := user.UpdateUser(s, u)
 		if err != nil {
 			_ = s.Rollback()
 			log.Fatalf("Error updating the user: %s", err)
@@ -289,17 +277,13 @@ var userChangeEnabledCmd = &cobra.Command{
 		u := getUserFromArg(s, args[0])
 
 		if userFlagEnableUser {
-			u.Status = user.StatusActive
+			u.IsActive = true
 		} else if userFlagDisableUser {
-			u.Status = user.StatusDisabled
+			u.IsActive = false
 		} else {
-			if u.Status == user.StatusActive {
-				u.Status = user.StatusDisabled
-			} else {
-				u.Status = user.StatusActive
-			}
+			u.IsActive = !u.IsActive
 		}
-		_, err := user.UpdateUser(s, u, false)
+		_, err := user.UpdateUser(s, u)
 		if err != nil {
 			_ = s.Rollback()
 			log.Fatalf("Could not enable the user")
@@ -309,64 +293,6 @@ var userChangeEnabledCmd = &cobra.Command{
 			log.Fatalf("Error saving everything: %s", err)
 		}
 
-		fmt.Printf("User status successfully changed, status is now \"%s\"\n", u.Status)
-	},
-}
-
-var userDeleteCmd = &cobra.Command{
-	Use:   "delete [user id]",
-	Short: "Delete an existing user.",
-	Long:  "Kick off the user deletion process. If call without the --now flag, this command will only trigger an email to the user in order for them to confirm and start the deletion process. With the flag the user is deleted immediately. USE WITH CAUTION.",
-	Args:  cobra.ExactArgs(1),
-	PreRun: func(cmd *cobra.Command, args []string) {
-		initialize.FullInit()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		if userFlagDeleteNow {
-			fmt.Println("You requested to delete the user immediately. Are you sure?")
-			fmt.Println(`To confirm, please type "yes, I confirm" in all uppercase:`)
-
-			cr := bufio.NewReader(os.Stdin)
-			text, err := cr.ReadString('\n')
-			if err != nil {
-				log.Fatalf("could not read confirmation message: %s", err)
-			}
-			if text != "YES, I CONFIRM\n" {
-				log.Fatalf("invalid confirmation message")
-			}
-		}
-
-		s := db.NewSession()
-		defer s.Close()
-
-		if err := s.Begin(); err != nil {
-			log.Fatalf("Count not start transaction: %s", err)
-		}
-
-		u := getUserFromArg(s, args[0])
-
-		if userFlagDeleteNow {
-			err := models.DeleteUser(s, u)
-			if err != nil {
-				_ = s.Rollback()
-				log.Fatalf("Error removing the user: %s", err)
-			}
-		} else {
-			err := user.RequestDeletion(s, u)
-			if err != nil {
-				_ = s.Rollback()
-				log.Fatalf("Could not request user deletion: %s", err)
-			}
-		}
-
-		if err := s.Commit(); err != nil {
-			log.Fatalf("Error saving everything: %s", err)
-		}
-
-		if userFlagDeleteNow {
-			fmt.Println("User deleted successfully.")
-		} else {
-			fmt.Println("User scheduled for deletion successfully.")
-		}
+		fmt.Printf("User status successfully changed, user is now active: %t.\n", u.IsActive)
 	},
 }

pkg/cmd/version.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/cmd/web.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -18,7 +18,6 @@ package cmd
 
 import (
 	"context"
-	"net"
 	"os"
 	"os/signal"
 	"time"
@@ -30,9 +29,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/routes"
 	"code.vikunja.io/api/pkg/swagger"
-	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/api/pkg/version"
-	"github.com/labstack/echo/v4"
 	"github.com/spf13/cobra"
 )
 
@@ -40,31 +37,6 @@ func init() {
 	rootCmd.AddCommand(webCmd)
 }
 
-func setupUnixSocket(e *echo.Echo) error {
-	path := config.ServiceUnixSocket.GetString()
-
-	// Remove old unix socket that may have remained after a crash
-	if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	if config.ServiceUnixSocketMode.Get() != nil {
-		// Use Umask instead of Chmod to prevent insecure race condition
-		// (no-op on Windows)
-		mode := config.ServiceUnixSocketMode.GetInt()
-		oldmask := utils.Umask(0o777 &^ mode)
-		defer utils.Umask(oldmask)
-	}
-
-	l, err := net.Listen("unix", path)
-	if err != nil {
-		return err
-	}
-
-	e.Listener = l
-	return nil
-}
-
 var webCmd = &cobra.Command{
 	Use:   "web",
 	Short: "Starts the rest api web server",
@@ -84,12 +56,6 @@ var webCmd = &cobra.Command{
 		routes.RegisterRoutes(e)
 		// Start server
 		go func() {
-			// Listen unix socket if needed (ServiceInterface will be ignored)
-			if config.ServiceUnixSocket.GetString() != "" {
-				if err := setupUnixSocket(e); err != nil {
-					e.Logger.Fatal(err)
-				}
-			}
 			if err := e.Start(config.ServiceInterface.GetString()); err != nil {
 				e.Logger.Info("shutting down...")
 			}

pkg/config/config.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -21,14 +21,12 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
-	_ "time/tzdata" // Imports time zone data instead of relying on the os
 
+	"4d63.com/tz"
 	"github.com/spf13/viper"
 )
 
@@ -38,18 +36,12 @@ type Key string
 // These constants hold all config value keys
 const (
 	// #nosec
-	ServiceJWTSecret       Key = `service.JWTSecret`
-	ServiceJWTTTL          Key = `service.jwtttl`
-	ServiceJWTTTLLong      Key = `service.jwtttllong`
-	ServiceInterface       Key = `service.interface`
-	ServiceUnixSocket      Key = `service.unixsocket`
-	ServiceUnixSocketMode  Key = `service.unixsocketmode`
-	ServiceFrontendurl     Key = `service.frontendurl`
-	ServiceEnableCaldav    Key = `service.enablecaldav`
-	ServiceRootpath        Key = `service.rootpath`
-	ServiceStaticpath      Key = `service.staticpath`
-	ServiceMaxItemsPerPage Key = `service.maxitemsperpage`
-	// Deprecated: Use metrics.enabled
+	ServiceJWTSecret             Key = `service.JWTSecret`
+	ServiceInterface             Key = `service.interface`
+	ServiceFrontendurl           Key = `service.frontendurl`
+	ServiceEnableCaldav          Key = `service.enablecaldav`
+	ServiceRootpath              Key = `service.rootpath`
+	ServiceMaxItemsPerPage       Key = `service.maxitemsperpage`
 	ServiceEnableMetrics         Key = `service.enablemetrics`
 	ServiceMotd                  Key = `service.motd`
 	ServiceEnableLinkSharing     Key = `service.enablelinksharing`
@@ -61,8 +53,6 @@ const (
 	ServiceSentryDsn             Key = `service.sentrydsn`
 	ServiceTestingtoken          Key = `service.testingtoken`
 	ServiceEnableEmailReminders  Key = `service.enableemailreminders`
-	ServiceEnableUserDeletion    Key = `service.enableuserdeletion`
-	ServiceMaxAvatarSize         Key = `service.maxavatarsize`
 
 	AuthLocalEnabled      Key = `auth.local.enabled`
 	AuthOpenIDEnabled     Key = `auth.openid.enabled`
@@ -82,10 +72,6 @@ const (
 	DatabaseMaxIdleConnections    Key = `database.maxidleconnections`
 	DatabaseMaxConnectionLifetime Key = `database.maxconnectionlifetime`
 	DatabaseSslMode               Key = `database.sslmode`
-	DatabaseSslCert               Key = `database.sslcert`
-	DatabaseSslKey                Key = `database.sslkey`
-	DatabaseSslRootCert           Key = `database.sslrootcert`
-	DatabaseTLS                   Key = `database.tls`
 
 	CacheEnabled        Key = `cache.enabled`
 	CacheType           Key = `cache.type`
@@ -96,7 +82,6 @@ const (
 	MailerPort          Key = `mailer.port`
 	MailerUsername      Key = `mailer.username`
 	MailerPassword      Key = `mailer.password`
-	MailerAuthType      Key = `mailer.authtype`
 	MailerSkipTLSVerify Key = `mailer.skiptlsverify`
 	MailerFromEmail     Key = `mailer.fromemail`
 	MailerQueuelength   Key = `mailer.queuelength`
@@ -116,10 +101,6 @@ const (
 	LogHTTP          Key = `log.http`
 	LogEcho          Key = `log.echo`
 	LogPath          Key = `log.path`
-	LogEvents        Key = `log.events`
-	LogEventsLevel   Key = `log.eventslevel`
-	LogMail          Key = `log.mail`
-	LogMailLevel     Key = `log.maillevel`
 
 	RateLimitEnabled Key = `ratelimit.enabled`
 	RateLimitKind    Key = `ratelimit.kind`
@@ -130,6 +111,10 @@ const (
 	FilesBasePath Key = `files.basepath`
 	FilesMaxSize  Key = `files.maxsize`
 
+	MigrationWunderlistEnable          Key = `migration.wunderlist.enable`
+	MigrationWunderlistClientID        Key = `migration.wunderlist.clientid`
+	MigrationWunderlistClientSecret    Key = `migration.wunderlist.clientsecret`
+	MigrationWunderlistRedirectURL     Key = `migration.wunderlist.redirecturl`
 	MigrationTodoistEnable             Key = `migration.todoist.enable`
 	MigrationTodoistClientID           Key = `migration.todoist.clientid`
 	MigrationTodoistClientSecret       Key = `migration.todoist.clientsecret`
@@ -155,22 +140,6 @@ const (
 	BackgroundsUnsplashApplicationID Key = `backgrounds.providers.unsplash.applicationid`
 
 	KeyvalueType Key = `keyvalue.type`
-
-	MetricsEnabled  Key = `metrics.enabled`
-	MetricsUsername Key = `metrics.username`
-	MetricsPassword Key = `metrics.password`
-
-	DefaultSettingsAvatarProvider              Key = `defaultsettings.avatar_provider`
-	DefaultSettingsAvatarFileID                Key = `defaultsettings.avatar_file_id`
-	DefaultSettingsEmailRemindersEnabled       Key = `defaultsettings.email_reminders_enabled`
-	DefaultSettingsDiscoverableByName          Key = `defaultsettings.discoverable_by_name`
-	DefaultSettingsDiscoverableByEmail         Key = `defaultsettings.discoverable_by_email`
-	DefaultSettingsOverdueTaskRemindersEnabled Key = `defaultsettings.overdue_tasks_reminders_enabled`
-	DefaultSettingsDefaultProjectID            Key = `defaultsettings.default_project_id`
-	DefaultSettingsWeekStart                   Key = `defaultsettings.week_start`
-	DefaultSettingsLanguage                    Key = `defaultsettings.language`
-	DefaultSettingsTimezone                    Key = `defaultsettings.timezone`
-	DefaultSettingsOverdueTaskRemindersTime    Key = `defaultsettings.overdue_tasks_reminders_time`
 )
 
 // GetString returns a string config value
@@ -215,7 +184,7 @@ var timezone *time.Location
 // it way easier, especially when testing.
 func GetTimeZone() *time.Location {
 	if timezone == nil {
-		loc, err := time.LoadLocation(ServiceTimeZone.GetString())
+		loc, err := tz.LoadLocation(ServiceTimeZone.GetString())
 		if err != nil {
 			fmt.Printf("Error parsing time zone: %s", err)
 			os.Exit(1)
@@ -235,39 +204,6 @@ func (k Key) setDefault(i interface{}) {
 	viper.SetDefault(string(k), i)
 }
 
-// Tries different methods to figure out the binary folder.
-// Copied and adopted from https://github.com/speedata/publisher/commit/3b668668d57edef04ea854d5bbd58f83eb1b799f
-func getBinaryDirLocation() string {
-	// First, check if the standard library gives us the path. This will work 99% of the time.
-	ex, err := os.Executable()
-	if err == nil {
-		return filepath.Dir(ex)
-	}
-
-	// Then check if the binary was run with a full path and use that if that's the case.
-	if strings.Contains(os.Args[0], "/") {
-		binDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
-		if err != nil {
-			log.Fatal(err)
-		}
-		return binDir
-	}
-
-	exeSuffix := ""
-	if runtime.GOOS == "windows" {
-		exeSuffix = ".exe"
-	}
-
-	// All else failing, search for a vikunja binary in the current $PATH.
-	// This can give wrong results.
-	exeLocation, err := exec.LookPath("vikunja" + exeSuffix)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return filepath.Dir(exeLocation)
-}
-
 // InitDefaultConfig sets default config values
 // This is an extra function so we can call it when initializing tests without initializing the full config
 func InitDefaultConfig() {
@@ -279,15 +215,16 @@ func InitDefaultConfig() {
 
 	// Service
 	ServiceJWTSecret.setDefault(random)
-	ServiceJWTTTL.setDefault(259200)      // 72 hours
-	ServiceJWTTTLLong.setDefault(2592000) // 30 days
 	ServiceInterface.setDefault(":3456")
-	ServiceUnixSocket.setDefault("")
 	ServiceFrontendurl.setDefault("")
 	ServiceEnableCaldav.setDefault(true)
 
-	ServiceRootpath.setDefault(getBinaryDirLocation())
-	ServiceStaticpath.setDefault("")
+	ex, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	exPath := filepath.Dir(ex)
+	ServiceRootpath.setDefault(exPath)
 	ServiceMaxItemsPerPage.setDefault(50)
 	ServiceEnableMetrics.setDefault(false)
 	ServiceMotd.setDefault("")
@@ -298,8 +235,6 @@ func InitDefaultConfig() {
 	ServiceEnableTaskComments.setDefault(true)
 	ServiceEnableTotp.setDefault(true)
 	ServiceEnableEmailReminders.setDefault(true)
-	ServiceEnableUserDeletion.setDefault(true)
-	ServiceMaxAvatarSize.setDefault(1024)
 
 	// Auth
 	AuthLocalEnabled.setDefault(true)
@@ -316,10 +251,6 @@ func InitDefaultConfig() {
 	DatabaseMaxIdleConnections.setDefault(50)
 	DatabaseMaxConnectionLifetime.setDefault(10000)
 	DatabaseSslMode.setDefault("disable")
-	DatabaseSslCert.setDefault("")
-	DatabaseSslKey.setDefault("")
-	DatabaseSslRootCert.setDefault("")
-	DatabaseTLS.setDefault("false")
 
 	// Cacher
 	CacheEnabled.setDefault(false)
@@ -329,14 +260,13 @@ func InitDefaultConfig() {
 	MailerEnabled.setDefault(false)
 	MailerHost.setDefault("")
 	MailerPort.setDefault("587")
-	MailerUsername.setDefault("")
+	MailerUsername.setDefault("user")
 	MailerPassword.setDefault("")
 	MailerSkipTLSVerify.setDefault(false)
 	MailerFromEmail.setDefault("mail@vikunja")
 	MailerQueuelength.setDefault(100)
 	MailerQueueTimeout.setDefault(30)
 	MailerForceSSL.setDefault(false)
-	MailerAuthType.setDefault("plain")
 	// Redis
 	RedisEnabled.setDefault(false)
 	RedisHost.setDefault("localhost:6379")
@@ -351,10 +281,6 @@ func InitDefaultConfig() {
 	LogHTTP.setDefault("stdout")
 	LogEcho.setDefault("off")
 	LogPath.setDefault(ServiceRootpath.GetString() + "/logs")
-	LogEvents.setDefault("off")
-	LogEventsLevel.setDefault("INFO")
-	LogMail.setDefault("off")
-	LogMailLevel.setDefault("INFO")
 	// Rate Limit
 	RateLimitEnabled.setDefault(false)
 	RateLimitKind.setDefault("user")
@@ -369,23 +295,18 @@ func InitDefaultConfig() {
 	CorsOrigins.setDefault([]string{"*"})
 	CorsMaxAge.setDefault(0)
 	// Migration
+	MigrationWunderlistEnable.setDefault(false)
 	MigrationTodoistEnable.setDefault(false)
 	MigrationTrelloEnable.setDefault(false)
 	MigrationMicrosoftTodoEnable.setDefault(false)
 	// Avatar
 	AvatarGravaterExpiration.setDefault(3600)
-	// Project Backgrounds
+	// List Backgrounds
 	BackgroundsEnabled.setDefault(true)
 	BackgroundsUploadEnabled.setDefault(true)
 	BackgroundsUnsplashEnabled.setDefault(false)
 	// Key Value
 	KeyvalueType.setDefault("memory")
-	// Metrics
-	MetricsEnabled.setDefault(false)
-	// Settings
-	DefaultSettingsAvatarProvider.setDefault("initials")
-	DefaultSettingsOverdueTaskRemindersEnabled.setDefault(true)
-	DefaultSettingsOverdueTaskRemindersTime.setDefault("9:00")
 }
 
 // InitConfig initializes the config, sets defaults etc.
@@ -412,17 +333,11 @@ func InitConfig() {
 
 	viper.AddConfigPath(".")
 	viper.SetConfigName("config")
-
 	err = viper.ReadInConfig()
-	if viper.ConfigFileUsed() != "" {
-		log.Printf("Using config file: %s", viper.ConfigFileUsed())
-
-		if err != nil {
-			log.Println(err.Error())
-			log.Println("Using default config.")
-		}
-	} else {
-		log.Println("No config file found, using default or config from environment variables.")
+	if err != nil {
+		log.Println(err.Error())
+		log.Println("Using default config.")
+		return
 	}
 
 	if CacheType.GetString() == "keyvalue" {
@@ -433,18 +348,10 @@ func InitConfig() {
 		RateLimitStore.Set(KeyvalueType.GetString())
 	}
 
-	if ServiceFrontendurl.GetString() != "" && !strings.HasSuffix(ServiceFrontendurl.GetString(), "/") {
-		ServiceFrontendurl.Set(ServiceFrontendurl.GetString() + "/")
-	}
-
 	if AuthOpenIDRedirectURL.GetString() == "" {
 		AuthOpenIDRedirectURL.Set(ServiceFrontendurl.GetString() + "auth/openid/")
 	}
 
-	if MigrationTodoistRedirectURL.GetString() == "" {
-		MigrationTodoistRedirectURL.Set(ServiceFrontendurl.GetString() + "migrate/todoist")
-	}
-
 	if MigrationTrelloRedirectURL.GetString() == "" {
 		MigrationTrelloRedirectURL.Set(ServiceFrontendurl.GetString() + "migrate/trello")
 	}
@@ -453,14 +360,7 @@ func InitConfig() {
 		MigrationMicrosoftTodoRedirectURL.Set(ServiceFrontendurl.GetString() + "migrate/microsoft-todo")
 	}
 
-	if DefaultSettingsTimezone.GetString() == "" {
-		DefaultSettingsTimezone.Set(ServiceTimeZone.GetString())
-	}
-
-	if ServiceEnableMetrics.GetBool() {
-		log.Println("WARNING: service.enablemetrics is deprecated and will be removed in a future release. Please use metrics.enable.")
-		MetricsEnabled.Set(true)
-	}
+	log.Printf("Using config file: %s", viper.ConfigFileUsed())
 }
 
 func random(length int) (string, error) {

pkg/cron/cron.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by

pkg/db/db.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -28,9 +28,9 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
 	xrc "gitea.com/xorm/xorm-redis-cache"
+	"xorm.io/core"
 	"xorm.io/xorm"
 	"xorm.io/xorm/caches"
-	"xorm.io/xorm/names"
 	"xorm.io/xorm/schemas"
 
 	_ "github.com/go-sql-driver/mysql" // Because.
@@ -81,7 +81,7 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 		log.Fatalf("Error parsing time zone: %s", err)
 	}
 	engine.SetTZDatabase(loc)
-	engine.SetMapper(names.GonicMapper{})
+	engine.SetMapper(core.GonicMapper{})
 	logger := log.NewXormLogger("")
 	engine.SetLogger(logger)
 
@@ -113,12 +113,11 @@ func initMysqlEngine() (engine *xorm.Engine, err error) {
 	// We're using utf8mb here instead of just utf8 because we want to use non-BMP characters.
 	// See https://stackoverflow.com/a/30074553/10924593 for more info.
 	connStr := fmt.Sprintf(
-		"%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&tls=%s",
+		"%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true",
 		config.DatabaseUser.GetString(),
 		config.DatabasePassword.GetString(),
 		config.DatabaseHost.GetString(),
-		config.DatabaseDatabase.GetString(),
-		config.DatabaseTLS.GetString())
+		config.DatabaseDatabase.GetString())
 	engine, err = xorm.NewEngine("mysql", connStr)
 	if err != nil {
 		return
@@ -148,33 +147,15 @@ func parsePostgreSQLHostPort(info string) (string, string) {
 	return host, port
 }
 
-// Copied and adopted from https://github.com/go-gitea/gitea/blob/f337c32e868381c6d2d948221aca0c59f8420c13/modules/setting/database.go#L176-L186
-func getPostgreSQLConnectionString(dbHost, dbUser, dbPasswd, dbName, dbSslMode, dbSslCert, dbSslKey, dbSslRootCert string) (connStr string) {
-	dbParam := "?"
-	if strings.Contains(dbName, dbParam) {
-		dbParam = "&"
-	}
-	host, port := parsePostgreSQLHostPort(dbHost)
-	if host[0] == '/' { // looks like a unix socket
-		connStr = fmt.Sprintf("postgres://%s:%s@:%s/%s%ssslmode=%s&sslcert=%s&sslkey=%s&sslrootcert=%s&host=%s",
-			url.PathEscape(dbUser), url.PathEscape(dbPasswd), port, dbName, dbParam, dbSslMode, dbSslCert, dbSslKey, dbSslRootCert, host)
-	} else {
-		connStr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s&sslcert=%s&sslkey=%s&sslrootcert=%s",
-			url.PathEscape(dbUser), url.PathEscape(dbPasswd), host, port, dbName, dbParam, dbSslMode, dbSslCert, dbSslKey, dbSslRootCert)
-	}
-	return connStr
-}
-
 func initPostgresEngine() (engine *xorm.Engine, err error) {
-	connStr := getPostgreSQLConnectionString(
-		config.DatabaseHost.GetString(),
-		config.DatabaseUser.GetString(),
-		config.DatabasePassword.GetString(),
+	host, port := parsePostgreSQLHostPort(config.DatabaseHost.GetString())
+	connStr := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=%s",
+		host,
+		port,
+		url.PathEscape(config.DatabaseUser.GetString()),
+		url.PathEscape(config.DatabasePassword.GetString()),
 		config.DatabaseDatabase.GetString(),
 		config.DatabaseSslMode.GetString(),
-		config.DatabaseSslCert.GetString(),
-		config.DatabaseSslKey.GetString(),
-		config.DatabaseSslRootCert.GetString(),
 	)
 
 	engine, err = xorm.NewEngine("postgres", connStr)
@@ -204,7 +185,7 @@ func initSqliteEngine() (engine *xorm.Engine, err error) {
 	}
 	file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0)
 	if err != nil {
-		return nil, fmt.Errorf("could not open database file [uid=%d, gid=%d]: %w", os.Getuid(), os.Getgid(), err)
+		return nil, fmt.Errorf("could not open database file [uid=%d, gid=%d]: %s", os.Getuid(), os.Getgid(), err)
 	}
 	_ = file.Close() // We directly close the file because we only want to check if it is writable. It will be reopened lazily later by xorm.
 

pkg/db/dump.go

@@ -1,5 +1,5 @@
 // Vikunja is a to-do list application to facilitate your life.
-// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public Licensee as published by
@@ -18,9 +18,6 @@ package db
 
 import (
 	"encoding/json"
-	"strings"
-
-	"code.vikunja.io/api/pkg/log"
 
 	"xorm.io/xorm/schemas"
 )
@@ -50,53 +47,13 @@ func Dump() (data map[string][]byte, err error) {
 
 // Restore restores a table with all its entries
 func Restore(table string, contents []map[string]interface{}) (err error) {
-	if _, err := x.IsTableExist(table); err != nil {
-		return err
-	}
-
-	meta, err := x.DBMetas()
-	if err != nil {
-		return err
-	}
-
-	var metaForCurrentTable *schemas.Table
-	for _, m := range meta {
-		if m.Name == table {
-			metaForCurrentTable = m
-			break
-		}
-	}
-
-	if metaForCurrentTable == nil {
-		log.Fatalf("Could not find table definition for table %s", table)
-	}
 
 	for _, content := range contents {
-		for colName, value := range content {
-			// Date fields might get restored as 0001-01-01 from null dates. This can have unintended side-effects like
-			// users being scheduled for deletion after a restore.
-			// To avoid this, we set these dates to nil so that they'll end up as null in the db.
-			col := metaForCurrentTable.GetColumn(colName)
-			strVal, is := value.(string)
-			if is && col.SQLType.IsTime() && (strVal == "" || strings.HasPrefix(strVal, "0001-")) {
-				content[colName] = nil
-			}
-		}
-
 		if _, err := x.Table(table).Insert(content); err != nil {
 			return err
 		}
 	}
 
-	if Type() == schemas.POSTGRES {
-		idSequence := table + "_id_seq"
-		_, err = x.Query("SELECT setval('" + idSequence + "', COALESCE(MAX(id), 1) )")
-		if err != nil {
-			log.Warningf("Could not reset id sequence for %s: %s", idSequence, err)
-			err = nil
-		}
-	}
-
 	return
 }
 

pkg/db/fixtures/buckets.yml

@@ -1,226 +1,209 @@
 - id: 1
   title: testbucket1
-  project_id: 1
+  list_id: 1
   created_by_id: 1
   limit: 9999999 # This bucket has a limit we will never exceed in the tests to make sure the logic allows for buckets with limits
-  position: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 2
   title: testbucket2
-  project_id: 1
+  list_id: 1
   created_by_id: 1
   limit: 3
-  position: 2
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 3
   title: testbucket3
-  project_id: 1
+  list_id: 1
   created_by_id: 1
-  is_done_bucket: 1
-  position: 3
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 4
-  title: testbucket4 - other project
-  project_id: 2
+  title: testbucket4 - other list
+  list_id: 2
   created_by_id: 1
-  is_done_bucket: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 # The following are not or only partly owned by user 1
 - id: 5
   title: testbucket5
-  project_id: 20
+  list_id: 20
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 6
   title: testbucket6
-  project_id: 6
+  list_id: 6
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 7
   title: testbucket7
-  project_id: 7
+  list_id: 7
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 8
   title: testbucket8
-  project_id: 8
+  list_id: 8
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 9
   title: testbucket9
-  project_id: 9
+  list_id: 9
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 10
   title: testbucket10
-  project_id: 10
+  list_id: 10
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 11
   title: testbucket11
-  project_id: 11
+  list_id: 11
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 12
   title: testbucket13
-  project_id: 12
+  list_id: 12
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 13
   title: testbucket13
-  project_id: 13
+  list_id: 13
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 14
   title: testbucket14
-  project_id: 14
+  list_id: 14
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 15
   title: testbucket15
-  project_id: 15
+  list_id: 15
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 16
   title: testbucket16
-  project_id: 16
+  list_id: 16
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 17
   title: testbucket17
-  project_id: 17
+  list_id: 17
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 18
   title: testbucket18
-  project_id: 5
+  list_id: 5
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 19
   title: testbucket19
-  project_id: 21
+  list_id: 21
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 20
   title: testbucket20
-  project_id: 22
+  list_id: 22
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 21
   title: testbucket21
-  project_id: 3
+  list_id: 3
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 # Duplicate buckets to make deletion of one of them possible
 - id: 22
   title: testbucket22
-  project_id: 6
+  list_id: 6
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 23
   title: testbucket23
-  project_id: 7
+  list_id: 7
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 24
   title: testbucket24
-  project_id: 8
+  list_id: 8
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 25
   title: testbucket25
-  project_id: 9
+  list_id: 9
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 26
   title: testbucket26
-  project_id: 10
+  list_id: 10
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 27
   title: testbucket27
-  project_id: 11
+  list_id: 11
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 28
   title: testbucket28
-  project_id: 12
+  list_id: 12
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 29
   title: testbucket29
-  project_id: 13
+  list_id: 13
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 30
   title: testbucket30
-  project_id: 14
+  list_id: 14
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 31
   title: testbucket31
-  project_id: 15
+  list_id: 15
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 32
   title: testbucket32
-  project_id: 16
+  list_id: 16
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 33
   title: testbucket33
-  project_id: 17
+  list_id: 17
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
-# This bucket is the last one in its project
+# This bucket is the last one in its list
 - id: 34
   title: testbucket34
-  project_id: 18
+  list_id: 18
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
-- id: 35
-  title: testbucket35
-  project_id: 23
-  created_by_id: -2
-  created: 2020-04-18 21:13:52
-  updated: 2020-04-18 21:13:52
-- id: 36
-  title: testbucket36
-  project_id: 26
-  created_by_id: 15
-  created: 2020-04-18 21:13:52
-  updated: 2020-04-18 21:13:52

pkg/db/fixtures/favorites.yml

@@ -1,21 +0,0 @@
-- entity_id: 1
-  user_id: 1
-  kind: 1
-- entity_id: 15
-  user_id: 6 # owner
-  kind: 1
-- entity_id: 15
-  user_id: 1
-  kind: 1
-- entity_id: 34
-  user_id: 13 # owner
-  kind: 1
-- entity_id: 34
-  user_id: 1
-  kind: 1
-- entity_id: 23
-  user_id: 12 # owner
-  kind: 2
-- entity_id: 23
-  user_id: 1
-  kind: 2

pkg/db/fixtures/label_task.yml

@@ -14,7 +14,3 @@
   task_id: 36
   label_id: 4
   created: 2018-12-01 15:13:12
-- id: 5
-  task_id: 39
-  label_id: 4
-  created: 2018-12-01 15:13:12

pkg/db/fixtures/link_sharing.yml

@@ -1,6 +1,6 @@
 - id: 1
   hash: test
-  project_id: 1
+  list_id: 1
   right: 0
   sharing_type: 1
   shared_by_id: 1
@@ -8,7 +8,7 @@
   updated: 2018-12-02 15:13:12
 - id: 2
   hash: test2
-  project_id: 2
+  list_id: 2
   right: 1
   sharing_type: 1
   shared_by_id: 1
@@ -16,18 +16,9 @@
   updated: 2018-12-02 15:13:12
 - id: 3
   hash: test3
-  project_id: 3
+  list_id: 3
   right: 2
   sharing_type: 1
   shared_by_id: 1
   created: 2018-12-01 15:13:12
   updated: 2018-12-02 15:13:12
-- id: 4
-  hash: testWithPassword
-  project_id: 1
-  right: 0
-  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
-  sharing_type: 2
-  shared_by_id: 1
-  created: 2018-12-01 15:13:12
-  updated: 2018-12-02 15:13:12

pkg/db/fixtures/list.yml

@@ -5,7 +5,6 @@
   identifier: test1
   owner_id: 1
   namespace_id: 1
-  position: 3
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -15,7 +14,6 @@
   identifier: test2
   owner_id: 3
   namespace_id: 1
-  position: 2
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -25,7 +23,6 @@
   identifier: test3
   owner_id: 3
   namespace_id: 2
-  position: 1
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -35,7 +32,6 @@
   identifier: test4
   owner_id: 3
   namespace_id: 3
-  position: 4
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -45,7 +41,6 @@
   identifier: test5
   owner_id: 5
   namespace_id: 5
-  position: 5
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -55,7 +50,6 @@
   identifier: test6
   owner_id: 6
   namespace_id: 6
-  position: 6
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -65,7 +59,6 @@
   identifier: test7
   owner_id: 6
   namespace_id: 6
-  position: 7
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -75,7 +68,6 @@
   identifier: test8
   owner_id: 6
   namespace_id: 6
-  position: 8
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -85,7 +77,6 @@
   identifier: test9
   owner_id: 6
   namespace_id: 6
-  position: 9
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -95,7 +86,6 @@
   identifier: test10
   owner_id: 6
   namespace_id: 6
-  position: 10
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -105,7 +95,6 @@
   identifier: test11
   owner_id: 6
   namespace_id: 6
-  position: 11
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -115,7 +104,6 @@
   identifier: test12
   owner_id: 6
   namespace_id: 7
-  position: 12
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -125,7 +113,6 @@
   identifier: test13
   owner_id: 6
   namespace_id: 8
-  position: 13
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -135,7 +122,6 @@
   identifier: test14
   owner_id: 6
   namespace_id: 9
-  position: 14
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -145,7 +131,6 @@
   identifier: test15
   owner_id: 6
   namespace_id: 10
-  position: 15
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -155,7 +140,6 @@
   identifier: test16
   owner_id: 6
   namespace_id: 11
-  position: 16
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -165,11 +149,10 @@
   identifier: test17
   owner_id: 6
   namespace_id: 12
-  position: 17
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# This project is owned by user 7, and several other users have access to it via different methods.
-# It is used to test the projectUsers method.
+# This list is owned by user 7, and several other users have access to it via different methods.
+# It is used to test the listUsers method.
 -
   id: 18
   title: Test18
@@ -177,7 +160,6 @@
   identifier: test18
   owner_id: 7
   namespace_id: 13
-  position: 18
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -187,10 +169,9 @@
   identifier: test19
   owner_id: 7
   namespace_id: 14
-  position: 19
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-# User 1 does not have access to this project
+# User 1 does not have access to this list
 -
   id: 20
   title: Test20
@@ -198,7 +179,6 @@
   identifier: test20
   owner_id: 13
   namespace_id: 15
-  position: 20
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -208,7 +188,6 @@
   identifier: test21
   owner_id: 1
   namespace_id: 16
-  position: 21
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -219,7 +198,6 @@
   owner_id: 1
   namespace_id: 1
   is_archived: 1
-  position: 22
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -229,37 +207,6 @@
   identifier: test23
   owner_id: 12
   namespace_id: 17
-  position: 23
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
--
-  id: 24
-  title: Test24
-  description: Lorem Ipsum
-  identifier: test6
-  owner_id: 6
-  namespace_id: 6
-  position: 7
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
--
-  id: 25
-  title: Test25 with background
-  description: Lorem Ipsum
-  identifier: test6
-  owner_id: 6
-  namespace_id: 6
-  background_file_id: 1
-  position: 8
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
--
-  id: 26
-  title: List 26 for Caldav tests
-  description: Lorem Ipsum
-  identifier: test26
-  owner_id: 15
-  namespace_id: 18
-  position: 1
+  is_favorite: true
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12

pkg/db/fixtures/namespaces.yml

@@ -88,9 +88,3 @@
   owner_id: 12
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
-- id: 18
-  title: testnamespace18
-  description: Lorem Ipsum
-  owner_id: 15
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12

pkg/db/fixtures/subscriptions.yml

@@ -1,35 +0,0 @@
-- id: 1
-  entity_type: 3 # Task
-  entity_id: 2
-  user_id: 1
-  created: 2021-02-01 15:13:12
-- id: 2
-  entity_type: 1 # Namespace
-  entity_id: 6
-  user_id: 6
-  created: 2021-02-01 15:13:12
-- id: 3
-  entity_type: 2 # project
-  entity_id: 12 # belongs to namespace 7
-  user_id: 6
-  created: 2021-02-01 15:13:12
-- id: 4
-  entity_type: 3 # Task
-  entity_id: 22 # belongs to project 13 which belongs to namespace 8
-  user_id: 6
-  created: 2021-02-01 15:13:12
-- id: 5
-  entity_type: 1 # Namespace
-  entity_id: 8
-  user_id: 6
-  created: 2021-02-01 15:13:12
-- id: 6
-  entity_type: 2 # project
-  entity_id: 13
-  user_id: 6
-  created: 2021-02-01 15:13:12
-- id: 7
-  entity_type: 3 # Task
-  entity_id: 26
-  user_id: 6
-  created: 2021-02-01 15:13:12

pkg/db/fixtures/task_attachments.yml

@@ -9,8 +9,3 @@
   file_id: 9999
   created_by_id: 1
   created: 2018-12-01 15:13:12
-- id: 3
-  task_id: 1
-  file_id: 1
-  created_by_id: -2
-  created: 2018-12-01 15:13:12

pkg/db/fixtures/task_comments.yml

@@ -94,9 +94,3 @@
   task_id: 36
   created: 2020-02-19 18:07:06
   updated: 2020-02-19 18:07:06
-- id: 17
-  comment: comment 17
-  author_id: -2
-  task_id: 35
-  created: 2020-02-19 18:07:06
-  updated: 2020-02-19 18:07:06