beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(deps): prettier 3 (#5336)

Browse source
This commit is contained in:
Jason Rasmussen 2023-11-27 11:42:04 -05:00 committed by GitHub
parent 87871e4df9
commit 3992119e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/.prettierrc
View file

@ -3,7 +3,6 @@
"trailingComma": "all", "trailingComma": "all",
"printWidth": 120, "printWidth": 120,
"semi": true, "semi": true,
"organizeImportsSkipDestructiveCodeActions": true,
"plugins": ["prettier-plugin-svelte"], "plugins": ["prettier-plugin-svelte"],
"pluginSearchDirs": false "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
} }

24
web/package-lock.json generated
View file

@ -52,8 +52,8 @@
"jest": "^29.4.3", "jest": "^29.4.3",
"jest-environment-jsdom": "^29.4.3", "jest-environment-jsdom": "^29.4.3",
"postcss": "^8.4.21", "postcss": "^8.4.21",
"prettier": "^2.8.4", "prettier": "^3.1.0",
"prettier-plugin-svelte": "^2.10.1", "prettier-plugin-svelte": "^3.1.2",
"svelte": "^4.0.5", "svelte": "^4.0.5",
"svelte-check": "^3.4.3", "svelte-check": "^3.4.3",
"svelte-jester": "^3.0.0", "svelte-jester": "^3.0.0",
@ -10231,28 +10231,28 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "2.8.8", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
"dev": true, "dev": true,
"bin": { "bin": {
"prettier": "bin-prettier.js" "prettier": "bin/prettier.cjs"
}, },
"engines": { "engines": {
"node": ">=10.13.0" "node": ">=14"
}, },
"funding": { "funding": {
"url": "https://github.com/prettier/prettier?sponsor=1" "url": "https://github.com/prettier/prettier?sponsor=1"
} }
}, },
"node_modules/prettier-plugin-svelte": { "node_modules/prettier-plugin-svelte": {
"version": "2.10.1", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.10.1.tgz", "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.1.2.tgz",
"integrity": "sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==", "integrity": "sha512-7xfMZtwgAWHMT0iZc8jN4o65zgbAQ3+O32V6W7pXrqNvKnHnkoyQCGCbKeUyXKZLbYE0YhFRnamfxfkEGxm8qA==",
"dev": true, "dev": true,
"peerDependencies": { "peerDependencies": {
"prettier": "^1.16.4 || ^2.0.0", "prettier": "^3.0.0",
"svelte": "^3.2.0 || ^4.0.0-next.0" "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
} }
}, },
"node_modules/pretty-format": { "node_modules/pretty-format": {

4
web/package.json
View file

@ -45,8 +45,8 @@
"jest": "^29.4.3", "jest": "^29.4.3",
"jest-environment-jsdom": "^29.4.3", "jest-environment-jsdom": "^29.4.3",
"postcss": "^8.4.21", "postcss": "^8.4.21",
"prettier": "^2.8.4", "prettier": "^3.1.0",
"prettier-plugin-svelte": "^2.10.1", "prettier-plugin-svelte": "^3.1.2",
"svelte": "^4.0.5", "svelte": "^4.0.5",
"svelte-check": "^3.4.3", "svelte-check": "^3.4.3",
"svelte-jester": "^3.0.0", "svelte-jester": "^3.0.0",

2
web/src/app.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en" class="dark"> <html lang="en" class="dark">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />

8
web/src/lib/components/asset-viewer/album-list-item.svelte
View file

@ -44,14 +44,10 @@
> >
<span class="flex gap-1 text-sm"> <span class="flex gap-1 text-sm">
{#if variant === 'simple'} {#if variant === 'simple'}
<span <span>{album.shared ? 'Shared' : ''}</span>
>{#if album.shared}Shared{/if}
</span>
{:else} {:else}
<span>{album.assetCount} items</span> <span>{album.assetCount} items</span>
<span <span>{album.shared ? ' · Shared' : ''} </span>
>{#if album.shared} · Shared{/if}
</span>
{/if} {/if}
</span> </span>
</div> </div>

4
web/src/lib/components/memory-page/memory-viewer.svelte
View file

@ -275,6 +275,8 @@
<style> <style>
.main-view { .main-view {
box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.3), 0 8px 12px 6px rgba(0, 0, 0, 0.15); box-shadow:
0 4px 4px 0 rgba(0, 0, 0, 0.3),
0 8px 12px 6px rgba(0, 0, 0, 0.15);
} }
</style> </style>

4
web/src/lib/components/photos-page/memory-lane.svelte
View file

@ -91,6 +91,8 @@
<style> <style>
.memory-card { .memory-card {
box-shadow: rgba(60, 64, 67, 0.3) 0px 1px 2px 0px, rgba(60, 64, 67, 0.15) 0px 1px 3px 1px; box-shadow:
rgba(60, 64, 67, 0.3) 0px 1px 2px 0px,
rgba(60, 64, 67, 0.15) 0px 1px 3px 1px;
} }
</style> </style>

7
web/src/lib/components/shared-components/album-selection-modal.svelte
View file

@ -52,7 +52,7 @@
<svelte:fragment slot="title"> <svelte:fragment slot="title">
<span class="flex place-items-center gap-2"> <span class="flex place-items-center gap-2">
<p class="font-medium"> <p class="font-medium">
Add to {#if shared}Shared {/if} Album Add to {shared ? 'Shared ' : ''}Album
</p> </p>
</span> </span>
</svelte:fragment> </svelte:fragment>
@ -88,7 +88,7 @@
<Icon path={mdiPlus} size="30" /> <Icon path={mdiPlus} size="30" />
</div> </div>
<p class=""> <p class="">
New {#if shared}Shared {/if}Album {#if search.length > 0}<b>{search}</b>{/if} New {shared ? 'Shared ' : ''}Album {#if search.length > 0}<b>{search}</b>{/if}
</p> </p>
</button> </button>
{#if filteredAlbums.length > 0} {#if filteredAlbums.length > 0}
@ -101,7 +101,8 @@
{#if !shared} {#if !shared}
<p class="px-5 py-3 text-xs"> <p class="px-5 py-3 text-xs">
{#if search.length === 0}ALL {/if}ALBUMS {#if search.length === 0}ALL
{/if}ALBUMS
</p> </p>
{/if} {/if}
{#each filteredAlbums as album (album.id)} {#each filteredAlbums as album (album.id)}

8
web/src/lib/components/shared-components/upload-asset-preview.svelte
View file

@ -66,13 +66,17 @@
<div class="h-[15px] rounded-md bg-immich-warning transition-all" style="width: 100%" /> <div class="h-[15px] rounded-md bg-immich-warning transition-all" style="width: 100%" />
<p class="absolute top-0 h-full w-full text-center text-[10px]"> <p class="absolute top-0 h-full w-full text-center text-[10px]">
Skipped Skipped
{#if uploadAsset.message} ({uploadAsset.message}){/if} {#if uploadAsset.message}
({uploadAsset.message})
{/if}
</p> </p>
{:else if uploadAsset.state === UploadState.DONE} {:else if uploadAsset.state === UploadState.DONE}
<div class="h-[15px] rounded-md bg-immich-success transition-all" style="width: 100%" /> <div class="h-[15px] rounded-md bg-immich-success transition-all" style="width: 100%" />
<p class="absolute top-0 h-full w-full text-center text-[10px]"> <p class="absolute top-0 h-full w-full text-center text-[10px]">
Uploaded Uploaded
{#if uploadAsset.message} ({uploadAsset.message}){/if} {#if uploadAsset.message}
({uploadAsset.message})
{/if}
</p> </p>
{/if} {/if}
</div> </div>

5
web/src/lib/stores/assets.store.ts
View file

@ -73,7 +73,10 @@ export class AssetStore {
assets: AssetResponseDto[] = []; assets: AssetResponseDto[] = [];
albumAssets: Set<string> = new Set(); albumAssets: Set<string> = new Set();
constructor(options: AssetStoreOptions, private albumId?: string) { constructor(
options: AssetStoreOptions,
private albumId?: string,
) {
this.options = { ...options, size: TimeBucketSize.Month }; this.options = { ...options, size: TimeBucketSize.Month };
this.store$.set(this); this.store$.set(this);
} }

8
web/src/routes/admin/user-management/+page.svelte
View file

@ -181,8 +181,8 @@
isDeleted(user) isDeleted(user)
? 'bg-red-300 dark:bg-red-900' ? 'bg-red-300 dark:bg-red-900'
: i % 2 == 0 : i % 2 == 0
? 'bg-immich-gray dark:bg-immich-dark-gray/75' ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
: 'bg-immich-bg dark:bg-immich-dark-gray/50' : 'bg-immich-bg dark:bg-immich-dark-gray/50'
}`} }`}
> >
<td class="w-4/12 text-ellipsis break-all px-2 text-sm">{user.email}</td> <td class="w-4/12 text-ellipsis break-all px-2 text-sm">{user.email}</td>
@ -247,8 +247,8 @@
isDeleted(user) isDeleted(user)
? 'bg-red-300 dark:bg-red-900' ? 'bg-red-300 dark:bg-red-900'
: i % 2 == 0 : i % 2 == 0
? 'bg-immich-gray dark:bg-immich-dark-gray/75' ? 'bg-immich-gray dark:bg-immich-dark-gray/75'
: 'bg-immich-bg dark:bg-immich-dark-gray/50' : 'bg-immich-bg dark:bg-immich-dark-gray/50'
}`} }`}
> >
<td class="w-1/4 text-ellipsis break-words px-2 text-sm">{user.name}</td> <td class="w-1/4 text-ellipsis break-words px-2 text-sm">{user.name}</td>