Adds ability to select a specific track within an album, and fixes info view not keeping position between albums.

.dockerignore

@@ -0,0 +1,3 @@
+**/node_modules/
+**/dist
+.git

.env

@@ -0,0 +1 @@
+VITE_API_URL=http://localhost:8080

.env.production

@@ -0,0 +1 @@
+VITE_API_URL=https://ppapi.halfbinary.net

.woodpecker.yaml

@@ -0,0 +1,15 @@
+when:
+  branch: main
+  event:
+    - push
+    - manual
+steps:
+  - name: build
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: git.halfbinary.net/${CI_REPO_OWNER}/prettyplayerfe
+      registry: git.halfbinary.net
+      tags: ${CI_PIPELINE_NUMBER}
+      username: ${CI_REPO_OWNER}
+      password:
+        from_secret: docker_password

Dockerfile

@@ -1,5 +1,7 @@
 FROM node:18-alpine
 
+LABEL maintainer="Alex Arbit <aarbit@gmail.com>"
+
 WORKDIR /app
 
 COPY package.json .

public/maximize-2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-maximize-2"><polyline points="15 3 21 3 21 9"></polyline><polyline points="9 21 3 21 3 15"></polyline><line x1="21" y1="3" x2="14" y2="10"></line><line x1="3" y1="21" x2="10" y2="14"></line></svg>

public/minimize-2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minimize-2"><polyline points="4 14 10 14 10 20"></polyline><polyline points="20 10 14 10 14 4"></polyline><line x1="14" y1="10" x2="21" y2="3"></line><line x1="3" y1="21" x2="10" y2="14"></line></svg>

src/AlbumPlayer.tsx

@@ -1,43 +0,0 @@
-import {useEffect, useState} from "react";
-import hostName from "./Config.ts";
-import {TrackInfo} from "./TrackInfo.tsx";
-
-interface AlbumPlayerProps {
-  albumHash: string
-}
-
-export default function AlbumPlayer(props: Readonly<AlbumPlayerProps>) {
-  const [trackNum, setTrackNum] = useState(1)
-  const [trackInfo, setTrackInfo] = useState<TrackInfo>()
-
-  useEffect(() => {
-    if (props.albumHash) {
-      let fetched = fetch(`${hostName}/track/${props.albumHash}/${trackNum}`)
-      fetched.then(response => {
-        if (response.ok) {
-          response.json().then(body => {
-                setTrackInfo(body)
-              }
-          )
-        }
-      })
-    }
-  }, [props.albumHash, trackNum])
-
-  function handleNextTrack() {
-    setTrackNum(trackNum+1)
-  }
-
-  if(props.albumHash) {
-    return (
-        <div className={"player"}>
-          <div>{trackInfo?.artist ?? ""} - {trackInfo?.trackTitle ?? ""}</div>
-          <audio title={trackInfo?.trackTitle} controls={true} autoPlay={true} preload={"metadata"}
-                 src={`${hostName}/music/album/${props.albumHash}/${trackNum}`}
-                 onEnded={handleNextTrack} />
-        </div>
-    )
-  } else {
-    return <div className={"player"}></div>
-  }
-}

src/App.css

