Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 루트 페이지를 로그인 페이지로 변경, 플러스 아이콘 표시, 프로젝트 리스트 페이지 수정 #329

Merged
merged 4 commits into from
Aug 28, 2024
Merged

fix: 루트 페이지를 로그인 페이지로 변경, 플러스 아이콘 표시, 프로젝트 리스트 페이지 수정 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea9c123
feat: 홈페이지에 들어오면 로그인 페이지가 보이도록 수정
surinkwon Aug 27, 2024
1d65487
feat: 프로젝트가 없을 시 프로젝트를 추가해달라는 문구 표시
surinkwon Aug 27, 2024
8fa28ab
fix: 프로젝트가 없을 시 프로젝트를 추가해달라는 문구 표시
surinkwon Aug 27, 2024
ae7cbb6
fix: 추가 버튼의 + 아이콘이 표시되도록 수정
surinkwon Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/src/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
LoginPage,
SignupPage,
AuthPage,
TempHomepage,
ProjectsPage,
ProjectCreatePage,
} from "./pages";
Expand Down Expand Up @@ -48,7 +47,7 @@ const router = createBrowserRouter([
children: [
{
index: true,
element: <TempHomepage />,
element: <LoginPage />,
},
...createAuthCheckRouter("PUBLIC", [
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/account/TechStackInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -48,7 +48,7 @@ const TechStackInput = ({
open(<TechStackModal {...{ close, onAddTechStack }} />)
}
>
<img src={plus} alt="plus" />
<Plus width={40} height={40} stroke="white" />
추가하기
</button>
<p className="text-3xl font-semibold text-dark-gray">입니다</p>
Expand Down
21 changes: 14 additions & 7 deletions frontend/src/components/projects/ProjectList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -59,17 +59,24 @@ 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}
>
<img src={plus} alt="더하기" className="w-7" />
<Plus width={32} height={32} stroke="white" />
추가하기
</button>
</div>
</div>
<div className="flex flex-wrap gap-10 w-[720px] max-h-[37.25rem] overflow-y-auto scrollbar-hide">
{projectList.map((project: ProjectDTO) => (
<Link key={project.id} to={`${ROUTER_URL.PROJECTS}/${project.id}`}>
<ProjectCard project={project} />
</Link>
))}
{projectList.length ? (
projectList.map((project: ProjectDTO) => (
<Link key={project.id} to={`${ROUTER_URL.PROJECTS}/${project.id}`}>
<ProjectCard project={project} />
</Link>
))
) : (
<div className="flex flex-col items-center w-full gap-1 py-6 text-xs bg-gray-100 rounded-md">
<p>진행 중인 프로젝트가 없습니다.</p>
<p>프로젝트를 추가해주세요.</p>
</div>
)}
</div>
</section>
);
Expand Down
Loading