#93 chore: 배포

src/components/common/chart/FundChartComponent.jsx

@@ -5,18 +5,6 @@ import { Doughnut } from "react-chartjs-2";
 ChartJS.register(ArcElement, Legend);
 
 export default function FundChartComponent({ type, ratio, className }) {
-  // const defaultColors = [
-  //   "#F0F4FF",
-  //   "#E4ECFF",
-  //   "#CCD8FF",
-  //   "#B3C5FF",
-  //   "#98B1FF",
-  //   "#6A8CFF",
-  //   "#375AFF",
-  //   "#B3C5FF",
-  //   "#B3C5FF",
-  //   "#B3C5FF",
-  // ]; // 기본 색상 배열
   const defaultColors = [
     "#EBEEFF",
     "#D8DDFF",
@@ -43,7 +31,6 @@ export default function FundChartComponent({ type, ratio, className }) {
   const backgroundColors = ratio.map(
     (_, index) => defaultColors[index % defaultColors.length]
   );
-
   const data = {
     labels: ["주식", "채권"],
     datasets: [

src/components/common/rebalnacing/FundListComponent.jsx

@@ -0,0 +1,34 @@
+import React from "react";
+
+// icons
+import arrow from "../../../assets/icons/cheveron-right.svg";
+
+export default function FundListComponent({
+  index,
+  weight,
+  data,
+  setOpen,
+  setIsSelected,
+}) {
+  return (
+    <div
+      className={`flex justify-between w-[90vw] rounded-[25px] px-5 py-5 shadow-lg`}
+      style={{ backgroundColor: `#E5E9FF` }}
+      onClick={() => {
+        setOpen(true);
+        setIsSelected(data);
+      }}
+    >
+      <div className="flex flex-col flex-1 mr-2 truncate">
+        <div className="w-full truncate">
+          <span className="text-[17px] font-bold">{data?.fund_name}</span>
+        </div>
+        <span className="text-[13px]">{data?.company_name}</span>
+      </div>
+      <div className="flex items-center">
+        <span className="text-[20px] font-bold">{weight[index]}%</span>
+        <img src={arrow} className="w-[20px]" />
+      </div>
+    </div>
+  );
+}

src/components/common/rebalnacing/NewsInfo.jsx

@@ -0,0 +1,26 @@
+import React from "react";
+
+// icons
+import arrow from "../../../assets/icons/cheveron-right.svg";
+
+export default function NewsInfo({ data }) {
+  return (
+    <div className="flex w-full py-3 bg-white">
+      <div className="flex flex-col flex-1 truncate">
+        <div className="flex items-center">
+          <img
+            src={`https://file.alphasquare.co.kr/media/images/stock_logo/kr/${data.stock_code}.png`}
+            className="rounded-full w-[22px]"
+          />
+          <span className="text-[16px] font-bold mx-1">{data.stock_name}</span>
+        </div>
+        <span className="w-full text-[13px] truncate">
+          {data.bad_news_title}
+        </span>
+      </div>
+      <a href={data.bad_news_url} target="_blank">
+        <img src={arrow} className="w-fit" />
+      </a>
+    </div>
+  );
+}

src/components/common/rebalnacing/ReportModal.jsx

@@ -0,0 +1,76 @@
+import React from "react";
+import { useEffect } from "react";
+import { useState } from "react";
+
+// modal
+import { Sheet } from "react-modal-sheet";
+
+// components
+import NewsInfo from "./NewsInfo";
+
+export default function ReportModal({ isOpen, setOpen, data }) {
+  // bad_news가 null이 아닌 항목들만 필터링
+  const filteredStocks =
+    data.stocks?.filter((stock) => stock.bad_news_title !== "None") || [];
+
+  return (
+    <Sheet
+      isOpen={isOpen}
+      onClose={() => setOpen(false)}
+      detent={"content-height"}
+    >
+      <Sheet.Container>
+        <Sheet.Header />
+        <Sheet.Content>
+          <div className="flex flex-col items-center w-full my-[2vh]">
+            <div className="flex flex-col w-[90vw] px-5 py-3 border-b mb-[2vh]">
+              <span className="text-[20px] font-bold self-center mb-3">
+                {data.fund_name}
+              </span>
+              <div className="flex flex-col justify-center w-full gap-1">
+                <div className="flex justify-between w-full">
+                  <span className="text-[15px]">운용사</span>
+                  <span className="text-[17px]">{data.company_name}</span>
+                </div>
+                <div className="flex justify-between w-full">
+                  <span className="text-[15px]">수익률</span>
+                  <div className="flex items-baseline">
+                    <span className="text-[13px] mr-2 text-[#4E4E4E]">
+                      3개월
+                    </span>
+                    <span className="text-[18px] font-bold text-[#ff0000]">
+                      {data.return3m?.toFixed(2)}%
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div className="w-[90vw] mb-[2vh]">
+              <p className="text-[15px]">
+                ✔︎{" "}
+                <span className="font-bold">
+                  총 {filteredStocks.length}개의 위험 판단 주식
+                </span>
+                을 찾았어요.
+              </p>
+            </div>
+            {/** 뉴스 기사 */}
+            <div className="flex flex-col w-[90vw] mb-[2vh]">
+              {filteredStocks.map((elem, index) => (
+                <NewsInfo data={elem} key={index} />
+              ))}
+            </div>
+            <div className="flex justify-center w-full">
+              <button
+                className="my-2 px-10 py-2 rounded-[25px] bg-[#375AFF] text-white font-bold"
+                onClick={() => setOpen(false)}
+              >
+                확인
+              </button>
+            </div>
+          </div>
+        </Sheet.Content>
+      </Sheet.Container>
+    </Sheet>
+  );
+}

src/components/common/topBar/TopBarComponents.jsx

@@ -13,12 +13,12 @@ export const LogoWithNotification = () => {
     <div className="p-3 flex flex-row items-center justify-between h-[7vh] bg-white">
       <img
         src={logo}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate("/")}
       />
       <img
         src={noti}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate("/notification")}
       />
     </div>
@@ -31,12 +31,12 @@ export const BackArrowWithNotification = () => {
     <div className="p-3 flex flex-row items-center justify-between h-[7vh] bg-white">
       <img
         src={backArrow}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate(-1)}
       />
       <img
         src={noti}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate("/notification")}
       />
     </div>
@@ -49,12 +49,12 @@ export const NotificationWithSetting = () => {
     <div className="p-3 flex flex-row items-center justify-end h-[7vh] bg-white gap-2">
       <img
         src={noti}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate("/notification")}
       />
       <img
         src={setting}
-        className="w-[10vw] max-w-10 hover:cursor-pointer"
+        className="w-[10vw] max-w-10"
         onClick={() => navigate("/setting")}
       />
     </div>
@@ -67,7 +67,7 @@ export const BackArrow = () => {
     <div className="p-3 flex items-center h-7[vh] bg-white">
       <img
         src={backArrow}
-        className="w-[9vw] max-w-9 hover:cursor-pointer"
+        className="w-[9vw] max-w-9"
         onClick={() => navigate(-1)}
       />
     </div>

src/components/home/RecommendComponent.jsx

@@ -76,7 +76,7 @@ const PortfolioRecommendComponent = ({
             </div>
           ) : null}
           <div
-            className="bg-main text-white font-bold w-5/12 py-1.5 rounded-[20px] text-[12px] flex justify-center items-center hover:cursor-pointer"
+            className="bg-main text-white font-bold w-5/12 py-1.5 rounded-[20px] text-[12px] flex justify-center items-center"
             onClick={() => {
               data.funds
                 ? navigate(`/detail/${data.name}`, { state: data.funds })

src/components/home/TabComponent.jsx

@@ -4,7 +4,7 @@ const TabComponent = ({ type, isSelected, setSelected }) => {
   return (
     <div className="flex items-center justify-center flex-1 h-full">
       <div
-        className={`h-full w-10/12 flex justify-center items-center hover:cursor-pointer ${
+        className={`h-full w-10/12 flex justify-center items-center ${
           isSelected ? "border-b border-main font-bold" : null
         }`}
         onClick={() => setSelected(type)}

src/components/manage/MoreServiceComponent.jsx

@@ -16,7 +16,7 @@ export default function MoreServiceComponent({ title, detail }) {
       </div>
       <img
         src={rightCircleArrow}
-        className="w-[50px] hover:cursor-pointer"
+        className="w-[50px]"
         onClick={() =>
           navigate(
             `${title === "노후 준비 종합 진단" ? "diagnosis" : "pension"}`

src/components/notification/NotificationListComponent.jsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 import { patchNotification } from "../../lib/apis/notificationApi";
 
 export default function NotificationListComponent({
@@ -8,6 +9,7 @@ export default function NotificationListComponent({
   check,
 }) {
   const [isRead, setIsRead] = useState(check);
+  const navigate = useNavigate();
   const fetchPatchNotification = async (notificationId) => {
     try {
       const response = await patchNotification(notificationId);
@@ -24,11 +26,14 @@ export default function NotificationListComponent({
       onClick={() => {
         setIsRead(true);
         fetchPatchNotification(id);
+        navigate("/rebalancing-report");
       }}
     >
       <p className="text-[15px]">리밸런싱 리포트</p>
       <div className="flex flex-col items-end">
-        <span className="flex justify-center flex-1 text-[12px]">{content}</span>
+        <span className="flex justify-center flex-1 text-[12px]">
+          {content}
+        </span>
         <span className="text-[11px]">{date}</span>
       </div>
     </div>

src/lib/apis/base.jsx

@@ -1,7 +1,12 @@
 import axios from "axios";
 
+const portfolioUrl = import.meta.env.VITE_PORTFOLIO_BASE_URI;
+const assetUrl = import.meta.env.VITE_ASSET_BASE_URI;
+const userUrl = import.meta.env.VITE_USER_BASE_URI;
+const mydataUrl = import.meta.env.VITE_MYDATA_BASE_URI;
+
 const instance = axios.create({
-  baseURL: "http://localhost:8081/api",
+	baseURL: `${userUrl}:8081/api`,
 });
 
 // const persistedString = localStorage.getItem("persist:user");
@@ -10,14 +15,21 @@ const instance = axios.create({
 //   : "";
 
 const authInstance = (port) => {
-  const token = localStorage.getItem("accessToken");
-  return axios.create({
-    baseURL: import.meta.env.VITE_BASE_URL || `http://localhost:${port}/api`,
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: token ? `Bearer ${token}` : "",
-    },
-  });
+	const token = localStorage.getItem("accessToken");
+	let url = "";
+	if (port == 8081) url = userUrl;
+	else if (port == 8082) url = mydataUrl;
+	else if (port == 8083) url = assetUrl;
+	else if (port == 8084) url = portfolioUrl;
+	else console.log("port is " + port);
+
+	return axios.create({
+		baseURL: import.meta.env.VITE_BASE_URL || `${url}:${port}/api`,
+		headers: {
+			"Content-Type": "application/json",
+			Authorization: token ? `Bearer ${token}` : "",
+		},
+	});
 };
 
 export default instance;

src/lib/apis/diagnosisApi.jsx

@@ -1,22 +1,24 @@
 import { authInstance } from "./base";
 
 export async function getDiagnosisResult(survey) {
-  try {
-    const response = await authInstance(8081).post(
-      `/retirements/test/results`,
-      survey
-    );
-    return response.data;
-  } catch (error) {
-    return error.response;
-  }
+	try {
+		const response = await authInstance(8081).post(
+			`/users/retirements/test/results`,
+			survey
+		);
+		return response.data;
+	} catch (error) {
+		return error.response;
+	}
 }
 
 export async function getPreviousDiagnosisResult() {
-  try {
-    const response = await authInstance(8081).get(`/retirements/test/results`);
-    return response.data;
-  } catch (error) {
-    return error.response;
-  }
+	try {
+		const response = await authInstance(8081).get(
+			`/users/retirements/test/results`
+		);
+		return response.data;
+	} catch (error) {
+		return error.response;
+	}
 }