diff --git a/.pnp.cjs b/.pnp.cjs index 485ae0e8..d3bcb75f 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -58,6 +58,7 @@ const RAW_RUNTIME_STATE = [null, {\ "packageLocation": "./",\ "packageDependencies": [\ + ["@tiptap/extension-code-block-lowlight", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.1"],\ ["@tiptap/extension-hard-break", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-placeholder", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-underline", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ @@ -69,8 +70,10 @@ const RAW_RUNTIME_STATE = ["dompurify", "npm:3.2.6"],\ ["framer-motion", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:12.23.12"],\ ["heic2any", "npm:0.0.4"],\ + ["highlight.js", "npm:11.11.1"],\ ["jsqr", "npm:1.4.0"],\ ["lottie-react", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:2.4.1"],\ + ["lowlight", "npm:3.3.0"],\ ["monorepo-nowaitFE", "workspace:."],\ ["prop-types", "npm:15.8.1"],\ ["prosemirror-model", "npm:1.25.3"],\ @@ -2660,6 +2663,44 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@tiptap/extension-code-block-lowlight", [\ + ["npm:3.4.1", {\ + "packageLocation": "./.yarn/cache/@tiptap-extension-code-block-lowlight-npm-3.4.1-516cda7ebf-19094d6a36.zip/node_modules/@tiptap/extension-code-block-lowlight/",\ + "packageDependencies": [\ + ["@tiptap/extension-code-block-lowlight", "npm:3.4.1"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.1", {\ + "packageLocation": "./.yarn/__virtual__/@tiptap-extension-code-block-lowlight-virtual-ea3e317d84/0/cache/@tiptap-extension-code-block-lowlight-npm-3.4.1-516cda7ebf-19094d6a36.zip/node_modules/@tiptap/extension-code-block-lowlight/",\ + "packageDependencies": [\ + ["@tiptap/core", null],\ + ["@tiptap/extension-code-block", null],\ + ["@tiptap/extension-code-block-lowlight", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.1"],\ + ["@tiptap/pm", null],\ + ["@types/highlight.js", null],\ + ["@types/lowlight", null],\ + ["@types/tiptap__core", null],\ + ["@types/tiptap__extension-code-block", null],\ + ["@types/tiptap__pm", null],\ + ["highlight.js", "npm:11.11.1"],\ + ["lowlight", "npm:3.3.0"]\ + ],\ + "packagePeers": [\ + "@tiptap/core",\ + "@tiptap/extension-code-block",\ + "@tiptap/pm",\ + "@types/highlight.js",\ + "@types/lowlight",\ + "@types/tiptap__core",\ + "@types/tiptap__extension-code-block",\ + "@types/tiptap__pm",\ + "highlight.js",\ + "lowlight"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@tiptap/extension-document", [\ ["npm:3.1.0", {\ "packageLocation": "./.yarn/cache/@tiptap-extension-document-npm-3.1.0-9bdb7d2c70-8311d854e9.zip/node_modules/@tiptap/extension-document/",\ @@ -3491,6 +3532,16 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@types/hast", [\ + ["npm:3.0.4", {\ + "packageLocation": "./.yarn/cache/@types-hast-npm-3.0.4-640776a343-3249781a51.zip/node_modules/@types/hast/",\ + "packageDependencies": [\ + ["@types/hast", "npm:3.0.4"],\ + ["@types/unist", "npm:3.0.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@types/hoist-non-react-statics", [\ ["npm:3.3.7", {\ "packageLocation": "./.yarn/cache/@types-hoist-non-react-statics-npm-3.3.7-efbaafecfe-ed8f4e8833.zip/node_modules/@types/hoist-non-react-statics/",\ @@ -3709,6 +3760,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@types/unist", [\ + ["npm:3.0.3", {\ + "packageLocation": "./.yarn/cache/@types-unist-npm-3.0.3-1c20461f2e-2b1e4adcab.zip/node_modules/@types/unist/",\ + "packageDependencies": [\ + ["@types/unist", "npm:3.0.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@types/use-sync-external-store", [\ ["npm:0.0.6", {\ "packageLocation": "./.yarn/cache/@types-use-sync-external-store-npm-0.0.6-9e5c635381-77c045a98f.zip/node_modules/@types/use-sync-external-store/",\ @@ -5098,6 +5158,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["dequal", [\ + ["npm:2.0.3", {\ + "packageLocation": "./.yarn/cache/dequal-npm-2.0.3-53a630c60e-f98860cdf5.zip/node_modules/dequal/",\ + "packageDependencies": [\ + ["dequal", "npm:2.0.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["detect-libc", [\ ["npm:1.0.3", {\ "packageLocation": "./.yarn/cache/detect-libc-npm-1.0.3-c30ac344d4-4da0deae9f.zip/node_modules/detect-libc/",\ @@ -5114,6 +5183,16 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["devlop", [\ + ["npm:1.1.0", {\ + "packageLocation": "./.yarn/cache/devlop-npm-1.1.0-d4a98d724c-e0928ab8f9.zip/node_modules/devlop/",\ + "packageDependencies": [\ + ["dequal", "npm:2.0.3"],\ + ["devlop", "npm:1.1.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["diff", [\ ["npm:5.2.0", {\ "packageLocation": "./.yarn/cache/diff-npm-5.2.0-f523a581f3-aed0941f20.zip/node_modules/diff/",\ @@ -6400,6 +6479,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["highlight.js", [\ + ["npm:11.11.1", {\ + "packageLocation": "./.yarn/cache/highlight.js-npm-11.11.1-1afef66f5e-40f53ac19d.zip/node_modules/highlight.js/",\ + "packageDependencies": [\ + ["highlight.js", "npm:11.11.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["hoist-non-react-statics", [\ ["npm:3.3.2", {\ "packageLocation": "./.yarn/cache/hoist-non-react-statics-npm-3.3.2-e7b709e6c1-fe0889169e.zip/node_modules/hoist-non-react-statics/",\ @@ -7148,6 +7236,18 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["lowlight", [\ + ["npm:3.3.0", {\ + "packageLocation": "./.yarn/cache/lowlight-npm-3.3.0-db2122ba38-9b796fa844.zip/node_modules/lowlight/",\ + "packageDependencies": [\ + ["@types/hast", "npm:3.0.4"],\ + ["devlop", "npm:1.1.0"],\ + ["highlight.js", "npm:11.11.1"],\ + ["lowlight", "npm:3.3.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["lru-cache", [\ ["npm:10.4.3", {\ "packageLocation": "./.yarn/cache/lru-cache-npm-10.4.3-30c10b861a-ebd04fbca9.zip/node_modules/lru-cache/",\ @@ -7471,6 +7571,7 @@ const RAW_RUNTIME_STATE = ["workspace:.", {\ "packageLocation": "./",\ "packageDependencies": [\ + ["@tiptap/extension-code-block-lowlight", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.1"],\ ["@tiptap/extension-hard-break", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-placeholder", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.4.0"],\ ["@tiptap/extension-underline", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:3.1.0"],\ @@ -7482,8 +7583,10 @@ const RAW_RUNTIME_STATE = ["dompurify", "npm:3.2.6"],\ ["framer-motion", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:12.23.12"],\ ["heic2any", "npm:0.0.4"],\ + ["highlight.js", "npm:11.11.1"],\ ["jsqr", "npm:1.4.0"],\ ["lottie-react", "virtual:126cdbadba5e8bc60c16e5ca60a6b6a066859a2a3035538550c2863938d34232c6957439128f75a42d45e171e70ca3d5212b1883f69b095de34326e72923545d#npm:2.4.1"],\ + ["lowlight", "npm:3.3.0"],\ ["monorepo-nowaitFE", "workspace:."],\ ["prop-types", "npm:15.8.1"],\ ["prosemirror-model", "npm:1.25.3"],\ diff --git a/.yarn/cache/@types-unist-npm-3.0.3-1c20461f2e-2b1e4adcab.zip b/.yarn/cache/@types-unist-npm-3.0.3-1c20461f2e-2b1e4adcab.zip new file mode 100644 index 00000000..ac84472c Binary files /dev/null and b/.yarn/cache/@types-unist-npm-3.0.3-1c20461f2e-2b1e4adcab.zip differ diff --git a/.yarn/cache/dequal-npm-2.0.3-53a630c60e-f98860cdf5.zip b/.yarn/cache/dequal-npm-2.0.3-53a630c60e-f98860cdf5.zip new file mode 100644 index 00000000..f5e1e516 Binary files /dev/null and b/.yarn/cache/dequal-npm-2.0.3-53a630c60e-f98860cdf5.zip differ diff --git a/.yarn/cache/devlop-npm-1.1.0-d4a98d724c-e0928ab8f9.zip b/.yarn/cache/devlop-npm-1.1.0-d4a98d724c-e0928ab8f9.zip new file mode 100644 index 00000000..7bbe9bc9 Binary files /dev/null and b/.yarn/cache/devlop-npm-1.1.0-d4a98d724c-e0928ab8f9.zip differ diff --git a/.yarn/cache/highlight.js-npm-11.11.1-1afef66f5e-40f53ac19d.zip b/.yarn/cache/highlight.js-npm-11.11.1-1afef66f5e-40f53ac19d.zip new file mode 100644 index 00000000..5d5829fc Binary files /dev/null and b/.yarn/cache/highlight.js-npm-11.11.1-1afef66f5e-40f53ac19d.zip differ diff --git a/.yarn/cache/lowlight-npm-3.3.0-db2122ba38-9b796fa844.zip b/.yarn/cache/lowlight-npm-3.3.0-db2122ba38-9b796fa844.zip new file mode 100644 index 00000000..03ec92e0 Binary files /dev/null and b/.yarn/cache/lowlight-npm-3.3.0-db2122ba38-9b796fa844.zip differ diff --git a/apps/nowait-admin/src/pages/AdminAnalytics/components/HeaderStatus.tsx b/apps/nowait-admin/src/pages/AdminAnalytics/components/HeaderStatus.tsx index a99b027f..8f35cc2c 100644 --- a/apps/nowait-admin/src/pages/AdminAnalytics/components/HeaderStatus.tsx +++ b/apps/nowait-admin/src/pages/AdminAnalytics/components/HeaderStatus.tsx @@ -136,7 +136,10 @@ const HeaderStatus: React.FC = ({ menu.imageUrl ?? "bg-[#788FB6]" }`} > - +

= ({ isTablet, }) => { const [showToday, setShowToday] = useState(true); - // const [isHoverBack, setIsHoverBack] = useState(false); - // const [isHoverForward, setIsHoverForward] = useState(false); const formatDate = (date: String) => { if (!date) return ""; diff --git a/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx b/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx index 00118752..8440e085 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx @@ -63,9 +63,9 @@ const BoothForm = () => { description: string; noticeTitle: string; noticeContent: string; - openTime: string; // "HHmmHHmm" + openTime: string; profileId: number | null; - bannerIds: Array; // 첫 3개 슬롯 기준 + bannerIds: Array; } | null>(null); const currentProfileSig = useMemo(() => { @@ -76,7 +76,6 @@ const BoothForm = () => { }, [profileImage]); const currentBannerSig = useMemo<(string | number | null)[]>(() => { - // UI가 3 슬롯이라 가정 const slots = [bannerImages[0], bannerImages[1], bannerImages[2]]; return slots.map((img) => { if (!img) return null; @@ -84,7 +83,7 @@ const BoothForm = () => { }); }, [bannerImages]); const hasChanges = useMemo(() => { - if (!baseline) return false; // 아직 로딩 중이면 비활성화 + if (!baseline) return false; const textChanged = norm(boothName) !== norm(baseline.name) || @@ -175,7 +174,7 @@ const BoothForm = () => { }, { onSuccess: () => resolve(), - onError: () => reject(new Error("부스 정보 수정 실패")), + onError: (err) => reject(err), } ); }); @@ -222,7 +221,7 @@ const BoothForm = () => { refetch(); after?.(); } catch (e) { - console.error(e); + console.log(e, "부스정보저장 에러메세지"); alert("저장 중 오류가 발생했어요. 다시 시도해주세요."); } }; diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx index ce6ea9df..ac7f8b79 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx @@ -434,7 +434,7 @@ const AccountPage = () => {

{ const selected = opt === value; const active = idx === highlight; + return (