Skip to content

📦[Chore] 10월 28일 기준 작업물 병합 및 배포 테스트 #167

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

Merged
s-ja merged 72 commits into from
Oct 28, 2024
Merged

📦[Chore] 10월 28일 기준 작업물 병합 및 배포 테스트 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
b0b7831
📦[Chore] react-icons 라이브러리 설치 #109
wynter24 Oct 22, 2024
c837d91
Merge branch 'main' of github.com:Mt-NextJs/linkle into feature/admin…
Defor721 Oct 23, 2024
1de8f20
✨[Feat] 미리보기 버튼 추가 및 일부 기능 구현 #109
wynter24 Oct 23, 2024
f49bb67
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into featu…
wynter24 Oct 23, 2024
16d4f08
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into featu…
wynter24 Oct 23, 2024
f1230bf
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 23, 2024
40aa5fd
🎨[Style] DatePicker 스타일 및 enableTabLoop 속성 추가 #109
wynter24 Oct 23, 2024
57bd251
🐛[Fix] 이벤트 설명 placeholder 움직임 문제 해결 #109
wynter24 Oct 23, 2024
0bf9ae0
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into fe…
wynter24 Oct 23, 2024
dfd1893
Merge pull request #133 from Mt-NextJs/feature/event-block-enhancement
lumpenop Oct 23, 2024
d7fed6a
🐛[Fix] 구분선 선택 기능 오작동 수정 #134
cchaeyoung Oct 23, 2024
a3ac1b5
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 23, 2024
8168b2d
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 23, 2024
cb447f3
✨[Feat] 사용자 일정 리스트뷰 및 캘린더뷰 표시 기능 추가 #101 (#132)
cchaeyoung Oct 23, 2024
31ff139
🐛[Fix] 구분선 선택 기능 오작동 수정 #134 (#135)
cchaeyoung Oct 23, 2024
09cf329
✨[Feat] 작업 내용 내 미사용 변수 제거 #138
lumpenop Oct 23, 2024
22de4bd
✨[Feat] 작업 내용 내 미사용 변수 제거 #138
lumpenop Oct 23, 2024
63452d3
Merge pull request #139 from Mt-NextJs/feature/theme-fix
lumpenop Oct 23, 2024
f8fef5c
🐛[Fix] 이벤트 블록 더보기 버튼 상태 유지 문제 해결 #115
wynter24 Oct 23, 2024
c683e81
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into featu…
wynter24 Oct 23, 2024
02ef0a5
✨ [Feat] basic block 하위 컴포넌트 구현 #14
Defor721 Oct 23, 2024
73e3bcf
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into fe…
wynter24 Oct 23, 2024
48ec56c
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 23, 2024
aad68ff
Merge pull request #143 from Mt-NextJs/feature/admin-page
Defor721 Oct 23, 2024
7ebf78c
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into fe…
wynter24 Oct 23, 2024
7fc2d50
Merge pull request #144 from Mt-NextJs/feature/event-block-enhancement
wynter24 Oct 23, 2024
e7405ab
✨ [Feat] basic block 하위 컴포넌트 퍼블리싱 및 구현(event,video,) #14
Defor721 Oct 24, 2024
5706c15
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 24, 2024
e7acaa9
✨[Feat] CalendarPage에 공통 Layout 컴포넌트 적용 #148
cchaeyoung Oct 24, 2024
b09cf2f
♻️[Refactor] Layout 컴포넌트 활용을 위한 CalendarHeader 중복 요소 제거 #148
cchaeyoung Oct 24, 2024
e3fe092
💄[Design] StyleSetting 컴포넌트 여백 스타일 수정 #148
cchaeyoung Oct 24, 2024
56df621
✨[Feat] 빈 일정 상태 표시를 위한 BsCalendarXFill 아이콘 추가 #148
cchaeyoung Oct 24, 2024
5e4100f
♻️[Refactor] ScheduleList 컴포넌트 불필요한 wrapper div 제거 #148
cchaeyoung Oct 24, 2024
bdcdb67
🐛[Fix] form 이벤트 제어를 통한 토글 기능 버그 수정 #148
cchaeyoung Oct 24, 2024
036b474
♻️[Refactor] 일정 관리 페이지 레이아웃 구조 통일 #148
cchaeyoung Oct 24, 2024
bf3602d
♻️[Refactor] 일정 폼 버튼을 공통 컴포넌트로 변경 #148
cchaeyoung Oct 24, 2024
52fb1f2
✨[Feat] 일정 폼 버튼 활성화 조건 추가 #148
cchaeyoung Oct 24, 2024
9e29646
♻️[Refactor] ListView에서 URL 관련 기능 제거 #148
cchaeyoung Oct 24, 2024
96ef498
♻️[Refactor] CalendarView에서 URL 관련 기능 제거 #148
cchaeyoung Oct 24, 2024
f53b2e6
📦[Chore] 파일명 수정: calendar → event-preview #146
wynter24 Oct 24, 2024
268f6ad
♻️[Refactor] ScheduleList에서서 URL 기능 제거 #148
cchaeyoung Oct 24, 2024
a4bf3d5
🐛[Fix] useEffect 의존성 배열 수정하여 fetchCalendarBlock 1회만 호출되도록 개선 #148
cchaeyoung Oct 24, 2024
f0490e5
♻️[Refactor] 일정 이름, 연결할 주소 입력 부분 FormInput 컴포넌트로 변경 #148
cchaeyoung Oct 24, 2024
be5cc0e
♻️[Refactor] 날짜/시간 선택 UI DateTimeInput 컴포넌트로 분리 #148
cchaeyoung Oct 24, 2024
a7e1b88
♻️[Refactor] DatePicker 라이브러리 적용하여 날짜/시간 선택 기능 개선 #148
cchaeyoung Oct 24, 2024
d232ce5
✨[Feat] 메인 페이지 작성 #151
lumpenop Oct 24, 2024
4d27e75
✨[Feat] 메인 페이지 작성 #151
lumpenop Oct 24, 2024
f94fa1e
✨[Feat] 블록 선택하기 모달 바깥영역 클릭 시 닫기 #154
lumpenop Oct 24, 2024
b7ffd5f
✨[Feat] 메인 메뉴 바깥영역 클릭 시 닫기 #154
lumpenop Oct 24, 2024
2aaf9e5
Merge pull request #153 from Mt-NextJs/feature/main-feat
lumpenop Oct 24, 2024
9d52ec4
📦[Chore] 이벤트 일정 달력 한국어 설정을 위한 date-fns 설치 #146
wynter24 Oct 24, 2024
575062e
Merge pull request #147 from Mt-NextJs/feature/admin-page
Defor721 Oct 25, 2024
a44daf2
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 25, 2024
95b9ab4
💄[Design] 로그인 페이지 퍼블리싱 및 기능 추가 #74 (#156)
s-ja Oct 28, 2024
b61672b
Merge branch 'develop' into feature/calendar-block
cchaeyoung Oct 28, 2024
1113190
♻️[Refactor] 구분선 블록 키 값을 한글에서 영어로 변경 #159
cchaeyoung Oct 28, 2024
39571ce
💄[Design] 구분선 블록 화면에 한글로 표시되도록 수정 #159
cchaeyoung Oct 28, 2024
c8b7a04
Merge branch 'develop' into feature/divider-block
cchaeyoung Oct 28, 2024
c950050
Merge pull request #160 from Mt-NextJs/feature/divider-block
cchaeyoung Oct 28, 2024
1c4ffea
Merge pull request #158 from Mt-NextJs/feature/calendar-block
cchaeyoung Oct 28, 2024
e317e62
💄[Design] datepicker custom #146
wynter24 Oct 28, 2024
2c34bd2
✨[Feat] 회원가입 페이지 퍼블리싱 및 기능 구현 #34 (#162)
s-ja Oct 28, 2024
71d7f40
Merge branch 'develop' of github.com:Mt-NextJs/linkle into feature/ad…
Defor721 Oct 28, 2024
2da0696
🎨[Style] console 주석 처리 #146
wynter24 Oct 28, 2024
5e8166f
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into fe…
wynter24 Oct 28, 2024
33f0a75
Merge pull request #165 from Mt-NextJs/feature/event-block-enhancemen…
wynter24 Oct 28, 2024
72c911f
✨ [Feat] calendar 블록 로직 구현 #14
Defor721 Oct 28, 2024
0d74ded
Merge pull request #168 from Mt-NextJs/feature/admin-page
Defor721 Oct 28, 2024
b657c9c
📦[Chore] 중간 발표전 배포를 위한 PR 작성 #136 (#145) (#170)
s-ja Oct 28, 2024
f1f654a
💄[Design] 아이콘 등 필요 비주얼 요소 추가 작업 #166 (#171)
s-ja Oct 28, 2024
8606b55
📦[Chore] 중간 발표전 배포를 위한 PR 작성 #136 (#145) (#172)
s-ja Oct 28, 2024
5424d61
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into develop
s-ja Oct 28, 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
194 changes: 115 additions & 79 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
"@fullcalendar/daygrid": "^6.1.15",
"@fullcalendar/interaction": "^6.1.15",
"@fullcalendar/react": "^6.1.15",
"@types/react-datepicker": "^4.19.5",
"date-fns": "^2.30.0",
"moment": "2.30.1",
"next": "14.2.14",
"react": "^18",
"react-datepicker": "^7.5.0",
"react-datepicker": "^4.21.0",
"react-dom": "^18",
"react-icons": "^5.3.0",
"tailwind-merge": "^2.5.3"
Expand Down
1 change: 1 addition & 0 deletions public/assets/icons/SVG/icon/icon_calendar.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/SVG/icon/icon_divider.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/SVG/icon/icon_event.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading