From a0a405dc7f4c8344cfd2efe5009cedbcdf853469 Mon Sep 17 00:00:00 2001 From: Valentin Kaelin Date: Thu, 21 Sep 2023 12:52:17 +0200 Subject: [PATCH] style: sort all tailwind classes with prettier plugin --- client/.prettierrc | 11 --- client/.prettierrc.js | 12 +++ client/package-lock.json | 75 ++++++++++++++++++- client/package.json | 2 + client/src/App.vue | 2 +- client/src/assets/css/base.css | 10 +-- client/src/assets/css/transition.css | 4 +- client/src/components/Common/CubeLoader.vue | 10 +-- client/src/components/Common/DotsLoader.vue | 8 +- client/src/components/Common/Ripple.vue | 6 +- client/src/components/Common/Tooltip.vue | 2 +- client/src/components/Form/LoadingButton.vue | 10 +-- client/src/components/Form/SearchForm.vue | 12 +-- .../components/Form/SearchFormDropdown.vue | 35 +++++---- .../Form/SearchFormDropdownPlayer.vue | 18 ++--- .../src/components/Form/SearchFormRegion.vue | 14 ++-- client/src/components/Form/SwitchToggle.vue | 12 +-- .../components/Global/PopupNotification.vue | 6 +- client/src/components/Layout/MainFooter.vue | 6 +- client/src/components/Match/DetailedMatch.vue | 4 +- .../Match/DetailedMatchGlobalStats.vue | 12 +-- .../components/Match/DetailedMatchTeam.vue | 74 +++++++++--------- client/src/components/Match/LiveMatch.vue | 22 +++--- client/src/components/Match/Match.vue | 68 ++++++++--------- client/src/components/Match/MatchItems.vue | 28 +++---- .../src/components/Match/Runes/RuneStyle.vue | 24 +++--- .../components/Match/Runes/RunesContainer.vue | 4 +- .../Summoner/Champions/ChampionsSearch.vue | 4 +- .../Summoner/Champions/ChampionsTable.vue | 16 ++-- .../Summoner/Champions/FilterQueue.vue | 6 +- .../Summoner/Champions/OnlyMostPlayed.vue | 2 +- .../src/components/Summoner/FilterSeason.vue | 8 +- .../src/components/Summoner/Live/LiveTeam.vue | 60 +++++++-------- .../Summoner/Overview/OverviewLoader.vue | 2 +- .../Summoner/Overview/SummonerChampions.vue | 32 ++++---- .../Summoner/Overview/SummonerMates.vue | 16 ++-- .../Summoner/Overview/SummonerStats.vue | 54 ++++++------- .../components/Summoner/RecentActivity.vue | 18 ++--- .../Summoner/Records/RecordCard.vue | 10 +-- .../components/Summoner/SummonerRanked.vue | 28 +++---- client/src/layouts/Default.vue | 44 +++++------ client/src/views/Home.vue | 14 ++-- client/src/views/Summoner.vue | 6 +- client/src/views/SummonerLive.vue | 10 +-- client/src/views/SummonerRecords.vue | 20 ++--- 45 files changed, 461 insertions(+), 380 deletions(-) delete mode 100644 client/.prettierrc create mode 100644 client/.prettierrc.js diff --git a/client/.prettierrc b/client/.prettierrc deleted file mode 100644 index 81a7fef..0000000 --- a/client/.prettierrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "trailingComma": "es5", - "semi": false, - "singleQuote": true, - "useTabs": false, - "quoteProps": "consistent", - "bracketSpacing": true, - "arrowParens": "always", - "printWidth": 100, - "endOfLine": "auto" -} diff --git a/client/.prettierrc.js b/client/.prettierrc.js new file mode 100644 index 0000000..1934747 --- /dev/null +++ b/client/.prettierrc.js @@ -0,0 +1,12 @@ +module.exports = { + trailingComma: 'es5', + semi: false, + singleQuote: true, + useTabs: false, + quoteProps: 'consistent', + bracketSpacing: true, + arrowParens: 'always', + printWidth: 100, + endOfLine: 'auto', + plugins: ['prettier-plugin-tailwindcss'], +} diff --git a/client/package-lock.json b/client/package-lock.json index dcb89be..51df512 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -29,6 +29,8 @@ "eslint-plugin-vue": "^9.17.0", "postcss": "^8.4.30", "postcss-import": "^12.0.1", + "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "^0.5.4", "tailwindcss": "^3.3.3", "vite": "^4.4.5", "vite-plugin-eslint": "^1.8.1" @@ -4421,7 +4423,6 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -4444,6 +4445,78 @@ "node": ">=6.0.0" } }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.4.tgz", + "integrity": "sha512-QZzzB1bID6qPsKHTeA9qPo1APmmxfFrA5DD3LQ+vbTmAnY40eJI7t9Q1ocqel2EKMWNPLJqdTDWZj1hKYgqSgg==", + "dev": true, + "engines": { + "node": ">=14.21.3" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@shufo/prettier-plugin-blade": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "prettier": "^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-import-sort": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-style-order": "*", + "prettier-plugin-svelte": "*" + }, + "peerDependenciesMeta": { + "@ianvs/prettier-plugin-sort-imports": { + "optional": true + }, + "@prettier/plugin-pug": { + "optional": true + }, + "@shopify/prettier-plugin-liquid": { + "optional": true + }, + "@shufo/prettier-plugin-blade": { + "optional": true + }, + "@trivago/prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-astro": { + "optional": true + }, + "prettier-plugin-css-order": { + "optional": true + }, + "prettier-plugin-import-sort": { + "optional": true + }, + "prettier-plugin-jsdoc": { + "optional": true + }, + "prettier-plugin-marko": { + "optional": true + }, + "prettier-plugin-organize-attributes": { + "optional": true + }, + "prettier-plugin-organize-imports": { + "optional": true + }, + "prettier-plugin-style-order": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + }, + "prettier-plugin-twig-melody": { + "optional": true + } + } + }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", diff --git a/client/package.json b/client/package.json index 3281a94..f5ec095 100644 --- a/client/package.json +++ b/client/package.json @@ -20,6 +20,8 @@ "eslint-plugin-vue": "^9.17.0", "postcss": "^8.4.30", "postcss-import": "^12.0.1", + "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "^0.5.4", "tailwindcss": "^3.3.3", "vite": "^4.4.5", "vite-plugin-eslint": "^1.8.1" diff --git a/client/src/App.vue b/client/src/App.vue index dcefdcf..f2dcc80 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -1,5 +1,5 @@ @@ -37,7 +37,7 @@ export default { .cube:before { content: ''; - @apply absolute top-0 left-0 w-full h-full bg-blue-300; + @apply absolute left-0 top-0 h-full w-full bg-blue-300; animation: cubeAngle 2.4s infinite linear both; transform-origin: 100% 100%; } diff --git a/client/src/components/Common/DotsLoader.vue b/client/src/components/Common/DotsLoader.vue index ae975bc..d7436b2 100644 --- a/client/src/components/Common/DotsLoader.vue +++ b/client/src/components/Common/DotsLoader.vue @@ -1,8 +1,8 @@ diff --git a/client/src/components/Common/Ripple.vue b/client/src/components/Common/Ripple.vue index 5df279c..4b7ed02 100644 --- a/client/src/components/Common/Ripple.vue +++ b/client/src/components/Common/Ripple.vue @@ -1,14 +1,14 @@