diff --git a/frontend/src/routes/Home.tsx b/frontend/src/routes/Home.tsx index 3d1ddfe..88e3373 100644 --- a/frontend/src/routes/Home.tsx +++ b/frontend/src/routes/Home.tsx @@ -74,12 +74,15 @@ function Album(props: { albums: Array, idx: number }) { const [coverBytes, {mutate, refetch}] = createResource | null>(async() => GetAlbumCover(props.albums[props.idx]?.id ?? "")); const [albumName, setAlbumName] = createSignal(""); const [artistName, setArtistName] = createSignal(""); + const [imageBase64, setImageBase64] = createSignal(""); + const [imgReady, setImgReady] = createSignal(false); const album = createMemo(() => props.albums[props.idx]); createEffect(() => { const a = album(); if (a === null) { + setImgReady(false); mutate(null); return; } else { @@ -90,31 +93,35 @@ function Album(props: { albums: Array, idx: number }) { refetch(); }); - const base64Image = createMemo(() => { - if (coverBytes.state !== "ready") return ""; - - // At runtime this is a string, not a number array - const bytes = coverBytes() as unknown as string; - return `data:;base64,${bytes}`; + createEffect(() => { + const status = coverBytes.state; + if (status === "ready") { + const bytes = coverBytes(); + if (bytes === null) return; + console.log("new image pushed, "); + setImageBase64(`data:;base64,${coverBytes()}`); + setImgReady(true); + } }); const isNull = createMemo(() => !album()); const opacity = createMemo(() => `${isNull() ? "opacity-0" : "opacity-100"} transition-opacity`); + const imgOpacity = createMemo(() => (imgReady() && !isNull() ? "opacity-100" : "opacity-0")); return (
-
+
{albumName()}
-
+
{artistName()}
diff --git a/session.go b/session.go index 84dcba9..307e96d 100644 --- a/session.go +++ b/session.go @@ -5,7 +5,6 @@ import ( "fmt" "log" "sync" - "time" "github.com/go-resty/resty/v2" ) @@ -90,8 +89,6 @@ func loadAlbums(serverUrl string) { log.Print("begin loadAlbums") - time.Sleep(5 * time.Second) - var errorData AuthError response, err := client.R(). SetHeader("x-nd-authorization", fmt.Sprintf("Bearer %s", LoggedUser.Token)).