-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #151 from tsirysndr/refactor/webui
chore(webui): refactor all components
- Loading branch information
Showing
64 changed files
with
622 additions
and
1,350 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Music Player</title><script defer="defer" src="/static/js/main.610fbbe1.js"></script><link href="/static/css/main.6215da36.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> | ||
| <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Music Player</title><script defer="defer" src="/static/js/main.20e29918.js"></script><link href="/static/css/main.6215da36.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
webui/musicplayer/src/Components/AlbumDetails/AlbumDetailsWithData.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { FC, useEffect } from "react"; | ||
| import AlbumDetails from "./AlbumDetails"; | ||
| import { useGetAlbumQuery } from "../../Hooks/GraphQL"; | ||
| import { useTimeFormat } from "../../Hooks/useFormat"; | ||
| import { usePlayback } from "../../Hooks/usePlayback"; | ||
| import { usePlaylist } from "../../Hooks/usePlaylist"; | ||
| import { useNavigate, useParams } from "react-router-dom"; | ||
|
|
||
| const AlbumDetailsWithData: FC = () => { | ||
| const params = useParams(); | ||
| const { data, loading, refetch } = useGetAlbumQuery({ | ||
| variables: { | ||
| id: params.id!, | ||
| }, | ||
| fetchPolicy: "network-only", | ||
| }); | ||
|
|
||
| useEffect(() => { | ||
| params.id && refetch(); | ||
| }, [params.id, refetch]); | ||
|
|
||
| const navigate = useNavigate(); | ||
| const { formatTime } = useTimeFormat(); | ||
| const { nowPlaying, playAlbum, playNext } = usePlayback(); | ||
| const album = | ||
| !loading && data | ||
| ? { | ||
| ...data.album, | ||
| tracks: data.album.tracks.map((track, index) => ({ | ||
| "#": track.trackNumber, | ||
| id: track.id, | ||
| title: track.title, | ||
| artist: track.artists.map((artist) => artist.name).join(", "), | ||
| time: formatTime(track.duration! * 1000), | ||
| artistId: track.artists[0].id, | ||
| albumId: data.album.id, | ||
| index, | ||
| })), | ||
| } | ||
| : { tracks: [] }; | ||
| const { recentPlaylists, createPlaylist, addTrackToPlaylist } = usePlaylist(); | ||
| return ( | ||
| <AlbumDetails | ||
| onBack={() => navigate(-1)} | ||
| album={album} | ||
| nowPlaying={nowPlaying} | ||
| onPlayAlbum={(albumId, shuffle, position) => | ||
| playAlbum({ variables: { albumId, position, shuffle } }) | ||
| } | ||
| onPlayNext={(trackId) => playNext({ variables: { trackId } })} | ||
| onCreatePlaylist={(name) => createPlaylist({ variables: { name } })} | ||
| onAddTrackToPlaylist={(playlistId, trackId) => | ||
| addTrackToPlaylist({ variables: { playlistId, trackId } }) | ||
| } | ||
| recentPlaylists={recentPlaylists} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default AlbumDetailsWithData; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| import AlbumDetails from "./AlbumDetails"; | ||
| import AlbumDetailsWithData from "./AlbumDetailsWithData"; | ||
|
|
||
| export default AlbumDetails; | ||
| export default AlbumDetailsWithData; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.