Skip to content

Comments

๐Ÿš‘[HOTFIX] dev to main ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ดํ›„ ์ž๋™ํ™” ์•ก์…˜ ์‹คํŒจ, ๋ณดํ˜ธ ํ•ด์ œ ํ›„ ๊ด€๋ จ ์„ค์ • ์ ๊ฒ€ #119#128

Merged
s-ja merged 7 commits intodevelopfrom
main
Oct 23, 2024

Conversation

@s-ja
Copy link
Collaborator

@s-ja s-ja commented Oct 23, 2024

์ž‘์—…์‚ฌํ•ญ

  • dev to main ๋ณ‘ํ•ฉ ์ดํ›„ ์ž๋™ํ™” ์•ก์…˜ ๋นŒ๋“œ ์‹คํŒจ, ๋ธŒ๋žœ์น˜ ๋ณดํ˜ธ ํ•ด์ œ ํ›„ dev ์™€ main ๋ธŒ๋žœ์น˜์—์„œ ์ง์ ‘ ํ™•์ธ
  • npm run fix & build ์‹คํ–‰ ๊ณผ์ •์—์„œ๋Š” ๋ฌธ์ œ ์—†์Œ
  • ์•ก์…˜ ์‹คํ–‰ ๊ณผ์ • ์ค‘ ์ถœ๋ ฅ๋œ ๋…ธ๋“œ ๋ฒ„์ „ ๊ด€๋ จ ์ฝ”๋“œ ์ˆ˜์ •
  • node modules ํŒŒ์ผ๊ณผ package lock ํŒŒ์ผ ์‚ญ์ œ ํ›„ npm ci๋กœ ์žฌ์„ค์น˜
  • packge lock ํŒŒ์ผ์— ๋ช‡๊ฐ€์ง€ ๋ณ€๊ฒฝ์‚ฌํ•ญ ํ™•์ธ
  • ๋ณดํ˜ธ ํ•ด์ œ์— ๋”ฐ๋ผ ์ง์ ‘ dev ์™€ main์— push ํ›„ ํ…Œ์ŠคํŠธ ๊ฒฐ๊ณผ ์•ก์…˜๊ณผ ๋นŒ๋“œ, ๋ฐฐํฌ ๋ชจ๋‘ ์ด์ƒ ์—†๋Š” ๊ฒƒ์œผ๋กœ ํ™•์ธ

๋ฏธ๋ฆฌ๋ณด๊ธฐ, ์‚ฌ์šฉ๋ฐฉ๋ฒ• ๋ฐ ๊ฒฐ๊ณผ๋ฌผ

๋ฐฐํฌ ์ž๋™ํ™” ์•ก์…˜ ํŒŒ์ผ์—์„œ์˜ ๋ณ€๊ฒฝ์‚ฌํ•ญ

image
LTS ๋ฒ„์ „์œผ๋กœ์˜ ๋ฒ„์ „ ๋ช…์‹œ ๋ณ€๊ฒฝ

package lock ํŒŒ์ผ์—์„œ์˜ ํŒจํ‚ค์ง€ ์ •๋ณด ๊ด€๋ จ ๋ณ€๊ฒฝ ์‚ฌํ•ญ ์ถ”์ 

๊ธฐํƒ€

  • ์ดํ›„ ์ž‘์—… ์ „ dev ๋ธŒ๋žœ์น˜ ๋ฐ˜๋“œ์‹œ ๋‹น๊ฒจ๋ฐ›์•„ ํ™•์ธํ•  ๊ฒƒ

์ž‘์„ฑ์ผ

2024.10.23

@s-ja s-ja added ๐Ÿ› Bug [์ž‘์—… ์œ ํ˜•] ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ •ํ•˜๊ธฐ ์œ„ํ•œ ์ด์Šˆ๋‚˜ PR โš™๏ธ Chore [์ž‘์—… ์œ ํ˜•] ๋นŒ๋“œ ์„ค์ •, ํŒจํ‚ค์ง€ ๊ด€๋ฆฌ ๋“ฑ๊ณผ ๊ฐ™์€ ๊ธฐํƒ€ ๊ด€๋ฆฌ ์ž‘์—… โœ… Done [์ž‘์—… ์ƒํ™ฉ] ์ž‘์—…์ด ์™„๋ฃŒ๋œ ์ด์Šˆ ๋˜๋Š” ๋จธ์ง€๋œ PR ๐Ÿ”ฅ High Priority [์ค‘์š”๋„] ์ฆ‰์‹œ ํ•ด๊ฒฐ์ด ํ•„์š”ํ•œ ์ค‘์š”ํ•œ ๋ฌธ์ œ labels Oct 23, 2024
@s-ja s-ja added this to the 3rd Week (๊ฐœ์„ ) milestone Oct 23, 2024
@s-ja s-ja self-assigned this Oct 23, 2024
Copy link
Collaborator

