From e9fdf15f234dfb15867eb6e0e43363bbfde263f2 Mon Sep 17 00:00:00 2001 From: renovate Date: Wed, 16 Jun 2021 08:18:25 +0000 Subject: [PATCH 01/25] Update dependency marked to v2.1.0 (#552) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/552 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 844110e7c..2d216b3e3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dompurify": "2.2.9", "highlight.js": "11.0.1", "lodash": "4.17.21", - "marked": "2.0.7", + "marked": "2.1.0", "register-service-worker": "1.7.2", "sass": "1.35.1", "snake-case": "3.0.4", diff --git a/yarn.lock b/yarn.lock index 9493175c5..d18c6ed01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9524,10 +9524,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.7.tgz#bc5b857a09071b48ce82a1f7304913a993d4b7d1" - integrity sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ== +marked@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.0.tgz#289924c0613f1505a6c2b20b41cd75db96a50efe" + integrity sha512-KSdOTs1I/+hrQrFB+e7O/r+AorwdD4XzAi9caoRrbbkRLUS6txr1MZCZQhimm1N5Pg7A/WazC9VrYgqnwGiXMg== marked@^2.0.0, marked@^2.0.1: version "2.0.1" From 08708927e665af636741415d9e9fe559d53a8eda Mon Sep 17 00:00:00 2001 From: renovate Date: Wed, 16 Jun 2021 18:31:45 +0000 Subject: [PATCH 02/25] Update dependency marked to v2.1.1 (#553) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/553 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2d216b3e3..3f422b8f7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dompurify": "2.2.9", "highlight.js": "11.0.1", "lodash": "4.17.21", - "marked": "2.1.0", + "marked": "2.1.1", "register-service-worker": "1.7.2", "sass": "1.35.1", "snake-case": "3.0.4", diff --git a/yarn.lock b/yarn.lock index d18c6ed01..080f97fbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9524,10 +9524,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.0.tgz#289924c0613f1505a6c2b20b41cd75db96a50efe" - integrity sha512-KSdOTs1I/+hrQrFB+e7O/r+AorwdD4XzAi9caoRrbbkRLUS6txr1MZCZQhimm1N5Pg7A/WazC9VrYgqnwGiXMg== +marked@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.1.tgz#b7c27f520fc4de0ddd049d9b4be3b04e06314923" + integrity sha512-5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw== marked@^2.0.0, marked@^2.0.1: version "2.0.1" From fe5ecb4865dc8b7a3a46413dbcb5e92a148aff53 Mon Sep 17 00:00:00 2001 From: renovate Date: Fri, 18 Jun 2021 22:09:00 +0000 Subject: [PATCH 03/25] Update dependency bulma to v0.9.3 (#554) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/554 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3f422b8f7..636fa9ba3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "browserslist": "4.16.6", - "bulma": "0.9.2", + "bulma": "0.9.3", "camel-case": "4.1.2", "copy-to-clipboard": "3.3.1", "date-fns": "2.22.1", diff --git a/yarn.lock b/yarn.lock index 080f97fbe..026980719 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4277,10 +4277,10 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= -bulma@0.9.2: - version "0.9.2" - resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.2.tgz#340011e119c605f19b8ca886bfea595f1deaf23c" - integrity sha512-e14EF+3VSZ488yL/lJH0tR8mFWiEQVCMi/BQUMi2TGMBOk+zrDg4wryuwm/+dRSHJw0gMawp2tsW7X1JYUCE3A== +bulma@0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.3.tgz#ddccb7436ebe3e21bf47afe01d3c43a296b70243" + integrity sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g== busboy@^0.3.1: version "0.3.1" From 9abe2a4de24077ef217b578d5b7355a0744c49ee Mon Sep 17 00:00:00 2001 From: renovate Date: Fri, 18 Jun 2021 22:09:31 +0000 Subject: [PATCH 04/25] Update dependency eslint to v7.29.0 (#555) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/555 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 636fa9ba3..9bb3f4451 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "babel-eslint": "10.1.0", "cypress": "7.5.0", "cypress-file-upload": "5.0.7", - "eslint": "7.28.0", + "eslint": "7.29.0", "eslint-plugin-vue": "7.11.1", "faker": "5.5.3", "jest": "27.0.4", diff --git a/yarn.lock b/yarn.lock index 026980719..40e5aed2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6223,10 +6223,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@7.28.0: - version "7.28.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" - integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== +eslint@7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.2" From 81f9d62ce2e8ca99ff2086965b7448a6dd3c365a Mon Sep 17 00:00:00 2001 From: renovate Date: Mon, 21 Jun 2021 08:40:48 +0000 Subject: [PATCH 05/25] Update dependency cypress-file-upload to v5.0.8 (#556) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/556 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9bb3f4451..5eda5f5fa 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "axios": "0.21.1", "babel-eslint": "10.1.0", "cypress": "7.5.0", - "cypress-file-upload": "5.0.7", + "cypress-file-upload": "5.0.8", "eslint": "7.29.0", "eslint-plugin-vue": "7.11.1", "faker": "5.5.3", diff --git a/yarn.lock b/yarn.lock index 40e5aed2e..5e64ff951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5390,10 +5390,10 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress-file-upload@5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.7.tgz#acf24fe08a92b2d0c892a58b56811fb933d34ea9" - integrity sha512-cgWsWx7igxjyyVm9/VJ9ukdy69jL00I7z0lrwUWtXXLPvX4neO+8JAZ054Ax8Xf+mdV9OerenXzb9nqRoafjHA== +cypress-file-upload@5.0.8: + version "5.0.8" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1" + integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g== cypress@7.5.0: version "7.5.0" From 7f2fba8bb79f9cd15a8b1d99c13ac15b6f91bb00 Mon Sep 17 00:00:00 2001 From: renovate Date: Mon, 21 Jun 2021 16:10:15 +0000 Subject: [PATCH 06/25] Update dependency vue-router to v3.5.2 (#557) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/557 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5eda5f5fa..d2b664000 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "sass-loader": "10.2.0", "vue-flatpickr-component": "8.1.6", "vue-notification": "1.3.20", - "vue-router": "3.5.1", + "vue-router": "3.5.2", "vue-template-compiler": "2.6.14", "wait-on": "5.3.0" }, diff --git a/yarn.lock b/yarn.lock index 5e64ff951..3c3c0875d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13583,10 +13583,10 @@ vue-notification@1.3.20: resolved "https://registry.yarnpkg.com/vue-notification/-/vue-notification-1.3.20.tgz#d85618127763b46f3e25b8962b857947d5a97cbe" integrity sha512-vPj67Ah72p8xvtyVE8emfadqVWguOScAjt6OJDEUdcW5hW189NsqvfkOrctxHUUO9UYl9cTbIkzAEcPnHu+zBQ== -vue-router@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9" - integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw== +vue-router@3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c" + integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ== vue-shortkey@3.1.7: version "3.1.7" From 92d3c8521fbc04ad7c5696ca701bb5b2c91284ca Mon Sep 17 00:00:00 2001 From: renovate Date: Tue, 22 Jun 2021 12:14:25 +0000 Subject: [PATCH 07/25] Update dependency jest to v27.0.5 (#558) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/558 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 294 +++++++++++++++++++++++++-------------------------- 2 files changed, 148 insertions(+), 148 deletions(-) diff --git a/package.json b/package.json index d2b664000..ca1694ba1 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "eslint": "7.29.0", "eslint-plugin-vue": "7.11.1", "faker": "5.5.3", - "jest": "27.0.4", + "jest": "27.0.5", "sass-loader": "10.2.0", "vue-flatpickr-component": "8.1.6", "vue-notification": "1.3.20", diff --git a/yarn.lock b/yarn.lock index 3c3c0875d..448ec74ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1843,15 +1843,15 @@ jest-util "^27.0.2" slash "^3.0.0" -"@jest/core@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" - integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== +"@jest/core@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.5.tgz#59e9e69e7374d65dbb22e3fc1bd52e80991eae72" + integrity sha512-g73//jF0VwsOIrWUC9Cqg03lU3QoAMFxVjsm6n6yNmwZcQPN/o8w+gLWODw5VfKNFZT38otXHWxc6b8eGDUpEA== dependencies: "@jest/console" "^27.0.2" - "@jest/reporters" "^27.0.4" + "@jest/reporters" "^27.0.5" "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" "@types/node" "*" ansi-escapes "^4.2.1" @@ -1860,15 +1860,15 @@ exit "^0.1.2" graceful-fs "^4.2.4" jest-changed-files "^27.0.2" - jest-config "^27.0.4" - jest-haste-map "^27.0.2" + jest-config "^27.0.5" + jest-haste-map "^27.0.5" jest-message-util "^27.0.2" jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-resolve-dependencies "^27.0.4" - jest-runner "^27.0.4" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" + jest-resolve "^27.0.5" + jest-resolve-dependencies "^27.0.5" + jest-runner "^27.0.5" + jest-runtime "^27.0.5" + jest-snapshot "^27.0.5" jest-util "^27.0.2" jest-validate "^27.0.2" jest-watcher "^27.0.2" @@ -1878,20 +1878,20 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" - integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== +"@jest/environment@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.5.tgz#a294ad4acda2e250f789fb98dc667aad33d3adc9" + integrity sha512-IAkJPOT7bqn0GiX5LPio6/e1YpcmLbrd8O5EFYpAOZ6V+9xJDsXjdgN2vgv9WOKIs/uA1kf5WeD96HhlBYO+FA== dependencies: - "@jest/fake-timers" "^27.0.3" + "@jest/fake-timers" "^27.0.5" "@jest/types" "^27.0.2" "@types/node" "*" jest-mock "^27.0.3" -"@jest/fake-timers@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" - integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== +"@jest/fake-timers@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.5.tgz#304d5aedadf4c75cff3696995460b39d6c6e72f6" + integrity sha512-d6Tyf7iDoKqeUdwUKrOBV/GvEZRF67m7lpuWI0+SCD9D3aaejiOQZxAOxwH2EH/W18gnfYaBPLi0VeTGBHtQBg== dependencies: "@jest/types" "^27.0.2" "@sinonjs/fake-timers" "^7.0.2" @@ -1900,24 +1900,24 @@ jest-mock "^27.0.3" jest-util "^27.0.2" -"@jest/globals@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" - integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== +"@jest/globals@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.5.tgz#f63b8bfa6ea3716f8df50f6a604b5c15b36ffd20" + integrity sha512-qqKyjDXUaZwDuccpbMMKCCMBftvrbXzigtIsikAH/9ca+kaae8InP2MDf+Y/PdCSMuAsSpHS6q6M25irBBUh+Q== dependencies: - "@jest/environment" "^27.0.3" + "@jest/environment" "^27.0.5" "@jest/types" "^27.0.2" expect "^27.0.2" -"@jest/reporters@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" - integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== +"@jest/reporters@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.5.tgz#cd730b77d9667b8ff700ad66d4edc293bb09716a" + integrity sha512-4uNg5+0eIfRafnpgu3jCZws3NNcFzhu5JdRd1mKQ4/53+vkIqwB6vfZ4gn5BdGqOaLtYhlOsPaL5ATkKzyBrJw== dependencies: "@bcoe/v8-coverage" "^0.2.3" "@jest/console" "^27.0.2" "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" @@ -1929,15 +1929,15 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.2" - jest-resolve "^27.0.4" + jest-haste-map "^27.0.5" + jest-resolve "^27.0.5" jest-util "^27.0.2" jest-worker "^27.0.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^7.0.0" + v8-to-istanbul "^8.0.0" "@jest/source-map@^27.0.1": version "27.0.1" @@ -1958,20 +1958,20 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" - integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== +"@jest/test-sequencer@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.5.tgz#c58b21db49afc36c0e3921d7ddf1fb7954abfded" + integrity sha512-opztnGs+cXzZ5txFG2+omBaV5ge/0yuJNKbhE3DREMiXE0YxBuzyEa6pNv3kk2JuucIlH2Xvgmn9kEEHSNt/SA== dependencies: "@jest/test-result" "^27.0.2" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-runtime "^27.0.4" + jest-haste-map "^27.0.5" + jest-runtime "^27.0.5" -"@jest/transform@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" - integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== +"@jest/transform@^27.0.5": + version "27.0.5" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.5.tgz#2dcb78953708af713941ac845b06078bc74ed873" + integrity sha512-lBD6OwKXSc6JJECBNk4mVxtSVuJSBsQrJ9WCBisfJs7EZuYq4K6vM9HmoB7hmPiLIDGeyaerw3feBV/bC4z8tg== dependencies: "@babel/core" "^7.1.0" "@jest/types" "^27.0.2" @@ -1980,7 +1980,7 @@ convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" + jest-haste-map "^27.0.5" jest-regex-util "^27.0.1" jest-util "^27.0.2" micromatch "^4.0.4" @@ -3808,12 +3808,12 @@ babel-extract-comments@^1.0.0: dependencies: babylon "^6.18.0" -babel-jest@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" - integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== +babel-jest@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.5.tgz#cd34c033ada05d1362211e5152391fd7a88080c8" + integrity sha512-bTMAbpCX7ldtfbca2llYLeSFsDM257aspyAOpsdrdSrBqoLkWCy4HPYTXtXWaSLgFPjrJGACL65rzzr4RFGadw== dependencies: - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" @@ -8501,12 +8501,12 @@ jest-changed-files@^27.0.2: execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" - integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== +jest-circus@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.5.tgz#b5e327f1d6857c8485126f8e364aefa4378debaa" + integrity sha512-p5rO90o1RTh8LPOG6l0Fc9qgp5YGv+8M5CFixhMh7gGHtGSobD1AxX9cjFZujILgY8t30QZ7WVvxlnuG31r8TA== dependencies: - "@jest/environment" "^27.0.3" + "@jest/environment" "^27.0.5" "@jest/test-result" "^27.0.2" "@jest/types" "^27.0.2" "@types/node" "*" @@ -8518,54 +8518,54 @@ jest-circus@^27.0.4: jest-each "^27.0.2" jest-matcher-utils "^27.0.2" jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" + jest-runtime "^27.0.5" + jest-snapshot "^27.0.5" jest-util "^27.0.2" pretty-format "^27.0.2" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" - integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== +jest-cli@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.5.tgz#f359ba042624cffb96b713010a94bffb7498a37c" + integrity sha512-kZqY020QFOFQKVE2knFHirTBElw3/Q0kUbDc3nMfy/x+RQ7zUY89SUuzpHHJoSX1kX7Lq569ncvjNqU3Td/FCA== dependencies: - "@jest/core" "^27.0.4" + "@jest/core" "^27.0.5" "@jest/test-result" "^27.0.2" "@jest/types" "^27.0.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.4" + jest-config "^27.0.5" jest-util "^27.0.2" jest-validate "^27.0.2" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" - integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== +jest-config@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.5.tgz#683da3b0d8237675c29c817f6e3aba1481028e19" + integrity sha512-zCUIXag7QIXKEVN4kUKbDBDi9Q53dV5o3eNhGqe+5zAbt1vLs4VE3ceWaYrOub0L4Y7E9pGfM84TX/0ARcE+Qw== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.4" + "@jest/test-sequencer" "^27.0.5" "@jest/types" "^27.0.2" - babel-jest "^27.0.2" + babel-jest "^27.0.5" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.4" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" + jest-circus "^27.0.5" + jest-environment-jsdom "^27.0.5" + jest-environment-node "^27.0.5" jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.4" + jest-jasmine2 "^27.0.5" jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-runner "^27.0.4" + jest-resolve "^27.0.5" + jest-runner "^27.0.5" jest-util "^27.0.2" jest-validate "^27.0.2" micromatch "^4.0.4" @@ -8599,26 +8599,26 @@ jest-each@^27.0.2: jest-util "^27.0.2" pretty-format "^27.0.2" -jest-environment-jsdom@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" - integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== +jest-environment-jsdom@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.5.tgz#c36771977cf4490a9216a70473b39161d193c212" + integrity sha512-ToWhViIoTl5738oRaajTMgYhdQL73UWPoV4GqHGk2DPhs+olv8OLq5KoQW8Yf+HtRao52XLqPWvl46dPI88PdA== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" + "@jest/environment" "^27.0.5" + "@jest/fake-timers" "^27.0.5" "@jest/types" "^27.0.2" "@types/node" "*" jest-mock "^27.0.3" jest-util "^27.0.2" jsdom "^16.6.0" -jest-environment-node@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" - integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== +jest-environment-node@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.5.tgz#b7238fc2b61ef2fb9563a3b7653a95fa009a6a54" + integrity sha512-47qqScV/WMVz5OKF5TWpAeQ1neZKqM3ySwNveEnLyd+yaE/KT6lSMx/0SOx60+ZUcVxPiESYS+Kt2JS9y4PpkQ== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" + "@jest/environment" "^27.0.5" + "@jest/fake-timers" "^27.0.5" "@jest/types" "^27.0.2" "@types/node" "*" jest-mock "^27.0.3" @@ -8629,10 +8629,10 @@ jest-get-type@^27.0.1: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== -jest-haste-map@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" - integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== +jest-haste-map@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.5.tgz#2e1e55073b5328410a2c0d74b334e513d71f3470" + integrity sha512-3LFryGSHxwPFHzKIs6W0BGA2xr6g1MvzSjR3h3D8K8Uqy4vbRm/grpGHzbPtIbOPLC6wFoViRrNEmd116QWSkw== dependencies: "@jest/types" "^27.0.2" "@types/graceful-fs" "^4.1.2" @@ -8649,13 +8649,13 @@ jest-haste-map@^27.0.2: optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" - integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== +jest-jasmine2@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.5.tgz#8a6eb2a685cdec3af13881145c77553e4e197776" + integrity sha512-m3TojR19sFmTn79QoaGy1nOHBcLvtLso6Zh7u+gYxZWGcza4rRPVqwk1hciA5ZOWWZIJOukAcore8JRX992FaA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.3" + "@jest/environment" "^27.0.5" "@jest/source-map" "^27.0.1" "@jest/test-result" "^27.0.2" "@jest/types" "^27.0.2" @@ -8667,8 +8667,8 @@ jest-jasmine2@^27.0.4: jest-each "^27.0.2" jest-matcher-utils "^27.0.2" jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" + jest-runtime "^27.0.5" + jest-snapshot "^27.0.5" jest-util "^27.0.2" pretty-format "^27.0.2" throat "^6.0.1" @@ -8724,19 +8724,19 @@ jest-regex-util@^27.0.1: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== -jest-resolve-dependencies@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" - integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== +jest-resolve-dependencies@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.5.tgz#819ccdddd909c65acddb063aac3a49e4ba1ed569" + integrity sha512-xUj2dPoEEd59P+nuih4XwNa4nJ/zRd/g4rMvjHrZPEBWeWRq/aJnnM6mug+B+Nx+ILXGtfWHzQvh7TqNV/WbuA== dependencies: "@jest/types" "^27.0.2" jest-regex-util "^27.0.1" - jest-snapshot "^27.0.4" + jest-snapshot "^27.0.5" -jest-resolve@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" - integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== +jest-resolve@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.5.tgz#937535a5b481ad58e7121eaea46d1424a1e0c507" + integrity sha512-Md65pngRh8cRuWVdWznXBB5eDt391OJpdBaJMxfjfuXCvOhM3qQBtLMCMTykhuUKiBMmy5BhqCW7AVOKmPrW+Q== dependencies: "@jest/types" "^27.0.2" chalk "^4.0.0" @@ -8748,15 +8748,15 @@ jest-resolve@^27.0.4: resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" - integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== +jest-runner@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.5.tgz#b6fdc587e1a5056339205914294555c554efc08a" + integrity sha512-HNhOtrhfKPArcECgBTcWOc+8OSL8GoFoa7RsHGnfZR1C1dFohxy9eLtpYBS+koybAHlJLZzNCx2Y/Ic3iEtJpQ== dependencies: "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" + "@jest/environment" "^27.0.5" "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" "@types/node" "*" chalk "^4.0.0" @@ -8764,30 +8764,30 @@ jest-runner@^27.0.4: exit "^0.1.2" graceful-fs "^4.2.4" jest-docblock "^27.0.1" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-haste-map "^27.0.2" + jest-environment-jsdom "^27.0.5" + jest-environment-node "^27.0.5" + jest-haste-map "^27.0.5" jest-leak-detector "^27.0.2" jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-runtime "^27.0.4" + jest-resolve "^27.0.5" + jest-runtime "^27.0.5" jest-util "^27.0.2" jest-worker "^27.0.2" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" - integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== +jest-runtime@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.5.tgz#cd5d1aa9754d30ddf9f13038b3cb7b95b46f552d" + integrity sha512-V/w/+VasowPESbmhXn5AsBGPfb35T7jZPGZybYTHxZdP7Gwaa+A0EXE6rx30DshHKA98lVCODbCO8KZpEW3hiQ== dependencies: "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/globals" "^27.0.3" + "@jest/environment" "^27.0.5" + "@jest/fake-timers" "^27.0.5" + "@jest/globals" "^27.0.5" "@jest/source-map" "^27.0.1" "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" "@types/yargs" "^16.0.0" chalk "^4.0.0" @@ -8796,12 +8796,12 @@ jest-runtime@^27.0.4: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" + jest-haste-map "^27.0.5" jest-message-util "^27.0.2" jest-mock "^27.0.3" jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-snapshot "^27.0.4" + jest-resolve "^27.0.5" + jest-snapshot "^27.0.5" jest-util "^27.0.2" jest-validate "^27.0.2" slash "^3.0.0" @@ -8816,10 +8816,10 @@ jest-serializer@^27.0.1: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" - integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== +jest-snapshot@^27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.5.tgz#6e3b9e8e193685372baff771ba34af631fe4d4d5" + integrity sha512-H1yFYdgnL1vXvDqMrnDStH6yHFdMEuzYQYc71SnC/IJnuuhW6J16w8GWG1P+qGd3Ag3sQHjbRr0TcwEo/vGS+g== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -8827,7 +8827,7 @@ jest-snapshot@^27.0.4: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.2" + "@jest/transform" "^27.0.5" "@jest/types" "^27.0.2" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" @@ -8837,10 +8837,10 @@ jest-snapshot@^27.0.4: graceful-fs "^4.2.4" jest-diff "^27.0.2" jest-get-type "^27.0.1" - jest-haste-map "^27.0.2" + jest-haste-map "^27.0.5" jest-matcher-utils "^27.0.2" jest-message-util "^27.0.2" - jest-resolve "^27.0.4" + jest-resolve "^27.0.5" jest-util "^27.0.2" natural-compare "^1.4.0" pretty-format "^27.0.2" @@ -8892,14 +8892,14 @@ jest-worker@^27.0.2: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" - integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== +jest@27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.5.tgz#141825e105514a834cc8d6e44670509e8d74c5f2" + integrity sha512-4NlVMS29gE+JOZvgmSAsz3eOjkSsHqjTajlIsah/4MVSmKvf3zFP/TvgcLoWe2UVHiE9KF741sReqhF0p4mqbQ== dependencies: - "@jest/core" "^27.0.4" + "@jest/core" "^27.0.5" import-local "^3.0.2" - jest-cli "^27.0.4" + jest-cli "^27.0.5" joi@^17.3.0: version "17.3.0" @@ -13429,10 +13429,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== -v8-to-istanbul@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" - integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== +v8-to-istanbul@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c" + integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" From ab4edc17dea67c15b47fa4d8305928cd9e15727f Mon Sep 17 00:00:00 2001 From: renovate Date: Tue, 22 Jun 2021 19:32:44 +0000 Subject: [PATCH 08/25] Update dependency marked to v2.1.2 (#559) Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/559 Co-authored-by: renovate Co-committed-by: renovate --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ca1694ba1..3a6ef24de 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dompurify": "2.2.9", "highlight.js": "11.0.1", "lodash": "4.17.21", - "marked": "2.1.1", + "marked": "2.1.2", "register-service-worker": "1.7.2", "sass": "1.35.1", "snake-case": "3.0.4", diff --git a/yarn.lock b/yarn.lock index 448ec74ac..1b264bab3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9524,10 +9524,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.1.tgz#b7c27f520fc4de0ddd049d9b4be3b04e06314923" - integrity sha512-5XFS69o9CzDpQDSpUYC+AN2xvq8yl1EGa5SG/GI1hP78/uTeo3PDfiDNmsUyiahpyhToDDJhQk7fNtJsga+KVw== +marked@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.2.tgz#59579e17b02443312caa1509994d5a0b18ae38e1" + integrity sha512-ueJhIvklJJw04qxQbGIAu63EXwwOCYc7yKMBjgagTM4rjC5QtWyqSNgW7jCosV1/Km/1TUfs5qEpAqcGG0Mo5g== marked@^2.0.0, marked@^2.0.1: version "2.0.1" From cdc805c8dae15434211b0bf3c57f20aef86d276c Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 22 Jun 2021 22:07:57 +0200 Subject: [PATCH 09/25] Refactor success and error messages --- src/components/home/contentAuth.vue | 2 +- src/components/home/navigation.vue | 2 +- src/components/list/partials/filters.vue | 4 +- src/components/migrator/migration.vue | 6 +- src/components/misc/subscription.vue | 8 +-- src/components/namespace/namespace-search.vue | 2 +- .../notifications/notifications.vue | 4 +- .../quick-actions/quick-actions.vue | 16 +++--- src/components/sharing/linkSharing.vue | 16 ++---- src/components/sharing/userTeam.vue | 42 ++++++-------- src/components/tasks/edit-task.vue | 4 +- src/components/tasks/gantt-component.vue | 6 +- .../tasks/mixins/attachmentUpload.js | 2 +- src/components/tasks/mixins/taskList.js | 2 +- src/components/tasks/partials/attachments.vue | 4 +- src/components/tasks/partials/comments.vue | 13 ++--- src/components/tasks/partials/defer-task.vue | 2 +- src/components/tasks/partials/description.vue | 2 +- .../tasks/partials/editAssignees.vue | 10 ++-- src/components/tasks/partials/editLabels.vue | 12 ++-- src/components/tasks/partials/heading.vue | 2 +- src/components/tasks/partials/listSearch.vue | 2 +- .../tasks/partials/relatedTasks.vue | 8 +-- .../tasks/partials/singleTaskInList.vue | 22 +++----- src/components/user/avatar-settings.vue | 10 ++-- src/main.js | 8 ++- src/message/index.js | 9 --- src/views/filters/CreateSavedFilter.vue | 2 +- src/views/filters/settings/delete.vue | 4 +- src/views/filters/settings/edit.vue | 6 +- src/views/labels/ListLabels.vue | 10 ++-- src/views/labels/NewLabel.vue | 4 +- src/views/list/NewList.vue | 7 +-- src/views/list/ShowList.vue | 2 +- src/views/list/settings/archive.vue | 4 +- src/views/list/settings/background.vue | 14 ++--- src/views/list/settings/delete.vue | 4 +- src/views/list/settings/duplicate.vue | 4 +- src/views/list/settings/edit.vue | 6 +- src/views/list/settings/share.vue | 2 +- src/views/list/views/Kanban.vue | 28 +++++----- src/views/list/views/List.vue | 10 ++-- src/views/namespaces/ListNamespaces.vue | 4 +- src/views/namespaces/NewNamespace.vue | 7 +-- src/views/namespaces/settings/archive.vue | 4 +- src/views/namespaces/settings/delete.vue | 4 +- src/views/namespaces/settings/edit.vue | 6 +- src/views/namespaces/settings/share.vue | 2 +- src/views/tasks/ShowTasks.vue | 2 +- src/views/tasks/TaskDetailView.vue | 10 ++-- src/views/teams/EditTeam.vue | 55 +++++++------------ src/views/teams/ListTeams.vue | 2 +- src/views/teams/NewTeam.vue | 7 +-- src/views/user/Login.vue | 19 +++++-- src/views/user/Settings.vue | 26 ++++----- 55 files changed, 219 insertions(+), 256 deletions(-) diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue index 576d77bf0..55ab90f8d 100644 --- a/src/components/home/contentAuth.vue +++ b/src/components/home/contentAuth.vue @@ -130,7 +130,7 @@ export default { loadLabels() { this.$store.dispatch('labels/loadAllLabels') .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue index a2933d759..05b8cd2a5 100644 --- a/src/components/home/navigation.vue +++ b/src/components/home/navigation.vue @@ -161,7 +161,7 @@ export default { return } this.$store.dispatch('lists/toggleListFavorite', list) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, resize() { // Hide the menu by default on mobile diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue index a28f339e6..448222d0f 100644 --- a/src/components/list/partials/filters.vue +++ b/src/components/list/partials/filters.vue @@ -490,7 +490,7 @@ export default { .then(r => { this.$set(this, kind, r) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) } }, setDoneFilter() { @@ -545,7 +545,7 @@ export default { })) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, add(kind, filterName) { diff --git a/src/components/migrator/migration.vue b/src/components/migrator/migration.vue index 4b65fc9fc..c6de5f2b5 100644 --- a/src/components/migrator/migration.vue +++ b/src/components/migrator/migration.vue @@ -105,7 +105,7 @@ export default { this.migrate() }) .catch(e => { - this.error(e, this) + this.error(e) }) } }, @@ -116,7 +116,7 @@ export default { this.authUrl = r.url }) .catch(e => { - this.error(e, this) + this.error(e) }) }, migrate() { @@ -129,7 +129,7 @@ export default { this.$store.dispatch('namespaces/loadNamespaces') }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.isMigrating = false diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue index d59a491c6..82ad2f620 100644 --- a/src/components/misc/subscription.vue +++ b/src/components/misc/subscription.vue @@ -96,10 +96,10 @@ export default { this.subscriptionService.create(subscription) .then(() => { this.$emit('change', subscription) - this.success({message: `You are now subscribed to this ${this.entity}`}, this) + this.success({message: `You are now subscribed to this ${this.entity}`}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, unsubscribe() { @@ -110,10 +110,10 @@ export default { this.subscriptionService.delete(subscription) .then(() => { this.$emit('change', null) - this.success({message: `You are now unsubscribed to this ${this.entity}`}, this) + this.success({message: `You are now unsubscribed to this ${this.entity}`}) }) .catch(e => { - this.error(e, this) + this.error(e) }) } }, diff --git a/src/components/namespace/namespace-search.vue b/src/components/namespace/namespace-search.vue index d2fbc556a..8444d6168 100644 --- a/src/components/namespace/namespace-search.vue +++ b/src/components/namespace/namespace-search.vue @@ -43,7 +43,7 @@ export default { this.$set(this, 'namespaces', response) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, clearAll() { diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index e0f72422d..00a76250f 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -98,7 +98,7 @@ export default { this.$set(this, 'allNotifications', r) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, to(n, index) { @@ -136,7 +136,7 @@ export default { .then(r => { this.$set(this.allNotifications, index, r) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) } }, }, diff --git a/src/components/quick-actions/quick-actions.vue b/src/components/quick-actions/quick-actions.vue index 02279db4f..c55b887f7 100644 --- a/src/components/quick-actions/quick-actions.vue +++ b/src/components/quick-actions/quick-actions.vue @@ -361,12 +361,12 @@ export default { }) this.taskService.create(newTask) .then(r => { - this.success({message: 'The task was successfully created.'}, this) + this.success({message: 'The task was successfully created.'}) this.$router.push({name: 'task.detail', params: {id: r.id}}) this.closeQuickActions() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, newList() { @@ -380,12 +380,12 @@ export default { }) this.listService.create(newList) .then(r => { - this.success({message: 'The list was successfully created.'}, this) + this.success({message: 'The list was successfully created.'}) this.$router.push({name: 'list.index', params: {listId: r.id}}) this.closeQuickActions() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, newNamespace() { @@ -393,11 +393,11 @@ export default { this.namespaceService.create(newNamespace) .then(r => { this.$store.commit('namespaces/addNamespace', r) - this.success({message: 'The namespace was successfully created.'}, this) + this.success({message: 'The namespace was successfully created.'}) this.closeQuickActions() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, newTeam() { @@ -408,11 +408,11 @@ export default { name: 'teams.edit', params: {id: r.id}, }) - this.success({message: 'The team was successfully created.'}, this) + this.success({message: 'The team was successfully created.'}) this.closeQuickActions() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, select(parentIndex, index) { diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue index 8094649a1..802015770 100644 --- a/src/components/sharing/linkSharing.vue +++ b/src/components/sharing/linkSharing.vue @@ -231,7 +231,7 @@ export default { this.linkShares = r }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, add() { @@ -248,14 +248,11 @@ export default { this.name = '' this.password = '' this.showNewForm = false - this.success( - {message: 'The link share was successfully created'}, - this - ) + this.success({message: 'The link share was successfully created'}) this.load() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, remove() { @@ -266,14 +263,11 @@ export default { this.linkShareService .delete(linkshare) .then(() => { - this.success( - {message: 'The link share was successfully deleted'}, - this - ) + this.success({message: 'The link share was successfully deleted'}) this.load() }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showDeleteModal = false diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue index cad550ce4..3a72d7e3b 100644 --- a/src/components/sharing/userTeam.vue +++ b/src/components/sharing/userTeam.vue @@ -249,7 +249,7 @@ export default { ) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, deleteSharable() { @@ -271,10 +271,10 @@ export default { this.sharables.splice(i, 1) } } - this.success({message: `The ${this.shareType} was successfully deleted from the ${this.typeString}.`}, this) + this.success({message: `The ${this.shareType} was successfully deleted from the ${this.typeString}.`}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, add(admin) { @@ -295,19 +295,16 @@ export default { this.stuffService .create(this.stuffModel) .then(() => { - this.success( - { - message: - 'The ' + - this.shareType + - ' was successfully added.', - }, - this - ) + this.success({ + message: + 'The ' + + this.shareType + + ' was successfully added.', + }) this.load() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, toggleType(sharable) { @@ -340,18 +337,15 @@ export default { this.$set(this.sharables[i], 'right', r.right) } } - this.success( - { - message: - 'The ' + - this.shareType + - ' right was successfully updated.', - }, - this - ) + this.success({ + message: + 'The ' + + this.shareType + + ' right was successfully updated.', + }) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, find(query) { @@ -366,7 +360,7 @@ export default { this.$set(this, 'found', response) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, clearAll() { diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue index 0e4f63939..208818bfc 100644 --- a/src/components/tasks/edit-task.vue +++ b/src/components/tasks/edit-task.vue @@ -150,10 +150,10 @@ export default { .then((r) => { this.$set(this, 'taskEditTask', r) this.initTaskFields() - this.success({message: 'The task has been saved successfully.'}, this) + this.success({message: 'The task has been saved successfully.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue index d27bd37fa..8147ca3d6 100644 --- a/src/components/tasks/gantt-component.vue +++ b/src/components/tasks/gantt-component.vue @@ -362,7 +362,7 @@ export default { }) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, addGantAttributes(t) { @@ -447,7 +447,7 @@ export default { } }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, editTask(task) { @@ -484,7 +484,7 @@ export default { this.hideCrateNewTask() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/components/tasks/mixins/attachmentUpload.js b/src/components/tasks/mixins/attachmentUpload.js index 7d0330811..1e08e0fc4 100644 --- a/src/components/tasks/mixins/attachmentUpload.js +++ b/src/components/tasks/mixins/attachmentUpload.js @@ -31,7 +31,7 @@ export default { } }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js index 6748ad068..a6e91c2db 100644 --- a/src/components/tasks/mixins/taskList.js +++ b/src/components/tasks/mixins/taskList.js @@ -115,7 +115,7 @@ export default { this.loadedList = cloneDeep(currentList) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, loadTasksForPage(e) { diff --git a/src/components/tasks/partials/attachments.vue b/src/components/tasks/partials/attachments.vue index 3e20b36b6..59c2be26a 100644 --- a/src/components/tasks/partials/attachments.vue +++ b/src/components/tasks/partials/attachments.vue @@ -226,10 +226,10 @@ export default { 'attachments/removeById', this.attachmentToDelete.id ) - this.success(r, this) + this.success(r) }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showDeleteModal = false diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue index 848731b56..838bbe1b1 100644 --- a/src/components/tasks/partials/comments.vue +++ b/src/components/tasks/partials/comments.vue @@ -236,7 +236,7 @@ export default { this.makeActions() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, addComment() { @@ -258,13 +258,10 @@ export default { .then((r) => { this.comments.push(r) this.newComment.comment = '' - this.success( - {message: 'The comment was added successfully.'}, - this - ) + this.success({message: 'The comment was added successfully.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.creating = false @@ -300,7 +297,7 @@ export default { }, 2000) }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.isCommentEdit = false @@ -318,7 +315,7 @@ export default { } }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showDeleteModal = false diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue index 0f6c0c474..93a1f1830 100644 --- a/src/components/tasks/partials/defer-task.vue +++ b/src/components/tasks/partials/defer-task.vue @@ -131,7 +131,7 @@ export default { this.$emit('input', r) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/components/tasks/partials/description.vue b/src/components/tasks/partials/description.vue index 738973f72..fed482529 100644 --- a/src/components/tasks/partials/description.vue +++ b/src/components/tasks/partials/description.vue @@ -86,7 +86,7 @@ export default { }, 2000) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.saving = false diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue index bb3f04cd8..ec98ac134 100644 --- a/src/components/tasks/partials/editAssignees.vue +++ b/src/components/tasks/partials/editAssignees.vue @@ -84,10 +84,10 @@ export default { this.$store.dispatch('tasks/addAssignee', {user: user, taskId: this.taskId}) .then(() => { this.$emit('input', this.assignees) - this.success({message: 'The user has been assigned successfully.'}, this) + this.success({message: 'The user has been assigned successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, removeAssignee(user) { @@ -99,10 +99,10 @@ export default { this.assignees.splice(a, 1) } } - this.success({message: 'The user has been unassinged successfully.'}, this) + this.success({message: 'The user has been unassinged successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, findUser(query) { @@ -119,7 +119,7 @@ export default { })) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, clearAllFoundUsers() { diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue index 5c03449cf..92f3ba28e 100644 --- a/src/components/tasks/partials/editLabels.vue +++ b/src/components/tasks/partials/editLabels.vue @@ -104,11 +104,11 @@ export default { .then(() => { this.$emit('input', this.labels) if (showNotification) { - this.success({message: 'The label has been added successfully.'}, this) + this.success({message: 'The label has been added successfully.'}) } }) .catch(e => { - this.error(e, this) + this.error(e) }) }, removeLabel(label) { @@ -121,10 +121,10 @@ export default { } } this.$emit('input', this.labels) - this.success({message: 'The label has been removed successfully.'}, this) + this.success({message: 'The label has been removed successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, createAndAddLabel(title) { @@ -133,10 +133,10 @@ export default { .then(r => { this.addLabel(r, false) this.labels.push(r) - this.success({message: 'The label has been created successfully.'}, this) + this.success({message: 'The label has been created successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue index 35dc55c9d..e4b70ab48 100644 --- a/src/components/tasks/partials/heading.vue +++ b/src/components/tasks/partials/heading.vue @@ -90,7 +90,7 @@ export default { }, 2000) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.saving = false diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue index 9d1582f25..3c281ea1c 100644 --- a/src/components/tasks/partials/listSearch.vue +++ b/src/components/tasks/partials/listSearch.vue @@ -51,7 +51,7 @@ export default { this.$set(this, 'foundLists', response) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, clearAll() { diff --git a/src/components/tasks/partials/relatedTasks.vue b/src/components/tasks/partials/relatedTasks.vue index d2a0c5443..40de796c7 100644 --- a/src/components/tasks/partials/relatedTasks.vue +++ b/src/components/tasks/partials/relatedTasks.vue @@ -192,7 +192,7 @@ export default { this.$set(this, 'foundTasks', response) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, addTaskRelation() { @@ -215,7 +215,7 @@ export default { }, 2000) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, removeTaskRelation() { @@ -239,7 +239,7 @@ export default { }, 2000) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showDeleteModal = false @@ -253,7 +253,7 @@ export default { this.addTaskRelation() }) .catch(e => { - this.error(e, this) + this.error(e) }) }, relationKindTitle(kind, length) { diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue index 7031e7c14..a1537077c 100644 --- a/src/components/tasks/partials/singleTaskInList.vue +++ b/src/components/tasks/partials/singleTaskInList.vue @@ -175,20 +175,16 @@ export default { } this.task = t this.$emit('task-updated', t) - this.success( - {message: 'The task was successfully ' + (this.task.done ? '' : 'un-') + 'marked as done.'}, - this, - [{ - title: 'Undo', - callback: () => { - this.task.done = !this.task.done - this.markAsDone(!checked) - } - }], - ) + this.success({message: 'The task was successfully ' + (this.task.done ? '' : 'un-') + 'marked as done.'}, [{ + title: 'Undo', + callback: () => { + this.task.done = !this.task.done + this.markAsDone(!checked) + } + }]) }) .catch(e => { - this.error(e, this) + this.error(e) }) } @@ -207,7 +203,7 @@ export default { this.$store.dispatch('namespaces/loadNamespacesIfFavoritesDontExist') }) .catch(e => { - this.error(e, this) + this.error(e) }) }, hideDeferDueDatePopup(e) { diff --git a/src/components/user/avatar-settings.vue b/src/components/user/avatar-settings.vue index 319da3200..47de56b8a 100644 --- a/src/components/user/avatar-settings.vue +++ b/src/components/user/avatar-settings.vue @@ -93,16 +93,16 @@ export default { .then(r => { this.avatarProvider = r.avatarProvider }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, updateAvatarStatus() { const avatarStatus = new AvatarModel({avatarProvider: this.avatarProvider}) this.avatarService.update(avatarStatus) .then(() => { - this.success({message: 'Avatar status was updated successfully!'}, this) + this.success({message: 'Avatar status was updated successfully!'}) this.$store.commit('auth/reloadAvatar') }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, uploadAvatar() { this.loading = true @@ -112,10 +112,10 @@ export default { canvas.toBlob(blob => { this.avatarService.create(blob) .then(() => { - this.success({message: 'The avatar has been set successfully!'}, this) + this.success({message: 'The avatar has been set successfully!'}) this.$store.commit('auth/reloadAvatar') }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) .finally(() => { this.loading = false this.isCropAvatar = false diff --git a/src/main.js b/src/main.js index 07c0880cd..012d59298 100644 --- a/src/main.js +++ b/src/main.js @@ -215,8 +215,12 @@ Vue.mixin({ }, formatDate: date => formatDate(date, 'PPPPpppp'), formatDateShort: date => formatDate(date, 'PPpp'), - error: (e, context, actions = []) => message.error(e, context, actions), - success: (s, context, actions = []) => message.success(s, context, actions), + error(e, actions = []) { + return message.error(e, this, actions) + }, + success(s, actions = []) { + return message.success(s, this, actions) + }, colorIsDark: colorIsDark, setTitle: setTitle, }, diff --git a/src/message/index.js b/src/message/index.js index 6f4569ad4..7d3f06b21 100644 --- a/src/message/index.js +++ b/src/message/index.js @@ -1,13 +1,4 @@ export default { - setLoading(context) { - const timeout = setTimeout(function () { - context.loading = true - }, 100) - return () => { - clearTimeout(timeout) - context.loading = false - } - }, error(e, context, actions = []) { // Build the notification text from error response let err = e.message diff --git a/src/views/filters/CreateSavedFilter.vue b/src/views/filters/CreateSavedFilter.vue index abd521462..b028ac33f 100644 --- a/src/views/filters/CreateSavedFilter.vue +++ b/src/views/filters/CreateSavedFilter.vue @@ -110,7 +110,7 @@ export default { this.$store.dispatch('namespaces/loadNamespaces') this.$router.push({name: 'list.index', params: {listId: r.getListId()}}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, }, } diff --git a/src/views/filters/settings/delete.vue b/src/views/filters/settings/delete.vue index 9102c3d68..6a8ccc964 100644 --- a/src/views/filters/settings/delete.vue +++ b/src/views/filters/settings/delete.vue @@ -34,10 +34,10 @@ export default { this.filterService.delete(filter) .then(() => { this.$store.dispatch('namespaces/loadNamespaces') - this.success({message: 'The filter was deleted successfully.'}, this) + this.success({message: 'The filter was deleted successfully.'}) this.$router.push({name: 'namespaces.index'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, }, } diff --git a/src/views/filters/settings/edit.vue b/src/views/filters/settings/edit.vue index 9e7dbdc55..0a7d8945f 100644 --- a/src/views/filters/settings/edit.vue +++ b/src/views/filters/settings/edit.vue @@ -110,19 +110,19 @@ export default { this.filter = r this.filters = objectToSnakeCase(this.filter.filters) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, save() { this.filter.filters = this.filters this.filterService.update(this.filter) .then(r => { this.$store.dispatch('namespaces/loadNamespaces') - this.success({message: 'The filter was saved successfully.'}, this) + this.success({message: 'The filter was saved successfully.'}) this.filter = r this.filters = objectToSnakeCase(this.filter.filters) this.$router.back() }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, }, } diff --git a/src/views/labels/ListLabels.vue b/src/views/labels/ListLabels.vue index ddeeca4a8..5bbe9f05b 100644 --- a/src/views/labels/ListLabels.vue +++ b/src/views/labels/ListLabels.vue @@ -141,25 +141,25 @@ export default { loadLabels() { this.$store.dispatch('labels/loadAllLabels') .catch(e => { - this.error(e, this) + this.error(e) }) }, deleteLabel(label) { this.$store.dispatch('labels/deleteLabel', label) .then(() => { - this.success({message: 'The label was successfully deleted.'}, this) + this.success({message: 'The label was successfully deleted.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, editLabelSubmit() { this.$store.dispatch('labels/updateLabel', this.labelEditLabel) .then(() => { - this.success({message: 'The label was successfully updated.'}, this) + this.success({message: 'The label was successfully updated.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, editLabel(label) { diff --git a/src/views/labels/NewLabel.vue b/src/views/labels/NewLabel.vue index a0925d1bb..885948311 100644 --- a/src/views/labels/NewLabel.vue +++ b/src/views/labels/NewLabel.vue @@ -77,10 +77,10 @@ export default { name: 'labels.index', params: {id: r.id}, }) - this.success({message: 'The label was successfully created.'}, this) + this.success({message: 'The label was successfully created.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue index 2aa6bd03e..89d917ce8 100644 --- a/src/views/list/NewList.vue +++ b/src/views/list/NewList.vue @@ -69,17 +69,14 @@ export default { this.$store .dispatch('lists/createList', this.list) .then((r) => { - this.success( - { message: 'The list was successfully created.' }, - this - ) + this.success({message: 'The list was successfully created.'}) this.$router.push({ name: 'list.index', params: { listId: r.id }, }) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/ShowList.vue b/src/views/list/ShowList.vue index ccadc6de3..1643de354 100644 --- a/src/views/list/ShowList.vue +++ b/src/views/list/ShowList.vue @@ -142,7 +142,7 @@ export default { this.$store.commit(CURRENT_LIST, r) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.listLoaded = this.$route.params.listId diff --git a/src/views/list/settings/archive.vue b/src/views/list/settings/archive.vue index 87a63cd78..a8a19e86d 100644 --- a/src/views/list/settings/archive.vue +++ b/src/views/list/settings/archive.vue @@ -38,10 +38,10 @@ export default { .then(r => { this.$store.commit('currentList', r) this.$store.commit('namespaces/setListInNamespaceById', r) - this.success({message: 'The list was successfully archived.'}, this) + this.success({message: 'The list was successfully archived.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.$router.back() diff --git a/src/views/list/settings/background.vue b/src/views/list/settings/background.vue index 689905de6..51dc73ae6 100644 --- a/src/views/list/settings/background.vue +++ b/src/views/list/settings/background.vue @@ -130,7 +130,7 @@ export default { }) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, 300) }, @@ -144,10 +144,10 @@ export default { .then(l => { this.$store.commit(CURRENT_LIST, l) this.$store.commit('namespaces/setListInNamespaceById', l) - this.success({message: 'The background has been set successfully!'}, this) + this.success({message: 'The background has been set successfully!'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, uploadBackground() { @@ -159,10 +159,10 @@ export default { .then(l => { this.$store.commit(CURRENT_LIST, l) this.$store.commit('namespaces/setListInNamespaceById', l) - this.success({message: 'The background has been set successfully!'}, this) + this.success({message: 'The background has been set successfully!'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, removeBackground() { @@ -170,11 +170,11 @@ export default { .then(l => { this.$store.commit(CURRENT_LIST, l) this.$store.commit('namespaces/setListInNamespaceById', l) - this.success({message: 'The background has been removed successfully!'}, this) + this.success({message: 'The background has been removed successfully!'}) this.$router.back() }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/settings/delete.vue b/src/views/list/settings/delete.vue index 942853461..b5857958a 100644 --- a/src/views/list/settings/delete.vue +++ b/src/views/list/settings/delete.vue @@ -31,11 +31,11 @@ export default { this.listService.delete(list) .then(() => { this.$store.commit('namespaces/removeListFromNamespaceById', list) - this.success({message: 'The list was successfully deleted.'}, this) + this.success({message: 'The list was successfully deleted.'}) this.$router.push({name: 'home'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue index d15cb6bcc..d03701dee 100644 --- a/src/views/list/settings/duplicate.vue +++ b/src/views/list/settings/duplicate.vue @@ -46,11 +46,11 @@ export default { .then(r => { this.$store.commit('namespaces/addListToNamespace', r.list) this.$store.commit('lists/setList', r.list) - this.success({message: 'The list was successfully duplicated.'}, this) + this.success({message: 'The list was successfully duplicated.'}) this.$router.push({name: 'list.index', params: {listId: r.list.id}}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue index ffc29c856..226cc99a5 100644 --- a/src/views/list/settings/edit.vue +++ b/src/views/list/settings/edit.vue @@ -109,17 +109,17 @@ export default { this.setTitle(`Edit "${this.list.title}"`) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, save() { this.$store.dispatch('lists/updateList', this.list) .then(() => { - this.success({message: 'The list was successfully updated.'}, this) + this.success({message: 'The list was successfully updated.'}) this.$router.back() }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue index e0c763629..1955745e2 100644 --- a/src/views/list/settings/share.vue +++ b/src/views/list/settings/share.vue @@ -70,7 +70,7 @@ export default { this.setTitle(`Share "${this.list.title}"`) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue index 59515dec6..7da19a732 100644 --- a/src/views/list/views/Kanban.vue +++ b/src/views/list/views/Kanban.vue @@ -387,14 +387,14 @@ export default { bucketId: b.id, }) .catch(e => { - this.error(e, this) + this.error(e) }) } }) }) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, onDrop(bucketId, dropResult) { @@ -449,7 +449,7 @@ export default { this.$store.dispatch('tasks/update', task) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.$set(this.taskUpdating, task.id, false) @@ -468,7 +468,7 @@ export default { } }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.$set(this.taskUpdating, task.id, false) @@ -516,7 +516,7 @@ export default { this.$store.commit('kanban/addTaskToBucket', r) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { if (!this.$refs[`tasks-container${task.bucketId}`][0]) { @@ -541,7 +541,7 @@ export default { this.showNewBucketInput = false }) .catch(e => { - this.error(e, this) + this.error(e) }) }, deleteBucketModal(bucketId) { @@ -560,10 +560,10 @@ export default { this.$store.dispatch('kanban/deleteBucket', {bucket: bucket, params: this.params}) .then(() => { - this.success({message: 'The bucket has been deleted successfully.'}, this) + this.success({message: 'The bucket has been deleted successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showBucketDeleteModal = false @@ -590,20 +590,20 @@ export default { .then(r => { realBucket.title = r.title bucketTitleElement.blur() - this.success({message: 'The bucket title has been saved successfully.'}, this) + this.success({message: 'The bucket title has been saved successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, updateBucket(bucket) { bucket.limit = parseInt(bucket.limit) this.$store.dispatch('kanban/updateBucket', bucket) .then(() => { - this.success({message: 'The bucket limit been saved successfully.'}, this) + this.success({message: 'The bucket limit been saved successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, setBucketLimit(bucket) { @@ -622,10 +622,10 @@ export default { bucket.isDoneBucket = !bucket.isDoneBucket this.$store.dispatch('kanban/updateBucket', bucket) .then(() => { - this.success({message: 'The done bucket has been saved successfully.'}, this) + this.success({message: 'The done bucket has been saved successfully.'}) }) .catch(e => { - this.error(e, this) + this.error(e) bucket.isDoneBucket = !bucket.isDoneBucket }) }, diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue index 46b5bd7e4..7ee215529 100644 --- a/src/views/list/views/List.vue +++ b/src/views/list/views/List.vue @@ -323,7 +323,7 @@ export default { labelAddings[index - 1].resolve(result) }) .catch(e => { - this.error(e, this) + this.error(e) }) } else { // label not found, create it @@ -345,11 +345,11 @@ export default { labelAddings[index - 1].resolve(result) }) .catch(e => { - this.error(e, this) + this.error(e) }) }) .catch(e => { - this.error(e, this) + this.error(e) }) } }) @@ -365,13 +365,13 @@ export default { this.$store.commit(HAS_TASKS, true) }) .catch(e => { - this.error(e, this) + this.error(e) }) }) } }) .catch(e => { - this.error(e, this) + this.error(e) }) }, editTask(id) { diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue index 7edf311c6..dbd74c2bb 100644 --- a/src/views/namespaces/ListNamespaces.vue +++ b/src/views/namespaces/ListNamespaces.vue @@ -131,7 +131,7 @@ export default { this.$set(this.backgrounds, l.id, b) }) .catch(e => { - this.error(e, this) + this.error(e) }) } }) @@ -144,7 +144,7 @@ export default { return } this.$store.dispatch('lists/toggleListFavorite', list) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, saveShowArchivedState() { localStorage.setItem('showArchived', JSON.stringify(this.showArchived)) diff --git a/src/views/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue index 4d041d741..05df04d3f 100644 --- a/src/views/namespaces/NewNamespace.vue +++ b/src/views/namespaces/NewNamespace.vue @@ -80,14 +80,11 @@ export default { .create(this.namespace) .then((r) => { this.$store.commit('namespaces/addNamespace', r) - this.success( - { message: 'The namespace was successfully created.' }, - this - ) + this.success({message: 'The namespace was successfully created.'}) this.$router.back() }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/namespaces/settings/archive.vue b/src/views/namespaces/settings/archive.vue index 3e4e5f5e2..c57aed036 100644 --- a/src/views/namespaces/settings/archive.vue +++ b/src/views/namespaces/settings/archive.vue @@ -38,10 +38,10 @@ export default { this.namespaceService.update(this.namespace) .then(r => { this.$store.commit('namespaces/setNamespaceById', r) - this.success({message: 'The namespace was successfully archived.'}, this) + this.success({message: 'The namespace was successfully archived.'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.$router.back() diff --git a/src/views/namespaces/settings/delete.vue b/src/views/namespaces/settings/delete.vue index dd58a7496..6f9b5b586 100644 --- a/src/views/namespaces/settings/delete.vue +++ b/src/views/namespaces/settings/delete.vue @@ -31,11 +31,11 @@ export default { this.$store.dispatch('namespaces/deleteNamespace', namespace) .then(() => { - this.success({message: 'The namespace was successfully deleted.'}, this) + this.success({message: 'The namespace was successfully deleted.'}) this.$router.push({name: 'home'}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/namespaces/settings/edit.vue b/src/views/namespaces/settings/edit.vue index 489bd60d9..c5e8dc84a 100644 --- a/src/views/namespaces/settings/edit.vue +++ b/src/views/namespaces/settings/edit.vue @@ -118,7 +118,7 @@ export default { this.setTitle(`Edit "${r.title}"`) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, save() { @@ -126,11 +126,11 @@ export default { .then(r => { // Update the namespace in the parent this.$store.commit('namespaces/setNamespaceById', r) - this.success({message: 'The namespace was successfully updated.'}, this) + this.success({message: 'The namespace was successfully updated.'}) this.$router.back() }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue index 7836aa31e..d7bfd5ba8 100644 --- a/src/views/namespaces/settings/share.vue +++ b/src/views/namespaces/settings/share.vue @@ -69,7 +69,7 @@ export default { this.setTitle(`Share "${this.namespace.title}"`) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue index bf0b976f0..dd005fa06 100644 --- a/src/views/tasks/ShowTasks.vue +++ b/src/views/tasks/ShowTasks.vue @@ -203,7 +203,7 @@ export default { this.$store.commit(HAS_TASKS, r.length > 0) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, updateTasks(updatedTask) { diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue index 65c7cd2ce..8f4c9e759 100644 --- a/src/views/tasks/TaskDetailView.vue +++ b/src/views/tasks/TaskDetailView.vue @@ -559,7 +559,7 @@ export default { this.setTitle(this.task.title) }) .catch(e => { - this.error(e, this) + this.error(e) }) .finally(() => { this.$nextTick(() => this.visible = true) @@ -620,10 +620,10 @@ export default { callback: undoCallback, }] } - this.success({message: 'The task was saved successfully.'}, this, actions) + this.success({message: 'The task was saved successfully.'}, actions) }) .catch(e => { - this.error(e, this) + this.error(e) }) }) }, @@ -648,11 +648,11 @@ export default { deleteTask() { this.$store.dispatch('tasks/delete', this.task) .then(() => { - this.success({message: 'The task has been deleted successfully.'}, this) + this.success({message: 'The task has been deleted successfully.'}) this.$router.push({name: 'list.index', params: {listId: this.task.listId}}) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, toggleTaskDone() { diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue index 72fdad59b..8c6c313e3 100644 --- a/src/views/teams/EditTeam.vue +++ b/src/views/teams/EditTeam.vue @@ -249,7 +249,7 @@ export default { this.setTitle(`Edit Team ${this.team.name}`) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, save() { @@ -263,44 +263,35 @@ export default { .update(this.team) .then((response) => { this.team = response - this.success( - {message: 'The team was successfully updated.'}, - this - ) + this.success({message: 'The team was successfully updated.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, deleteTeam() { this.teamService .delete(this.team) .then(() => { - this.success( - {message: 'The team was successfully deleted.'}, - this - ) + this.success({message: 'The team was successfully deleted.'}) router.push({name: 'teams.index'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, deleteUser() { this.teamMemberService .delete(this.member) .then(() => { - this.success( - { - message: - 'The user was successfully deleted from the team.', - }, - this - ) + this.success({ + message: + 'The user was successfully deleted from the team.', + }) this.loadTeam() }) .catch((e) => { - this.error(e, this) + this.error(e) }) .finally(() => { this.showUserDeleteModal = false @@ -315,13 +306,10 @@ export default { .create(newMember) .then(() => { this.loadTeam() - this.success( - {message: 'The team member was successfully added.'}, - this - ) + this.success({message: 'The team member was successfully added.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, toggleUserType(member) { @@ -336,18 +324,15 @@ export default { break } } - this.success( - { - message: - 'The team member was successfully made ' + - (member.admin ? 'admin' : 'member') + - '.', - }, - this - ) + this.success({ + message: + 'The team member was successfully made ' + + (member.admin ? 'admin' : 'member') + + '.', + }) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, findUser(query) { @@ -362,7 +347,7 @@ export default { this.$set(this, 'foundUsers', response) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, clearAll() { diff --git a/src/views/teams/ListTeams.vue b/src/views/teams/ListTeams.vue index 832987ece..e3f962ef8 100644 --- a/src/views/teams/ListTeams.vue +++ b/src/views/teams/ListTeams.vue @@ -50,7 +50,7 @@ export default { this.$set(this, 'teams', response) }) .catch(e => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/teams/NewTeam.vue b/src/views/teams/NewTeam.vue index 22708923a..594c97982 100644 --- a/src/views/teams/NewTeam.vue +++ b/src/views/teams/NewTeam.vue @@ -67,13 +67,10 @@ export default { name: 'teams.edit', params: { id: response.id }, }) - this.success( - { message: 'The team was successfully created.' }, - this - ) + this.success({message: 'The team was successfully created.'}) }) .catch((e) => { - this.error(e, this) + this.error(e) }) }, }, diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index d097185f9..3fcd8215c 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -82,7 +82,9 @@ -
+
{ localStorage.removeItem('emailConfirmToken') @@ -158,6 +159,15 @@ export default { openidConnect: state => state.config.auth.openidConnect, }), methods: { + setLoading() { + const timeout = setTimeout(() => { + this.loading = true + }, 100) + return () => { + clearTimeout(timeout) + this.loading = false + } + }, submit() { this.$store.commit(ERROR_MESSAGE, '') // Some browsers prevent Vue bindings from working with autofilled values. @@ -173,7 +183,8 @@ export default { } this.$store.dispatch('auth/login', credentials) - .catch(() => {}) + .catch(() => { + }) }, redirectToProvider(provider) { const state = Math.random().toString(36).substring(2, 24) diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue index 956515705..adbf38329 100644 --- a/src/views/user/Settings.vue +++ b/src/views/user/Settings.vue @@ -338,22 +338,22 @@ export default { methods: { updatePassword() { if (this.passwordConfirm !== this.passwordUpdate.newPassword) { - this.error({message: 'The new password and its confirmation don\'t match.'}, this) + this.error({message: 'The new password and its confirmation don\'t match.'}) return } this.passwordUpdateService.update(this.passwordUpdate) .then(() => { - this.success({message: 'The password was successfully updated.'}, this) + this.success({message: 'The password was successfully updated.'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, updateEmail() { this.emailUpdateService.update(this.emailUpdate) .then(() => { - this.success({message: 'Your email address was successfully updated. We\'ve sent you a link to confirm it.'}, this) + this.success({message: 'Your email address was successfully updated. We\'ve sent you a link to confirm it.'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, totpStatus() { if (!this.totpEnabled) { @@ -371,7 +371,7 @@ export default { return } - this.error(e, this) + this.error(e) }) }, totpSetQrCode() { @@ -388,24 +388,24 @@ export default { this.$set(this, 'totp', r) this.totpSetQrCode() }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, totpConfirm() { this.totpService.enable({passcode: this.totpConfirmPasscode}) .then(() => { this.$set(this.totp, 'enabled', true) - this.success({message: 'You\'ve successfully confirmed your totp setup and can use it from now on!'}, this) + this.success({message: 'You\'ve successfully confirmed your totp setup and can use it from now on!'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, totpDisable() { this.totpService.disable({password: this.totpDisablePassword}) .then(() => { this.totpEnrolled = false this.$set(this, 'totp', new TotpModel()) - this.success({message: 'Two factor authentication was sucessfully disabled.'}, this) + this.success({message: 'Two factor authentication was sucessfully disabled.'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, updateSettings() { localStorage.setItem(playSoundWhenDoneKey, this.playSoundWhenDone) @@ -413,9 +413,9 @@ export default { this.userSettingsService.update(this.settings) .then(() => { this.$store.commit('auth/setUserSettings', this.settings) - this.success({message: 'The name was successfully changed.'}, this) + this.success({message: 'The name was successfully changed.'}) }) - .catch(e => this.error(e, this)) + .catch(e => this.error(e)) }, copy(text) { copy(text) From 0e53745e9176f60f3a18b19b84123a86a646b3ee Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 22 Jun 2021 22:41:29 +0200 Subject: [PATCH 10/25] Refactor success and error notifications to prevent html in them --- src/components/misc/notification.vue | 12 +++++++---- src/message/index.js | 30 +++++++++++++--------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/components/misc/notification.vue b/src/components/misc/notification.vue index c12137ead..2c839a6fb 100644 --- a/src/components/misc/notification.vue +++ b/src/components/misc/notification.vue @@ -11,13 +11,17 @@ >
+ > + {{ props.item.title }} +
+ > + +
+ + +
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + Save + + + + + +
@@ -88,76 +158,6 @@ - - -
- -
- -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- - - Save - - - - - - Date: Wed, 23 Jun 2021 22:08:20 +0200 Subject: [PATCH 12/25] Fix header layout for long list titles --- src/components/home/topNavigation.vue | 8 ++++++-- src/components/notifications/notifications.vue | 10 ++++++---- src/styles/components/list.scss | 10 +++++++++- src/styles/components/notifications.scss | 2 +- src/styles/theme/navigation.scss | 16 ++++++++++------ src/styles/theme/variables/variables.scss | 2 ++ 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue index 5a475f154..dba162eff 100644 --- a/src/components/home/topNavigation.vue +++ b/src/components/home/topNavigation.vue @@ -25,7 +25,7 @@ > -
+

@@ -48,7 +48,7 @@
- + diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue index dba162eff..385f971a2 100644 --- a/src/components/home/topNavigation.vue +++ b/src/components/home/topNavigation.vue @@ -25,14 +25,16 @@ > -
-

- {{ currentList.title === '' ? 'Loading...' : currentList.title }} -

+
+
@@ -61,27 +63,27 @@ - Settings + {{ $t('user.settings.title') }} - Imprint + {{ $t('navigation.imprint') }} - Privacy policy + {{ $t('navigation.privacy') }} - Keyboard Shortcuts + {{ $t('keyboardShortcuts.title') }} - Logout + {{ $t('user.auth.logout') }}
@@ -117,8 +119,14 @@ export default { canWriteCurrentList: state => state.currentList.maxRight > Rights.READ, }), mounted() { - const usernameWidth = this.$refs.usernameDropdown.$el.clientWidth - this.$refs.listTitle.style.setProperty('--nav-username-width', `${usernameWidth}px`) + this.$nextTick(() => { + if (typeof this.$refs.usernameDropdown === 'undefined' || typeof this.$refs.listTitle === 'undefined') { + return + } + + const usernameWidth = this.$refs.usernameDropdown.$el.clientWidth + this.$refs.listTitle.style.setProperty('--nav-username-width', `${usernameWidth}px`) + }) }, methods: { logout() { diff --git a/src/components/home/update.vue b/src/components/home/update.vue index 63559e3c2..2569c9c3a 100644 --- a/src/components/home/update.vue +++ b/src/components/home/update.vue @@ -1,8 +1,8 @@ diff --git a/src/components/input/colorPicker.vue b/src/components/input/colorPicker.vue index 5b2395fd7..868ad58ea 100644 --- a/src/components/input/colorPicker.vue +++ b/src/components/input/colorPicker.vue @@ -19,7 +19,7 @@ :class="{'is-empty': empty}" /> - Reset Color + {{ $t('input.resetColor') }}
diff --git a/src/components/input/datepicker.vue b/src/components/input/datepicker.vue index 2260d67dd..029ccac17 100644 --- a/src/components/input/datepicker.vue +++ b/src/components/input/datepicker.vue @@ -18,7 +18,7 @@ - Today + {{ $t('input.datepicker.today') }} {{ getWeekdayFromStringInterval('today') }} @@ -31,7 +31,7 @@ - Tomorrow + {{ $t('input.datepicker.tomorrow') }} {{ getWeekdayFromStringInterval('tomorrow') }} @@ -44,7 +44,7 @@ - Next Monday + {{ $t('input.datepicker.nextMonday') }} {{ getWeekdayFromStringInterval('nextMonday') }} @@ -57,7 +57,7 @@ - This Weekend + {{ $t('input.datepicker.thisWeekend') }} {{ getWeekdayFromStringInterval('thisWeekend') }} @@ -70,7 +70,7 @@ - Later This Week + {{ $t('input.datepicker.laterThisWeek') }} {{ getWeekdayFromStringInterval('laterThisWeek') }} @@ -83,7 +83,7 @@ - Next Week + {{ $t('input.datepicker.nextWeek') }} {{ getWeekdayFromStringInterval('nextWeek') }} @@ -102,7 +102,7 @@ :shadow="false" @click="close" > - Confirm + {{ $t('misc.confirm') }}
@@ -118,7 +118,6 @@ import {calculateDayInterval} from '@/helpers/time/calculateDayInterval' import {calculateNearestHours} from '@/helpers/time/calculateNearestHours' import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside' import {createDateFromString} from '@/helpers/time/createDateFromString' -import {mapState} from 'vuex' export default { name: 'datepicker', @@ -142,7 +141,9 @@ export default { }, chooseDateLabel: { type: String, - default: 'Choose a date' + default() { + return this.$t('input.datepicker.chooseDate') + } }, disabled: { type: Boolean, @@ -165,19 +166,21 @@ export default { this.updateData() }, }, - computed: mapState({ - flatPickerConfig: state => ({ - altFormat: 'j M Y H:i', - altInput: true, - dateFormat: 'Y-m-d H:i', - enableTime: true, - time_24hr: true, - inline: true, - locale: { - firstDayOfWeek: state.auth.settings.weekStart, - }, - }) - }), + computed: { + flatPickerConfig() { + return { + altFormat: this.$t('date.altFormatLong'), + altInput: true, + dateFormat: 'Y-m-d H:i', + enableTime: true, + time_24hr: true, + inline: true, + locale: { + firstDayOfWeek: this.$store.state.auth.settings.weekStart, + }, + } + }, + }, methods: { setDateValue(newVal) { if(newVal === null) { diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue index 0334bac6b..068799901 100644 --- a/src/components/input/editor.vue +++ b/src/components/input/editor.vue @@ -15,7 +15,7 @@ :shadow="false" type="secondary" > - Done + {{ $t('input.editor.done') }}

@@ -129,112 +129,112 @@ export default { { name: 'heading-1', action: EasyMDE.toggleHeading1, - title: 'Heading 1', + title: this.$t('input.editor.heading1'), icon: '', }, { name: 'heading-2', action: EasyMDE.toggleHeading2, - title: 'Heading 2', + title: this.$t('input.editor.heading2'), icon: '', }, { name: 'heading-3', action: EasyMDE.toggleHeading3, - title: 'Heading 3', + title: this.$t('input.editor.heading3'), icon: '', }, { name: 'heading-smaller', action: EasyMDE.toggleHeadingSmaller, - title: 'Heading Smaller', + title: this.$t('input.editor.headingSmaller'), icon: '', }, { name: 'heading-bigger', action: EasyMDE.toggleHeadingBigger, - title: 'Heading Bigger', + title: this.$t('input.editor.headingBigger'), icon: '', }, '|', { name: 'bold', action: EasyMDE.toggleBold, - title: 'Bold', + title: this.$t('input.editor.bold'), icon: '', }, { name: 'italic', action: EasyMDE.toggleItalic, - title: 'Italic', + title: this.$t('input.editor.italic'), icon: '', }, { name: 'strikethrough', action: EasyMDE.toggleStrikethrough, - title: 'Strikethrough', + title: this.$t('input.editor.strikethrough'), icon: '', }, { name: 'code', action: EasyMDE.toggleCodeBlock, - title: 'Code', + title: this.$t('input.editor.code'), icon: '', }, { name: 'quote', action: EasyMDE.toggleBlockquote, - title: 'Quote', + title: this.$t('input.editor.quote'), icon: '', }, { name: 'unordered-list', action: EasyMDE.toggleUnorderedList, - title: 'Unordered List', + title: this.$t('input.editor.unorderedList'), icon: '', }, { name: 'ordered-list', action: EasyMDE.toggleOrderedList, - title: 'Ordered List', + title: this.$t('input.editor.orderedList'), icon: '', }, '|', { name: 'clean-block', action: EasyMDE.cleanBlock, - title: 'Clean Block', + title: this.$t('input.editor.cleanBlock'), icon: '', }, { name: 'link', action: EasyMDE.drawLink, - title: 'Link', + title: this.$t('input.editor.link'), icon: '', }, { name: 'image', action: EasyMDE.drawImage, - title: 'Image', + title: this.$t('input.editor.image'), icon: '', }, { name: 'table', action: EasyMDE.drawTable, - title: 'Table', + title: this.$t('input.editor.table'), icon: '', }, { name: 'horizontal-rule', action: EasyMDE.drawHorizontalRule, - title: 'Horizontal Rule', + title: this.$t('input.editor.horizontalRule'), icon: '', }, '|', { name: 'side-by-side', action: EasyMDE.toggleSideBySide, - title: 'Side By Side', + title: this.$t('input.editor.sideBySide'), icon: '', }, { @@ -242,7 +242,7 @@ export default { action: () => { window.open('https://www.markdownguide.org/basic-syntax/', '_blank') }, - title: 'Guide', + title: this.$t('input.editor.guide'), icon: '', }, ], diff --git a/src/components/input/multiselect.vue b/src/components/input/multiselect.vue index f0db907c5..34a81fad2 100644 --- a/src/components/input/multiselect.vue +++ b/src/components/input/multiselect.vue @@ -149,15 +149,15 @@ export default { createPlaceholder: { type: String, default() { - return 'Create new' - }, + return this.$t('input.multiselect.createPlaceholder') + } }, // The text shown next to an option. selectPlaceholder: { type: String, default() { - return 'Click or press enter to select' - }, + return this.$t('input.multiselect.selectPlaceholder') + } }, // If true, allows for selecting multiple items. v-model will be an array with all selected values in that case. multiple: { diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue index 090defb1f..e44bec3a1 100644 --- a/src/components/list/list-settings-dropdown.vue +++ b/src/components/list/list-settings-dropdown.vue @@ -5,13 +5,13 @@ :to="{ name: `${listRoutePrefix}.settings.edit`, params: { listId: list.id } }" icon="pen" > - Edit + {{ $t('menu.edit') }} - Delete + {{ $t('misc.delete') }} diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue index 448222d0f..1bb586593 100644 --- a/src/components/list/partials/filters.vue +++ b/src/components/list/partials/filters.vue @@ -1,28 +1,30 @@ @@ -76,19 +78,19 @@ :selected="s.right === rights.READ" :value="rights.READ" > - Read only + {{ $t('list.share.right.read') }}
@@ -108,7 +110,7 @@ - Not shared with any {{ shareType }} yet. + {{ $t('list.share.userTeam.notShared', {type: shareTypeNames}) }} @@ -117,13 +119,11 @@ @submit="deleteSharable()" v-if="showDeleteModal" > - Remove a {{ shareType }} from the {{ typeString }} + + {{ $t('list.share.userTeam.removeHeader', {type: shareTypeName, sharable: sharableName}) }} +

- Are you sure you want to remove this {{ shareType }} from the - {{ typeString }}?
- This CANNOT BE UNDONE! + {{ $t('list.share.userTeam.removeText', {type: shareTypeName, sharable: sharableName}) }}

@@ -131,8 +131,6 @@