From 0c315972c1005f35e6d49f9b56930cf218d12b57 Mon Sep 17 00:00:00 2001
From: alikia2x <alikia2x@outlook.com>
Date: Tue, 22 Oct 2024 00:22:17 +0800
Subject: [PATCH] ref: project structure, write basic type for lyrics layout

---
 src/lib/components/{ => lyrics}/lyrics.svelte    | 0
 src/lib/components/{ => lyrics}/newLyrics.svelte | 7 +++----
 src/lib/components/lyrics/type.d.ts              | 6 ++++++
 src/routes/play/[id]/+page.svelte                | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)
 rename src/lib/components/{ => lyrics}/lyrics.svelte (100%)
 rename src/lib/components/{ => lyrics}/newLyrics.svelte (92%)

diff --git a/src/lib/components/lyrics.svelte b/src/lib/components/lyrics/lyrics.svelte
similarity index 100%
rename from src/lib/components/lyrics.svelte
rename to src/lib/components/lyrics/lyrics.svelte
diff --git a/src/lib/components/newLyrics.svelte b/src/lib/components/lyrics/newLyrics.svelte
similarity index 92%
rename from src/lib/components/newLyrics.svelte
rename to src/lib/components/lyrics/newLyrics.svelte
index aa6e17d..97b6349 100644
--- a/src/lib/components/newLyrics.svelte
+++ b/src/lib/components/lyrics/newLyrics.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
     import type { LrcJsonData } from '$lib/lyrics/type';
     import { onMount } from 'svelte';
-    import LyricsLine from './lyrics/lyricLine.svelte';
-    import type { ScriptItem } from 'lrc-parser-ts';
-    import LyricLine from './lyrics/lyricLine.svelte';
-    import type { LyricPos } from './lyrics/type';
+    import type { ScriptItem } from '$lib/lyrics/type';
+    import LyricLine from './lyricLine.svelte';
+    import type { LyricPos } from './type';
 
     // Props
     export let originalLyrics: LrcJsonData;
diff --git a/src/lib/components/lyrics/type.d.ts b/src/lib/components/lyrics/type.d.ts
index 115703b..13bfc64 100644
--- a/src/lib/components/lyrics/type.d.ts
+++ b/src/lib/components/lyrics/type.d.ts
@@ -1,4 +1,10 @@
 export interface LyricPos {
     x: number;
     y: number;
+}
+
+export interface LyricLayout {
+    pos: LyricPos;
+    blur: number;
+    scale: number;
 }
\ No newline at end of file
diff --git a/src/routes/play/[id]/+page.svelte b/src/routes/play/[id]/+page.svelte
index 7dfc0f0..96be32f 100644
--- a/src/routes/play/[id]/+page.svelte
+++ b/src/routes/play/[id]/+page.svelte
@@ -4,7 +4,7 @@
     import Background from '$lib/components/background.svelte';
     import Cover from '$lib/components/cover.svelte';
     import InteractiveBox from '$lib/components/interactiveBox.svelte';
-    import Lyrics from '$lib/components/lyrics.svelte';
+    import Lyrics from '$lib/components/lyrics/lyrics.svelte';
     import extractFileName from '$lib/extractFileName';
     import localforage from 'localforage';
     import { writable } from 'svelte/store';
@@ -15,7 +15,7 @@
     import { onMount } from 'svelte';
     import progressBarRaw from '$lib/state/progressBarRaw';
     import { parseTTML, type LyricLine } from '$lib/lyrics/ttml';
-    import NewLyrics from '$lib/components/newLyrics.svelte';
+    import NewLyrics from '$lib/components/lyrics/newLyrics.svelte';
 
     const audioId = $page.params.id;
     let audioPlayer: HTMLAudioElement | null = null;