@wynter24 wynter24 left a comment

Choose a reason for hiding this comment

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

ํ™•์ธํ–ˆ์Šต๋‹ˆ๋‹ค!

@s-ja s-ja merged commit 221b6f6 into develop Oct 23, 2024
s-ja added a commit that referenced this pull request Oct 23, 2024
* ๐Ÿ“ฆ[Chore] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #96

* โ™ป๏ธ[Refactor] fetchCalendarBlock ํ•จ์ˆ˜ ๋ฆฌํŒฉํ† ๋ง #99

* โœจ[Feat] ์ƒˆ ์ผ์ • ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* โœจ[Feat] ์ผ์ • ์ถ”๊ฐ€ ํ›„ ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ #99

* โ™ป๏ธ[Refactor] ์ผ์ • ๋ฐ ์บ˜๋ฆฐ๋” ๋ธ”๋ก ์ฒ˜๋ฆฌ ๋กœ์ง ๋ฆฌํŒฉํ† ๋ง #99

* โœจ[Feat] getSequence ํ•จ์ˆ˜ ์ถ”๊ฐ€ #99

* โœจ[Feat] ์ผ์ • ์กฐํšŒ API ์—ฐ๋™ ์ถ”๊ฐ€ #99

* โœจ[Feat] ์ผ์ • ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* โ™ป๏ธ[Refactor] ์ „์ฒด ํŽ˜์ด์ง€ ์˜ค๋ฅ˜ ํ‘œ์‹œ ๋กœ์ง ์ œ๊ฑฐ #96

* โœจ[Feat] ์ผ์ • ์—†์„ ๋•Œ ๋นˆ ์ƒํƒœ ๋ฉ”์‹œ์ง€ ํ‘œ์‹œ #96

* ๐Ÿ›[Fix] ์ผ์ • ํŽ˜์ด์ง€ ๋ผ์šฐํŒ… ๊ฒฝ๋กœ ์ˆ˜์ • #96

* โ™ป๏ธ[Refactor] ์ผ์ • ์ถ”๊ฐ€ ํผ์—์„œ ๋กœ๋”ฉ ์ƒํƒœ ๋ฐ ์—๋Ÿฌ ํ‘œ์‹œ ์ œ๊ฑฐ #96

* โ™ป๏ธ[Refactor] ํŒŒ์ผ ๊ตฌ์กฐ ๋ณ€๊ฒฝ #96

* โ™ปโœจ[Feat] ์ผ์ • ํผ ์ปดํฌ๋„ŒํŠธ์— ์ˆ˜์ • ๊ธฐ๋Šฅ์„ ์œ„ํ•œ ์ธํ„ฐํŽ˜์ด์Šค ์ถ”๊ฐ€ #96

* ๐ŸŽจ[Style] ์ผ์ • ๊ด€๋ฆฌ ํŽ˜์ด์ง€ ์ปดํฌ๋„ŒํŠธ๋ช… ๋ณ€๊ฒฝ #96

* โœจ[Feat] ์ผ์ • ์ˆ˜์ • ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* ๐Ÿ“ฆ[Chore] react-icons ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #109

* โœจ[Feat] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ๋ฅผ ์‚ฌ์šฉํ•œ ์บ˜๋ฆฐ๋” ๋ทฐ ๊ตฌํ˜„ #96

* โœจ[Feat] ๋ฏธ๋ฆฌ๋ณด๊ธฐ ๋ฒ„ํŠผ ์ถ”๊ฐ€ ๋ฐ ์ผ๋ถ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #109

* โœจ[Feat] hover ์‹œ ์ผ์ • URL ํด๋ฆญ #96

