From a37138fb0a801cc6db7f695ad9736f7d575264f4 Mon Sep 17 00:00:00 2001 From: dgKim1 Date: Thu, 4 Sep 2025 08:41:12 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EC=9B=A8=EC=9D=B4=ED=8C=85=20?= =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EA=B0=84=EA=B2=A9=2010px=EB=A1=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx | 2 +- .../nowait-admin/src/pages/AdminHome/components/WaitingCard.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx b/apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx index ab748ee8..96c2be48 100644 --- a/apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx +++ b/apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx @@ -290,7 +290,7 @@ const AdminHome = () => { -
+
{filteredReservations.map((res) => { const requested = new Date(res.requestedAt); console.log(res, "웨이팅 카드 정보"); diff --git a/apps/nowait-admin/src/pages/AdminHome/components/WaitingCard.tsx b/apps/nowait-admin/src/pages/AdminHome/components/WaitingCard.tsx index 9173c90a..5499cf31 100644 --- a/apps/nowait-admin/src/pages/AdminHome/components/WaitingCard.tsx +++ b/apps/nowait-admin/src/pages/AdminHome/components/WaitingCard.tsx @@ -85,7 +85,7 @@ export function WaitingCard({ }, [status, calledAt]); return ( -
+
{/* 헤더 */}

From 15808118b441787d11a0a7ce3d42359be14bb43e Mon Sep 17 00:00:00 2001 From: dgKim1 Date: Thu, 4 Sep 2025 08:47:27 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EB=A9=94=EB=89=B4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?placeholder=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/AdminBooth/components/MenuSection.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx index 22faefc4..9f612202 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx @@ -12,6 +12,7 @@ import MenuRemoveModal from "./Modal/MenuRemoveModal"; import { useDeleteMenu } from "../../../hooks/booth/menu/useDeleteMenu"; import { useToggleMenuSoldOut } from "../../../hooks/booth/menu/useToggleMenuSoldOut"; import { useUpdateMenuSort } from "../../../hooks/booth/menu/useUpadateMenuSort"; +import imgPlaceHolder from "../../../assets/image_placeholder.svg"; import { SwipeableRow } from "./Swipe/SwipeableRow"; function lockVertical( @@ -345,7 +346,7 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => { >

placeholder @@ -360,7 +361,6 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
- {/* ✨ 여기만 드래그 핸들! */} 순서 변경 Date: Thu, 4 Sep 2025 09:27:38 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EC=9E=85=EB=A0=A5=20=EC=B9=B4?= =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/menu_placeholder.png | Bin 0 -> 817 bytes .../AdminBooth/components/MenuSection.tsx | 7 ++-- .../AdminBooth/components/Modal/menuModal.tsx | 33 +++++++++++++----- 3 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 apps/nowait-admin/src/assets/menu_placeholder.png diff --git a/apps/nowait-admin/src/assets/menu_placeholder.png b/apps/nowait-admin/src/assets/menu_placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..55e4e37ab802d7cda217ee7489d2307d4c2df564 GIT binary patch literal 817 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1|$ph9<=}|&H|6fVg?3oVGw3ym^DWND9BhG zMjGr{YJq z9S+6K-`H~VC)`_L>v&0ci>+f-^D_4rycJJd`8iu06kIt{KHmMAUzl=W^7ItnrswLG zeQ&2;_-ACDz5b+y$l4cwyF^`Th5Au-qY#_EV&zc`s+u$epOU0V+l zKF?PFl(nDWpU^Av;pF$f*2-<4y(atV9JFh!?wiHUfANrFiK~}K+0K}6l`K2uJ#IeV zd;0TFRZZ&;996Fi>TXUbYVh{b(QHQRjiK-Y}A{r=4d8zwD?(F@)fvE=!&t{E3IQog09r>6+lZBG2hu-=WQO>jln z>T6DO?>7eSjjR8$=DFMC^%w>#9raNYF79uto|;@}V)&v)X2Qj{WoP$YetBV|Mc0gn z1s-S9CRgpfchK|%hjOab++*83n~oe^a5*tukz+3Z!NciaEY|r3sc5mCH|?0B(IGHL zzW?|m;mR9oooLJzy`|dK8joSi5+2?KHZgqOIwZ<-g+jOTzNnT5Z z_KJOB^9TAqLegvA^O=!LE@n)~{SaxkL5XcA%VwTyDY?nXd&MJu7bz`^xSh1==9;Y? z7xQzuGCql-gbuaNP0Z}xx1Xw>*uUh>fuwgbSGpcvHQOWS6U;i{ zc*f6t^^FTl&a=<=G+Z!^=UZBs(^u}kIrFC!En+Pz)8b=wEO@-@o#|2m7B>BL^_>0u zUWU2ZCmsA+FEx6qN|;`p+;^o)n`5ez)|dSa*EKIbTH7Wm>6|`0z5EBei-7vc2j|lg QfhnB9)78&qol`;+05N@GjsO4v literal 0 HcmV?d00001 diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx index 9f612202..9df6550e 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx @@ -12,7 +12,7 @@ import MenuRemoveModal from "./Modal/MenuRemoveModal"; import { useDeleteMenu } from "../../../hooks/booth/menu/useDeleteMenu"; import { useToggleMenuSoldOut } from "../../../hooks/booth/menu/useToggleMenuSoldOut"; import { useUpdateMenuSort } from "../../../hooks/booth/menu/useUpadateMenuSort"; -import imgPlaceHolder from "../../../assets/image_placeholder.svg"; +import imgPlaceHolder from "../../../assets/menu_placeholder.png"; import { SwipeableRow } from "./Swipe/SwipeableRow"; function lockVertical( @@ -275,6 +275,8 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => { setMenus(transformed); }, [fetchedMenus]); + console.log(menus, "메뉴목록들"); + return (
@@ -369,7 +371,6 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => { />
) : ( - // ✅ 보기 모드: SwipeableRow로 스와이프 삭제 { >
placeholder diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/Modal/menuModal.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/Modal/menuModal.tsx index 01b69f64..44e7fe01 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/Modal/menuModal.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/Modal/menuModal.tsx @@ -91,6 +91,15 @@ const MenuModal = ({ const [image, setImage] = useState( initialData?.imageUrl || null ); + + const [focus, setFocus] = useState({ + name: false, + admin: false, + desc: false, + }); + + const counterClass = (focused: boolean, hasValue: boolean) => + focused && hasValue ? "text-black" : "text-gray-400"; const { removeEmojiAll, removeEmojiSome } = useRemoveEmoji(); const isFormValid = @@ -174,6 +183,8 @@ const MenuModal = ({ type="text" value={name} onChange={(e) => setName(removeEmojiSome(e.target.value))} + onFocus={() => setFocus((f) => ({ ...f, name: true }))} + onBlur={() => setFocus((f) => ({ ...f, name: false }))} maxLength={25} className="w-full h-[52px] border border-[#DDDDDD] bg-black-5 bg-black-5 focus:bg-white px-4 py-2 border rounded-lg text-14-regular" placeholder="메뉴명을 입력해주세요" @@ -184,9 +195,7 @@ const MenuModal = ({ }`} > 0 ? "text-black" : "text-gray-400" - }`} + className={`${counterClass(focus.name, name.length > 0)}`} > {name.length} {" "} @@ -238,6 +247,8 @@ const MenuModal = ({ setFocus((f) => ({ ...f, admin: true }))} + onBlur={() => setFocus((f) => ({ ...f, admin: false }))} onChange={(e) => setAdminDisplayName(removeEmojiAll(e.target.value)) } @@ -256,9 +267,10 @@ const MenuModal = ({ }`} > 0 ? "text-black" : "text-gray-400" - }`} + className={` ${counterClass( + focus.admin, + adminDisplayName.length > 0 + )}`} > {adminDisplayName.length} {" "} @@ -275,15 +287,18 @@ const MenuModal = ({