@@ -7,6 +7,7 @@
 .photoContainer {
   width: clamp(5vmin, 15vmin, 25vmin);
   height: clamp(5vmin, 15vmin, 25vmin);
+  background-image: url("/prettyplayer-logo.svg");
 }
 
 .photo {
@@ -28,8 +29,35 @@
 
 .player {
   background: rgba(0,0,0,0.5);
-  position: -webkit-sticky;
+  position: sticky;
+  width: 100%;
+  bottom:0;
+  transition: height 2s;
+}
+
+.player-container {
+  background: rgba(0,0,0,0.5);
   position: sticky;
   width: 100%;
   bottom:0;
 }
+
+.expander {
+  align-self: center;
+  height:.75em;
+  aspect-ratio: 1 / 1;
+  background-color: rgba(255, 255, 255, 0.8);
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 500%;
+}
+
+.album-title {
+  font-size: larger;
+}
+
+.bold-title {
+  font-weight: bold;
+}

src/App.tsx

@@ -1,18 +1,21 @@
 import React, {useEffect, useState} from 'react'
 import './App.css'
-import {AlbumInfo} from "./AlbumInfo.ts"
-import PhotoContainer from "./PhotoContainer.tsx";
-import AlbumPlayer from "./AlbumPlayer.tsx";
+import {AlbumMetadata} from "./models/AlbumMetadata.ts"
+import PhotoContainer from "./components/PhotoContainer.tsx";
+import AlbumPlayer from "./components/AlbumPlayer.tsx";
 import hostName from "./Config.ts";
+import {AlbumInfo} from "./models/AlbumInfo.ts";
 
 
 
 function App() {
-  const [albums, setAlbums] = useState(Array<AlbumInfo>)
+  const [albums, setAlbums] = useState(Array<AlbumMetadata>)
   const [selectedAlbum, setSelectedAlbum] = useState("")
+  const [albumInfo, setAlbumInfo] = useState<AlbumInfo>()
+  const [isShowAlbumInfo, setIsShowAlbumInfo] = useState(false)
 
   useEffect(() => {
-    let fetched = fetch(`${hostName}/albums`)
+    let fetched = fetch(`${hostName}/album`)
     fetched.then(response => {
       if(response.ok) {
         response.json().then( body =>
@@ -22,14 +25,31 @@ function App() {
     })
   }, [])
 
+  useEffect(() => {
+    if (selectedAlbum) {
+      let fetched = fetch(`${hostName}/album/${selectedAlbum}`)
+      fetched.then(response => {
+        if (response.ok) {
+          response.json().then(body =>
+              setAlbumInfo(body)
+          )
+        }
+      })
+    }
+  }, [selectedAlbum])
+
   function handleAlbumClick(event: React.MouseEvent<HTMLElement>) {
     setSelectedAlbum(event.currentTarget.id)
   }
 
+  function handleAlbumInfoAdjust() {
+    setIsShowAlbumInfo(!isShowAlbumInfo)
+  }
+
   return (
       <div className={"gallery"}>
         <PhotoContainer imageList={albums} albumClickHandler={handleAlbumClick}/>
-        <AlbumPlayer albumHash={selectedAlbum} key={selectedAlbum}/>
+        {albumInfo ? <AlbumPlayer handleAlbumInfoAdjust={handleAlbumInfoAdjust} isShowAlbumInfo={isShowAlbumInfo} albumHash={selectedAlbum} albumInfo={albumInfo} key={selectedAlbum}/> : <div></div> }
       </div>
   )
 }

src/Config.ts

@@ -1,4 +1,2 @@
-//const hostName = "http://192.168.187.129:8082"
-//const hostName = "http://localhost:8080"
-const hostName = "http://192.168.187.118:8080"
+const hostName = import.meta.env.VITE_API_URL
 export default hostName

src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

src/components/AlbumInfoDisplay.tsx

@@ -0,0 +1,19 @@
+import {AlbumInfo} from "../models/AlbumInfo.ts";
+import TrackListing from "./TrackListing.tsx";
+import React from "react";
+
+interface AlbumInfoDisplayProps {
+  albumInfo: AlbumInfo,
+  trackNumber: number,
+  trackClickHandler: (event: React.MouseEvent<HTMLElement>, trackNumber: number) => void
+}
+export default function AlbumInfoDisplay(props: Readonly<AlbumInfoDisplayProps>) {
+  let isVarious = props.albumInfo.albumArtist.startsWith("Various")
+  let isOneArtist = props.albumInfo.albumArtist === props.albumInfo.trackList[0].trackArtist
+  return (
+      <div>
+        <div className={`album-title`}>{!isVarious && `${props.albumInfo.albumArtist} - `}{props.albumInfo.albumTitle}</div>
+        <TrackListing trackClickHandler={props.trackClickHandler} trackList={props.albumInfo.trackList} isOneArtist={isOneArtist} trackNumber={props.trackNumber}/>
+      </div>
+  )
+}

src/components/AlbumPlayer.tsx

@@ -0,0 +1,52 @@
+import React, {useEffect, useState} from "react";
+import hostName from "../Config.ts";
+import {AlbumInfo} from "../models/AlbumInfo.ts";
+import AlbumInfoDisplay from "./AlbumInfoDisplay.tsx";
+import TrackInfoDisplay from "./TrackInfoDisplay.tsx";
+import maximize from '/maximize-2.svg'
+import minimize from '/minimize-2.svg'
+
+interface AlbumPlayerProps {
+  albumHash: string,
+  albumInfo: AlbumInfo
+  handleAlbumInfoAdjust: () => void,
+  isShowAlbumInfo: boolean
+}
+
+export default function AlbumPlayer(props: Readonly<AlbumPlayerProps>) {
+  const [trackNum, setTrackNum] = useState<number>(0)
+  const [isAlbumOver, setIsAlbumOver] = useState(false)
+
+  let album = props.albumInfo
+
+  useEffect(() => {
+    document.title = `Pretty Player - ${album.trackList[trackNum].trackTitle}`; // Quick solution
+  }, [trackNum]);
+
+  function handleNextTrack() {
+    if(!isAlbumOver && trackNum+1 === props.albumInfo.trackList.length) {
+      setIsAlbumOver(true)
+    } else {
+      setTrackNum(trackNum+1)
+    }
+  }
+
+  function handleTrackClick(_: React.MouseEvent<HTMLElement>, trackNumber: number) {
+    setTrackNum(trackNumber)
+  }
+
+  if(props.albumHash && album) {
+    console.log(album)
+    return (
+        <div className={"player-container"}>
+          <div className={`expander`} onClick={props.handleAlbumInfoAdjust} id={"maximizer"}>{props.isShowAlbumInfo ? <img src={minimize} alt={'minimize song text'}/> : <img src={maximize} alt={'show full album information'}/>}</div>
+          <div>{props.isShowAlbumInfo ? <AlbumInfoDisplay albumInfo={props.albumInfo} trackNumber={trackNum} trackClickHandler={handleTrackClick} /> : <TrackInfoDisplay artist={album.trackList[trackNum].trackArtist} track={album.trackList[trackNum].trackTitle} />}</div>
+          <audio title={album.trackList[trackNum].trackTitle} controls={true} autoPlay={true} preload={"metadata"}
+                 src={`${hostName}/music/album/${props.albumHash}/track/${trackNum}`}
+                 onEnded={handleNextTrack} />
+        </div>
+    )
+  } else {
+    return <div className={"player"}></div>
+  }
+}

src/components/PhotoContainer.tsx

@@ -1,9 +1,9 @@
-import {AlbumInfo} from "./AlbumInfo.ts";
+import {AlbumMetadata} from "../models/AlbumMetadata.ts";
 import React from "react";
-import hostName from "./Config.ts";
+import hostName from "../Config.ts";
 
 interface PhotoContainerProps {
-  imageList: AlbumInfo[],
+  imageList: AlbumMetadata[],
   albumClickHandler: (event: React.MouseEvent<HTMLElement>) => void
 }
 export default function PhotoContainer(props: PhotoContainerProps) {

src/components/TrackInfoDisplay.tsx

@@ -0,0 +1,11 @@
+interface TrackInfoDisplayProps {
+  artist: string,
+  track: string
+}
+export default function TrackInfoDisplay(props: Readonly<TrackInfoDisplayProps>) {
+  return (
+      <div>
+        <div className={`album-title`}>{`${props.artist} - `}{props.track}</div>
+      </div>
+  )
+}

src/components/TrackListing.tsx

@@ -0,0 +1,22 @@
+import {AlbumTrackInfo} from "../models/AlbumTrackInfo.ts";
+import React from "react";
+
+interface TrackListingProps {
+  trackList: AlbumTrackInfo[],
+  isOneArtist: boolean,
+  trackNumber: number,
+  trackClickHandler: (event: React.MouseEvent<HTMLElement>, trackNumber: number) => void
+}
+export default function TrackListing(props: Readonly<TrackListingProps>) {
+  return (
+      <div>
+        {props.trackList.map((track, index) => {
+          let rawKeyString = `${track.trackNumber}${track.trackArtist}${track.trackTitle}`
+          let isCurrentTrack = index===props.trackNumber
+          return (
+              <div onClick={(e) => props.trackClickHandler(e, index)} key={rawKeyString} className={ isCurrentTrack ? `bold-title` : ``}>{track.trackNumber}. {!props.isOneArtist && `${track.trackArtist} - `}{track.trackTitle}</div>
+          )
+        })}
+      </div>
+  )
+}

src/models/AlbumInfo.ts

@@ -0,0 +1,7 @@
+import {AlbumTrackInfo} from "./AlbumTrackInfo.ts";
+
+export interface AlbumInfo {
+  albumTitle: string,
+  albumArtist: string,
+  trackList: AlbumTrackInfo[]
+}

src/models/AlbumMetadata.ts

@@ -1,4 +1,4 @@
-export interface AlbumInfo {
+export interface AlbumMetadata {
   albumTitle: string,
   albumFolder: string,
   hash: string

src/models/AlbumTrackInfo.ts

@@ -0,0 +1,5 @@
+export interface AlbumTrackInfo {
+  trackNumber: number,
+  trackArtist: string,
+  trackTitle: string
+}

vite.config.ts

@@ -13,6 +13,6 @@ export default defineConfig({
     port: 8083,
     strictPort: true,
     host: true,
-    origin: "http://0.0.0.0:8083",
+    //origin: "http://0.0.0.0:8083",
   },
 })