diff --git a/.pnp.cjs b/.pnp.cjs index 52915d48..6f1d8947 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -58,6 +58,7 @@ const RAW_RUNTIME_STATE = [null, {\ "packageLocation": "./",\ "packageDependencies": [\ + ["@tiptap/extension-placeholder", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-underline", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ ["@tiptap/react", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ ["@tiptap/starter-kit", "npm:3.1.0"],\ @@ -2692,6 +2693,52 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@tiptap/extension-placeholder", [\ + ["npm:2.26.1", {\ + "packageLocation": "./.yarn/cache/@tiptap-extension-placeholder-npm-2.26.1-fce6aefc10-c1471ac31f.zip/node_modules/@tiptap/extension-placeholder/",\ + "packageDependencies": [\ + ["@tiptap/extension-placeholder", "npm:2.26.1"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["npm:3.4.0", {\ + "packageLocation": "./.yarn/cache/@tiptap-extension-placeholder-npm-3.4.0-b4244826d8-4b167e5c89.zip/node_modules/@tiptap/extension-placeholder/",\ + "packageDependencies": [\ + ["@tiptap/extension-placeholder", "npm:3.4.0"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0", {\ + "packageLocation": "./.yarn/__virtual__/@tiptap-extension-placeholder-virtual-7221eec1cc/0/cache/@tiptap-extension-placeholder-npm-3.4.0-b4244826d8-4b167e5c89.zip/node_modules/@tiptap/extension-placeholder/",\ + "packageDependencies": [\ + ["@tiptap/extension-placeholder", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ + ["@tiptap/extensions", null],\ + ["@types/tiptap__extensions", null]\ + ],\ + "packagePeers": [\ + "@tiptap/extensions",\ + "@types/tiptap__extensions"\ + ],\ + "linkType": "HARD"\ + }],\ + ["virtual:90ba738da64cc41a6a40703c7ac5e2c2c261729a24fb736c3057b9db1463c5ff20217c4c849e768425e7a5dbbcc4a4c1acbda29afa5757900668d8ef42dd597e#npm:2.26.1", {\ + "packageLocation": "./.yarn/__virtual__/@tiptap-extension-placeholder-virtual-4bda4c83f1/0/cache/@tiptap-extension-placeholder-npm-2.26.1-fce6aefc10-c1471ac31f.zip/node_modules/@tiptap/extension-placeholder/",\ + "packageDependencies": [\ + ["@tiptap/core", "virtual:f8a3cb00e42d72a340973a0e5155f252a3c8ffaa7cd248bf67dc60191bc93804a10b05ae2dccfd6917900af76348bdfa016d136e8a7c06a4ff2e828f3e3726c3#npm:3.1.0"],\ + ["@tiptap/extension-placeholder", "virtual:90ba738da64cc41a6a40703c7ac5e2c2c261729a24fb736c3057b9db1463c5ff20217c4c849e768425e7a5dbbcc4a4c1acbda29afa5757900668d8ef42dd597e#npm:2.26.1"],\ + ["@tiptap/pm", "npm:3.1.0"],\ + ["@types/tiptap__core", null],\ + ["@types/tiptap__pm", null]\ + ],\ + "packagePeers": [\ + "@tiptap/core",\ + "@tiptap/pm",\ + "@types/tiptap__core",\ + "@types/tiptap__pm"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@tiptap/extension-strike", [\ ["npm:3.1.0", {\ "packageLocation": "./.yarn/cache/@tiptap-extension-strike-npm-3.1.0-d716bbc14c-afc6af480f.zip/node_modules/@tiptap/extension-strike/",\ @@ -6978,6 +7025,7 @@ const RAW_RUNTIME_STATE = ["workspace:.", {\ "packageLocation": "./",\ "packageDependencies": [\ + ["@tiptap/extension-placeholder", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-underline", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ ["@tiptap/react", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ ["@tiptap/starter-kit", "npm:3.1.0"],\ @@ -7190,6 +7238,7 @@ const RAW_RUNTIME_STATE = ["@tailwindcss/postcss", "npm:4.1.11"],\ ["@tanstack/react-query", "virtual:90ba738da64cc41a6a40703c7ac5e2c2c261729a24fb736c3057b9db1463c5ff20217c4c849e768425e7a5dbbcc4a4c1acbda29afa5757900668d8ef42dd597e#npm:5.84.2"],\ ["@tiptap/core", "virtual:f8a3cb00e42d72a340973a0e5155f252a3c8ffaa7cd248bf67dc60191bc93804a10b05ae2dccfd6917900af76348bdfa016d136e8a7c06a4ff2e828f3e3726c3#npm:3.1.0"],\ + ["@tiptap/extension-placeholder", "virtual:90ba738da64cc41a6a40703c7ac5e2c2c261729a24fb736c3057b9db1463c5ff20217c4c849e768425e7a5dbbcc4a4c1acbda29afa5757900668d8ef42dd597e#npm:2.26.1"],\ ["@tiptap/extension-underline", "virtual:f8a3cb00e42d72a340973a0e5155f252a3c8ffaa7cd248bf67dc60191bc93804a10b05ae2dccfd6917900af76348bdfa016d136e8a7c06a4ff2e828f3e3726c3#npm:3.1.0"],\ ["@tiptap/pm", "npm:3.1.0"],\ ["@tiptap/react", "virtual:90ba738da64cc41a6a40703c7ac5e2c2c261729a24fb736c3057b9db1463c5ff20217c4c849e768425e7a5dbbcc4a4c1acbda29afa5757900668d8ef42dd597e#npm:3.1.0"],\ diff --git a/.yarn/cache/@tiptap-extension-placeholder-npm-2.26.1-fce6aefc10-c1471ac31f.zip b/.yarn/cache/@tiptap-extension-placeholder-npm-2.26.1-fce6aefc10-c1471ac31f.zip new file mode 100644 index 00000000..52679017 Binary files /dev/null and b/.yarn/cache/@tiptap-extension-placeholder-npm-2.26.1-fce6aefc10-c1471ac31f.zip differ diff --git a/.yarn/cache/@tiptap-extension-placeholder-npm-3.4.0-b4244826d8-4b167e5c89.zip b/.yarn/cache/@tiptap-extension-placeholder-npm-3.4.0-b4244826d8-4b167e5c89.zip new file mode 100644 index 00000000..9b2c8e57 Binary files /dev/null and b/.yarn/cache/@tiptap-extension-placeholder-npm-3.4.0-b4244826d8-4b167e5c89.zip differ diff --git a/apps/nowait-admin/package.json b/apps/nowait-admin/package.json index 8e8f1dd3..498f3b63 100644 --- a/apps/nowait-admin/package.json +++ b/apps/nowait-admin/package.json @@ -14,6 +14,7 @@ "@repo/ui": "workspace:*", "@tanstack/react-query": "^5.81.2", "@tiptap/core": "^3.0.7", + "@tiptap/extension-placeholder": "^2", "@tiptap/extension-underline": "^3.0.7", "@tiptap/pm": "^3.0.7", "@tiptap/react": "^3.0.7", diff --git a/apps/nowait-admin/src/assets/booth/kakao.png b/apps/nowait-admin/src/assets/booth/kakao.png new file mode 100644 index 00000000..00699acb Binary files /dev/null and b/apps/nowait-admin/src/assets/booth/kakao.png differ diff --git a/apps/nowait-admin/src/assets/booth/kakaoLogo.svg b/apps/nowait-admin/src/assets/booth/kakaoLogo.svg deleted file mode 100644 index 1af595ca..00000000 --- a/apps/nowait-admin/src/assets/booth/kakaoLogo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/apps/nowait-admin/src/assets/booth/naver.png b/apps/nowait-admin/src/assets/booth/naver.png new file mode 100644 index 00000000..6d9a89d1 Binary files /dev/null and b/apps/nowait-admin/src/assets/booth/naver.png differ diff --git a/apps/nowait-admin/src/assets/booth/naverLogo.svg b/apps/nowait-admin/src/assets/booth/naverLogo.svg deleted file mode 100644 index b6b83406..00000000 --- a/apps/nowait-admin/src/assets/booth/naverLogo.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/apps/nowait-admin/src/assets/booth/toss.png b/apps/nowait-admin/src/assets/booth/toss.png new file mode 100644 index 00000000..408c0296 Binary files /dev/null and b/apps/nowait-admin/src/assets/booth/toss.png differ diff --git a/apps/nowait-admin/src/assets/booth/tossLogo.svg b/apps/nowait-admin/src/assets/booth/tossLogo.svg deleted file mode 100644 index bdb18005..00000000 --- a/apps/nowait-admin/src/assets/booth/tossLogo.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - 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 00000000..55e4e37a Binary files /dev/null and b/apps/nowait-admin/src/assets/menu_placeholder.png differ diff --git a/apps/nowait-admin/src/global.css b/apps/nowait-admin/src/global.css index b6338e69..b2394b85 100644 --- a/apps/nowait-admin/src/global.css +++ b/apps/nowait-admin/src/global.css @@ -33,6 +33,18 @@ body, box-sizing: border-box; } +/* 에디터 본문: 너의 커스텀 텍스트 유틸 적용 */ +.editor-root .ProseMirror { + font-size: 14px; +} +.editor-root .ProseMirror p.is-editor-empty:first-child::before { + content: attr(data-placeholder); + float: left; + height: 0; + font-size: 14px; + color: #aaaaaa; +} + /* Admin 앱 전용 스타일 */ .admin-container { max-width: 1600px; diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx index 3913d612..ce6ea9df 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx @@ -2,9 +2,9 @@ import { useState, useRef, useEffect, useMemo } from "react"; import jsQR from "jsqr"; import banner from "../../../assets/booth/banner.svg"; import RedBadge from "../../../components/RedBadge"; -import naverLogo from "../../../assets/booth/naverLogo.svg"; -import kakaoLogo from "../../../assets/booth/kakaoLogo.svg"; -import tossLogo from "../../../assets/booth/tossLogo.svg"; +import naverLogo from "../../../assets/booth/naver.png"; +import kakaoLogo from "../../../assets/booth/kakao.png"; +import tossLogo from "../../../assets/booth/toss.png"; import { useGetStorePayment } from "../../../hooks/booth/payment/useGetStorePayment"; import { useCreateStorePayment } from "../../../hooks/booth/payment/useCreateStorePayment"; import { useUpdateStorePayment } from "../../../hooks/booth/payment/useUpdateStorePayment"; diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/MenuSection.tsx index 22faefc4..9df6550e 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/menu_placeholder.png"; import { SwipeableRow } from "./Swipe/SwipeableRow"; function lockVertical( @@ -274,6 +275,8 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => { setMenus(transformed); }, [fetchedMenus]); + console.log(menus, "메뉴목록들"); + return (
@@ -345,7 +348,7 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => { >
placeholder @@ -360,7 +363,6 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
- {/* ✨ 여기만 드래그 핸들! */} 순서 변경 { />
) : ( - // ✅ 보기 모드: SwipeableRow로 스와이프 삭제 { >
placeholder diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx index 03fa469a..00b56096 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx @@ -7,23 +7,23 @@ export const UnsavedChangesModal = ({ }) => { return (
-
+

저장하지 않은 변경사항이 있어요

-

- 이 페이지를 나가면 변경사항이 저장되지 않아요. +

+ 페이지를 나가면 변경사항이 저장되지 않아요.

-
+