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.

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

[Refactor] 과제 api 연결 및 바뀐 dto 반영 #114

Merged
merged 26 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
473c397
feat: 큐에이 반영
SeieunYoo Sep 1, 2024
4d96c98
fix: 소문자로 변경
SeieunYoo Sep 2, 2024
0a470e4
refactor: api dto 반영, 이번 주 과제 조회 api 연결
SeieunYoo Sep 2, 2024
15efae9
feat: 히스토리 api 수정된 dto 반영
SeieunYoo Sep 2, 2024
98ca46f
feat: 히스토리 api 수정된 거 반영, 레포지토리 입력 api 반영
SeieunYoo Sep 2, 2024
14e3318
refactor: 레포 모달 창 상태 관리 컴포넌트로 벼녕
SeieunYoo Sep 2, 2024
4a2bdaa
feat: 필요없는 로직 삭제
SeieunYoo Sep 2, 2024
e4e81a7
feat: 이번 주 과제 조회 스터디 추가
SeieunYoo Sep 2, 2024
02ccc06
feat: merge dev
SeieunYoo Sep 2, 2024
c40f35d
feat: 모달 라우팅 삭제
SeieunYoo Sep 2, 2024
3f55541
feat: submissionLink 에서 폴더
SeieunYoo Sep 2, 2024
c535042
chore: 안쓰는 상수 삭제
SeieunYoo Sep 2, 2024
3ba2820
chore: 말줄임 처리, github url 인지 체크
SeieunYoo Sep 3, 2024
30b1482
feat: 스터디 시작 날짜가 현재 날짜인지 확인하고 disabled 처리
SeieunYoo Sep 3, 2024
5300dab
feat: 공통 타입은 common 으로 옮기기, 리뷰 반영
SeieunYoo Sep 3, 2024
2353d51
fix: 빠진 네이밍 수정 반영
SeieunYoo Sep 3, 2024
44b6eae
feat: Button asProp 으로 Link 전달, css 수정
SeieunYoo Sep 4, 2024
87913e4
refactor: NonNullable 처리, Initial 로 관리
SeieunYoo Sep 4, 2024
9e1ec27
feat: github 관련 유틸 분리,css 수정
SeieunYoo Sep 4, 2024
083fd28
chore: 필요없는 프래그먼트 삭제
SeieunYoo Sep 4, 2024
9193df3
chore: cache 속서 추가
SeieunYoo Sep 4, 2024
9807666
feat: currentPath href 매치될 때만 active 되게 navItem 수정
SeieunYoo Sep 4, 2024
70a1a10
chore: myStudy 용 타입 추가
SeieunYoo Sep 4, 2024
2f2237c
chore: EDITING_WITH_WARNING 타입 삭제, 상태 네이밍 변경
SeieunYoo Sep 4, 2024
172f10c
chore: 조건식 간소화
SeieunYoo Sep 4, 2024
329f205
chore: submissionLink null 로 내려오는 부분 우선 삭제
SeieunYoo Sep 4, 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
2 changes: 1 addition & 1 deletion apps/client/constants/navMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const navMenu = [
name: "나의 스터디",
items: [
{
href: "/my-assignment",
href: "my-assignment",
imageUrl: folderImageUrl,
alt: "folder-icon",
name: "나의 과제",
Expand Down
5 changes: 4 additions & 1 deletion packages/ui/src/components/NavItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ const NavItem = ({ href, imageUrl, alt, name, items }: NavItemProps) => {
}
};

const currentPath = `/${segment.join("/")}`;

const navItemType =
(!segment[1] && `${segment[0]}` === href) || `/${segment[0]}` === href
(currentPath === href && !segment[1] && `${segment[0]}` === href) ||
(currentPath === href && `/${segment[0]}` === href)
? "active"
SeieunYoo marked this conversation as resolved.
Show resolved Hide resolved
: "inactive";

Expand Down
Loading