From 7bb49fdd6c8f4ba9bca74c421deff05a8aca7042 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 22:11:04 +0900 Subject: [PATCH 01/11] =?UTF-8?q?fix:=2026=EA=B8=B0=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=9D=84=2027=EA=B8=B0=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/applicationNode/Radio.component.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/components/application/applicationNode/Radio.component.tsx b/frontend/components/application/applicationNode/Radio.component.tsx index 8845ad10..32687e8a 100644 --- a/frontend/components/application/applicationNode/Radio.component.tsx +++ b/frontend/components/application/applicationNode/Radio.component.tsx @@ -5,15 +5,15 @@ import Txt from "@/components/common/Txt.component"; import { APPLICATION_DESIGN, APPLICATION_NAVBAR_DESIGN, -} from "@/src/constants/application/26/designer"; +} from "@/src/constants/application/27/designer"; import { APPLICATION_DEVELOPER, APPLICATION_NAVBAR_DEVELOPER, -} from "@/src/constants/application/26/developer"; +} from "@/src/constants/application/27/developer"; import { APPLICATION_MANAGER, APPLICATION_NAVBAR_MANAGER, -} from "@/src/constants/application/26/manager"; +} from "@/src/constants/application/27/manager"; import { ApplicationNode, type ApplicationRadio, From fd8ef4fdaa458e72617d7ee3b68146f36455784d Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 22:11:23 +0900 Subject: [PATCH 02/11] =?UTF-8?q?fix:=20=EB=A7=88=EC=B9=A8=ED=91=9C?= =?UTF-8?q?=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=A5=EC=9D=84=20=EA=B5=AC=EB=B6=84=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/constants/application/27/designer.ts | 2 +- frontend/src/constants/application/27/developer.ts | 2 +- frontend/src/constants/application/27/manager.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/constants/application/27/designer.ts b/frontend/src/constants/application/27/designer.ts index c6ab1992..5d820d66 100644 --- a/frontend/src/constants/application/27/designer.ts +++ b/frontend/src/constants/application/27/designer.ts @@ -137,7 +137,7 @@ export const APPLICATION_DESIGN: ApplicationQuestion[] = [ title: "자신을 어필할 수 있는 포트폴리오를 업로드해 주세요.", direction: "horizontal", subtitle: - "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", + "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요. 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", nodes: [ { name: "portfolio", diff --git a/frontend/src/constants/application/27/developer.ts b/frontend/src/constants/application/27/developer.ts index b90c1099..a1282393 100644 --- a/frontend/src/constants/application/27/developer.ts +++ b/frontend/src/constants/application/27/developer.ts @@ -127,7 +127,7 @@ export const APPLICATION_DEVELOPER: ApplicationQuestion[] = [ id: 12, title: "자신을 어필할 수 있는 포트폴리오를 업로드해 주세요.", subtitle: - "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", + "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요. 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", direction: "horizontal", nodes: [ { diff --git a/frontend/src/constants/application/27/manager.ts b/frontend/src/constants/application/27/manager.ts index d71f5314..aae58a1c 100644 --- a/frontend/src/constants/application/27/manager.ts +++ b/frontend/src/constants/application/27/manager.ts @@ -144,7 +144,7 @@ export const APPLICATION_MANAGER: ApplicationQuestion[] = [ id: 13, title: "자신을 어필할 수 있는 포트폴리오를 업로드해 주세요.", subtitle: - "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", + "지원자 분의 포트폴리오 링크 접근 권한을 열어주세요. 만약 접근 권한이 없을 경우 불이익이 있을 수 있습니다.", direction: "horizontal", nodes: [ { From 3ebf1909f9ca52409275bee5d0910e047f7c92ad Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 22:11:42 +0900 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=EB=B3=B5=EC=88=98=EC=A0=84?= =?UTF-8?q?=EA=B3=B5,=20=EB=B6=80=EC=A0=84=EA=B3=B5,=20=ED=8F=AC=ED=8A=B8?= =?UTF-8?q?=ED=8F=B4=EB=A6=AC=EC=98=A4=20=EB=A7=81=ED=81=AC=EB=A5=BC=20pos?= =?UTF-8?q?t=EC=9A=94=EC=B2=AD=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/functions/getApplication.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/src/functions/getApplication.ts b/frontend/src/functions/getApplication.ts index 4fec02b2..c1cae22f 100644 --- a/frontend/src/functions/getApplication.ts +++ b/frontend/src/functions/getApplication.ts @@ -21,9 +21,7 @@ export const getApplicationNames = ( case "radioForCheck": case "text": case "textarea": - if (element.require) { - applicationNameSet.add(element.name); - } + applicationNameSet.add(element.name); break; case "booleanTextarea": case "radioByTwoRank": @@ -47,8 +45,13 @@ export const getApplicationNames = ( export const getApplicationValues = (node: ApplicationQuestion[]) => { const applicationNames = getApplicationNames(node); - return Array.from(applicationNames).map((name) => ({ - name, - answer: localStorage.get(name, ""), - })); + return Array.from(applicationNames) + .map((name) => { + const value = localStorage.get(name, ""); + return { + name, + answer: value ? value : undefined, + }; + }) + .filter((item) => item.answer !== undefined); }; From 5aede900415c1a12b33211b2c06cc47095abcea3 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 22:20:47 +0900 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=EB=A7=81=ED=81=AC=EA=B0=80=20?= =?UTF-8?q?=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=BC=20=EB=95=8C=20=EB=82=98?= =?UTF-8?q?=EB=89=98=EC=96=B4=20=EC=9D=B4=EB=8F=99=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=EB=A5=BC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicantNode/CustomResource.component.tsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/frontend/components/applicant/applicantNode/CustomResource.component.tsx b/frontend/components/applicant/applicantNode/CustomResource.component.tsx index ae20ad83..6f54993b 100644 --- a/frontend/components/applicant/applicantNode/CustomResource.component.tsx +++ b/frontend/components/applicant/applicantNode/CustomResource.component.tsx @@ -9,6 +9,10 @@ interface ApplicantResourceProps { } const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => { + const portfolio = applicantDataFinder(data, "portfolio") + .split(",") + .map((url: string) => url.trim()); + return ( <>
@@ -43,11 +47,13 @@ const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => {
링크 - - - {applicantDataFinder(data, "portfolio")} - - + {portfolio.map((url: string, index: number) => { + return ( + + {url} + + ); + })}
파일 From 320539d6d054ec0ccb23a622ae2b63137fb3ce10 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 22:22:17 +0900 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=ED=8C=8C=EC=9D=BC=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=EA=B0=80=20=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=BC=20?= =?UTF-8?q?=EB=95=8C=20=EA=B0=81=EA=B0=81=20=EC=84=A0=ED=83=9D=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicantNode/CustomResource.component.tsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/frontend/components/applicant/applicantNode/CustomResource.component.tsx b/frontend/components/applicant/applicantNode/CustomResource.component.tsx index 6f54993b..243aa548 100644 --- a/frontend/components/applicant/applicantNode/CustomResource.component.tsx +++ b/frontend/components/applicant/applicantNode/CustomResource.component.tsx @@ -13,6 +13,10 @@ const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => { .split(",") .map((url: string) => url.trim()); + const file = applicantDataFinder(data, "fileUrl") + .split(",") + .map((url: string) => url.trim()); + return ( <>
@@ -57,11 +61,13 @@ const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => {
파일 - - - {applicantDataFinder(data, "fileUrl")} - - + {file.map((url: string, index: number) => { + return ( + + {url} + + ); + })}
From 65e038b923a9e6d7437de31d7b6c37cd16c7a65e Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 23:02:04 +0900 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20require=EC=9D=B8=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=EB=A7=8C=20=EC=A7=91=ED=95=A9=EC=97=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/functions/getApplication.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/functions/getApplication.ts b/frontend/src/functions/getApplication.ts index c1cae22f..0c2ca886 100644 --- a/frontend/src/functions/getApplication.ts +++ b/frontend/src/functions/getApplication.ts @@ -21,7 +21,9 @@ export const getApplicationNames = ( case "radioForCheck": case "text": case "textarea": - applicationNameSet.add(element.name); + if (element.require) { + applicationNameSet.add(element.name); + } break; case "booleanTextarea": case "radioByTwoRank": @@ -50,8 +52,8 @@ export const getApplicationValues = (node: ApplicationQuestion[]) => { const value = localStorage.get(name, ""); return { name, - answer: value ? value : undefined, + answer: value ? value : "", }; }) - .filter((item) => item.answer !== undefined); + .filter((item) => item.answer !== ""); }; From 91ca1d7f5b4bee4cfe2192bc10a6f45ae1cedb89 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 23:02:33 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20require=EC=9D=B8=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20=EC=A7=88=EB=AC=B8=EB=93=A4=EC=9D=80=20localStorage?= =?UTF-8?q?=EC=97=90=20=EA=B0=81=EA=B0=81=20=EC=A0=91=EA=B7=BC=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/hooks/useSendApplication.tsx | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/frontend/src/hooks/useSendApplication.tsx b/frontend/src/hooks/useSendApplication.tsx index 4c5fbcb3..bc51eb67 100644 --- a/frontend/src/hooks/useSendApplication.tsx +++ b/frontend/src/hooks/useSendApplication.tsx @@ -32,6 +32,11 @@ export const postApplication = async ( return false; } + const doubleMajor = localStorage.get("doubleMajor", ""); + const minor = localStorage.get("minor", ""); + const portfolio = localStorage.get("portfolio", ""); + const fileUrl = localStorage.get("fileUrl", ""); + const sendValues = getApplicationValues(applicationQuestions).filter( (value) => value.name !== "channelEtc" && value.name !== "channel" ); @@ -51,6 +56,26 @@ export const postApplication = async ( name: "timeline", answer: JSON.stringify(timeline), }); + portfolio && + sendValues.push({ + name: "portfolio", + answer: portfolio, + }); + fileUrl && + sendValues.push({ + name: "fileUrl", + answer: fileUrl, + }); + doubleMajor && + sendValues.push({ + name: "doubleMajor", + answer: doubleMajor, + }); + minor && + sendValues.push({ + name: "minor", + answer: minor, + }); if (sendValues.some((value) => value.answer === "")) { alert("지원서를 작성해주세요."); From 931fe5eb4c1abef958f9cc3f9d49880081e5624a Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 23:19:04 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20url=20split=20=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicant/applicantNode/CustomResource.component.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/components/applicant/applicantNode/CustomResource.component.tsx b/frontend/components/applicant/applicantNode/CustomResource.component.tsx index 243aa548..7cb3ec39 100644 --- a/frontend/components/applicant/applicantNode/CustomResource.component.tsx +++ b/frontend/components/applicant/applicantNode/CustomResource.component.tsx @@ -9,12 +9,14 @@ interface ApplicantResourceProps { } const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => { + const regex = /[\s,;|]+/; + const portfolio = applicantDataFinder(data, "portfolio") - .split(",") + .split(regex) .map((url: string) => url.trim()); const file = applicantDataFinder(data, "fileUrl") - .split(",") + .split(regex) .map((url: string) => url.trim()); return ( From 3e0dc39d19a63b23f8b3b6111970a5687915c364 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Sun, 3 Mar 2024 23:51:40 +0900 Subject: [PATCH 09/11] =?UTF-8?q?fix:=20requirement=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/functions/getApplication.ts | 13 ++++++++---- frontend/src/hooks/useSendApplication.tsx | 25 ----------------------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/frontend/src/functions/getApplication.ts b/frontend/src/functions/getApplication.ts index 0c2ca886..03055f9e 100644 --- a/frontend/src/functions/getApplication.ts +++ b/frontend/src/functions/getApplication.ts @@ -7,12 +7,17 @@ import { isApplicationQuestion } from "./validator"; export const getApplicationNames = ( node: (ApplicationQuestion | ApplicationNode)[], + requirement: boolean = true, applicationName?: Set ) => { const applicationNameSet = applicationName || new Set(); node.forEach((element) => { if (isApplicationQuestion(element)) { - return getApplicationNames(element.nodes, applicationNameSet); + return getApplicationNames( + element.nodes, + requirement, + applicationNameSet + ); } switch (element.type) { case "checkbox": @@ -21,7 +26,7 @@ export const getApplicationNames = ( case "radioForCheck": case "text": case "textarea": - if (element.require) { + if (!requirement || element.require) { applicationNameSet.add(element.name); } break; @@ -29,7 +34,7 @@ export const getApplicationNames = ( case "radioByTwoRank": if (element.subNodes) { element.subNodes.forEach((subNode) => { - if (subNode.require) { + if (!requirement || subNode.require) { applicationNameSet.add(subNode.name); } }); @@ -46,7 +51,7 @@ export const getApplicationNames = ( }; export const getApplicationValues = (node: ApplicationQuestion[]) => { - const applicationNames = getApplicationNames(node); + const applicationNames = getApplicationNames(node, false); return Array.from(applicationNames) .map((name) => { const value = localStorage.get(name, ""); diff --git a/frontend/src/hooks/useSendApplication.tsx b/frontend/src/hooks/useSendApplication.tsx index bc51eb67..4c5fbcb3 100644 --- a/frontend/src/hooks/useSendApplication.tsx +++ b/frontend/src/hooks/useSendApplication.tsx @@ -32,11 +32,6 @@ export const postApplication = async ( return false; } - const doubleMajor = localStorage.get("doubleMajor", ""); - const minor = localStorage.get("minor", ""); - const portfolio = localStorage.get("portfolio", ""); - const fileUrl = localStorage.get("fileUrl", ""); - const sendValues = getApplicationValues(applicationQuestions).filter( (value) => value.name !== "channelEtc" && value.name !== "channel" ); @@ -56,26 +51,6 @@ export const postApplication = async ( name: "timeline", answer: JSON.stringify(timeline), }); - portfolio && - sendValues.push({ - name: "portfolio", - answer: portfolio, - }); - fileUrl && - sendValues.push({ - name: "fileUrl", - answer: fileUrl, - }); - doubleMajor && - sendValues.push({ - name: "doubleMajor", - answer: doubleMajor, - }); - minor && - sendValues.push({ - name: "minor", - answer: minor, - }); if (sendValues.some((value) => value.answer === "")) { alert("지원서를 작성해주세요."); From 5c7ba09a9008abdd0598848631473f8aa554264a Mon Sep 17 00:00:00 2001 From: baegyeong Date: Mon, 4 Mar 2024 00:00:59 +0900 Subject: [PATCH 10/11] =?UTF-8?q?feat:=20=ED=8F=AC=ED=8A=B8=ED=8F=B4?= =?UTF-8?q?=EB=A6=AC=EC=98=A4=20=EB=9E=80=EC=9D=84=20=EB=94=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=EB=A1=9C=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pdf viewer에 포트폴리오를 추가한다 --- .../applicant/PdfViewer.component.tsx | 2 + .../CustomResource.component.tsx | 37 +------------- .../applicantNode/Portfolio.component.tsx | 50 +++++++++++++++++++ 3 files changed, 54 insertions(+), 35 deletions(-) create mode 100644 frontend/components/applicant/applicantNode/Portfolio.component.tsx diff --git a/frontend/components/applicant/PdfViewer.component.tsx b/frontend/components/applicant/PdfViewer.component.tsx index f4350221..2016bd41 100644 --- a/frontend/components/applicant/PdfViewer.component.tsx +++ b/frontend/components/applicant/PdfViewer.component.tsx @@ -4,6 +4,7 @@ import ApplicantDetailRight from "@/components/applicant/DetailRight.component"; import { getApplicationById } from "@/src/apis/applicant"; import { useQuery } from "@tanstack/react-query"; import { useSearchParams } from "next/navigation"; +import Portfolio from "./applicantNode/Portfolio.component"; const ApplicationPdfViewer = () => { const searchParams = useSearchParams(); @@ -28,6 +29,7 @@ const ApplicationPdfViewer = () => { return (
+
); }; diff --git a/frontend/components/applicant/applicantNode/CustomResource.component.tsx b/frontend/components/applicant/applicantNode/CustomResource.component.tsx index 7cb3ec39..cb4ae89b 100644 --- a/frontend/components/applicant/applicantNode/CustomResource.component.tsx +++ b/frontend/components/applicant/applicantNode/CustomResource.component.tsx @@ -1,24 +1,13 @@ import Txt from "@/components/common/Txt.component"; import { ApplicantReq } from "@/src/apis/applicant"; import { applicantDataFinder } from "@/src/functions/finder"; -import Link from "next/link"; - +import Portfolio from "./Portfolio.component"; interface ApplicantResourceProps { data: ApplicantReq[]; postId: string; } const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => { - const regex = /[\s,;|]+/; - - const portfolio = applicantDataFinder(data, "portfolio") - .split(regex) - .map((url: string) => url.trim()); - - const file = applicantDataFinder(data, "fileUrl") - .split(regex) - .map((url: string) => url.trim()); - return ( <>
@@ -49,29 +38,7 @@ const ApplicantResource = ({ data, postId }: ApplicantResourceProps) => {
- 포트폴리오 -
-
- 링크 - {portfolio.map((url: string, index: number) => { - return ( - - {url} - - ); - })} -
-
- 파일 - {file.map((url: string, index: number) => { - return ( - - {url} - - ); - })} -
-
+
); diff --git a/frontend/components/applicant/applicantNode/Portfolio.component.tsx b/frontend/components/applicant/applicantNode/Portfolio.component.tsx new file mode 100644 index 00000000..10b4660c --- /dev/null +++ b/frontend/components/applicant/applicantNode/Portfolio.component.tsx @@ -0,0 +1,50 @@ +import Txt from "@/components/common/Txt.component"; +import { ApplicantReq } from "@/src/apis/applicant"; +import { applicantDataFinder } from "@/src/functions/finder"; +import Link from "next/link"; + +interface PortfolioProps { + data: ApplicantReq[]; +} + +const Portfolio = ({ data }: PortfolioProps) => { + const regex = /[\s,;|]+/; + + const portfolio = applicantDataFinder(data, "portfolio") + .split(regex) + .map((url: string) => url.trim()); + + const file = applicantDataFinder(data, "fileUrl") + .split(regex) + .map((url: string) => url.trim()); + + return ( + <> + 포트폴리오 +
+
+ 링크 + {portfolio.map((url: string, index: number) => { + return ( + + {url} + + ); + })} +
+
+ 파일 + {file.map((url: string, index: number) => { + return ( + + {url} + + ); + })} +
+
+ + ); +}; + +export default Portfolio; From bc806379259f322085327bf63f178f36c686a78b Mon Sep 17 00:00:00 2001 From: baegyeong Date: Mon, 4 Mar 2024 00:56:52 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20component=20postfix=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/app/applicant/pdf-viewer/page.tsx | 2 +- .../applicant/{PdfViewer.component.tsx => PdfViewer.tsx} | 2 +- .../applicant/applicantNode/CustomResource.component.tsx | 2 +- .../applicantNode/{Portfolio.component.tsx => Portfolio.tsx} | 0 frontend/components/application/Junction.component.tsx | 2 +- .../applicationNode/{Radio.component.tsx => Radio.tsx} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename frontend/components/applicant/{PdfViewer.component.tsx => PdfViewer.tsx} (93%) rename frontend/components/applicant/applicantNode/{Portfolio.component.tsx => Portfolio.tsx} (100%) rename frontend/components/application/applicationNode/{Radio.component.tsx => Radio.tsx} (100%) diff --git a/frontend/app/applicant/pdf-viewer/page.tsx b/frontend/app/applicant/pdf-viewer/page.tsx index cc55f18e..844151b6 100644 --- a/frontend/app/applicant/pdf-viewer/page.tsx +++ b/frontend/app/applicant/pdf-viewer/page.tsx @@ -1,7 +1,7 @@ import { dehydrate, Hydrate } from "@tanstack/react-query"; import getQueryClient from "@/src/functions/getQueryClient"; import { getApplicationById } from "@/src/apis/applicant"; -import ApplicationPdfViewer from "@/components/applicant/PdfViewer.component"; +import ApplicationPdfViewer from "@/components/applicant/PdfViewer"; interface ApplicationPdfViewerPageProps { searchParams: { diff --git a/frontend/components/applicant/PdfViewer.component.tsx b/frontend/components/applicant/PdfViewer.tsx similarity index 93% rename from frontend/components/applicant/PdfViewer.component.tsx rename to frontend/components/applicant/PdfViewer.tsx index 2016bd41..9d517c97 100644 --- a/frontend/components/applicant/PdfViewer.component.tsx +++ b/frontend/components/applicant/PdfViewer.tsx @@ -4,7 +4,7 @@ import ApplicantDetailRight from "@/components/applicant/DetailRight.component"; import { getApplicationById } from "@/src/apis/applicant"; import { useQuery } from "@tanstack/react-query"; import { useSearchParams } from "next/navigation"; -import Portfolio from "./applicantNode/Portfolio.component"; +import Portfolio from "./applicantNode/Portfolio"; const ApplicationPdfViewer = () => { const searchParams = useSearchParams(); diff --git a/frontend/components/applicant/applicantNode/CustomResource.component.tsx b/frontend/components/applicant/applicantNode/CustomResource.component.tsx index cb4ae89b..d6ff1ccb 100644 --- a/frontend/components/applicant/applicantNode/CustomResource.component.tsx +++ b/frontend/components/applicant/applicantNode/CustomResource.component.tsx @@ -1,7 +1,7 @@ import Txt from "@/components/common/Txt.component"; import { ApplicantReq } from "@/src/apis/applicant"; import { applicantDataFinder } from "@/src/functions/finder"; -import Portfolio from "./Portfolio.component"; +import Portfolio from "./Portfolio"; interface ApplicantResourceProps { data: ApplicantReq[]; postId: string; diff --git a/frontend/components/applicant/applicantNode/Portfolio.component.tsx b/frontend/components/applicant/applicantNode/Portfolio.tsx similarity index 100% rename from frontend/components/applicant/applicantNode/Portfolio.component.tsx rename to frontend/components/applicant/applicantNode/Portfolio.tsx diff --git a/frontend/components/application/Junction.component.tsx b/frontend/components/application/Junction.component.tsx index 513b9d2f..34358580 100644 --- a/frontend/components/application/Junction.component.tsx +++ b/frontend/components/application/Junction.component.tsx @@ -1,7 +1,7 @@ import { ApplicationNode } from "@/src/constants/application/type"; import { ReactNode } from "react"; -import ApplicationRadio from "./applicationNode/Radio.component"; +import ApplicationRadio from "./applicationNode/Radio"; import ApplicationRadioByTwoRank from "./applicationNode/RadioByTwoRank.component"; import ApplicationText from "./applicationNode/Text.component"; import ApplicationCheckboxWithEtc from "./applicationNode/CheckboxWithEtc.component"; diff --git a/frontend/components/application/applicationNode/Radio.component.tsx b/frontend/components/application/applicationNode/Radio.tsx similarity index 100% rename from frontend/components/application/applicationNode/Radio.component.tsx rename to frontend/components/application/applicationNode/Radio.tsx