Changeset 890e036 for frontend

Timestamp:

02/09/26 21:45:41 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

0808ef2

Parents:

03a8d87 (diff), 27660af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'main' into gavro/features

Location:

frontend/src

Files:

• App.tsx (modified) (3 diffs)
• pages/MySongs.tsx (added)
• pages/Nav.tsx (modified) (2 diffs)
• pages/PublishSong.tsx (added)
• utils/consts.ts (added)
• utils/types.ts (modified) (2 diffs)

frontend/src/App.tsx

@@ -17 +17 @@
 import Login from "./pages/Login";
 import MusicalCollection from "./pages/MusicalCollection";
+import MySongs from "./pages/MySongs";
 import Nav from "./pages/Nav";
+import PublishSong from "./pages/PublishSong";
 import Register from "./pages/Register";
 import SongDetail from "./pages/SongDetail";
@@ -28 +30 @@
         // show sidebar only if user is logged in and is on the landing page
         const isLandingPage = location.pathname === "/";
-        const [isSidebarOpen, setIsSidebarOpen] = useState(!!user && isLandingPage);
+        const [isSidebarOpen, setIsSidebarOpen] = useState(
+                !!user && isLandingPage && !user?.isArtist && !user?.isAdmin,
+        );
 
         // Open sidebar when user logs in and navigates to landing page
         useEffect(() => {
-                if (user && isLandingPage) {
+                if (user && isLandingPage && !user.isArtist && !user.isAdmin) {
                         setIsSidebarOpen(true);
                 }
@@ -104 +108 @@
                         },
                         {
+                                path: "/my-songs",
+                                element: <MySongs />,
+                        },
+                        {
+                                path: "/publish",
+                                element: <PublishSong />,
+                        },
+                        {
                                 path: "/songs/:id",
                                 element: <SongDetail />,

frontend/src/pages/Nav.tsx

@@ -22 +22 @@
                         setUser(undefined);
                         setIsDropdownOpen(false);
-                        toast.success("Logout successful!");
+                        window.location.href = "/";
+                        // toast.success("Logout successful!");
                 } catch (error) {
                         console.error("Logout failed:", error);
@@ -81 +82 @@
                                 {!isAuthLoading && (
                                         <div className="flex items-center space-x-3">
+                                                {user?.isArtist && (
+                                                        <Link
+                                                                to="/my-songs"
+                                                                className="text-white hover:text-[#1db954] px-4 py-2 text-sm font-medium transition-colors"
+                                                        >
+                                                                My Songs
+                                                        </Link>
+                                                )}
                                                 {user ? (
                                                         <div className="relative" ref={dropdownRef}>

frontend/src/utils/types.ts

@@ -4 +4 @@
         email?: string;
         profilePhoto?: string | null;
-        role?: "ADMIN" | "NONADMIN";
+        isAdmin: boolean;
+        isArtist: boolean;
 }
 
@@ -107 +108 @@
         songCount: number;
 }
+
+export interface CatalogItem {
+        id: number;
+        title: string;
+        genre: string;
+        cover: string | null;
+        type: "SONG" | "ALBUM";
+        releaseDate: string;
+}
+
+export interface Contributor {
+        username: string;
+        fullName: string;
+        role: string;
+}
+
+export interface ArtistSearchResult {
+        username: string;
+        fullName: string;
+        profilePhoto?: string;
+}
+
+export interface SongEntry {
+        title: string;
+        link: string;
+        contributors: Contributor[];
+}