Merge pull request #246 from Meetfolio-Project-CodeZ-Team/develop

merge to main
Meetfolio-Project-CodeZ-Team · Jun 7, 2024 · 7061ae7 · 7061ae7
2 parents 7cfe35b + b164e0b
commit 7061ae7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/app/components/coverletter/AiAnalysis.tsx b/src/app/components/coverletter/AiAnalysis.tsx
@@ -66,8 +66,8 @@ const AiAnalysis = ({ analysisData }: AiAnalysisProps) => {
           <div className="w-[360px] h-[360px] relative">
             <JobAnal
               jKeyword={transKeyword(analysisData?.job_keyword || '')}
-              accuracy={Number(analysisData?.job_suitability)}
-              all={100 - Number(analysisData?.job_suitability)}
+              accuracy={Number(jobSuitability)}
+              all={100 - Number(jobSuitability)}
             />
             <div className="bg-[#0A7AFF] w-5 h-5 rounded-[100px] absolute bottom-[-24px] left-[132px]"></div>
           </div>

diff --git a/src/app/components/coverletter/ExpCard.tsx b/src/app/components/coverletter/ExpCard.tsx
@@ -57,7 +57,7 @@ const ExpCard = ({
       <div className="absolute top-[258px] text-[15px] font-bold">
         {startDate + '~' + endDate}
       </div>
-      <div className="absolute w-[230px] top-[282px] text-2xl font-bold leading-9 overflow-x-auto whitespace-nowrap scrollbar-hide">
+      <div className="absolute w-[270px] top-[282px] text-2xl font-bold leading-9 overflow-x-auto whitespace-nowrap scrollbar-hide truncate">
         {title}
       </div>
       <div className="flex gap-x-[20px] absolute top-[328px] text-[16px] font-semibold">

diff --git a/src/app/components/mypage/MyCovletCardDetail.tsx b/src/app/components/mypage/MyCovletCardDetail.tsx
@@ -85,6 +85,8 @@ const MyCovletCardDetail = ({
   const roundedPercentage = Math.round(jobSuitabilityPercentage * 100) / 100
 
   const percentage = Math.ceil(roundedPercentage)
+  console.log(percentage)
+
 
   const JobSuitability =
     Number(percentage) > 95
@@ -494,8 +496,8 @@ const MyCovletCardDetail = ({
               <div className="w-[360px] h-[360px] relative">
                 <JobAnal
                   jKeyword={jobKeyword}
-                  accuracy={Number(roundedPercentage)}
-                  all={100 - Number(roundedPercentage)}
+                  accuracy={JobSuitability}
+                  all={100 - JobSuitability}
                 />
                 <div className="bg-[#0A7AFF] w-5 h-5 rounded-[100px] absolute bottom-[-24px] left-[132px]"></div>
               </div>

diff --git a/src/app/components/mypage/MyExpCard.tsx b/src/app/components/mypage/MyExpCard.tsx
@@ -150,7 +150,7 @@ const MyExpCard = ({
       <div className="absolute top-[258px] text-[15px] font-bold">
         {startDate + '~' + endDate}
       </div>
-      <div className="absolute w-[230px] top-[282px] text-2xl font-bold leading-9 overflow-x-auto whitespace-nowrap scrollbar-hide truncate">
+      <div className="absolute w-[270px] top-[282px] text-2xl font-bold leading-9 overflow-x-auto whitespace-nowrap scrollbar-hide truncate">
         {title}
       </div>
       <div className="flex gap-x-[20px] absolute top-[328px] text-[16px] font-semibold">

diff --git a/src/app/components/mypage/common/JobAnal.tsx b/src/app/components/mypage/common/JobAnal.tsx
@@ -24,7 +24,7 @@ const JobAnal = (jobAnal: JobAnalProps) => {
               track: 'stroke-[#D8E9FF]/90',
               value: 'text-5xl font-semibold text-[#486284]',
             }}
-            value={accuracy > 95 ? accuracy - 5 : accuracy}
+            value={accuracy}
             strokeWidth={4}
             showValueLabel={true}
           />