Skip to content

Commit acd602f

Browse files
authored
Merge pull request #329 from boostcampwm2023/feature/login-page
fix: 루트 페이지를 로그인 페이지로 변경, 플러스 아이콘 표시, 프로젝트 리스트 페이지 수정
2 parents 75485f9 + ae7cbb6 commit acd602f

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

frontend/src/AppRouter.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
LoginPage,
99
SignupPage,
1010
AuthPage,
11-
TempHomepage,
1211
ProjectsPage,
1312
ProjectCreatePage,
1413
} from "./pages";
@@ -48,7 +47,7 @@ const router = createBrowserRouter([
4847
children: [
4948
{
5049
index: true,
51-
element: <TempHomepage />,
50+
element: <LoginPage />,
5251
},
5352
...createAuthCheckRouter("PUBLIC", [
5453
{

frontend/src/components/account/TechStackInput.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useModal } from "../../hooks/common/modal/useModal";
22
import TechStackModal from "./TechStackModal";
3-
import plus from "../../assets/icons/plus.svg";
3+
import Plus from "../../assets/icons/plus.svg?react";
44
import NextStepButton from "../common/NextStepButton";
55
import CategoryButton from "../common/CategoryButton";
66
import { WheelEvent } from "react";
@@ -48,7 +48,7 @@ const TechStackInput = ({
4848
open(<TechStackModal {...{ close, onAddTechStack }} />)
4949
}
5050
>
51-
<img src={plus} alt="plus" />
51+
<Plus width={40} height={40} stroke="white" />
5252
추가하기
5353
</button>
5454
<p className="text-3xl font-semibold text-dark-gray">입니다</p>

frontend/src/components/projects/ProjectList.tsx

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
33
import useDropdown from "../../hooks/common/dropdown/useDropdown";
44
import { ProjectCard } from ".";
55
import { PROJECT_SORT_OPTION } from "../../constants/projects";
6-
import plus from "../../assets/icons/plus.svg";
6+
import Plus from "../../assets/icons/plus.svg?react";
77
import { ProjectDTO } from "../../types/DTO/projectDTO";
88
import projectSortByOption from "../../utils/projectSortByOption";
99
import { useGetProjects } from "../../hooks/queries/project";
@@ -59,17 +59,24 @@ const ProjectList = () => {
5959
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"
6060
onClick={handleCreateButtonClick}
6161
>
62-
<img src={plus} alt="더하기" className="w-7" />
62+
<Plus width={32} height={32} stroke="white" />
6363
추가하기
6464
</button>
6565
</div>
6666
</div>
6767
<div className="flex flex-wrap gap-10 w-[720px] max-h-[37.25rem] overflow-y-auto scrollbar-hide">
68-
{projectList.map((project: ProjectDTO) => (
69-
<Link key={project.id} to={`${ROUTER_URL.PROJECTS}/${project.id}`}>
70-
<ProjectCard project={project} />
71-
</Link>
72-
))}
68+
{projectList.length ? (
69+
projectList.map((project: ProjectDTO) => (
70+
<Link key={project.id} to={`${ROUTER_URL.PROJECTS}/${project.id}`}>
71+
<ProjectCard project={project} />
72+
</Link>
73+
))
74+
) : (
75+
<div className="flex flex-col items-center w-full gap-1 py-6 text-xs bg-gray-100 rounded-md">
76+
<p>진행 중인 프로젝트가 없습니다.</p>
77+
<p>프로젝트를 추가해주세요.</p>
78+
</div>
79+
)}
7380
</div>
7481
</section>
7582
);

0 commit comments

Comments
 (0)