Merge branch 'develop'

Author: seungw0o

src/components/BandBanner.tsx

@@ -11,14 +11,7 @@ export default function BandBanner() {
   return (
     <Link
       className="w-full h-[120px] py-7 px-[100px] mt-15 cursor-pointer relative"
-      href={"/"} /**추후에 다시 취업률 페이지로 연동 */
-      onClick={() => {
-        append({
-          title: "",
-          message: "개발 중인 기능입니다.",
-          type: "YELLOW",
-        });
-      }}
+      href={"/job-rate"}
     >
       <div className="flex flex-col w-full h-full">
         <p className="text-white text-h6 leading-h6 font-b">

src/components/jobRate/JobCurrentSituation.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEmploymentStats } from "@/apis/applications";
-const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL;
+const BASE_URL = process.env.NEXT_PUBLIC_IMAGE_URL;
 import useGetClass from "@/util/getClassName";
 
 export default function JobCurrentSituation() {
@@ -28,7 +28,7 @@ export default function JobCurrentSituation() {
                   className="bg-[#fff] border border-[#F7F7F7] rounded-md w-[100px] h-[44px] p-1"
                 >
                   <img
-                    src={`${BASE_URL}/applications/employment${data.logo_url}`}
+                    src={`${BASE_URL}/${data.logo_url}`}
                     alt={`${data.company_name} 로고`}
                     className="w-full h-auto rounded-md"
                   />

src/components/jobRate/JobPieChart.tsx

@@ -5,26 +5,28 @@ import { useEffect, useState } from "react";
 import { PieChart, Pie, Cell } from "recharts";
 
 export default function JobPieChart() {
-  const { data: employmentData } = useTotalEmplymentStats();
+  const { data: employmentData, isLoading } = useTotalEmplymentStats();
+
   const passedCount = employmentData?.passed_count || 0;
   const totalStudentCount = employmentData?.total_student_count || 1;
+
   const data = [
     {
       name: "취업 완료",
-      value: employmentData?.passed_count,
+      value: passedCount,
       color: "#237BC9",
       id: 1,
     },
     {
       name: "취업 전",
-      value:
-        (employmentData?.total_student_count ?? 0) -
-        (employmentData?.passed_count ?? 0),
+      value: totalStudentCount - passedCount,
       color: "rgba(35, 123, 201, 0.2)",
       id: 2,
     },
   ];
 
+  if (isLoading || !employmentData) return null;
+
   return (
     <div className="flex flex-col items-center bg-[#FFF] rounded-xl pt-[24px] pb-[27px] pr-9  gap-8 border border-[#E5E5E5]">
       <div className="w-full">
@@ -58,7 +60,7 @@ export default function JobPieChart() {
               endAngle={-270}
               isAnimationActive={false}
             >
-              {data.map((entry, index) => (
+              {data.map((entry) => (
                 <Cell
                   key={`cell-${entry.id}`}
                   fill={entry.color}
@@ -83,7 +85,7 @@ export default function JobPieChart() {
         <div className="w-[1px] h-[26px] bg-[#E5E5E5]"></div>
         <div className="flex flex-col gap-3 items-center">
           <p className="text-primaryBlue03 font-m text-caption">전체 통계</p>
-          <p className="text-primaryBlue03 font-m text-h6">{`${employmentData?.passed_count}/${employmentData?.total_student_count}명`}</p>
+          <p className="text-primaryBlue03 font-m text-h6">{`${passedCount}/${totalStudentCount}명`}</p>
         </div>
       </div>
     </div>

src/util/object/enum.ts

@@ -48,5 +48,5 @@ export const bannerTypeEnum: Record<BannerStatusType, string> = {
   NONE: "/",
   INTERNSHIP: "/recruitments/?page=1&winter_intern=true",
   COMPANY: "/companies/detail/",
-  EMPLOYMENT: "/", /**추후에 다시 취업률 페이지로 연동 */
-} 
+  EMPLOYMENT: "/job-rate",
+};