From d6bb0b1ddcee86cdd9923890b10aa94ee1a54787 Mon Sep 17 00:00:00 2001 From: ZXY101 Date: Wed, 27 Sep 2023 11:06:03 +0200 Subject: [PATCH] Refactor catalog --- src/app.html | 2 +- src/lib/catalog/index.ts | 5 +-- src/lib/components/Catalog.svelte | 14 +----- src/lib/components/CatalogItem.svelte | 37 ++++++++-------- src/lib/components/Reader/MangaPage.svelte | 5 ++- src/lib/components/Reader/Reader.svelte | 26 +++++++++--- src/lib/components/Settings/Profiles.svelte | 17 ++++++-- src/lib/components/VolumeItem.svelte | 35 ++++++++------- src/routes/+page.svelte | 6 ++- src/routes/[manga]/+page.svelte | 47 ++++++++++++--------- src/routes/[manga]/[volume]/+layout.svelte | 14 ------ 11 files changed, 109 insertions(+), 99 deletions(-) diff --git a/src/app.html b/src/app.html index 5f6197a..2a588fb 100644 --- a/src/app.html +++ b/src/app.html @@ -10,7 +10,7 @@ /> %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/lib/catalog/index.ts b/src/lib/catalog/index.ts index 0a66cb5..6b1edb5 100644 --- a/src/lib/catalog/index.ts +++ b/src/lib/catalog/index.ts @@ -1,7 +1,4 @@ -import type { Volume } from '$lib/types'; -import { writable } from 'svelte/store'; import { db } from '$lib/catalog/db'; import { liveQuery } from 'dexie'; -export const currentManga = writable(undefined); -export const currentVolume = writable(undefined); + export const catalog = liveQuery(() => db.catalog.toArray()); diff --git a/src/lib/components/Catalog.svelte b/src/lib/components/Catalog.svelte index bcfb898..2bd9eb7 100644 --- a/src/lib/components/Catalog.svelte +++ b/src/lib/components/Catalog.svelte @@ -1,24 +1,14 @@ {#if $catalog} {#if $catalog.length > 0}
-
- -
- {#each $catalog as { id, manga } (id)} - + {#each $catalog as { id } (id)} + {/each}
diff --git a/src/lib/components/CatalogItem.svelte b/src/lib/components/CatalogItem.svelte index 1b82914..fbe22a3 100644 --- a/src/lib/components/CatalogItem.svelte +++ b/src/lib/components/CatalogItem.svelte @@ -1,23 +1,22 @@ - -
- {mokuroData.title} - {#if files} - img - {/if} -
- +{#if manga} + +
+ {manga.mokuroData.title} + {#if manga.files} + img + {/if} +
+ +{/if} diff --git a/src/lib/components/Reader/MangaPage.svelte b/src/lib/components/Reader/MangaPage.svelte index 718bf84..569bd64 100644 --- a/src/lib/components/Reader/MangaPage.svelte +++ b/src/lib/components/Reader/MangaPage.svelte @@ -1,16 +1,19 @@
diff --git a/src/lib/components/Reader/Reader.svelte b/src/lib/components/Reader/Reader.svelte index 805176f..1bd9bd9 100644 --- a/src/lib/components/Reader/Reader.svelte +++ b/src/lib/components/Reader/Reader.svelte @@ -1,9 +1,9 @@ + + {volume?.mokuroData.volume || 'Volume'} + {#if volume && pages} @@ -235,4 +243,8 @@ on:mouseup={right} class="right-0 top-0 absolute h-full w-10 hover:bg-slate-400 opacity-[0.01]" /> +{:else} +
+ +
{/if} diff --git a/src/lib/components/Settings/Profiles.svelte b/src/lib/components/Settings/Profiles.svelte index c5820ae..8921503 100644 --- a/src/lib/components/Settings/Profiles.svelte +++ b/src/lib/components/Settings/Profiles.svelte @@ -1,5 +1,7 @@ Profile -
- + +
+
diff --git a/src/lib/components/VolumeItem.svelte b/src/lib/components/VolumeItem.svelte index e379610..0470293 100644 --- a/src/lib/components/VolumeItem.svelte +++ b/src/lib/components/VolumeItem.svelte @@ -1,25 +1,30 @@ - -
- {volumeName} - {#if files} - img - {/if} -
+ + +
+

{volumeName}

+

{progressDisplay}

+
+ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6845f71..bfe81ad 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -2,6 +2,10 @@ import Catalog from '$lib/components/Catalog.svelte'; -
+ + Mokuro + + +
diff --git a/src/routes/[manga]/+page.svelte b/src/routes/[manga]/+page.svelte index 11c58b5..b9004a8 100644 --- a/src/routes/[manga]/+page.svelte +++ b/src/routes/[manga]/+page.svelte @@ -1,13 +1,15 @@ -
-
- + + {manga?.[0].mokuroData.title || 'Manga'} + +{#if manga} +
+
+
+

{manga[0].mokuroData.title}

+

Volumes: {manga.length}

+
+
+
+ + +
-
- {#if manga} - {#each manga as volume} - - {/each} - {/if} -
-
+{:else} +
Manga not found
+{/if} diff --git a/src/routes/[manga]/[volume]/+layout.svelte b/src/routes/[manga]/[volume]/+layout.svelte index 66c4e7e..066a866 100644 --- a/src/routes/[manga]/[volume]/+layout.svelte +++ b/src/routes/[manga]/[volume]/+layout.svelte @@ -1,17 +1,3 @@ - -