Merge pull request #84 from Team-inglo/feat/IGW-49/73

Feat/igw-49/73 - 회원가입 동의 모달 에러 해결 및 고용주 프로필 api

src/components/Employer/Profile/EmployerJobInfo.tsx

@@ -1,30 +1,37 @@
-import { EmployerInfoData } from '@/constants/profile';
-// import { useGetOwnerApplicationCounts } from '@/hooks/api/useProfile';
+import { useGetOwnerApplicationCounts } from '@/hooks/api/useProfile';
+import { EmployerCountsInfoResponse } from '@/types/api/profile';
+import { useEffect, useState } from 'react';
 
 const EmployerJobInfo = () => {
-  // const { data } = useGetOwnerApplicationCounts();
-  const data = EmployerInfoData;
+  const { data } = useGetOwnerApplicationCounts();
+  const [jobData, setJobData] = useState<EmployerCountsInfoResponse>();
+
+  useEffect(() => {
+    if (data) {
+      setJobData(data.data);
+    }
+  }, [data]);
 
   return (
     <>
-      {data && data.success ? (
+      {jobData ? (
         <div className="flex gap-4 items-center justify-between">
           <div className="flex flex-col gap-3 w-24 py-2 px-1">
             <div className="body-3 text-[#1E1926] text-center">올린 공고</div>
             <div className="head-3 text-[#1E1926] text-center">
-              {data.data.job_postings_counts}
+              {jobData.job_postings_counts}
             </div>
           </div>
           <div className="flex flex-col gap-3 py-2 px-1">
             <div className="body-3 text-[#1E1926] text-center">지원자 총합</div>
             <div className="head-3 text-[#1E1926] text-center">
-              {data.data.applicants_counts}
+              {jobData.applicants_counts}
             </div>
           </div>
           <div className="flex flex-col gap-3 w-24 py-2 px-1">
             <div className="body-3 text-[#1E1926] text-center">계약 성공</div>
             <div className="head-3 text-[#1E1926] text-center">
-              {data.data.successful_hire_counts}
+              {jobData.successful_hire_counts}
             </div>
           </div>
         </div>

src/components/Employer/Profile/EmployerProfileCard.tsx

@@ -1,18 +1,24 @@
-import { EmployerSummaryData } from '@/constants/profile';
-// import { usegetOwnerSummaries } from '@/hooks/api/useProfile';
+import { usegetOwnerSummaries } from '@/hooks/api/useProfile';
+import { EmployerProfileResponse } from '@/types/api/profile';
+import { useEffect, useState } from 'react';
 
 const EmployerProfileCard = () => {
-  // const { data } = usegetOwnerSummaries();
-  const data = EmployerSummaryData;
+  const { data } = usegetOwnerSummaries();
+  const [profileData, setProfileData] = useState<EmployerProfileResponse>();
 
+  useEffect(() => {
+    if (data) {
+      setProfileData(data.data);
+    }
+  }, [data]);
   return (
     <>
-      {data && data.success ? (
+      {profileData ? (
         <div className="pt-5 pb-4 flex items-center gap-4">
           <div className="w-20 h-20 rounded-full overflow-hidden">
-            <img src={data?.data.icon_img_url} alt="profile image" />
+            <img src={profileData.icon_img_url} alt="profile image" />
           </div>
-          <h1 className="head-3 text-[#1E1926]">{data?.data.company_name}</h1>
+          <h1 className="head-3 text-[#1E1926]">{profileData.company_name}</h1>
         </div>
       ) : (
         <div>로딩 중</div>

src/components/Employer/Signup/AgreeModalInner.tsx

@@ -145,8 +145,8 @@ const AgreeModalInner = ({
         title="Agree"
         onClick={
           essentialAgreeList.slice(0, 3).includes(false)
-            ? handleNext
-            : undefined
+            ? undefined
+            : handleNext
         }
       />
     </div>

src/components/Profile/ProfileHeader.tsx

@@ -1,7 +1,14 @@
+import { headerTranslation } from '@/constants/translation';
+import { isEmployer } from '@/utils/signup';
+import { useLocation } from 'react-router-dom';
+
 const ProfileHeader = () => {
+  const { pathname } = useLocation();
   return (
     <section className="w-full h-[3.5rem] flex justify-center items-center">
-      <span className="head-3 text-[#464646]">Profile</span>
+      <span className="head-3 text-[#464646]">
+        {headerTranslation.profile[isEmployer(pathname)]}
+      </span>
     </section>
   );
 };

src/components/Profile/ProfileMenu.tsx

@@ -9,7 +9,7 @@ import LogoutIcon from '@/assets/icons/Profile/LogoutIcon.svg?react';
 import ToggleBar from '@/assets/icons/Profile/ToggleBar.svg?react';
 import ToggleButton from '@/assets/icons/Profile/ToggleButton.svg?react';
 import { usePatchNotificationAllowed } from '@/hooks/api/useSetting';
-import { useGetUserSummaries } from '@/hooks/api/useProfile';
+import { usegetOwnerSummaries } from '@/hooks/api/useProfile';
 
 type ProfileMenuProps = {
   title: string;
@@ -25,17 +25,14 @@ const ProfileMenu = ({
   isToggle,
 }: ProfileMenuProps) => {
   const { mutate: patchNotificationAllowed } = usePatchNotificationAllowed();
-  const { data: notificaionAllowed } = useGetUserSummaries();
+  const { data: notificaionAllowed } = usegetOwnerSummaries();
 
-  // const { data } = useGetUserSummaries();
   const [toggleOn, setToggleOn] = useState<boolean>(false);
 
   useEffect(() => {
     // 알림 설정 상태 불러오기
-    if (isToggle && notificaionAllowed && notificaionAllowed.success) {
-      setToggleOn(
-        notificaionAllowed.data.user_information.is_notification_allowed,
-      );
+    if (isToggle && notificaionAllowed) {
+      setToggleOn(notificaionAllowed.data.is_notification_allowed);
     }
   }, []);
 

src/constants/translation.ts

@@ -139,3 +139,10 @@ export const profileTranslation = {
     en: 'Delete',
   },
 };
+
+export const headerTranslation = {
+  profile: {
+    ko: '프로필',
+    en: 'Profile',
+  },
+};