From e758bbf70b3e860895e84089c706bdf8815bf98d Mon Sep 17 00:00:00 2001 From: Claudio Dekker Date: Wed, 8 Dec 2021 18:52:56 +0100 Subject: [PATCH] WIP --- .eslintrc.js | 1 + package.json | 5 ++ resources/js/Pages/Auth/Login.vue | 12 ++-- resources/js/Pages/Contacts/Create.vue | 28 ++++---- resources/js/Pages/Contacts/Edit.vue | 32 ++++----- resources/js/Pages/Contacts/Index.vue | 34 ++++----- resources/js/Pages/Dashboard/Index.vue | 4 +- resources/js/Pages/Organizations/Create.vue | 24 +++---- resources/js/Pages/Organizations/Edit.vue | 50 +++++++------- resources/js/Pages/Organizations/Index.vue | 76 +++++++++++---------- resources/js/Pages/Reports/Index.vue | 2 +- resources/js/Pages/Users/Create.vue | 20 +++--- resources/js/Pages/Users/Edit.vue | 28 ++++---- resources/js/Pages/Users/Index.vue | 36 +++++----- resources/js/Shared/Dropdown.vue | 6 +- resources/js/Shared/FileInput.vue | 9 +-- resources/js/Shared/FlashMessages.vue | 8 +-- resources/js/Shared/Icon.vue | 7 +- resources/js/Shared/Layout.vue | 30 ++++---- resources/js/Shared/MainMenu.vue | 18 ++--- resources/js/Shared/Pagination.vue | 4 +- resources/js/Shared/SearchFilter.vue | 13 ++-- resources/js/Shared/SelectInput.vue | 1 + resources/js/Shared/TextInput.vue | 1 + resources/js/Shared/TextareaInput.vue | 1 + resources/js/Shared/TrashedMessage.vue | 9 +-- yarn.lock | 53 ++++++++++++++ 27 files changed, 283 insertions(+), 229 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index a38644f..88b3b71 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,6 +17,7 @@ module.exports = { 'comma-dangle': ['warn', 'always-multiline'], 'vue/multi-word-component-names': 'off', 'vue/max-attributes-per-line': 'off', + 'vue/no-v-html': 'off', 'vue/require-default-prop': 'off', 'vue/singleline-html-element-content-newline': 'off', 'vue/html-self-closing': [ diff --git a/package.json b/package.json index c5479b6..41fe9de 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "scripts": { "dev": "npm run development", "development": "mix", + "fix:eslint": "eslint --ext .js,.vue resources/js/ --fix", + "fix:prettier": "prettier --write --loglevel warn 'resources/js/**/*.vue'", + "fix-code-style": "npm run fix:prettier && npm run fix:eslint", "watch": "mix watch", "watch-poll": "mix watch -- --watch-options-poll=1000", "hot": "mix watch --hot", @@ -23,6 +26,8 @@ "postcss": "^8.4.4", "postcss-import": "^12.0.1", "postcss-nesting": "^7.0.1", + "prettier": "^2.5.1", + "prettier-plugin-tailwind": "^2.2.12", "tailwindcss": "^2.0.3", "uuid": "^8.3.2", "vue": "^3.2.24", diff --git a/resources/js/Pages/Auth/Login.vue b/resources/js/Pages/Auth/Login.vue index fbb877d..57e9e31 100644 --- a/resources/js/Pages/Auth/Login.vue +++ b/resources/js/Pages/Auth/Login.vue @@ -1,21 +1,21 @@