-
- {:else}
-
-
-
-
- {#each $catalog as { id, manga } (id)}
-
-
-
- {/if}
+ {#if $catalog.length > 0}
+ Your catalog is currently empty.
-
+
+ {:else}
+
+
+
+
+ {#each $catalog as { id, manga } (id)}
+
+
+
+ {/if}
{:else}
- Your catalog is currently empty.
+Loading...
+Loading...
{/if} diff --git a/src/lib/components/CatalogItem.svelte b/src/lib/components/CatalogItem.svelte index caad1a2..ff68f64 100644 --- a/src/lib/components/CatalogItem.svelte +++ b/src/lib/components/CatalogItem.svelte @@ -1,23 +1,23 @@ -
- {mokuroData.title}
- {#if files}
- [0])})
- {/if}
-
+
+ {mokuroData.title}
+ {#if files}
+
+ {/if}
+
diff --git a/src/lib/components/ConfirmationPopup.svelte b/src/lib/components/ConfirmationPopup.svelte
index 16403cc..6aaba8f 100644
--- a/src/lib/components/ConfirmationPopup.svelte
+++ b/src/lib/components/ConfirmationPopup.svelte
@@ -1,25 +1,25 @@
-
+ - {$confirmationPopupStore?.message} -
- - -
+
+ {$confirmationPopupStore?.message} +
+ + +
-
-
- Mokuro
-
-
- {#if isReader}
-
- {/if}
+
+
+ Mokuro
+
+
+ {#if isReader}
+
+ {/if}
- (uploadModalOpen = true)} />
-
-
+ (uploadModalOpen = true)} />
+
+
-
diff --git a/src/lib/components/Reader/Reader.svelte b/src/lib/components/Reader/Reader.svelte
index 4a906c7..e46c0ab 100644
--- a/src/lib/components/Reader/Reader.svelte
+++ b/src/lib/components/Reader/Reader.svelte
@@ -1,133 +1,122 @@
-
-
- changePage($settings.rightToLeft ? pages.length : 1, true)}
- class="hover:text-primary-600"
- />
-
- changePage($settings.rightToLeft ? 1 : pages.length, true)}
- class="hover:text-primary-600"
- />
-
-
-
-
-
-
-
-
-
+
- {#if !$settings.singlePageView && index + 1 < pages.length}
-
-
+
+
+ changePage($settings.rightToLeft ? pages.length : 1, true)}
+ class="hover:text-primary-600"
+ />
+
+ changePage($settings.rightToLeft ? 1 : pages.length, true)}
+ class="hover:text-primary-600"
+ />
+
+
+
+
+
+
+
+
+
{/if}
diff --git a/src/lib/components/Reader/TextBoxes.svelte b/src/lib/components/Reader/TextBoxes.svelte
index 20b6e62..9dc1664 100644
--- a/src/lib/components/Reader/TextBoxes.svelte
+++ b/src/lib/components/Reader/TextBoxes.svelte
@@ -1,94 +1,94 @@
{#each textBoxes as { fontSize, height, left, lines, top, width, writingMode }, index (`text-box-${index}`)}
-
+ {#if !$settings.singlePageView && index + 1 < pages.length}
+
+
- {#each lines as line}
-
+ {line}
- {/each} -
+ {#each lines as line}
+
{/each}
diff --git a/src/lib/components/Settings.svelte b/src/lib/components/Settings.svelte
index 9a43266..34f0a50 100644
--- a/src/lib/components/Settings.svelte
+++ b/src/lib/components/Settings.svelte
@@ -1,113 +1,113 @@
{line}
+ {/each} +
-
-
- (hidden = true)} class="mb-4 dark:text-white" />
-
-
-
-
- updateSetting(key, !value)}
- >{text}
- {/each}
-
+
-
-
- {#each toggles as { key, text, value }}
-
-
-
-
-
-
-
-
-
+
+
+ (hidden = true)} class="mb-4 dark:text-white" />
+
+
+
+
+ updateSetting(key, !value)}
+ >{text}
+ {/each}
+
+
+
+ {#each toggles as { key, text, value }}
+
+
+
+
+
+
+
+
+ Loading...
-- Upload {files.length} - {files.length > 1 ? 'files' : 'file'}? -
- {:else if draggedFiles && draggedFiles.length > 0} -- Upload {draggedFiles.length} hih - {draggedFiles.length > 1 ? 'files' : 'file'}? -
- {:else if loading} -
- Drag and drop /
Loading...
++ Upload {files.length} + {files.length > 1 ? 'files' : 'file'}? +
+ {:else if draggedFiles && draggedFiles.length > 0} ++ Upload {draggedFiles.length} hih + {draggedFiles.length > 1 ? 'files' : 'file'}? +
+ {:else if loading} +
+ Drag and drop /
{storageSpace}
-
-
-
-
- {/await}
+ {storageSpace}
+
+
+
+
+ {/await}
- {volumeName}
- {#if files}
-
- {/if}
-
+
+ {volumeName}
+ {#if files}
+
+ {/if}
+
diff --git a/src/lib/panzoom/Panzoom.svelte b/src/lib/panzoom/Panzoom.svelte
index 6f70812..bff2206 100644
--- a/src/lib/panzoom/Panzoom.svelte
+++ b/src/lib/panzoom/Panzoom.svelte
@@ -1,7 +1,7 @@
-
diff --git a/src/lib/panzoom/index.ts b/src/lib/panzoom/index.ts
index 4ee7eab..8210f50 100644
--- a/src/lib/panzoom/index.ts
+++ b/src/lib/panzoom/index.ts
@@ -1,2 +1,2 @@
-export * from './util'
-export {default as Panzoom} from './Panzoom.svelte'
\ No newline at end of file
+export * from './util';
+export { default as Panzoom } from './Panzoom.svelte';
diff --git a/src/lib/panzoom/util.ts b/src/lib/panzoom/util.ts
index c80b1fd..a7bb822 100644
--- a/src/lib/panzoom/util.ts
+++ b/src/lib/panzoom/util.ts
@@ -37,20 +37,20 @@ export function initPanzoom(node: HTMLElement) {
}
});
- panzoomStore.set(pz)
+ panzoomStore.set(pz);
}
-type PanX = 'left' | 'center' | 'right'
-type PanY = 'top' | 'center' | 'bottom'
+type PanX = 'left' | 'center' | 'right';
+type PanY = 'top' | 'center' | 'bottom';
export function panAlign(alignX: PanX, alignY: PanY) {
if (!pz || !container) {
- return
+ return;
}
const { scale } = pz.getTransform();
- const { innerWidth, innerHeight } = window
- const { offsetWidth, offsetHeight } = container
+ const { innerWidth, innerHeight } = window;
+ const { offsetWidth, offsetHeight } = container;
let x = 0;
let y = 0;
@@ -63,7 +63,7 @@ export function panAlign(alignX: PanX, alignY: PanY) {
x = (innerWidth - offsetWidth * scale) / 2;
break;
case 'right':
- x = (innerWidth - offsetWidth * scale);
+ x = innerWidth - offsetWidth * scale;
break;
}
@@ -75,11 +75,11 @@ export function panAlign(alignX: PanX, alignY: PanY) {
y = (innerHeight - offsetHeight * scale) / 2;
break;
case 'bottom':
- y = (innerHeight - offsetHeight * scale);
+ y = innerHeight - offsetHeight * scale;
break;
}
- pz?.moveTo(x, y)
+ pz?.moveTo(x, y);
}
export function zoomOriginal() {
@@ -90,12 +90,11 @@ export function zoomOriginal() {
export function zoomFitToWidth() {
if (!pz || !container) {
- return
+ return;
}
- const { innerWidth } = window
+ const { innerWidth } = window;
- const scale =
- (1 / pz.getTransform().scale) * (innerWidth / container.offsetWidth);
+ const scale = (1 / pz.getTransform().scale) * (innerWidth / container.offsetWidth);
pz.moveTo(0, 0);
pz.zoomTo(0, 0, scale);
@@ -104,13 +103,12 @@ export function zoomFitToWidth() {
export function zoomFitToScreen() {
if (!pz || !container) {
- return
+ return;
}
- const { innerWidth, innerHeight } = window
+ const { innerWidth, innerHeight } = window;
const scaleX = innerWidth / container.offsetWidth;
const scaleY = innerHeight / container.offsetHeight;
- const scale =
- (1 / pz.getTransform().scale) * Math.min(scaleX, scaleY);
+ const scale = (1 / pz.getTransform().scale) * Math.min(scaleX, scaleY);
pz.moveTo(0, 0);
pz.zoomTo(0, 0, scale);
panAlign('center', 'center');
@@ -121,7 +119,7 @@ export function keepZoomStart() {
}
export function zoomDefault() {
- const zoomDefault = get(settings).zoomDefault
+ const zoomDefault = get(settings).zoomDefault;
switch (zoomDefault) {
case 'zoomFitToScreen':
zoomFitToScreen();
@@ -136,4 +134,4 @@ export function zoomDefault() {
keepZoomStart();
return;
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/settings/index.ts b/src/lib/settings/index.ts
index f8449cf..6d06725 100644
--- a/src/lib/settings/index.ts
+++ b/src/lib/settings/index.ts
@@ -1,27 +1,29 @@
-import { browser } from "$app/environment";
-import { zoomDefault } from "$lib/panzoom";
-import { writable } from "svelte/store";
+import { browser } from '$app/environment';
+import { zoomDefault } from '$lib/panzoom';
+import { writable } from 'svelte/store';
-export type FontSize = 'auto' |
- '9' |
- '10' |
- '11' |
- '12' |
- '14' |
- '16' |
- '18' |
- '20' |
- '24' |
- '32' |
- '40' |
- '48' |
- '60'
+export type FontSize =
+ | 'auto'
+ | '9'
+ | '10'
+ | '11'
+ | '12'
+ | '14'
+ | '16'
+ | '18'
+ | '20'
+ | '24'
+ | '32'
+ | '40'
+ | '48'
+ | '60';
-export type ZoomModes = 'zoomFitToScreen' |
- 'zoomFitToWidth' |
- 'zoomOriginal' |
- 'keepZoom' |
- 'keepZoomStart'
+export type ZoomModes =
+ | 'zoomFitToScreen'
+ | 'zoomFitToWidth'
+ | 'zoomOriginal'
+ | 'keepZoom'
+ | 'keepZoomStart';
export type Settings = {
rightToLeft: boolean;
@@ -37,7 +39,7 @@ export type Settings = {
zoomDefault: ZoomModes;
};
-export type SettingsKey = keyof Settings
+export type SettingsKey = keyof Settings;
const defaultSettings: Settings = {
rightToLeft: true,
@@ -51,12 +53,12 @@ const defaultSettings: Settings = {
backgroundColor: '#0d0d0f',
fontSize: 'auto',
zoomDefault: 'zoomFitToScreen'
-}
+};
-const stored = browser ? window.localStorage.getItem('settings') : undefined
-const initialSettings: Settings = stored && browser ? JSON.parse(stored) : defaultSettings
+const stored = browser ? window.localStorage.getItem('settings') : undefined;
+const initialSettings: Settings = stored && browser ? JSON.parse(stored) : defaultSettings;
-export * from './progress'
+export * from './progress';
export const settings = writable