From ea9c123ea90c4ca47dd0628c09cc226340d74aa9 Mon Sep 17 00:00:00 2001 From: surinkwon Date: Tue, 27 Aug 2024 21:34:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=ED=99=88=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=97=90=20=EB=93=A4=EC=96=B4=EC=98=A4=EB=A9=B4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/AppRouter.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/AppRouter.tsx b/frontend/src/AppRouter.tsx index 66ed890f..21f66d20 100644 --- a/frontend/src/AppRouter.tsx +++ b/frontend/src/AppRouter.tsx @@ -8,7 +8,6 @@ import { LoginPage, SignupPage, AuthPage, - TempHomepage, ProjectsPage, ProjectCreatePage, } from "./pages"; @@ -48,7 +47,7 @@ const router = createBrowserRouter([ children: [ { index: true, - element: , + element: , }, ...createAuthCheckRouter("PUBLIC", [ { From 1d65487857cfdab842daebf672632d04656a6179 Mon Sep 17 00:00:00 2001 From: surinkwon Date: Tue, 27 Aug 2024 21:42:47 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=EA=B0=80=20=EC=97=86=EC=9D=84=20=EC=8B=9C=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=A5=BC=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=B4=EB=8B=AC=EB=9D=BC=EB=8A=94=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/projects/ProjectList.tsx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/projects/ProjectList.tsx b/frontend/src/components/projects/ProjectList.tsx index 71bba237..74690fa4 100644 --- a/frontend/src/components/projects/ProjectList.tsx +++ b/frontend/src/components/projects/ProjectList.tsx @@ -65,11 +65,18 @@ const ProjectList = () => {
- {projectList.map((project: ProjectDTO) => ( - - - - ))} + {!projectList.length ? ( + projectList.map((project: ProjectDTO) => ( + + + + )) + ) : ( +
+

진행 중인 프로젝트가 없습니다.

+

프로젝트를 추가해주세요.

+
+ )}
); From 8fa28ab5839eb5dfe1734c8d6f53524ed8a1fd60 Mon Sep 17 00:00:00 2001 From: surinkwon Date: Tue, 27 Aug 2024 21:43:11 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8?= =?UTF-8?q?=EA=B0=80=20=EC=97=86=EC=9D=84=20=EC=8B=9C=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=B4?= =?UTF-8?q?=EB=8B=AC=EB=9D=BC=EB=8A=94=20=EB=AC=B8=EA=B5=AC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/projects/ProjectList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/projects/ProjectList.tsx b/frontend/src/components/projects/ProjectList.tsx index 74690fa4..cc913fc8 100644 --- a/frontend/src/components/projects/ProjectList.tsx +++ b/frontend/src/components/projects/ProjectList.tsx @@ -65,7 +65,7 @@ const ProjectList = () => {
- {!projectList.length ? ( + {projectList.length ? ( projectList.map((project: ProjectDTO) => ( From ae7cbb664e81f7d66b0442ff844287cb8d40902c Mon Sep 17 00:00:00 2001 From: surinkwon Date: Tue, 27 Aug 2024 21:59:54 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=EC=B6=94=EA=B0=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EC=9D=98=20+=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=9D=B4?= =?UTF-8?q?=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/account/TechStackInput.tsx | 4 ++-- frontend/src/components/projects/ProjectList.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/account/TechStackInput.tsx b/frontend/src/components/account/TechStackInput.tsx index f259d40c..28cb54e6 100644 --- a/frontend/src/components/account/TechStackInput.tsx +++ b/frontend/src/components/account/TechStackInput.tsx @@ -1,6 +1,6 @@ import { useModal } from "../../hooks/common/modal/useModal"; import TechStackModal from "./TechStackModal"; -import plus from "../../assets/icons/plus.svg"; +import Plus from "../../assets/icons/plus.svg?react"; import NextStepButton from "../common/NextStepButton"; import CategoryButton from "../common/CategoryButton"; import { WheelEvent } from "react"; @@ -48,7 +48,7 @@ const TechStackInput = ({ open() } > - plus + 추가하기

입니다

diff --git a/frontend/src/components/projects/ProjectList.tsx b/frontend/src/components/projects/ProjectList.tsx index cc913fc8..3de07b16 100644 --- a/frontend/src/components/projects/ProjectList.tsx +++ b/frontend/src/components/projects/ProjectList.tsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import useDropdown from "../../hooks/common/dropdown/useDropdown"; import { ProjectCard } from "."; import { PROJECT_SORT_OPTION } from "../../constants/projects"; -import plus from "../../assets/icons/plus.svg"; +import Plus from "../../assets/icons/plus.svg?react"; import { ProjectDTO } from "../../types/DTO/projectDTO"; import projectSortByOption from "../../utils/projectSortByOption"; import { useGetProjects } from "../../hooks/queries/project"; @@ -59,7 +59,7 @@ const ProjectList = () => { className="flex items-center justify-center w-[10.45rem] h-[2.5rem] py-2 pl-3 pr-9 text-white text-xs bg-middle-green gap-3 rounded-[0.375rem] shadow-box" onClick={handleCreateButtonClick} > - 더하기 + 추가하기