Changeset 98992cf for frontend/src

Timestamp:

01/30/26 00:08:04 (5 months ago)

Author:

Dimitar Arsov <dimitararsov04@…>

Branches:

main

Children:

2b08bed

Parents:

6de2873

Message:

refactor NonAdminUser dtos

Location:

frontend/src

Files:

• components/userProfile/ArtistView.tsx (modified) (1 diff)
• components/userProfile/ListenerView.tsx (modified) (6 diffs)
• pages/UserDetailView.tsx (modified) (6 diffs)
• utils/types.ts (modified) (1 diff)

frontend/src/components/userProfile/ArtistView.tsx

@@ -1 +1 @@
 import { useNavigate } from "react-router-dom";
 import { Music, Disc3 } from "lucide-react";
-import type { ArtistContributionDTO } from "../../utils/types";
+import type { ArtistContribution } from "../../utils/types";
 
 interface ArtistViewProps {
-  contributions: ArtistContributionDTO[];
+  contributions: ArtistContribution[];
 }
 

frontend/src/components/userProfile/ListenerView.tsx

@@ -1 +1 @@
 import { useNavigate } from "react-router-dom";
 import { Heart, ListMusic, Music, Album } from "lucide-react";
-import type { Playlist, MusicalEntityDTO } from "../../utils/types";
+import type { Playlist, MusicalEntity } from "../../utils/types";
 
 interface ListenerViewProps {
-  likedEntities: MusicalEntityDTO[];
-  playlists?: Playlist[];
+  likedEntities: MusicalEntity[] | [];
+  playlists: Playlist[] | [];
 }
 
@@ -11 +11 @@
   const navigate = useNavigate();
 
-  const likedSongs = likedEntities.filter((e) => e.type === "SONG");
-  const likedAlbums = likedEntities.filter((e) => e.type === "ALBUM");
+  const likedSongs = likedEntities?.filter((e) => e.type === "SONG");
+  const likedAlbums = likedEntities?.filter((e) => e.type === "ALBUM");
 
   return (
@@ -55 +55 @@
       )}
 
-      {likedSongs.length > 0 && (
+      {likedSongs && likedSongs.length > 0 && (
         <section>
           <div className="flex items-center gap-2 mb-6 pb-2 border-b-2 border-gray-200">
@@ -61 +61 @@
             <h3 className="text-2xl font-bold text-gray-800">Liked Songs</h3>
             <span className="text-sm text-gray-400 ml-1">
-              ({likedSongs.length})
+              ({likedSongs?.length})
             </span>
           </div>
@@ -90 +90 @@
       )}
 
-      {likedAlbums.length > 0 && (
+      {likedAlbums && likedAlbums.length > 0 && (
         <section>
           <div className="flex items-center gap-2 mb-6 pb-2 border-b-2 border-gray-200">
@@ -120 +120 @@
       )}
 
-      {likedEntities.length === 0 && (!playlists || playlists.length === 0) && (
-        <div className="flex flex-col items-center justify-center py-16 text-gray-300">
-          <p className="text-lg font-medium text-gray-400">Nothing here yet</p>
-          <p className="text-sm text-gray-400 mt-1">
-            Start exploring music to build your collection
-          </p>
-        </div>
-      )}
+      {likedEntities &&
+        likedEntities.length === 0 &&
+        (!playlists || playlists.length === 0) && (
+          <div className="flex flex-col items-center justify-center py-16 text-gray-300">
+            <p className="text-lg font-medium text-gray-400">
+              Nothing here yet
+            </p>
+            <p className="text-sm text-gray-400 mt-1">
+              Start exploring music to build your collection
+            </p>
+          </div>
+        )}
     </div>
   );

frontend/src/pages/UserDetailView.tsx

@@ -5 +5 @@
 import ListenerView from "../components/userProfile/ListenerView";
 import type {
-  ArtistContributionDTO,
-  MusicalEntityDTO,
+  MusicalEntity,
   Playlist,
+  ArtistContribution,
 } from "../utils/types";
 
-interface User {
+interface BaseUser {
   id: number;
-  username: string;
   fullName: string;
   userType: string;
@@ -18 +17 @@
   following: number;
   isFollowedByCurrentUser: boolean;
+}
 
-  musicalEntities?: {
-    contributions: ArtistContributionDTO[];
-  };
+interface Artist extends BaseUser {
+  userType: "ARTIST";
+  contributions: ArtistContribution[];
+}
+interface Listener extends BaseUser {
+  userType: "LISTENER";
+  likedEntities: MusicalEntity[];
+  createdPlaylists: Playlist[];
+}
 
-  likes?: {
-    likedEntities: MusicalEntityDTO[];
-  };
-
-  createdPlaylists?: Playlist[];
-}
+type UserProfile = Artist | Listener;
 
 const UserDetail = () => {
@@ -34 +35 @@
   const { userId } = useParams();
   const navigate = useNavigate();
-  const [user, setUser] = useState<User | null>(null);
+  const [user, setUser] = useState<UserProfile | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [isFollowing, setIsFollowing] = useState(false);
@@ -43 +44 @@
     setIsFollowing(true);
     try {
-      const response = await axiosInstance.post<User>(
+      const response = await axiosInstance.post<UserProfile>(
         `/users/follow/${userId}`,
       );
-      setUser(response.data);
     } catch (err: any) {
       console.error(err.response?.data?.error);
@@ -59 +59 @@
       try {
         const response = await axiosInstance.get(`/users/${userId}`);
+        console.log(response.data);
 
         setUser(response.data);
@@ -135 +136 @@
         </div>
 
-        {user.userType === "ARTIST" && user.musicalEntities?.contributions && (
-          <ArtistView contributions={user.musicalEntities.contributions} />
-        )}
-
-        {user.userType === "LISTENER" && user.likes?.likedEntities && (
+        {user.userType === "ARTIST" ? (
+          <ArtistView contributions={user.contributions} />
+        ) : (
           <ListenerView
-            likedEntities={user.likes.likedEntities}
+            likedEntities={user.likedEntities}
             playlists={user.createdPlaylists}
           />

frontend/src/utils/types.ts

@@ -1 +1 @@
 export interface User {
-        username: string;
-        fullName: string;
-        email?: string;
-        profilePhoto?: string | null;
-        role?: "ADMIN" | "NONADMIN";
+  username: string;
+  fullName: string;
+  email?: string;
+  profilePhoto?: string | null;
+  role?: "ADMIN" | "NONADMIN";
 }
 
-export interface ArtistContributionDTO {
-        musicalEntityId: number;
-        title: string;
-        genre: string;
-        role: string;
-        entityType: string;
+export interface ArtistContribution {
+  musicalEntityId: number;
+  title: string;
+  genre: string;
+  role: string;
+  entityType: string;
 }
-export interface MusicalEntityDTO {
-        id: number;
-        title: string;
-        genre: string;
-        type: string;
+export interface MusicalEntity {
+  id: number;
+  title: string;
+  genre: string;
+  type: string;
 }
 
 export interface Playlist {
-        id: number;
-        name: string;
-        cover: string;
-        creatorName: string;
+  id: number;
+  name: string;
+  cover: string;
+  creatorName: string;
 }