diff --git a/package.json b/package.json
index 3f8d4ef..0aa3051 100644
--- a/package.json
+++ b/package.json
@@ -38,4 +38,4 @@
"dependencies": {
"svelte-tiny-virtual-list": "^2.0.5"
}
-}
+}
\ No newline at end of file
diff --git a/src/app.d.ts b/src/app.d.ts
index 824da68..2bc1360 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -11,4 +11,4 @@ declare global {
}
}
-export {};
+export { };
diff --git a/src/routes/share/[token]/+page.server.ts b/src/routes/share/[token]/+page.server.ts
index fbd7a1d..acb8ef6 100644
--- a/src/routes/share/[token]/+page.server.ts
+++ b/src/routes/share/[token]/+page.server.ts
@@ -3,17 +3,29 @@ import { LOCAL_MUSIKQUAD_SERVER } from '$env/static/private';
import { scheme } from '../../../utils';
interface MusicInfo {
- title: string;
- album: string;
- artist: string;
+ title: string;
+ album: string;
+ artist: string;
}
export async function load({ params }) {
- const resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/info/${params.token}`);
- const info: MusicInfo = await resp.json();
- return {
- info,
- thumbnail_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/thumbnail/${params.token}`,
- audio_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/audio/${params.token}`
- };
+ const token = params.token;
+ let color = '#222222';
+
+ const resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/info/${token}`);
+ const info: MusicInfo = await resp.json();
+
+ /*const thumb_resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/thumbnail/${token}`);
+ if (thumb_resp.ok) {
+ const thumb = await thumb_resp.blob();
+ const rawColor = await getColor(thumb);
+ color = rgbToHex(rawColor[0], rawColor[1], rawColor[2]);
+ }*/
+
+ return {
+ info,
+ color,
+ thumbnail_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/thumbnail/${token}`,
+ audio_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/audio/${token}`
+ };
}
diff --git a/src/routes/share/[token]/+page.svelte b/src/routes/share/[token]/+page.svelte
index b446c0d..2c95f81 100644
--- a/src/routes/share/[token]/+page.svelte
+++ b/src/routes/share/[token]/+page.svelte
@@ -18,7 +18,7 @@
const hasAlbum = data.info.album;
if (hasArtist && hasAlbum) {
- return `from ${data.info.album} by ${data.info.artist}`;
+ return `from ${data.info.album}\nby ${data.info.artist}`;
} else if (hasArtist) {
return `by ${data.info.artist}`;
} else if (hasAlbum) {
@@ -44,6 +44,7 @@
+
event.currentTarget.play()}
/>