* ๐Ÿš‘[HOTFIX] dev to main ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ดํ›„ ์ž๋™ํ™” ์•ก์…˜ ์‹คํŒจ, ๋ณดํ˜ธ ํ•ด์ œ ํ›„ ๊ด€๋ จ ์„ค์ • ์ ๊ฒ€ #119 (#128)

* ๐Ÿ“ฆ[Chore] ๋นŒ๋“œ ๊ณผ์ •์—์„œ์˜ ๋ธŒ๋žœ์น˜ ๊ทœ์น™ ๋ณ€๊ฒฝ ๋ณต๊ตฌ ํ…Œ์ŠคํŠธ #8

* ๐Ÿš‘[HOTFIX] ์ถฉ๋Œ ํ•ด๊ฒฐ์ค‘, ๋ณ€๊ฒฝ๋œ ๊ตฌ์กฐ์— ๋Œ€ํ•œ ๋ฏธ๋ฐ˜์˜ ๋ถ€๋ถ„ ๋ฐœ๊ฒฌ, ์ˆ˜์ • #119

* โœจ[Feat] ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€ ์ถ”๊ฐ€ #96

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ, ์Šคํƒ€์ผ ์„ค์ • ์ถ”๊ฐ€ #96

* โ™ป๏ธ[Refactor] ์บ˜๋ฆฐ๋” ๊ฒฝ๋กœ ์ˆ˜์ • (/admin/block/calendar -> /admin/calendar) #96

* ๐ŸŽจ[Style] DatePicker ์Šคํƒ€์ผ ๋ฐ enableTabLoop ์†์„ฑ ์ถ”๊ฐ€ #109

* โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ(block-menu.tsx) ๋ชจ๋‹ฌ ์ƒ์„ฑ #124

* โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ ๋ชจ๋‹ฌ ๋ฐฐ๊ฒฝ opacity ์ ์šฉ ๋ฐ ๊ตฌ๋ถ„์„  ๋งํฌ ํด๋ฆญ ์‹œ ์ฃผ์†Œ ๋ณ€๊ฒฝ #130

* โœจ[Feat] /admin ํŽ˜์ด์ง€ dnd ์‹œ api ์—ฐ๋™ ํ™•์ธ #87

* ๐Ÿ›[Fix] ์ด๋ฒคํŠธ ์„ค๋ช… placeholder ์›€์ง์ž„ ๋ฌธ์ œ ํ•ด๊ฒฐ #109

* โœจ[Feat] ์‚ฌ์šฉ์ž ์ผ์ • ๋ฆฌ์ŠคํŠธ๋ทฐ ๋ฐ ์บ˜๋ฆฐ๋”๋ทฐ ํ‘œ์‹œ ๊ธฐ๋Šฅ ์ถ”๊ฐ€ #101 (#132)

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ์™€ ์บ˜๋ฆฐ๋”๋ทฐ์— ์‚ฌ์šฉ์ž ์ผ์ • ํ‘œ์‹œ #101

* โœจ[Feat] ์บ˜๋ฆฐ๋”๋ทฐ ์ผ์ •์— URL ์—ฐ๊ฒฐ #101

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ ์ผ์ •์— URL ์—ฐ๊ฒฐ #101

* ๐Ÿ›[Fix] ๊ตฌ๋ถ„์„  ์„ ํƒ ๊ธฐ๋Šฅ ์˜ค์ž‘๋™ ์ˆ˜์ • #134 (#135)

---------

Co-authored-by: cchaeyoung <kimchaeyoung05@naver.com>
Co-authored-by: wynter24 <m.wynter24.k@gmail.com>
Co-authored-by: ๊น€์ฑ„์˜ <123921311+cchaeyoung@users.noreply.github.com>
Co-authored-by: lumpen <swk5373@gmail.com>
Co-authored-by: LUMPEN <68418005+lumpenop@users.noreply.github.com>
s-ja added a commit that referenced this pull request Oct 23, 2024
* ๐Ÿ“ฆ[Chore] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #96

* โ™ป๏ธ[Refactor] fetchCalendarBlock ํ•จ์ˆ˜ ๋ฆฌํŒฉํ† ๋ง #99

* โœจ[Feat] ์ƒˆ ์ผ์ • ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* โœจ[Feat] ์ผ์ • ์ถ”๊ฐ€ ํ›„ ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ #99

