diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 09d13d7..aa1147c 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -16,4 +16,5 @@ services: - 5173:5173 volumes: - ~/immichFrame_Config:/app/Config + - ../immichFrame.Web/src:/app/src # - PATH/TO/CONFIG:/app/Config diff --git a/immichFrame.Web/eslint.config.js b/immichFrame.Web/eslint.config.js index 62dbd03..d10144b 100644 --- a/immichFrame.Web/eslint.config.js +++ b/immichFrame.Web/eslint.config.js @@ -3,6 +3,7 @@ import ts from 'typescript-eslint'; import svelte from 'eslint-plugin-svelte'; import prettier from 'eslint-config-prettier'; import globals from 'globals'; +import parser from 'svelte-eslint-parser'; /** @type {import('eslint').Linter.Config[]} */ export default [ @@ -22,12 +23,22 @@ export default [ { files: ['**/*.svelte'], languageOptions: { + parser: parser, + ecmaVersion: 5, + sourceType: 'script', + parserOptions: { - parser: ts.parser + parser: '@typescript-eslint/parser' } } }, { ignores: ['build/', '.svelte-kit/', 'dist/'] + }, + { + files: ['*.ts'], + rules: { + 'no-undef': 'off' + } } ]; diff --git a/immichFrame.Web/package.json b/immichFrame.Web/package.json index 91efdb9..972431c 100644 --- a/immichFrame.Web/package.json +++ b/immichFrame.Web/package.json @@ -10,10 +10,7 @@ "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "lint": "prettier --check . && eslint .", "format": "prettier --write .", - "api": "oazapfts https://localhost:7018/swagger/v1/swagger.json src/lib/immichFrameApi.ts", - "dev-up": "docker compose -f ../docker/docker-compose.dev.yml up --remove-orphans || make dev-down", - "dev-down": "docker compose -f ../docker/docker-compose.dev.yml down --remove-orphans", - "dev-update": "docker compose -f ../docker/docker-compose.dev.yml up --build -V --remove-orphans" + "api": "oazapfts https://localhost:7018/swagger/v1/swagger.json src/lib/immichFrameApi.ts" }, "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", diff --git a/immichFrame.Web/src/lib/components/elements/imageOverlay.svelte b/immichFrame.Web/src/lib/components/elements/imageOverlay.svelte index 0835791..c7e8d0c 100644 --- a/immichFrame.Web/src/lib/components/elements/imageOverlay.svelte +++ b/immichFrame.Web/src/lib/components/elements/imageOverlay.svelte @@ -7,8 +7,6 @@ function clickNext() { dispatch('next'); - dispatch('back'); - dispatch('settings'); } function clickBack() { dispatch('back'); @@ -23,23 +21,23 @@
-
- -
-
@@ -62,8 +60,10 @@ justify-content: center; /* Centers the SVG horizontally */ align-items: center; /* Optionally, centers the SVG vertically as well */ /* background-color: rgba(75, 75, 75, 0.4); */ - color: wheat; height: 100%; width: 100%; } + .frame-color { + color: wheat; + } diff --git a/immichFrame.Web/src/lib/components/elements/progress-bar.svelte b/immichFrame.Web/src/lib/components/elements/progress-bar.svelte new file mode 100644 index 0000000..3732626 --- /dev/null +++ b/immichFrame.Web/src/lib/components/elements/progress-bar.svelte @@ -0,0 +1,101 @@ + + + + +{#if !hidden} + +{/if} + + diff --git a/immichFrame.Web/src/lib/components/home-page/home-page.svelte b/immichFrame.Web/src/lib/components/home-page/home-page.svelte index eaf2d62..f09e2ab 100644 --- a/immichFrame.Web/src/lib/components/home-page/home-page.svelte +++ b/immichFrame.Web/src/lib/components/home-page/home-page.svelte @@ -1,15 +1,25 @@
{#if imageData && assetData} - loadImage()} /> + { + await loadImage(); + progressBar.restart(true); + }} + on:back={async () => { + await loadImage(); + progressBar.restart(true); + }} + /> +