Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 49 additions & 0 deletions .pnp.cjs

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

Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions apps/nowait-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added apps/nowait-admin/src/assets/booth/kakao.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions apps/nowait-admin/src/assets/booth/kakaoLogo.svg

This file was deleted.

Binary file added apps/nowait-admin/src/assets/booth/naver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions apps/nowait-admin/src/assets/booth/naverLogo.svg

This file was deleted.

Binary file added apps/nowait-admin/src/assets/booth/toss.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions apps/nowait-admin/src/assets/booth/tossLogo.svg

This file was deleted.

Binary file added apps/nowait-admin/src/assets/menu_placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions apps/nowait-admin/src/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -274,6 +275,8 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
setMenus(transformed);
}, [fetchedMenus]);

console.log(menus, "메뉴목록들");

return (
<div className="mt-[40px] mb-[20px] max-w-[614px]">
<div className="flex justify-between items-center mb-[20px]">
Expand Down Expand Up @@ -345,7 +348,7 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
>
<div className="w-[70px] h-[70px] bg-black-5 rounded-md flex items-center justify-center overflow-hidden">
<img
src={menu.imageUrl}
src={menu.imageUrl ?? imgPlaceHolder}
className="w-full h-full object-cover"
alt="placeholder"
/>
Expand All @@ -360,7 +363,6 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
</div>
</div>

{/* ✨ 여기만 드래그 핸들! */}
<img
src={editOrderIcon}
alt="순서 변경"
Expand All @@ -369,7 +371,6 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
/>
</div>
) : (
// ✅ 보기 모드: SwipeableRow로 스와이프 삭제
<SwipeableRow
ref={provided.innerRef}
disabled={false}
Expand All @@ -390,7 +391,7 @@ const MenuSection = ({ isTablet }: { isTablet: boolean }) => {
>
<div className="w-[70px] h-[70px] bg-black-5 rounded-md flex items-center justify-center overflow-hidden">
<img
src={menu.imageUrl}
src={menu.imageUrl ?? imgPlaceHolder}
className="w-full h-full object-cover"
alt="placeholder"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ export const UnsavedChangesModal = ({
}) => {
return (
<div className="fixed inset-0 flex items-center justify-center bg-black/50 z-50">
<div className="flex items-center bg-white rounded-[20px] p-[30px] w-[324px] h-[185px]">
<div className="flex items-center bg-white rounded-[20px] pt-[33px] pb-[22px] px-[22px] w-[297px] h-[177px]">
<div className="flex flex-col justify-center items-center w-full">
<h3 className="text-title-20-bold">
저장하지 않은 변경사항이 있어요
</h3>
<p className="text-13-regular text-black-60 mb-[20px] mt-[10px]">
페이지를 나가면 변경사항이 저장되지 않아요.
<p className="text-14-regular text-black-60 mb-[20px] mt-[10px]">
페이지를 나가면 변경사항이 저장되지 않아요.
</p>
<div className="flex justify-between h-[48px] w-full">
<div className="flex h-[48px] w-[253px] gap-2">
<button
className="px-[20px] py-[13px] w-[128px] rounded-[10px] bg-black-20 text-black-80"
className="flex-1 px-[12px] py-[10px] rounded-[10px] w-full bg-black-20 text-black-80 text-16-semibold"
onClick={onReset}
>
재설정
</button>
<button
className="px-[20px] py-[13px] w-[128px] rounded-[10px] bg-black text-white"
className="flex-1 px-[12px] py-[10px] rounded-[10px] w-full bg-black text-white whitespace-nowrap text-16-semibold"
onClick={onSave}
>
변경사항 저장
Expand Down
Loading