Changeset 5938bc9

Timestamp:

02/07/26 14:59:57 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

ebdd3d4

Parents:

591919d

Message:

fix bug that prevented unauthenticated users to see top songs

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (modified) (1 diff)
• frontend/src/App.tsx (modified) (3 diffs)
• frontend/src/components/Sidebar.tsx (modified) (2 diffs)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java

@@ -20 +20 @@
 @AllArgsConstructor
 public class SongController {
-    private final AuthService authService;
     private final SongService songService;
 
     @GetMapping("/top")
     public HttpEntity<List<MusicalEntityDto>> getSongs(){
-        Long userId = authService.getCurrentUserID();
-        return ResponseEntity.ok(songService.getTopSongs(userId));
+        return ResponseEntity.ok(songService.getTopSongs());
     }
 

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java

@@ -15 +15 @@
     private final AuthService authService;
 
-    public List<MusicalEntityDto> getTopSongs(Long userId){
+    public List<MusicalEntityDto> getTopSongs(){
+        Long userId = null;
+        try {
+            userId = authService.getCurrentUserID();
+        } catch (Exception ignored) {}
         return songRepository.findTopByListens(userId);
     }

frontend/src/App.tsx

@@ -4 +4 @@
 import "react-toastify/dist/ReactToastify.css";
 import Sidebar from "./components/Sidebar";
+import { useAuth } from "./context/authContext";
 import AllUsers from "./pages/AllUsers";
 import LandingPage from "./pages/LandingPage";
@@ -12 +13 @@
 import UserDetail from "./pages/UserDetail";
 
-const Layout = () => {
-        const [isSidebarOpen, setIsSidebarOpen] = useState(true);
+const MainLayout = () => {
+        const { user } = useAuth();
+        const [isSidebarOpen, setIsSidebarOpen] = useState(!!user);
 
         return (
@@ -43 +45 @@
                 </div>
         );
+};
+
+const Layout = () => {
+        const { isAuthLoading } = useAuth();
+
+        if (isAuthLoading) {
+                return (
+                        <div className="flex h-screen items-center justify-center bg-[#121212]">
+                                <div className="w-12 h-12 border-4 border-white/10 border-t-[#1db954] rounded-full animate-spin"></div>
+                        </div>
+                );
+        }
+
+        return <MainLayout />;
 };
 

frontend/src/components/Sidebar.tsx

@@ -1 +1 @@
 import { useEffect, useState } from "react";
 import axiosInstance from "../api/axiosInstance";
+import { useAuth } from "../context/authContext";
 import type { BasicPlaylist, BasicSong, SidebarProps } from "../utils/types";
 
 const Sidebar = ({ isOpen, onClose }: SidebarProps) => {
+        const { user } = useAuth();
         const [recentlyListened, setRecentlyListened] = useState<BasicSong[]>([]);
         const [playlists, setPlaylists] = useState<BasicPlaylist[]>([]);
@@ -25 +27 @@
                         }
                 };
-                fetchData();
-        }, []);
+                if (user) {
+                        fetchData();
+                } else {
+                        setRecentlyListened([]);
+                        setPlaylists([]);
+                }
+        }, [user]);
         return (
                 <div