Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
754a450
๐Ÿ“ฆ[Chore] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #96
cchaeyoung Oct 21, 2024
e7cb349
๐Ÿ“ฆ[Chore] Merge develop into feature/calendar-block #96
cchaeyoung Oct 21, 2024
6e4599f
โ™ป๏ธ[Refactor] fetchCalendarBlock ํ•จ์ˆ˜ ๋ฆฌํŒฉํ† ๋ง #99
cchaeyoung Oct 21, 2024
bd843ac
โœจ[Feat] ์ƒˆ ์ผ์ • ์ถ”๊ฐ€ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99
cchaeyoung Oct 21, 2024
10c5d5e
โœจ[Feat] ์ผ์ • ์ถ”๊ฐ€ ํ›„ ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธ #99
cchaeyoung Oct 21, 2024
878225c
โ™ป๏ธ[Refactor] ์ผ์ • ๋ฐ ์บ˜๋ฆฐ๋” ๋ธ”๋ก ์ฒ˜๋ฆฌ ๋กœ์ง ๋ฆฌํŒฉํ† ๋ง #99
cchaeyoung Oct 21, 2024
0f9968b
โœจ[Feat] getSequence ํ•จ์ˆ˜ ์ถ”๊ฐ€ #99
cchaeyoung Oct 21, 2024
64bd9a8
โœจ[Feat] ์ผ์ • ์กฐํšŒ API ์—ฐ๋™ ์ถ”๊ฐ€ #99
cchaeyoung Oct 21, 2024
516ee0b
โœจ[Feat] ์ผ์ • ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99
cchaeyoung Oct 21, 2024
7e1c511
โ™ป๏ธ[Refactor] ์ „์ฒด ํŽ˜์ด์ง€ ์˜ค๋ฅ˜ ํ‘œ์‹œ ๋กœ์ง ์ œ๊ฑฐ #96
cchaeyoung Oct 21, 2024
c489125
โœจ[Feat] ์ผ์ • ์—†์„ ๋•Œ ๋นˆ ์ƒํƒœ ๋ฉ”์‹œ์ง€ ํ‘œ์‹œ #96
cchaeyoung Oct 21, 2024
48f16d3
๐Ÿ›[Fix] ์ผ์ • ํŽ˜์ด์ง€ ๋ผ์šฐํŒ… ๊ฒฝ๋กœ ์ˆ˜์ • #96
cchaeyoung Oct 21, 2024
63ab060
โ™ป๏ธ[Refactor] ์ผ์ • ์ถ”๊ฐ€ ํผ์—์„œ ๋กœ๋”ฉ ์ƒํƒœ ๋ฐ ์—๋Ÿฌ ํ‘œ์‹œ ์ œ๊ฑฐ #96
cchaeyoung Oct 21, 2024
c0cb8b8
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into hotfiโ€ฆ
s-ja Oct 22, 2024
0258642
๐Ÿš‘[HOTFIX] ๋ฐฐํฌ ๊ณผ์ •์—์„œ ์ถฉ๋Œ ํ•ด๊ฒฐ ํ›„ ํ…Œ์ŠคํŠธ ์ค‘ ๋ฐœ๊ฒฌํ•œ ์ž˜๋ชป๋œ ์ฝ”๋“œ ์ˆ˜์ • #120
s-ja Oct 22, 2024
0d10263
โ™ป๏ธ[Refactor] ํŒŒ์ผ ๊ตฌ์กฐ ๋ณ€๊ฒฝ #96
cchaeyoung Oct 22, 2024
0602114
โ™ปโœจ[Feat] ์ผ์ • ํผ ์ปดํฌ๋„ŒํŠธ์— ์ˆ˜์ • ๊ธฐ๋Šฅ์„ ์œ„ํ•œ ์ธํ„ฐํŽ˜์ด์Šค ์ถ”๊ฐ€ #96
cchaeyoung Oct 22, 2024
6295edd
๐ŸŽจ[Style] ์ผ์ • ๊ด€๋ฆฌ ํŽ˜์ด์ง€ ์ปดํฌ๋„ŒํŠธ๋ช… ๋ณ€๊ฒฝ #96
cchaeyoung Oct 22, 2024
2a0b06b
โœจ[Feat] ์ผ์ • ์ˆ˜์ • ๊ธฐ๋Šฅ ๊ตฌํ˜„ #99
cchaeyoung Oct 22, 2024
b0b7831
๐Ÿ“ฆ[Chore] react-icons ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์„ค์น˜ #109
wynter24 Oct 22, 2024
4483c5d
โœจ[Feat] FullCalendar ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ๋ฅผ ์‚ฌ์šฉํ•œ ์บ˜๋ฆฐ๋” ๋ทฐ ๊ตฌํ˜„ #96
cchaeyoung Oct 22, 2024
c847d0d
Merge branch 'develop' into feature/calendar-block
cchaeyoung Oct 22, 2024
d58a25b
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into hotfiโ€ฆ
s-ja Oct 23, 2024
3c2e6c5
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into hotfiโ€ฆ
s-ja Oct 23, 2024
eebf3d4
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into hoโ€ฆ
s-ja Oct 23, 2024
a9dc7e3
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into hoโ€ฆ
s-ja Oct 23, 2024
1b4b375
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into hotfiโ€ฆ
s-ja 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
18058cf
โœจ[Feat] hover ์‹œ ์ผ์ • URL ํด๋ฆญ #96
cchaeyoung Oct 23, 2024
0a9484f
Merge branch 'develop' into feature/calendar-block
cchaeyoung Oct 23, 2024
16d4f08
Merge branch 'main' of https://github.com/Mt-NextJs/linkle into featuโ€ฆ
wynter24 Oct 23, 2024
221b6f6
๐Ÿš‘[HOTFIX] dev to main ๋ธŒ๋žœ์น˜ ๋ณ‘ํ•ฉ ์ดํ›„ ์ž๋™ํ™” ์•ก์…˜ ์‹คํŒจ, ๋ณดํ˜ธ ํ•ด์ œ ํ›„ ๊ด€๋ จ ์„ค์ • ์ ๊ฒ€ #119 (#128)
s-ja Oct 23, 2024
2d30e79
Merge branch 'develop' into feature/calendar-block
cchaeyoung Oct 23, 2024
d41520b
โœจ[Feat] ์บ˜๋ฆฐ๋” ํŽ˜์ด์ง€ ์ถ”๊ฐ€ #96
cchaeyoung Oct 23, 2024
73192f4
โœจ[Feat] ๋ฆฌ์ŠคํŠธ๋ทฐ, ์Šคํƒ€์ผ ์„ค์ • ์ถ”๊ฐ€ #96
cchaeyoung Oct 23, 2024
9d09772
โ™ป๏ธ[Refactor] ์บ˜๋ฆฐ๋” ๊ฒฝ๋กœ ์ˆ˜์ • (/admin/block/calendar -> /admin/calendar) #96
cchaeyoung Oct 23, 2024
e46abe8
Merge pull request #129 from Mt-NextJs/feature/calendar-block
cchaeyoung Oct 23, 2024
40aa5fd
๐ŸŽจ[Style] DatePicker ์Šคํƒ€์ผ ๋ฐ enableTabLoop ์†์„ฑ ์ถ”๊ฐ€ #109
wynter24 Oct 23, 2024
4533142
โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ(block-menu.tsx) ๋ชจ๋‹ฌ ์ƒ์„ฑ #124
lumpenop Oct 23, 2024
0158106
โœจ[Feat] ๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ ๋ชจ๋‹ฌ ๋ฐฐ๊ฒฝ opacity ์ ์šฉ ๋ฐ ๊ตฌ๋ถ„์„  ๋งํฌ ํด๋ฆญ ์‹œ ์ฃผ์†Œ ๋ณ€๊ฒฝ #130
lumpenop Oct 23, 2024
1959bff
Merge branch 'develop' into feature/theme-fix
lumpenop Oct 23, 2024
a969e85
โœจ[Feat] /admin ํŽ˜์ด์ง€ dnd ์‹œ api ์—ฐ๋™ ํ™•์ธ #87
lumpenop Oct 23, 2024
1ab0800
Merge pull request #131 from Mt-NextJs/feature/theme-fix
lumpenop 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
cb447f3
โœจ[Feat] ์‚ฌ์šฉ์ž ์ผ์ • ๋ฆฌ์ŠคํŠธ๋ทฐ ๋ฐ ์บ˜๋ฆฐ๋”๋ทฐ ํ‘œ์‹œ ๊ธฐ๋Šฅ ์ถ”๊ฐ€ #101 (#132)
cchaeyoung Oct 23, 2024
31ff139
๐Ÿ›[Fix] ๊ตฌ๋ถ„์„  ์„ ํƒ ๊ธฐ๋Šฅ ์˜ค์ž‘๋™ ์ˆ˜์ • #134 (#135)
cchaeyoung Oct 23, 2024
72baa9d
Merge branch 'develop' of https://github.com/Mt-NextJs/linkle into hoโ€ฆ
s-ja Oct 23, 2024
d8f5543
๐Ÿš‘[HOTFIX] ๊นƒํ—™ ์•ก์…˜ ๋นŒ๋“œ ๊ณผ์ • ์ค‘ ์• ๋Ÿฌ ํ•ด๊ฒฐ #120
s-ja Oct 23, 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
56 changes: 56 additions & 0 deletions package-lock.json

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

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
"fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix && prettier --write ."
},
"dependencies": {
"@fullcalendar/core": "^6.1.15",
"@fullcalendar/daygrid": "^6.1.15",
"@fullcalendar/interaction": "^6.1.15",
"@fullcalendar/react": "^6.1.15",
"moment": "2.30.1",
"next": "14.2.14",
"react": "^18",
"react-datepicker": "^7.5.0",
"react-dom": "^18",
"react-icons": "^5.3.0",
"tailwind-merge": "^2.5.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin/(block)/block-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const BlockMenu = ({ isOpen, setIsOpen }: Props) => {
];
return (
<Portal>
<div className="flex h-screen w-screen items-center justify-center bg-gray-600">
<div className="mx-auto flex w-[700px] flex-col gap-4 rounded-xl bg-white p-6">
<div className="flex h-screen w-screen items-center justify-center before:relative before:h-screen before:w-screen before:bg-black before:opacity-25">
<div className="absolute flex w-[700px] flex-col gap-4 rounded-xl bg-white p-6">
<div className="flex w-full items-center justify-between">
<h1 className="text-2xl font-bold">๋ธ”๋ก ์„ ํƒํ•˜๊ธฐ</h1>
<button type="button" onClick={handleClose}>
Expand Down
36 changes: 0 additions & 36 deletions src/app/admin/(block)/calendar/add/page.tsx

This file was deleted.

Loading