From 4ab08fb472611dcfef5fad57a85d6ecba5481231 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 22:20:08 +0000 Subject: [PATCH 01/11] Bump prettier from 1.14.3 to 1.17.1 in /webapp Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 29714e513..5fd7211ac 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -107,7 +107,7 @@ "jest": "~24.8.0", "node-sass": "~4.12.0", "nodemon": "~1.19.1", - "prettier": "~1.14.3", + "prettier": "~1.17.1", "sass-loader": "~7.1.0", "tippy.js": "^4.3.1", "vue-jest": "~3.0.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index f2e45260c..3c6ad8347 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8797,15 +8797,10 @@ prettier@1.16.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== -prettier@^1.15.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008" - integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw== - -prettier@~1.14.3: - version "1.14.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" - integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg== +prettier@^1.15.2, prettier@~1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db" + integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg== pretty-bytes@^5.2.0: version "5.2.0" From 154b6a6f788541fd7de0d3622b1cced1a173a3b4 Mon Sep 17 00:00:00 2001 From: aonomike Date: Tue, 28 May 2019 23:31:57 +0300 Subject: [PATCH 02/11] Fix large file sizes bug --- webapp/components/Upload/index.vue | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue index 831edd2f8..df9d35d22 100644 --- a/webapp/components/Upload/index.vue +++ b/webapp/components/Upload/index.vue @@ -9,6 +9,7 @@ :style="backgroundImage" @vdropzone-thumbnail="thumbnail" @vdropzone-drop="vddrop" + @vdropzone-error="verror" /> @@ -27,10 +28,11 @@ export default { return { dropzoneOptions: { url: this.vddrop, - maxFilesize: 0.5, + maxFilesize: 3.0, previewTemplate: this.template(), dictDefaultMessage: '', }, + error: false, } }, computed: { @@ -42,19 +44,20 @@ export default { } }, }, + watch: { + error() { + let that = this + setTimeout(function() { + that.error = false + }, 2000) + }, + }, methods: { template() { return `
-
-
-
-
-
-
-
` }, @@ -94,6 +97,12 @@ export default { }) .catch(error => this.$toast.error(error.message)) }, + verror(file, message) { + this.error = true + if (file.status === 'error') { + this.$toast.error(file.status, message) + } + }, }, } From ec1a24cbd31c29a5bd617519056f2aa2f18689cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 29 May 2019 13:18:18 +0200 Subject: [PATCH 03/11] Fix update incompatibility It seems that prettier supports vue in version `v1.15` and above. See: https://github.com/prettier/prettier/releases/tag/1.15.0 So I guess that interferes with the old vue linter rules in place. I graduated the vlue rule from `recommended` to `essential` and now running `yarn run lint --fix` is doing fine. --- webapp/.eslintrc.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js index 0400fe5f2..f5aa82c81 100644 --- a/webapp/.eslintrc.js +++ b/webapp/.eslintrc.js @@ -10,7 +10,7 @@ module.exports = { }, extends: [ 'standard', - 'plugin:vue/recommended', + 'plugin:vue/essential', 'plugin:prettier/recommended' ], // required to lint *.vue files @@ -25,7 +25,9 @@ module.exports = { 'no-console': ['error'], 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'vue/component-name-in-template-casing': ['error', 'kebab-case'], - 'prettier/prettier': ['error'], + 'prettier/prettier': ['error', { + htmlWhitespaceSensitivity: 'ignore' + }], // 'newline-per-chained-call': [2] } } From da0a4eabfc137056a18f6d972d0264d9c5d235fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Wed, 29 May 2019 11:30:33 +0000 Subject: [PATCH 04/11] Bump prettier from 1.14.3 to 1.17.1 in /webapp Bumps [prettier](https://github.com/prettier/prettier) from 1.14.3 to 1.17.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/1.14.3...1.17.1) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index b73b5cb3b..e2b151638 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -106,7 +106,7 @@ "jest": "~24.8.0", "node-sass": "~4.12.0", "nodemon": "~1.19.1", - "prettier": "~1.14.3", + "prettier": "~1.17.1", "sass-loader": "~7.1.0", "tippy.js": "^4.3.1", "vue-jest": "~3.0.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index f2e45260c..3c6ad8347 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8797,15 +8797,10 @@ prettier@1.16.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== -prettier@^1.15.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008" - integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw== - -prettier@~1.14.3: - version "1.14.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" - integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg== +prettier@^1.15.2, prettier@~1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db" + integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg== pretty-bytes@^5.2.0: version "5.2.0" From ff0b4b6867228d30e6f1c8281549b21f7b94150c Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Wed, 29 May 2019 09:47:24 -0300 Subject: [PATCH 05/11] Fix lint --- webapp/components/Badges.vue | 19 +- webapp/components/Category/index.vue | 5 +- webapp/components/Comment.vue | 15 +- webapp/components/ContentMenu.vue | 29 +-- webapp/components/ContributionForm/index.vue | 32 +--- webapp/components/CountTo.vue | 5 +- webapp/components/Dropdown.vue | 13 +- webapp/components/Editor/index.vue | 16 +- webapp/components/Empty.vue | 15 +- webapp/components/Image/index.vue | 5 +- webapp/components/LoadMore.vue | 12 +- webapp/components/LocaleSwitch.vue | 22 +-- webapp/components/Modal/DeleteModal.vue | 30 +-- webapp/components/Modal/DisableModal.vue | 18 +- webapp/components/Modal/ReportModal.vue | 22 +-- webapp/components/Password/Change.vue | 6 +- webapp/components/Password/Strength.vue | 10 +- webapp/components/PostCard/index.vue | 33 +--- webapp/components/SearchInput.vue | 39 ++-- webapp/components/ShoutButton.vue | 18 +- webapp/components/User/index.vue | 73 ++----- .../components/comments/CommentForm/index.vue | 19 +- .../components/comments/CommentList/index.vue | 23 +-- .../notifications/Notification/index.vue | 22 +-- .../notifications/NotificationMenu/index.vue | 32 +--- webapp/layouts/default.vue | 60 ++---- webapp/nuxt.config.js | 36 ++-- webapp/pages/admin.vue | 10 +- webapp/pages/admin/categories.vue | 11 +- webapp/pages/admin/index.vue | 80 ++------ webapp/pages/admin/notifications.vue | 5 +- webapp/pages/admin/organizations.vue | 5 +- webapp/pages/admin/pages.vue | 5 +- webapp/pages/admin/settings.vue | 5 +- webapp/pages/admin/tags.vue | 11 +- webapp/pages/admin/users.vue | 5 +- webapp/pages/index.vue | 14 +- webapp/pages/login.vue | 42 ++-- webapp/pages/logout.vue | 30 +-- webapp/pages/moderation.vue | 5 +- webapp/pages/moderation/index.vue | 85 ++++----- webapp/pages/post/_id.vue | 10 +- webapp/pages/post/_id/_slug/index.vue | 35 +--- webapp/pages/post/_id/_slug/more-info.vue | 35 ++-- webapp/pages/post/_id/_slug/take-action.vue | 5 +- webapp/pages/post/create.vue | 5 +- webapp/pages/post/edit/_id.vue | 5 +- webapp/pages/profile/_id/_slug.vue | 180 ++++-------------- webapp/pages/settings.vue | 10 +- webapp/pages/settings/data-download.vue | 5 +- webapp/pages/settings/delete-account.vue | 5 +- webapp/pages/settings/index.vue | 13 +- webapp/pages/settings/invites.vue | 5 +- webapp/pages/settings/languages.vue | 5 +- webapp/pages/settings/my-organizations.vue | 5 +- webapp/pages/settings/my-social-media.vue | 36 +--- 56 files changed, 316 insertions(+), 985 deletions(-) diff --git a/webapp/components/Badges.vue b/webapp/components/Badges.vue index ff8a2bd35..40d323b2d 100644 --- a/webapp/components/Badges.vue +++ b/webapp/components/Badges.vue @@ -1,20 +1,7 @@ diff --git a/webapp/components/Category/index.vue b/webapp/components/Category/index.vue index 31c1aa97b..acc35772a 100644 --- a/webapp/components/Category/index.vue +++ b/webapp/components/Category/index.vue @@ -1,9 +1,6 @@ diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue index dcad2a2ac..751a11f02 100644 --- a/webapp/components/Comment.vue +++ b/webapp/components/Comment.vue @@ -1,17 +1,11 @@ diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue index a2e73b8af..6e5bca4c0 100644 --- a/webapp/components/ContentMenu.vue +++ b/webapp/components/ContentMenu.vue @@ -1,32 +1,13 @@