Index: frontend/src/components/Sidebar.tsx =================================================================== --- frontend/src/components/Sidebar.tsx (revision 615dceec5ce09f962e30b3bc96b8c511eea814eb) +++ frontend/src/components/Sidebar.tsx (revision 947fcaadc3ddb75ae7bee1ae398ae0f43c988c1e) @@ -5,276 +5,276 @@ import { useAuth } from "../context/authContext"; import { usePlayer } from "../context/playerContext"; +import { useCreatedPlaylists } from "../context/playlistContext"; +import { getErrorMessage } from "../utils/error"; import type { BasicSong, SidebarProps } from "../utils/types"; import { toEmbedUrl } from "../utils/utils"; -import { useCreatedPlaylists } from "../context/playlistContext"; import CreatePlaylistModal from "./playlist/CreatePlaylistModal"; -import { getErrorMessage } from "../utils/error"; const Sidebar = ({ isOpen, onClose }: SidebarProps) => { - const { user } = useAuth(); - const { - createdPlaylists, - isLoading: playlistsLoading, - refreshPlaylists, - } = useCreatedPlaylists(); - const navigate = useNavigate(); - const { play, currentSong } = usePlayer(); - const [recentlyListened, setRecentlyListened] = useState([]); - const [songsLoading, setSongsLoading] = useState(false); - const [isModalOpen, setIsModalOpen] = useState(false); - - useEffect(() => { - const fetchData = async () => { - setSongsLoading(true); - try { - const data = await axiosInstance.get("/songs/recent"); - setRecentlyListened(data.data); - } catch (error) { - toast.error(getErrorMessage(error)); - } finally { - setSongsLoading(false); - } - }; - if (user) { - fetchData(); - } else { - setRecentlyListened([]); - setSongsLoading(false); - } - }, [user]); - - const isLoading = songsLoading || playlistsLoading; - - return ( - <> -
-
- {/* Sidebar Header */} -
-

Library

- -
- - {/* Loading State */} - {isLoading ? ( -
-
-
- ) : ( - <> - {/* Recently Listened */} -
-

- Recently Played -

-
- {recentlyListened.map((song) => ( -
- {song.title} { - (e.target as HTMLImageElement).src = "/favicon.png"; - }} - /> -
-

navigate(`/songs/${song.id}`)} - className="text-sm font-medium text-white truncate hover:underline cursor-pointer" - > - {song.title} -

-
- { - e.stopPropagation(); - if (song.artistUsername) { - navigate(`/users/${song.artistUsername}`); - } - }} - className={`truncate ${ - song.artistUsername - ? "hover:underline cursor-pointer hover:text-white" - : "" - }`} - > - {song.artist} - - {song.album && ( - <> - • - { - e.stopPropagation(); - if (song.albumId) { - navigate( - `/collection/album/${song.albumId}`, - ); - } - }} - className={`truncate ${ - song.albumId - ? "hover:underline cursor-pointer hover:text-white" - : "" - }`} - > - {song.album} - - - )} -
-
- {song.link && ( - - )} -
- ))} -
-
- - {/* Playlists */} -
-

- Your Playlists -

-
- {createdPlaylists?.map((playlist) => ( -
{ - navigate(`/collection/playlist/${playlist.id}`); - }} - className="flex items-center justify-between p-3 rounded-lg hover:bg-white/5 cursor-pointer transition-colors" - > -
-
- - - -
-
-

- {playlist.name} -

-

- {playlist.songCount} songs -

-
-
-
- ))} - - {/* Create Playlist Button */} - -
-
- - )} -
-
- - setIsModalOpen(false)} - onSuccess={() => refreshPlaylists(false)} - songId={null} - /> - - ); + const { user } = useAuth(); + const { + createdPlaylists, + isLoading: playlistsLoading, + refreshPlaylists, + } = useCreatedPlaylists(); + const navigate = useNavigate(); + const { play, currentSong } = usePlayer(); + const [recentlyListened, setRecentlyListened] = useState([]); + const [songsLoading, setSongsLoading] = useState(false); + const [isModalOpen, setIsModalOpen] = useState(false); + + useEffect(() => { + const fetchData = async () => { + setSongsLoading(true); + try { + const data = await axiosInstance.get("/songs/recent"); + setRecentlyListened(data.data); + } catch (error) { + toast.error(getErrorMessage(error)); + } finally { + setSongsLoading(false); + } + }; + if (user) { + fetchData(); + } else { + setRecentlyListened([]); + setSongsLoading(false); + } + }, [user]); + + const isLoading = songsLoading || playlistsLoading; + + return ( + <> +
+
+ {/* Sidebar Header */} +
+

Library

+ +
+ + {/* Loading State */} + {isLoading ? ( +
+
+
+ ) : ( + <> + {/* Recently Listened */} +
+

+ Recently Played +

+
+ {recentlyListened.map((song) => ( +
+ {song.title} { + (e.target as HTMLImageElement).src = "/favicon.png"; + }} + /> +
+

navigate(`/songs/${song.id}`)} + className="text-sm font-medium text-white truncate hover:underline cursor-pointer" + > + {song.title} +

+
+ { + e.stopPropagation(); + if (song.artistUsername) { + navigate(`/users/${song.artistUsername}`); + } + }} + className={`truncate ${ + song.artistUsername + ? "hover:underline cursor-pointer hover:text-white" + : "" + }`} + > + {song.artist} + + {song.album && ( + <> + • + { + e.stopPropagation(); + if (song.albumId) { + navigate( + `/collection/album/${song.albumId}`, + ); + } + }} + className={`truncate ${ + song.albumId + ? "hover:underline cursor-pointer hover:text-white" + : "" + }`} + > + {song.album} + + + )} +
+
+ {song.link && ( + + )} +
+ ))} +
+
+ + {/* Playlists */} +
+

