diff --git a/apps/nowait-admin/package.json b/apps/nowait-admin/package.json index ebcf12ee..d1f794e4 100644 --- a/apps/nowait-admin/package.json +++ b/apps/nowait-admin/package.json @@ -27,6 +27,7 @@ "prosemirror-state": "^1.4.3", "prosemirror-transform": "^1.10.4", "react": "^19.1.0", + "react-beautiful-dnd": "^13.1.1", "react-dom": "^19.1.0", "react-quill": "^2.0.0", "react-router": "^7.6.2", @@ -39,6 +40,7 @@ "@tailwindcss/postcss": "^4.1.5", "@types/node": "^24.0.3", "@types/react": "^19.1.2", + "@types/react-beautiful-dnd": "^13", "@types/react-dom": "^19.1.2", "@vitejs/plugin-react": "^4.4.1", "autoprefixer": "^10.4.20", diff --git a/apps/nowait-admin/src/assets/edit_order_icon.svg b/apps/nowait-admin/src/assets/edit_order_icon.svg new file mode 100644 index 00000000..a94678fa --- /dev/null +++ b/apps/nowait-admin/src/assets/edit_order_icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/nowait-admin/src/assets/editorToolBar/h1.svg b/apps/nowait-admin/src/assets/editorToolBar/h1.svg new file mode 100644 index 00000000..4b19d030 --- /dev/null +++ b/apps/nowait-admin/src/assets/editorToolBar/h1.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/nowait-admin/src/assets/editorToolBar/h2.svg b/apps/nowait-admin/src/assets/editorToolBar/h2.svg new file mode 100644 index 00000000..415a054c --- /dev/null +++ b/apps/nowait-admin/src/assets/editorToolBar/h2.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/nowait-admin/src/assets/editorToolBar/italic.svg b/apps/nowait-admin/src/assets/editorToolBar/italic.svg new file mode 100644 index 00000000..e4b051b8 --- /dev/null +++ b/apps/nowait-admin/src/assets/editorToolBar/italic.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/nowait-admin/src/assets/editorToolBar/sunder.svg b/apps/nowait-admin/src/assets/editorToolBar/sunder.svg new file mode 100644 index 00000000..ab3e7c31 --- /dev/null +++ b/apps/nowait-admin/src/assets/editorToolBar/sunder.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/nowait-admin/src/assets/editorToolBar/underline (1).svg b/apps/nowait-admin/src/assets/editorToolBar/underline (1).svg new file mode 100644 index 00000000..22df8076 --- /dev/null +++ b/apps/nowait-admin/src/assets/editorToolBar/underline (1).svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/apps/nowait-admin/src/components/AdminSidebar.tsx b/apps/nowait-admin/src/components/AdminSidebar.tsx index b9cca044..ac68261e 100644 --- a/apps/nowait-admin/src/components/AdminSidebar.tsx +++ b/apps/nowait-admin/src/components/AdminSidebar.tsx @@ -70,7 +70,7 @@ const AdminSidebar = () => { className="w-5 h-5" /> } - label="웨이팅" + label="대기" compact={isCompact} /> { className="w-5 h-5" /> } - label="관리 · 통계" + label="통계" compact={isCompact} /> { className="w-5 h-5" /> } - label="부스" + label="부스 관리" compact={isCompact} /> diff --git a/apps/nowait-admin/src/components/MobileAdminNav.tsx b/apps/nowait-admin/src/components/MobileAdminNav.tsx index 3c761d86..94af48ad 100644 --- a/apps/nowait-admin/src/components/MobileAdminNav.tsx +++ b/apps/nowait-admin/src/components/MobileAdminNav.tsx @@ -6,7 +6,6 @@ import statIcon from "../assets/Statistics.svg"; import statIconActive from "../assets/statIconActive.svg"; import boothIcon from "../assets/Tent.svg"; import boothIconActive from "../assets/boothIconActive.svg"; -import profileImg from "../assets/profile.png"; // 사용자 이미지 import cancelIcon from "../assets/Cancel.svg"; import { useLocation, useNavigate } from "react-router"; @@ -36,7 +35,9 @@ const MobileAdminNav = ({ onClose }: { onClose: () => void }) => { const navigate = useNavigate(); const { pathname } = useLocation(); return ( -
+
{/* 상단 - 닫기 버튼 */}
diff --git a/apps/nowait-admin/src/components/MobileMenuBar.tsx b/apps/nowait-admin/src/components/MobileMenuBar.tsx index 4e4a6c29..b1b5bf27 100644 --- a/apps/nowait-admin/src/components/MobileMenuBar.tsx +++ b/apps/nowait-admin/src/components/MobileMenuBar.tsx @@ -22,7 +22,16 @@ const MobileMenuBar = () => { - {showNav && setShowNav(false)} />} + {/* 사이드 메뉴: 항상 렌더링되지만 translate-x로 제어 */} +
+ setShowNav(false)} /> +
+ {/* dim 영역 */} + {showNav &&
}
); }; diff --git a/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx b/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx index 3894f554..0b1355b9 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx @@ -5,6 +5,221 @@ import placeholderIcon from "../../assets/image_placeholder.svg"; import { useWindowWidth } from "../../hooks/useWindowWidth"; import OperatingTimeSelector from "./components/OperatingTimeSelector"; import NoticeEditor from "./components/NoticeEditor"; +import editOrderIcon from "../../assets/edit_order_icon.svg"; +import ToggleSwitch from "../AdminHome/components/ToggleSwitch"; + +const BoothSection = ({ + boothName, + setBoothName, + isFocused, + setIsFocused, + boothIntro, + setBoothIntro, + isTextareaFocused, + setIsTextareaFocused, + bannerImages, + setBannerImages, +}: { + boothName: string; + setBoothName: (val: string) => void; + isFocused: boolean; + setIsFocused: (val: boolean) => void; + boothIntro: string; + setBoothIntro: (val: string) => void; + isTextareaFocused: boolean; + setIsTextareaFocused: (val: boolean) => void; + bannerImages: File[]; + setBannerImages: (val: File[]) => void; +}) => ( + <> +
+
+
+ 썸네일 +
+ +
+
+ + 부스명 + + + 컴퓨터공학과 + +
+ setIsFocused(true)} + onBlur={() => setIsFocused(false)} + onChange={(e) => setBoothName(e.target.value)} + placeholder="부스명을 입력해주세요" + className="w-full h-full bg-black-5 border border-[#DDDDDD] rounded-xl px-4 py-2 text-sm bg-black-5 " + /> + + + {boothName.length} + {" "} + / 20 + +
+
+
+ + {/* 부스 소개 */} +
+ +

+ 부스를 자유롭게 소개해주세요 +

+