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

[FE][Feat] : 배포를 위한 머지 #174

Merged
merged 122 commits into from
Nov 14, 2024
Merged

[FE][Feat] : 배포를 위한 머지 #174

merged 122 commits into from
Nov 14, 2024

Conversation

effozen
Copy link
Collaborator

@effozen effozen commented Nov 14, 2024

📝 PR 개요

  • Frontend에서 Backend로 머지하기 위한 PR

🔍 변경 사항

  • 2주차 작업물

✅ 체크리스트 (Checklist)

  • 코드가 빌드 오류 없이 잘 작동하는지 확인
  • 테스트가 통과하는지 확인
  • 스타일 가이드와 일관성을 유지했는지 확인
  • 관련 문서가 업데이트되었는지 확인 (선택 사항)
  • 리뷰어가 이해할 수 있도록 주석이나 설명을 추가했는지 확인

leedongyull and others added 30 commits November 6, 2024 18:20
@leedongyull
[FE][Feat] #16 : InputComponent 구현
941ae50
@leedongyull
[FE][FEAT] 페이지 구현
ef9dc8d
@leedongyull
Merge branch 'main' of https://github.com/boostcampwm-2024/web28-DDara …
4aea9e8 
…into feature/fe/#106-AddChannelUI
@effozen
[ENV][Fix] #1 : auto merge 에러 수정
936cb39
@leedongyull
[FE][FEAT] #106 : 기본 UI 구현
d209411
@happyhyep
Merge pull request #126 from boostcampwm-2024/docs
726b9d5 
[ENV][Docs] #1 : [Env][Docs] #1 : Docusaurus 기반, 프로젝트 전체 문서 CI/CD 설정 및 충돌 오류 해결
@effozen
[ENV][Fix] #1 : eslint 및 ReadMe.md 수정
f33e608
@effozen
Merge pull request #129 from boostcampwm-2024/docs
0342cae 
[ENV][Fix] #1 : eslint 및 ReadMe.md 수정
@effozen
[FE][Chore] #1 : react-router-dom 설치
f8498e4
@leedongyull
[CHORE][FE] #130 : tailwind 컬러 및 폰트 세팅
5386686
@effozen
Merge pull request #133 from boostcampwm-2024/chore/fe/#130-setupTail…
82fa75a 
…wind

[CHORE][FE] #130 : tailwind 컬러 및 폰트 세팅
@leedongyull
[CHORE][FE] boxShadow 추가 설정
0f4a6e3
@leedongyull
[FEAT][FE] #134 : Footer 구현
3dc5d05
@effozen
[FE][Fix] #1 : Eslint 수정
50556c5 
- 'arrow-body-style': 'off' 옵션해제
@leedongyull
[FEAT][FE] #134 : Header 구현
7a33efe
@leedongyull
[FEAT][FE] #134 : Layout 구현
698e99f
@leedongyull
[FEAT][FE] Footer title 수정
d89350f
@leedongyull
[FIX][FE] props 전달 방식 수정
f064e5f
@leedongyull
[FIX][FE] React.FC 제거
dcdf178
@leedongyull
[FIX][FE] ReactNode 대신 ReactElement로 구체화
ddc2250
@effozen
[FE][Feat] #108 : 네이버 지도를 브라우저 위에서 출력할 수 있도록 구현
baec832
@leedongyull
[Fe][Fix] 핸들러 네이밍 변경
b8e95d7
@juwon5272
[FE][Feat] #131 : router 경로들 설정
8d13ecd
@effozen
Merge pull request #140 from boostcampwm-2024/feature/fe/#107-mapcomp…
a3ddf10 
…onent

