diff --git a/webdev-prosjekt1/src/App.tsx b/webdev-prosjekt1/src/App.tsx index 2edea47..92976d9 100644 --- a/webdev-prosjekt1/src/App.tsx +++ b/webdev-prosjekt1/src/App.tsx @@ -232,10 +232,10 @@ function App() { matchesGenre([artist]) ) ?? []; - if (isAlbumDetailRoute) return ; - if (isArtistDetailRoute) return ; - if (isSongDetailRoute) return ; - if (isFavoritesRoute) return ; + if (isAlbumDetailRoute) return ; + if (isArtistDetailRoute) return ; + if (isSongDetailRoute) return ; + if (isFavoritesRoute) return ; return (
diff --git a/webdev-prosjekt1/src/components/AlbumDetailPage.tsx b/webdev-prosjekt1/src/components/AlbumDetailPage.tsx index 20ccff8..02a1036 100644 --- a/webdev-prosjekt1/src/components/AlbumDetailPage.tsx +++ b/webdev-prosjekt1/src/components/AlbumDetailPage.tsx @@ -11,9 +11,10 @@ import { PreviewPlayer } from './PreviewPlayer'; type AlbumDetailPageProps = { album: Album; onTrackClick: (track: AlbumTrack) => void; + onHome: () => void; }; -export const AlbumDetailPage = ({ album, onTrackClick }: AlbumDetailPageProps) => { +export const AlbumDetailPage = ({ album, onTrackClick, onHome }: AlbumDetailPageProps) => { const [playingTrackId, setPlayingTrackId] = useState(null); const artistNames = album.artists.map((artist) => artist.name).join(', '); const albumImage = album.images[0]?.url; @@ -26,7 +27,7 @@ export const AlbumDetailPage = ({ album, onTrackClick }: AlbumDetailPageProps) = return (
-
+
diff --git a/webdev-prosjekt1/src/components/ArtistDetailPage.tsx b/webdev-prosjekt1/src/components/ArtistDetailPage.tsx index 9c35f03..5f368a0 100644 --- a/webdev-prosjekt1/src/components/ArtistDetailPage.tsx +++ b/webdev-prosjekt1/src/components/ArtistDetailPage.tsx @@ -11,9 +11,10 @@ type ArtistDetailPageProps = { artist: Artist; onTrackClick: (track: Track) => void; onAlbumClick: (album: Album) => void; + onHome: () => void; }; -export const ArtistDetailPage = ({ artist, onTrackClick, onAlbumClick }: ArtistDetailPageProps) => { +export const ArtistDetailPage = ({ artist, onTrackClick, onAlbumClick, onHome }: ArtistDetailPageProps) => { const artistImage = artist.images[0]?.url; const { data: tracks, isLoading: isLoadingTracks, isError: isTracksError } = useQuery({ queryKey: ['artist-tracks', artist.name], @@ -30,7 +31,7 @@ export const ArtistDetailPage = ({ artist, onTrackClick, onAlbumClick }: ArtistD return (
-
+
diff --git a/webdev-prosjekt1/src/components/FavoritesPage.tsx b/webdev-prosjekt1/src/components/FavoritesPage.tsx index a74822c..9e8bc2f 100644 --- a/webdev-prosjekt1/src/components/FavoritesPage.tsx +++ b/webdev-prosjekt1/src/components/FavoritesPage.tsx @@ -8,14 +8,15 @@ import musicWizImage from '../assets/musicwiz.png'; type FavoritesPageProps = { onTrackClick: (track: Track | AlbumTrack) => void; + onHome: () => void; }; -export const FavoritesPage = ({ onTrackClick }: FavoritesPageProps) => { +export const FavoritesPage = ({ onTrackClick, onHome }: FavoritesPageProps) => { const { favorites } = useFavorites(); return (
-
+
diff --git a/webdev-prosjekt1/src/components/TrackDetailPage.tsx b/webdev-prosjekt1/src/components/TrackDetailPage.tsx index dfe071b..6af3365 100644 --- a/webdev-prosjekt1/src/components/TrackDetailPage.tsx +++ b/webdev-prosjekt1/src/components/TrackDetailPage.tsx @@ -9,6 +9,7 @@ import { PreviewPlayer } from './PreviewPlayer'; type TrackDetailPageProps = { song: Track; onAlbumClick: (album: Album) => void; + onHome: () => void; }; export type DetailSelectHandler = (song: Track) => void; @@ -21,7 +22,7 @@ const formatDuration = (durationMs: number) => { return `${minutes}:${seconds}`; }; -export const TrackDetailPage = ({ song, onAlbumClick }: TrackDetailPageProps) => { +export const TrackDetailPage = ({ song, onAlbumClick, onHome }: TrackDetailPageProps) => { const firstArtistName = song.artists[0].name; const artistNames = song.artists.map((artist) => artist.name).join(', '); const albumImage = song.album.images[0]?.url; @@ -35,7 +36,7 @@ export const TrackDetailPage = ({ song, onAlbumClick }: TrackDetailPageProps) => return (
-
+