* โ™ป๏ธ[Refactor] ์ผ์ • ๋ฐ ์บ˜๋ฆฐ๋” ๋ธ”๋ก ์ฒ˜๋ฆฌ ๋กœ์ง ๋ฆฌํŒฉํ† ๋ง #99

* โœจ[Feat] getSequence ํ•จ์ˆ˜ ์ถ”๊ฐ€ #99

* โœจ[Feat] ์ผ์ • ์กฐํšŒ API ์—ฐ๋™ ์ถ”๊ฐ€ #99

* โœจ[Feat] ์ผ์ • ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* โ™ป๏ธ[Refactor] ์ „์ฒด ํŽ˜์ด์ง€ ์˜ค๋ฅ˜ ํ‘œ์‹œ ๋กœ์ง ์ œ๊ฑฐ #96

* โœจ[Feat] ์ผ์ • ์—†์„ ๋•Œ ๋นˆ ์ƒํƒœ ๋ฉ”์‹œ์ง€ ํ‘œ์‹œ #96

* ๐Ÿ›[Fix] ์ผ์ • ํŽ˜์ด์ง€ ๋ผ์šฐํŒ… ๊ฒฝ๋กœ ์ˆ˜์ • #96

* โ™ป๏ธ[Refactor] ์ผ์ • ์ถ”๊ฐ€ ํผ์—์„œ ๋กœ๋”ฉ ์ƒํƒœ ๋ฐ ์—๋Ÿฌ ํ‘œ์‹œ ์ œ๊ฑฐ #96

* ๐Ÿš‘[HOTFIX] ๋ฐฐํฌ ๊ณผ์ •์—์„œ ์ถฉ๋Œ ํ•ด๊ฒฐ ํ›„ ํ…Œ์ŠคํŠธ ์ค‘ ๋ฐœ๊ฒฌํ•œ ์ž˜๋ชป๋œ ์ฝ”๋“œ ์ˆ˜์ • #120

* โ™ป๏ธ[Refactor] ํŒŒ์ผ ๊ตฌ์กฐ ๋ณ€๊ฒฝ #96

* โ™ปโœจ[Feat] ์ผ์ • ํผ ์ปดํฌ๋„ŒํŠธ์— ์ˆ˜์ • ๊ธฐ๋Šฅ์„ ์œ„ํ•œ ์ธํ„ฐํŽ˜์ด์Šค ์ถ”๊ฐ€ #96

* ๐ŸŽจ[Style] ์ผ์ • ๊ด€๋ฆฌ ํŽ˜์ด์ง€ ์ปดํฌ๋„ŒํŠธ๋ช… ๋ณ€๊ฒฝ #96

* โœจ[Feat] ์ผ์ • ์ˆ˜์ • ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99

* ๐Ÿ“ฆ[Chore] react-icons ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #109

* โœจ[Feat] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ๋ฅผ ์‚ฌ์šฉํ•œ ์บ˜๋ฆฐ๋” ๋ทฐ ๊ตฌํ˜„ #96

* โœจ[Feat] ๋ฏธ๋ฆฌ๋ณด๊ธฐ ๋ฒ„ํŠผ ์ถ”๊ฐ€ ๋ฐ ์ผ๋ถ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #109

* โœจ[Feat] hover ์‹œ ์ผ์ • URL ํด๋ฆญ #96

* ๐Ÿš‘[HOTFIX] dev to main ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ดํ›„ ์ž๋™ํ™” ์•ก์…˜ ์‹คํŒจ, ๋ณดํ˜ธ ํ•ด์ œ ํ›„ ๊ด€๋ จ ์„ค์ • ์ ๊ฒ€ #119 (#128)

* ๐Ÿ“ฆ[Chore] ๋นŒ๋“œ ๊ณผ์ •์—์„œ์˜ ๋ธŒ๋žœ์น˜ ๊ทœ์น™ ๋ณ€๊ฒฝ ๋ณต๊ตฌ ํ…Œ์ŠคํŠธ #8

* ๐Ÿš‘[HOTFIX] ์ถฉ๋Œ ํ•ด๊ฒฐ์ค‘, ๋ณ€๊ฒฝ๋œ ๊ตฌ์กฐ์— ๋Œ€ํ•œ ๋ฏธ๋ฐ˜์˜ ๋ถ€๋ถ„ ๋ฐœ๊ฒฌ, ์ˆ˜์ • #119