+ Your Playlists +

+
+ {createdPlaylists?.map((playlist) => ( +
{ + navigate(`/collection/playlist/${playlist.id}`); + }} + className="flex items-center justify-between p-3 rounded-lg hover:bg-white/5 cursor-pointer transition-colors" + > +
+
+ + + +
+
+

+ {playlist.name} +

+

+ {playlist.songCount} songs +

+
+
+
+ ))} + + {/* Create Playlist Button */} + +
+
+ + )} +
+
+ + setIsModalOpen(false)} + onSuccess={() => refreshPlaylists(false)} + songId={null} + /> + + ); }; Index: frontend/src/components/userProfile/UserListModal.tsx =================================================================== --- frontend/src/components/userProfile/UserListModal.tsx (revision 615dceec5ce09f962e30b3bc96b8c511eea814eb) +++ frontend/src/components/userProfile/UserListModal.tsx (revision 947fcaadc3ddb75ae7bee1ae398ae0f43c988c1e) @@ -1,97 +1,97 @@ +import { useEffect } from "react"; import { useNavigate } from "react-router-dom"; import { baseURL } from "../../api/axiosInstance"; +import { useAuth } from "../../context/authContext"; import type { BaseNonAdminUser } from "../../utils/types"; -import { useEffect } from "react"; -import { useAuth } from "../../context/authContext"; interface ModalProps { - title: string; - users: BaseNonAdminUser[]; - onClose: () => void; - onFollowToggle: (targetUsername: string) => Promise; + title: string; + users: BaseNonAdminUser[]; + onClose: () => void; + onFollowToggle: (targetUsername: string) => Promise; } const UserListModal = ({ - title, - users, - onClose, - onFollowToggle, + title, + users, + onClose, + onFollowToggle, }: ModalProps) => { - const navigate = useNavigate(); - const { user } = useAuth(); - useEffect(() => { - document.body.style.overflow = "hidden"; - return () => { - document.body.style.overflow = ""; - }; - }, []); + const navigate = useNavigate(); + const { user } = useAuth(); + useEffect(() => { + document.body.style.overflow = "hidden"; + return () => { + document.body.style.overflow = ""; + }; + }, []); - return ( -
-
-
-

{title}

- -
+ return ( +
+
+
+

{title}

+ +
-
- {users.length === 0 ? ( -

No users found.

- ) : ( - users.map((u) => ( -
-
{ - onClose(); - navigate(`/users/${u.username}`); - }} - > -
- {u.profilePhoto ? ( - - ) : ( - - {u.fullName.charAt(0)} - - )} -
-
-

{u.fullName}

-

@{u.username}

-
-
- {user && ( - - )} -
- )) - )} -
-
-
-
- ); +
+ {users.length === 0 ? ( +

No users found.

+ ) : ( + users.map((u) => ( +
+
{ + onClose(); + navigate(`/users/${u.username}`); + }} + > +
+ {u.profilePhoto ? ( + + ) : ( + + {u.fullName.charAt(0)} + + )} +
+
+

{u.fullName}

+

@{u.username}

+
+
+ {user && user.username !== u.username && ( + + )} +
+ )) + )} +
+
+
+
+ ); };