Merge pull request #146 from Weflo-A/develop

Develop
Weflo-A · Mar 10, 2024 · 0aa7725 · 0aa7725
2 parents a90b07d + 3769352
commit 0aa7725
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/src/components/estimate/NewPartsInfoBox.tsx b/src/components/estimate/NewPartsInfoBox.tsx
@@ -70,7 +70,7 @@ const NewPartInfoBox = ({
           </Stack>
           <Stack direction='row' alignItems='center' gap='1rem'>
             <Typography variant='h4' fontWeight='bold'>
-              {price} 원
+              {price.toLocaleString()} 원
             </Typography>
             <CheckBox
               key={id}

diff --git a/src/components/estimate/RecyclePartBox.tsx b/src/components/estimate/RecyclePartBox.tsx
@@ -47,7 +47,7 @@ const RecyclePartBox = ({
       <Typography fontSize='14px'>{name}</Typography>
       <Typography fontSize='14px'>{score}점</Typography>
       <Typography variant='h4' fontWeight='bold' color={colors.accent100}>
-        {price} 원
+        {price.toLocaleString()} 원
       </Typography>
       <CheckBox value={name} checked={checked} onChange={onChange} />
     </PartBox>

diff --git a/src/components/estimate/RepairCompanyCard.tsx b/src/components/estimate/RepairCompanyCard.tsx
@@ -81,7 +81,7 @@ const RepairCompanyCard = ({
             예상 수리 비용
           </Typography>
           <Typography variant='h4' fontWeight='bold' color={colors.accent100}>
-            {`${cost[0]} ~ ${cost[1]}`}
+            {`${cost[0].toLocaleString()}원 ~ ${cost[1].toLocaleString()}원`}
           </Typography>
         </Stack>
       </Stack>

diff --git a/src/components/estimate/RepairCompanyList.tsx b/src/components/estimate/RepairCompanyList.tsx
@@ -64,7 +64,7 @@ const RepairCompanyList = ({ items }: RepairCompanyProps) => {
               logo={logoImg1}
               cost={[item.minPrice, item.maxPrice]}
               name={item.name}
-              tag={item.features}
+              tag={[...new Set(item.features)]}
               type={
                 item.features.length >= 3
                   ? 'best'

diff --git a/src/components/onboarding/droneGroupSearch/DroneGroupCard.tsx b/src/components/onboarding/droneGroupSearch/DroneGroupCard.tsx
@@ -85,7 +85,7 @@ const DroneGroupCard: React.FC<DroneGroupCardProps> = ({ data }) => {
               투입 비용
             </Typography>
             <Typography variant='caption' color={colors.basic500}>
-              {data.cost}
+              {data.cost.toLocaleString()}원
             </Typography>
           </Box>
           <Box>

diff --git a/src/pages/EstimatePage.tsx b/src/pages/EstimatePage.tsx
@@ -278,8 +278,8 @@ const EstimatePage = () => {
       getEnglishType(topSection?.components[0].type || '모터') || 'Motor';
     const second =
       getEnglishType(topSection?.components[1].type || '블레이드') || 'Blade';
-    getRepairCompany(currentDrone?.name || 'Model1', [first, second]).then(
-      (res) => setRepairCompanies(res.data.data)
+    getRepairCompany(droneModel || 'EAGEL', [first, second]).then((res) =>
+      setRepairCompanies(res.data.data)
     );
   }, [topSection]);
 
@@ -560,7 +560,6 @@ const EstimatePage = () => {
       <MenuTab type='dashboard' drones={drones} />
       <div className='page'>
         {renderPageHeader()}
-        <img src='/assets/images/drone-parts.png' />
         <Stack direction='column' gap='3.25rem'>
           {/* 교체가 피필요한 부품 및 총 점수 */}
           <Stack direction='row' gap='1rem'>

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,9 @@
 {
   "compilerOptions": {
+    "downlevelIteration": true,
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "types": [
-      "node",
-      "react",
-      "react-dom",
-      "@types/apexcharts",
-      "axios"
-    ],
+    "types": ["node", "react", "react-dom", "@types/apexcharts", "axios"],
     "typeRoots": ["./node_modules/@types"],
     "allowJs": true,
     "skipLibCheck": true,