[FE][Feat] #108 : 네이버 지도 API 브라우저에 출력할 수 있는 컴포넌트 구현
@effozen
Merge branch 'frontend' into feature/fe/#131-router-page
bea10bc
@effozen
[FE][Feat] #108 : dropdownButton 구현
96b64d4
@leedongyull
Merge branch 'feature/fe/#134-makeLayoutComponent' of https://github.…
be8cd95 
…com/boostcampwm-2024/web28-DDara into feature/fe/#106-AddChannelUI
@effozen
[FE][Docs] #108 : dropdownButton 스토리북 구현
bf81633
@effozen
[FE][Feat] #108 : vite.svg 삭제
bdb253f
@effozen
[FE][Feat] : Frontend branch와 통합
e56de9c
juwon5272 and others added 19 commits November 14, 2024 16:11
@juwon5272
[FE][Feat] #4 : DrawRoute 페이지 초안
2a4c2ee
@effozen
[FE][Feat] #112 : Tailwind.config.js에 z-index 추가
a925d15
@leedongyull
[FE][Style] #106 : 색상 변경 및 디자인 변경
31a1029
@leedongyull
Delete package.json
e4a8509
@leedongyull
Delete pnpm-lock.yaml
0cb24d8
@leedongyull
Delete frontend/package.json
3f948ee
@leedongyull
Delete backend/package.json
65c9325
@effozen
[FE][Feat] #112 : Layout 수정 및 조건부 Header 컴포넌트 업데이트 로직 이용
8a0ceb2 
- useContext와 useMemo, useState 조합해서 처리할 수 있도록 구현
@effozen
Merge pull request #168 from boostcampwm-2024/feature/fe/#134-layout-…
8fb2ad4 
…and-router

[FE][Feat] #112 : 레이아웃 상단 헤더 구현 및 공통 레이아웃 적용 (라우터 수정)
@effozen
Merge pull request #165 from boostcampwm-2024/feature/fe/#30-mainpage
7030f01 
[FE][Feat] #30 : Main 페이지
@effozen
Merge pull request #172 from boostcampwm-2024/feature/fe/#4-linedrawer
aa2d6d9 
[FE][Feat] #4 : DrawRoute 페이지 초안
@leedongyull
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
0639b78 
…DDara into feature/fe/#106-AddChannelUI
@leedongyull
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
0d88c6a 
…DDara into feature/fe/#106-AddChannelUI
@leedongyull
[FE][Feat] #106 : Footer 투명 추가
5b98450
@leedongyull
Merge branch 'feature/fe/#106-AddChannelUI' of https://github.com/boo…
f176c60 
…stcampwm-2024/web28-DDara into feature/fe/#106-AddChannelUI
@leedongyull
[FE][Chore]#106 : json 추가
459b26d
@leedongyull
[FE][Chore]#106 : 백엔드 json 변경
743cfa5
@leedongyull
Merge pull request #173 from boostcampwm-2024/feature/fe/#106-AddChan…
18ec212 
…nelUI-Merge

Feature/fe/#106 add channel UI merge
@happyhyep
Merge branch 'development' into frontend
2dde3d2
@juwon5272 juwon5272 self-requested a review November 14, 2024 10:45
@happyhyep happyhyep self-assigned this Nov 14, 2024
@leedongyull leedongyull requested review from leedongyull and removed request for juwon5272 November 14, 2024 10:45
@juwon5272 juwon5272 self-requested a review November 14, 2024 10:45
leedongyull
leedongyull approved these changes Nov 14, 2024
View reviewed changes
Copy link
Collaborator

@leedongyull leedongyull left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@happyhyep happyhyep self-requested a review November 14, 2024 10:45
@effozen effozen self-assigned this Nov 14, 2024
@happyhyep happyhyep merged commit 6c5c6a5 into development Nov 14, 2024
3 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@happyhyep happyhyep happyhyep approved these changes

@juwon5272 juwon5272 juwon5272 approved these changes

@leedongyull leedongyull leedongyull approved these changes

Assignees

@happyhyep happyhyep

@effozen effozen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@effozen @leedongyull @juwon5272 @happyhyep