From 7316ad5a72dfcfad46082681c6a42409fef676c6 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Jul 2023 13:19:39 -0500 Subject: [PATCH] chore(web): sort tailwindcss class automatically (#3330) --- web/package-lock.json | 82 +++++++++++++++++++ web/package.json | 1 + web/src/app.css | 2 +- .../admin-page/jobs/job-tile-button.svelte | 2 +- .../admin-page/jobs/job-tile-status.svelte | 2 +- .../admin-page/jobs/job-tile.svelte | 18 ++-- .../server-stats/server-stats-panel.svelte | 38 ++++----- .../admin-page/server-stats/stats-card.svelte | 4 +- .../settings/ffmpeg/ffmpeg-settings.svelte | 2 +- .../settings/job-settings/job-settings.svelte | 2 +- .../settings/oauth/oauth-settings.svelte | 2 +- .../password-login-settings.svelte | 2 +- .../settings/setting-accordion.svelte | 6 +- .../settings/setting-buttons-row.svelte | 4 +- .../settings/setting-input-field.svelte | 8 +- .../admin-page/settings/setting-select.svelte | 8 +- .../admin-page/settings/setting-switch.svelte | 10 +-- .../storage-template-settings.svelte | 14 ++-- .../supported-datetime-panel.svelte | 16 ++-- .../supported-variables-panel.svelte | 10 +-- .../components/album-page/album-card.svelte | 14 ++-- .../components/album-page/album-viewer.svelte | 16 ++-- .../album-page/asset-selection.svelte | 6 +- .../album-page/share-info-modal.svelte | 12 +-- .../album-page/thumbnail-selection.svelte | 4 +- .../album-page/user-selection-modal.svelte | 22 ++--- .../asset-viewer/album-list-item.svelte | 6 +- .../asset-viewer/asset-viewer-nav-bar.svelte | 4 +- .../asset-viewer/asset-viewer.svelte | 16 ++-- .../asset-viewer/detail-panel.svelte | 24 +++--- .../asset-viewer/download-panel.svelte | 14 ++-- .../asset-viewer/navigation-area.svelte | 4 +- .../asset-viewer/photo-viewer.svelte | 4 +- .../asset-viewer/video-viewer.svelte | 4 +- .../assets/thumbnail/image-thumbnail.svelte | 4 +- .../assets/thumbnail/thumbnail.svelte | 16 ++-- .../assets/thumbnail/video-thumbnail.svelte | 6 +- web/src/lib/components/elements/badge.svelte | 2 +- .../components/elements/buttons/button.svelte | 2 +- .../buttons/circle-icon-button.svelte | 2 +- .../lib/components/elements/dropdown.svelte | 8 +- .../faces-page/edit-name-input.svelte | 6 +- .../faces-page/face-thumbnail-selector.svelte | 4 +- .../faces-page/face-thumbnail.svelte | 10 +-- .../faces-page/merge-face-selector.svelte | 14 ++-- .../components/faces-page/show-hide.svelte | 8 +- .../forms/admin-registration-form.svelte | 2 +- .../lib/components/forms/api-key-form.svelte | 8 +- .../components/forms/api-key-secret.svelte | 8 +- .../forms/change-password-form.svelte | 6 +- .../components/forms/create-user-form.svelte | 12 +-- .../components/forms/edit-user-form.svelte | 12 +-- .../lib/components/forms/login-form.svelte | 10 +-- .../layouts/user-page-layout.svelte | 6 +- .../map-page/map-settings-modal.svelte | 14 ++-- .../memory-page/memory-viewer.svelte | 46 +++++------ .../photos-page/asset-date-group.svelte | 6 +- .../components/photos-page/asset-grid.svelte | 2 +- .../components/photos-page/memory-lane.svelte | 14 ++-- .../individual-shared-viewer.svelte | 4 +- .../album-selection-modal.svelte | 30 +++---- .../shared-components/base-modal.svelte | 6 +- .../shared-components/confirm-dialogue.svelte | 10 +-- .../context-menu/context-menu.svelte | 2 +- .../context-menu/menu-option.svelte | 2 +- .../shared-components/control-app-bar.svelte | 8 +- .../create-shared-link-modal.svelte | 10 +-- .../drag-and-drop-upload-overlay.svelte | 4 +- .../shared-components/dropdown-button.svelte | 6 +- .../empty-placeholder.svelte | 8 +- .../full-screen-modal.svelte | 2 +- .../fullscreen-container.svelte | 10 +-- .../asset-selection-viewer.svelte | 2 +- .../gallery-viewer/gallery-viewer.svelte | 2 +- .../shared-components/leaflet/map.svelte | 2 +- .../shared-components/loading-spinner.svelte | 2 +- .../navigation-bar/account-info-panel.svelte | 10 +-- .../navigation-bar/navigation-bar.svelte | 26 +++--- .../navigation-loading-bar.svelte | 4 +- .../notification/notification-card.svelte | 6 +- .../profile-image-cropper.svelte | 10 +-- .../scrollbar/scrollbar.svelte | 10 +-- .../search-bar/search-bar.svelte | 18 ++-- .../side-bar/side-bar-button.svelte | 16 ++-- .../side-bar/side-bar-section.svelte | 2 +- .../side-bar/side-bar.svelte | 6 +- .../shared-components/status-box.svelte | 18 ++-- .../shared-components/theme-button.svelte | 4 +- .../upload-asset-preview.svelte | 20 ++--- .../shared-components/upload-panel.svelte | 14 ++-- .../shared-components/user-avatar.svelte | 6 +- .../version-announcement-box.svelte | 12 +-- .../sharedlinks-page/shared-link-card.svelte | 18 ++-- .../change-password-settings.svelte | 2 +- .../user-settings-page/device-card.svelte | 12 +-- .../user-settings-page/device-list.svelte | 6 +- .../user-settings-page/oauth-settings.svelte | 2 +- .../partner-selection-modal.svelte | 10 +-- .../partner-settings.svelte | 2 +- .../user-api-key-list.svelte | 26 +++--- .../user-profile-settings.svelte | 2 +- web/src/routes/(user)/albums/+page.svelte | 2 +- web/src/routes/(user)/explore/+page.svelte | 30 +++---- web/src/routes/(user)/map/+page.svelte | 4 +- .../(user)/partners/[userId]/+page.svelte | 2 +- web/src/routes/(user)/people/+page.svelte | 6 +- .../(user)/people/[personId]/+page.svelte | 10 +-- web/src/routes/(user)/search/+page.svelte | 10 +-- .../routes/(user)/share/[key]/+error.svelte | 4 +- web/src/routes/(user)/sharing/+page.svelte | 20 ++--- .../(user)/sharing/sharedlinks/+page.svelte | 8 +- .../routes/(user)/user-settings/+page.svelte | 2 +- web/src/routes/+error.svelte | 30 +++---- web/src/routes/+layout.svelte | 2 +- web/src/routes/+page.svelte | 10 +-- web/src/routes/admin/+layout.svelte | 4 +- .../routes/admin/user-management/+page.svelte | 66 +++++++-------- 117 files changed, 638 insertions(+), 555 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index d0f920b771..f870fb061f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -53,6 +53,7 @@ "postcss": "^8.4.21", "prettier": "^2.8.4", "prettier-plugin-svelte": "^2.10.1", + "prettier-plugin-tailwindcss": "^0.4.1", "svelte": "^4.0.5", "svelte-check": "^3.4.3", "svelte-jester": "^2.3.2", @@ -10146,6 +10147,80 @@ "svelte": "^3.2.0 || ^4.0.0-next.0" } }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz", + "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==", + "dev": true, + "engines": { + "node": ">=12.17.0" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@shufo/prettier-plugin-blade": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "prettier": "^2.2 || ^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-import-sort": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-style-order": "*", + "prettier-plugin-svelte": "*", + "prettier-plugin-twig-melody": "*" + }, + "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/pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", @@ -19248,6 +19323,13 @@ "dev": true, "requires": {} }, + "prettier-plugin-tailwindcss": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz", + "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==", + "dev": true, + "requires": {} + }, "pretty-format": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", diff --git a/web/package.json b/web/package.json index 805b2d12b0..e42f96adb5 100644 --- a/web/package.json +++ b/web/package.json @@ -48,6 +48,7 @@ "postcss": "^8.4.21", "prettier": "^2.8.4", "prettier-plugin-svelte": "^2.10.1", + "prettier-plugin-tailwindcss": "^0.4.1", "svelte": "^4.0.5", "svelte-check": "^3.4.3", "svelte-jester": "^2.3.2", diff --git a/web/src/app.css b/web/src/app.css index f959d2dc88..595086731f 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -56,7 +56,7 @@ input:focus-visible { @layer utilities { .immich-form-input { - @apply bg-slate-200 p-4 rounded-xl focus:border-immich-primary text-sm dark:bg-gray-600 dark:text-immich-dark-fg disabled:bg-gray-400 dark:disabled:bg-gray-800 disabled:cursor-not-allowed disabled:text-gray-200; + @apply rounded-xl bg-slate-200 p-4 text-sm focus:border-immich-primary disabled:cursor-not-allowed disabled:bg-gray-400 disabled:text-gray-200 dark:bg-gray-600 dark:text-immich-dark-fg dark:disabled:bg-gray-800; } .immich-form-label { diff --git a/web/src/lib/components/admin-page/jobs/job-tile-button.svelte b/web/src/lib/components/admin-page/jobs/job-tile-button.svelte index cf12b7c436..b794c387c8 100644 --- a/web/src/lib/components/admin-page/jobs/job-tile-button.svelte +++ b/web/src/lib/components/admin-page/jobs/job-tile-button.svelte @@ -12,7 +12,7 @@