diff --git a/apps/nowait-user/package.json b/apps/nowait-user/package.json index 8a6a6c80..bf266d2a 100644 --- a/apps/nowait-user/package.json +++ b/apps/nowait-user/package.json @@ -14,6 +14,7 @@ "@tanstack/react-query": "^5.80.10", "@tanstack/react-virtual": "^3.13.11", "axios": "^1.10.0", + "framer-motion": "^12.20.1", "react": "^19.1.0", "react-dom": "^19.1.0", "react-router-dom": "^7.6.2", diff --git a/apps/nowait-user/src/components/order/ConfirmModal.tsx b/apps/nowait-user/src/components/order/ConfirmModal.tsx index 949d7f1b..5c0f6250 100644 --- a/apps/nowait-user/src/components/order/ConfirmModal.tsx +++ b/apps/nowait-user/src/components/order/ConfirmModal.tsx @@ -1,6 +1,7 @@ -import React from "react"; +import React, { useState } from "react"; import { Button } from "@repo/ui"; import Portal from "../common/modal/Portal"; +import { AnimatePresence, motion } from "framer-motion"; interface PropsType { open: () => void; @@ -8,33 +9,59 @@ interface PropsType { } const ConfirmModal = ({ open, close }: PropsType) => { + // const [isVisible, setIsVisible] = useState(true); + + // const handleClose = () => { + // setIsVisible(false); + // }; + + + // const handleExitComplete = () => { + // if (!isVisible) close(); + // }; + return ( -
-
-

이체 완료 하셨나요?

-

- 아직 이체하지 않으셨다면 주문이 -
정상적으로 접수되지 않을 수 있어요. -
- 계좌로 송금을 마치셨다면 버튼을 눌러주세요. -

- - -
-
+ +

+ 이체 완료 하셨나요? +

+

+ 아직 이체하지 않으셨다면 주문이 +
정상적으로 접수되지 않을 수 있어요. +
+ 계좌로 송금을 마치셨다면 버튼을 눌러주세요. +

+ + +
+ + {/* )} */} +
); }; diff --git a/apps/nowait-user/src/components/order/MenuItem.tsx b/apps/nowait-user/src/components/order/MenuItem.tsx index 9eddd8db..d7d844ec 100644 --- a/apps/nowait-user/src/components/order/MenuItem.tsx +++ b/apps/nowait-user/src/components/order/MenuItem.tsx @@ -1,6 +1,8 @@ import QuantitySelector from "../common/QuantitySelector"; import close from "../../assets/icon/close.svg"; import { useCartStore } from "../../stores/cartStore"; +import { motion } from "framer-motion"; +import { useState } from "react"; interface PropsType { id: string; @@ -11,8 +13,16 @@ interface PropsType { const MenuItem = ({ id, name, price, quantity }: PropsType) => { const { removeFromCart, increaseQuantity, decreaseQuantity } = useCartStore(); + const [isRemoving, setIsRemoving] = useState(false); return ( -
  • +
    @@ -21,7 +31,12 @@ const MenuItem = ({ id, name, price, quantity }: PropsType) => {

    {price.toLocaleString()}원

    -
    @@ -34,7 +49,7 @@ const MenuItem = ({ id, name, price, quantity }: PropsType) => { decreaseQuantity={decreaseQuantity} />
    -
  • + ); }; diff --git a/apps/nowait-user/src/components/order/Toast.tsx b/apps/nowait-user/src/components/order/Toast.tsx index 7d19428c..fec45fdc 100644 --- a/apps/nowait-user/src/components/order/Toast.tsx +++ b/apps/nowait-user/src/components/order/Toast.tsx @@ -1,4 +1,5 @@ import React from "react"; +import { motion } from "framer-motion"; interface PropsType { message: string; @@ -6,9 +7,14 @@ interface PropsType { const Toast = ({ message }: PropsType) => { return ( -
    +

    {message}

    -
    + ); }; diff --git a/apps/nowait-user/src/pages/order/OrderListPage.tsx b/apps/nowait-user/src/pages/order/OrderListPage.tsx index 38626fe2..4899e4e5 100644 --- a/apps/nowait-user/src/pages/order/OrderListPage.tsx +++ b/apps/nowait-user/src/pages/order/OrderListPage.tsx @@ -4,11 +4,13 @@ import { Button } from "@repo/ui"; import { useNavigate, useParams } from "react-router-dom"; import TotalButton from "../../components/order/TotalButton"; import { useCartStore } from "../../stores/cartStore"; +import { AnimatePresence } from "framer-motion"; import EmptyCart from "../../components/order/EmptyCart"; import { sumTotalPrice } from "../../utils/sumUtils"; import axios from "axios"; import { getTableId } from "../../utils/cartStorage"; + const OrderListPage = () => { const navigate = useNavigate(); const { storeId } = useParams(); @@ -46,17 +48,19 @@ const OrderListPage = () => {

    총 주문 {cart.length}건