-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: loading screen, initSDK on bootstrap, fix FOUC for theme #10350
Merged
+329
−174
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
cdeea7d
feat: loading screen, initSDK on bootstrap, fix FOUC for theme
midzelis f2c262d
pulsate immich logo, don't set localstorage
midzelis 8f804c5
Make it spin
midzelis 935e33b
Merge branch 'main' into feat_bootstrap_spinner - incomplete!
midzelis 228c10f
Rework error handling a bit
midzelis 1756453
Merge branch 'main' into feat_bootstrap_spinner
midzelis 566be81
Cleanup
midzelis 9b7e7ee
fix test
midzelis 3fd9680
rename, memoize
midzelis 3b1d5d7
Merge branch 'main' into feat_bootstrap_spinner
midzelis ffea173
merge main
alextran1502 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| <script lang="ts"> | ||
| import Icon from '$lib/components/elements/icon.svelte'; | ||
| import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte'; | ||
| import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte'; | ||
| import { copyToClipboard } from '$lib/utils'; | ||
| import { mdiCodeTags, mdiContentCopy, mdiMessage, mdiPartyPopper } from '@mdi/js'; | ||
| import { t } from 'svelte-i18n'; | ||
|
|
||
| export let error: { message: string; code?: string | number; stack?: string } | undefined | null = undefined; | ||
|
|
||
| const handleCopy = async () => { | ||
| if (!error) { | ||
| return; | ||
| } | ||
|
|
||
| await copyToClipboard(`${error.message} - ${error.code}\n${error.stack}`); | ||
| }; | ||
| </script> | ||
|
|
||
| <div class="h-screen w-screen"> | ||
| <section class="bg-immich-bg dark:bg-immich-dark-bg"> | ||
| <div class="flex place-items-center border-b px-6 py-4 dark:border-b-immich-dark-gray"> | ||
| <a class="flex place-items-center gap-2 hover:cursor-pointer" href="/photos"> | ||
| <ImmichLogo width="55%" /> | ||
| </a> | ||
| </div> | ||
| </section> | ||
|
|
||
| <div class="fixed top-0 flex h-full w-full place-content-center place-items-center overflow-hidden bg-black/50"> | ||
| <div> | ||
| <div | ||
| class="w-[500px] max-w-[95vw] rounded-3xl border bg-immich-bg shadow-sm dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-fg" | ||
| > | ||
| <div> | ||
| <div class="flex items-center justify-between gap-4 px-4 py-4"> | ||
| <h1 class="font-medium text-immich-primary dark:text-immich-dark-primary"> | ||
| 🚨 {$t('error_title')} | ||
| </h1> | ||
| <div class="flex justify-end"> | ||
| <CircleIconButton | ||
| color="primary" | ||
| icon={mdiContentCopy} | ||
| title={$t('copy_error')} | ||
| on:click={() => handleCopy()} | ||
| /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <hr /> | ||
|
|
||
| <div class="immich-scrollbar max-h-[75vh] min-h-[300px] gap-4 overflow-y-auto p-4 pb-4"> | ||
| <div class="flex w-full flex-col gap-2"> | ||
| <p class="text-red-500">{error?.message} ({error?.code})</p> | ||
| {#if error?.stack} | ||
| <label for="stacktrace">{$t('stacktrace')}</label> | ||
| <pre id="stacktrace" class="text-xs">{error?.stack || 'No stack'}</pre> | ||
| {/if} | ||
| </div> | ||
| </div> | ||
|
|
||
| <hr /> | ||
|
|
||
| <div class="flex place-content-center place-items-center justify-around"> | ||
| <!-- href="https://github.com/immich-app/immich/issues/new" --> | ||
| <a | ||
| href="https://discord.immich.app" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="flex grow basis-0 justify-center p-4" | ||
| > | ||
| <div class="flex flex-col place-content-center place-items-center gap-2"> | ||
| <Icon path={mdiMessage} size={24} /> | ||
| <p class="text-sm">{$t('get_help')}</p> | ||
| </div> | ||
| </a> | ||
|
|
||
| <a | ||
| href="https://github.com/immich-app/immich/releases" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="flex grow basis-0 justify-center p-4" | ||
| > | ||
| <div class="flex flex-col place-content-center place-items-center gap-2"> | ||
| <Icon path={mdiPartyPopper} size={24} /> | ||
| <p class="text-sm">{$t('read_changelog')}</p> | ||
| </div> | ||
| </a> | ||
|
|
||
| <a | ||
| href="https://immich.app/docs/guides/docker-help" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="flex grow basis-0 justify-center p-4" | ||
| > | ||
| <div class="flex flex-col place-content-center place-items-center gap-2"> | ||
| <Icon path={mdiCodeTags} size={24} /> | ||
| <p class="text-sm">{$t('check_logs')}</p> | ||
| </div> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { retrieveServerConfig } from '$lib/stores/server-config.store'; | ||
| import { initLanguage } from '$lib/utils'; | ||
| import { defaults } from '@immich/sdk'; | ||
| import { memoize } from 'lodash-es'; | ||
|
|
||
| type fetchType = typeof fetch; | ||
|
|
||
| export function initSDK(fetch: fetchType) { | ||
| // set event.fetch on the fetch-client used by @immich/sdk | ||
| // https://kit.svelte.dev/docs/load#making-fetch-requests | ||
| // https://github.com/oazapfts/oazapfts/blob/main/README.md#fetch-options | ||
| defaults.fetch = fetch; | ||
| } | ||
|
|
||
| async function _init(fetch: fetchType) { | ||
| initSDK(fetch); | ||
| await initLanguage(); | ||
| await retrieveServerConfig(); | ||
| } | ||
|
|
||
| export const init = memoize(_init, () => 'singlevalue'); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this line causes a JavaScript error
item is undefinedand one is unable to login. I suppose this was supposed to bevalue: theme?