Skip to content

Commit

Permalink
Merge branch 'hotfix' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
KANGYONGSU23 committed Nov 22, 2023
2 parents c8deb75 + 6f323f7 commit 9b8b8a9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/app/recruitments/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Pagination from "@/components/common/Pagination";
import Filter from "@/components/recruitments/filter";
import RecruitmentsCard from "@/components/RecruitmentsCard";
import RecruitmentsCard from "@/components/recruitments/RecruitmentsCard";

export default function Recruitments() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/CardList.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import CompanyCard from "./CompanyCard";
import RecruitmentsCard from "./RecruitmentsCard";
import RecruitmentsCard from "./recruitments/RecruitmentsCard";

interface PropsType {
listType: "Company" | "Recruitments" | "BookMark";
Expand Down
3 changes: 1 addition & 2 deletions src/components/Suggestion.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import CompanyCard from "./CompanyCard";
import RecruitmentsCard from "./RecruitmentsCard";
import RecruitmentsCard from "./recruitments/RecruitmentsCard";
import SuggestionHeader from "./SuggestionHeader";

interface PropsType {
listType: "Company" | "Recruitments" | "BookMark";
}


export default function Suggestion({ listType }: PropsType) {
return (
<div className="flex flex-col items-start w-full">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React, { useEffect, useState } from "react";
import { useSearchParams } from "next/navigation";
import { RecruitmentsListType } from "@/apis/recruitments/type";
import { GetRecruitmentsList } from "@/apis/recruitments";
import HoverPrefetchLink from "./common/HoverPrefetchLink";
import HoverPrefetchLink from "../common/HoverPrefetchLink";

export default function RecruitmentsCard() {
const getParams = useSearchParams();
Expand Down
8 changes: 4 additions & 4 deletions src/components/recruitments/RecruitmentsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { RecruitmentsDetailTable } from "@/apis/recruitments/type";
import { hiringProgressEnum } from "@/util/enum";
import { time_parsing } from "@/util/regex";
import { money_regex, time_parsing } from "@/util/regex";
import { Icon } from "@team-return/design-system";
import React, { useState } from "react";

Expand Down Expand Up @@ -108,12 +108,12 @@ function RecruitmentsTable({ ...rest }: RecruitmentsDetailTable) {
</td>
</tr>
<tr>
<td className="key">실습 수당 </td>
<td className="value">{train_pay} 만원/월</td>
<td className="key">실습 수당 월급</td>
<td className="value">{money_regex(train_pay)}/월</td>
</tr>
<tr>
<td className="key">정규직 전환 시 연봉</td>
<td className="value">{pay ?? "-"} 만원/년</td>
<td className="value">{pay ? pay + " 만원/년" : "-"}</td>
</tr>
<tr>
<td className="key">복지</td>
Expand Down
4 changes: 4 additions & 0 deletions src/util/regex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ export const pon_number_regex = (number: string | null) => {
export const time_parsing = (time: string) => {
return time.slice(0, 5);
};

export const money_regex = (money: number) => {
return money.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
};

0 comments on commit 9b8b8a9

Please sign in to comment.