* โœจ[Feat] ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€ ์ถ”๊ฐ€ #96

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ, ์Šคํƒ€์ผ ์„ค์ • ์ถ”๊ฐ€ #96

* โ™ป๏ธ[Refactor] ์บ˜๋ฆฐ๋” ๊ฒฝ๋กœ ์ˆ˜์ • (/admin/block/calendar -> /admin/calendar) #96

* ๐ŸŽจ[Style] DatePicker ์Šคํƒ€์ผ ๋ฐ enableTabLoop ์†์„ฑ ์ถ”๊ฐ€ #109

* โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ(block-menu.tsx) ๋ชจ๋‹ฌ ์ƒ์„ฑ #124

* โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ ๋ชจ๋‹ฌ ๋ฐฐ๊ฒฝ opacity ์ ์šฉ ๋ฐ ๊ตฌ๋ถ„์„  ๋งํฌ ํด๋ฆญ ์‹œ ์ฃผ์†Œ ๋ณ€๊ฒฝ #130

* โœจ[Feat] /admin ํŽ˜์ด์ง€ dnd ์‹œ api ์—ฐ๋™ ํ™•์ธ #87

* ๐Ÿ›[Fix] ์ด๋ฒคํŠธ ์„ค๋ช… placeholder ์›€์ง์ž„ ๋ฌธ์ œ ํ•ด๊ฒฐ #109

* โœจ[Feat] ์‚ฌ์šฉ์ž ์ผ์ • ๋ฆฌ์ŠคํŠธ๋ทฐ ๋ฐ ์บ˜๋ฆฐ๋”๋ทฐ ํ‘œ์‹œ ๊ธฐ๋Šฅ ์ถ”๊ฐ€ #101 (#132)

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ์™€ ์บ˜๋ฆฐ๋”๋ทฐ์— ์‚ฌ์šฉ์ž ์ผ์ • ํ‘œ์‹œ #101

* โœจ[Feat] ์บ˜๋ฆฐ๋”๋ทฐ ์ผ์ •์— URL ์—ฐ๊ฒฐ #101

* โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ ์ผ์ •์— URL ์—ฐ๊ฒฐ #101

* ๐Ÿ›[Fix] ๊ตฌ๋ถ„์„  ์„ ํƒ ๊ธฐ๋Šฅ ์˜ค์ž‘๋™ ์ˆ˜์ • #134 (#135)

* ๐Ÿš‘[HOTFIX] ๊นƒํ—™ ์•ก์…˜ ๋นŒ๋“œ ๊ณผ์ • ์ค‘ ์• ๋Ÿฌ ํ•ด๊ฒฐ #120

---------

Co-authored-by: cchaeyoung <kimchaeyoung05@naver.com>
Co-authored-by: wynter24 <m.wynter24.k@gmail.com>
Co-authored-by: ๊น€์ฑ„์˜ <123921311+cchaeyoung@users.noreply.github.com>
Co-authored-by: lumpen <swk5373@gmail.com>
Co-authored-by: LUMPEN <68418005+lumpenop@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

๐Ÿ› Bug [์ž‘์—… ์œ ํ˜•] ๋ฒ„๊ทธ๋ฅผ ์ˆ˜์ •ํ•˜๊ธฐ ์œ„ํ•œ ์ด์Šˆ๋‚˜ PR โš™๏ธ Chore [์ž‘์—… ์œ ํ˜•] ๋นŒ๋“œ ์„ค์ •, ํŒจํ‚ค์ง€ ๊ด€๋ฆฌ ๋“ฑ๊ณผ ๊ฐ™์€ ๊ธฐํƒ€ ๊ด€๋ฆฌ ์ž‘์—… โœ… Done [์ž‘์—… ์ƒํ™ฉ] ์ž‘์—…์ด ์™„๋ฃŒ๋œ ์ด์Šˆ ๋˜๋Š” ๋จธ์ง€๋œ PR ๐Ÿ”ฅ High Priority [์ค‘์š”๋„] ์ฆ‰์‹œ ํ•ด๊ฒฐ์ด ํ•„์š”ํ•œ ์ค‘์š”ํ•œ ๋ฌธ์ œ

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants