From f0beabe3545658641ad77be059be19189ece9275 Mon Sep 17 00:00:00 2001
From: Junhyeong Park <pljh0906@yonsei.ac.kr>
Date: Fri, 17 May 2024 02:59:01 +0900
Subject: [PATCH] fix: auto routing logic update

---
 src/App.tsx              |  4 +--
 src/Pages/MainPage.tsx   | 22 +-----------
 src/Pages/ResultPage.tsx | 73 ++++++++++++++++++++++++++++++++++++----
 3 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 8a7db12..f96d5c6 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
-import ResultPage from "./Pages/ResultPage";
 import MainPage from "./Pages/MainPage";
+import ResultPage from "./Pages/ResultPage";
 
 const App: React.FC = () => {
   return (
     <Router>
       <Routes>
         <Route path="/" element={<MainPage />} />
-        <Route path="/result" element={<ResultPage />} />
+        <Route path="/result/:task_id" element={<ResultPage />} />
       </Routes>
     </Router>
   );
diff --git a/src/Pages/MainPage.tsx b/src/Pages/MainPage.tsx
index 0436513..6322094 100644
--- a/src/Pages/MainPage.tsx
+++ b/src/Pages/MainPage.tsx
@@ -40,27 +40,7 @@ const MainPage: React.FC = () => {
 
       const { task_id } = response.data;
       console.log("File uploaded successfully, task ID:", task_id);
-
-      const checkTaskStatus = async () => {
-        try {
-          const statusResponse = await axios.get(
-            `https://ajtksbackend.p-e.kr/task/${task_id}`
-          );
-          const { status, searchResult } = statusResponse.data;
-
-          if (status === "completed") {
-            navigate("/result", { state: { searchResult } });
-            setIsAnalyzing(false);
-          } else {
-            setTimeout(checkTaskStatus, 3000);
-          }
-        } catch (error) {
-          console.error("Error checking task status:", error);
-          setIsAnalyzing(false);
-        }
-      };
-
-      checkTaskStatus();
+      navigate(`/result/${task_id}`);
     } catch (error) {
       console.error("Error uploading file:", error);
       setIsAnalyzing(false);
diff --git a/src/Pages/ResultPage.tsx b/src/Pages/ResultPage.tsx
index e14329c..c83793d 100644
--- a/src/Pages/ResultPage.tsx
+++ b/src/Pages/ResultPage.tsx
@@ -1,6 +1,65 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
+import { useParams, useNavigate } from "react-router-dom";
+import axios from "axios";
 
 const ResultPage = () => {
+  const { task_id } = useParams<{ task_id: string }>();
+  const [searchResult, setSearchResult] = useState<any>(null);
+  const [error, setError] = useState<string | null>(null);
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    const fetchResult = async () => {
+      try {
+        const response = await axios.get(
+          `https://ajtksbackend.p-e.kr/task/${task_id}`
+        );
+        const { status, searchResult } = response.data;
+
+        if (status === "completed") {
+          setSearchResult(searchResult);
+        } else {
+          setTimeout(fetchResult, 3000);
+        }
+      } catch (error) {
+        console.error("Error fetching task status:", error);
+        setError("결과를 가져오는 중 오류가 발생했습니다.");
+      }
+    };
+
+    fetchResult();
+  }, [task_id]);
+
+  if (error) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-red-100">
+        <div className="bg-white p-4 rounded shadow-lg text-center">
+          <p className="mb-4">{error}</p>
+          <button
+            className="bg-red-500 text-white py-2 px-4 rounded"
+            onClick={() => navigate("/")}
+          >
+            돌아가기
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  if (!searchResult) {
+    return (
+      <div className="fixed inset-0 flex items-center justify-center bg-white bg-opacity-75">
+        <img className="w-40 h-40 animate-pulse" src="Group 1.png" alt="" />
+        <div
+          className="text-center text-black text-2xl font-normal mb-4"
+          style={{ fontFamily: "Inter" }}
+        >
+          분석 중입니다...
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className="overflow-hidden w-full min-h-screen fixed inset-0 flex flex-col items-center justify-center">
       <img
@@ -12,8 +71,7 @@ const ResultPage = () => {
         추천 음악 목록
       </div>
       <div className="relative z-10 mt-4 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-4 px-4">
-        {/* Cards Repeated with Different Contents */}
-        {Array.from({ length: 5 }).map((_, index) => (
+        {searchResult.map((result: any, index: number) => (
           <div
             key={index}
             className="relative w-[172px] h-[228px] rounded-tl-[38px] overflow-hidden bg-white bg-opacity-60 shadow-md border border-white backdrop-blur-md"
@@ -21,7 +79,7 @@ const ResultPage = () => {
             <div className="w-full h-[172px] bg-gray-300">
               <img
                 className="w-full h-full"
-                src={`path-to-image-${index + 1}.jpg`}
+                src={result.image}
                 alt={`Music recommendation ${index + 1}`}
               />
             </div>
@@ -33,7 +91,7 @@ const ResultPage = () => {
           <div className="w-full sm:w-1/3 bg-gray-300">
             <img
               className="w-full h-full"
-              src="path-to-featured-image.jpg"
+              src={searchResult[0]?.featuredImage}
               alt="Featured music"
             />
           </div>
@@ -42,7 +100,10 @@ const ResultPage = () => {
           <div className="bg-black bg-opacity-80 text-blue-400 text-sm font-bold px-4 py-2 rounded-full">
             음악 설명 by MU-LLaMA
           </div>
-          <div className="bg-blue-800 text-white text-base font-bold px-4 py-2 rounded-full">
+          <div
+            className="bg-blue-800 text-white text-base font-bold px-4 py-2 rounded-full cursor-pointer"
+            onClick={() => navigate("/")}
+          >
             다시 인식하기
           </div>
         </div>