diff --git a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx index 001a135b..18677c1c 100644 --- a/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx +++ b/apps/nowait-admin/src/pages/AdminBooth/components/AccountPage.tsx @@ -350,7 +350,7 @@ const AccountPage = () => { placeholder={ errors[option.id] ? "" : REQUIRED_PREFIX[option.id] } - className={`flex w-full bg-transparent outline-none text-14-regular text-black-90`} + className={`flex-1 w-[calc(100%-4px)] bg-transparent outline-none text-14-regular text-black-90`} readOnly={sources[option.id] === "image"} /> {errors[option.id] && ( diff --git a/apps/nowait-user/src/api/order.ts b/apps/nowait-user/src/api/order.ts index 030b5a99..74a82b5c 100644 --- a/apps/nowait-user/src/api/order.ts +++ b/apps/nowait-user/src/api/order.ts @@ -31,7 +31,7 @@ export const getOrderDetails = async ( }; //주점 QR, 계좌번호 조회 -export const getStorePayments = async (storeId: string) => { +export const getStorePayments = async (storeId: number) => { try { const res = await api.get( `/v1/store-payments/${storeId}` diff --git a/apps/nowait-user/src/assets/icon/back.svg b/apps/nowait-user/src/assets/icon/back.svg index 4df0049a..c8a3e76f 100644 --- a/apps/nowait-user/src/assets/icon/back.svg +++ b/apps/nowait-user/src/assets/icon/back.svg @@ -1,3 +1,3 @@ - - + + diff --git a/apps/nowait-user/src/components/BackHeader.tsx b/apps/nowait-user/src/components/BackHeader.tsx index ec37fce3..a473c737 100644 --- a/apps/nowait-user/src/components/BackHeader.tsx +++ b/apps/nowait-user/src/components/BackHeader.tsx @@ -9,12 +9,12 @@ const BackHeader = ({ title }: PropsType) => { const navigate = useNavigate() return (
-
-

{title}

-
+
); diff --git a/apps/nowait-user/src/components/BackOnlyHeader.tsx b/apps/nowait-user/src/components/BackOnlyHeader.tsx index 1e959758..0deca00a 100644 --- a/apps/nowait-user/src/components/BackOnlyHeader.tsx +++ b/apps/nowait-user/src/components/BackOnlyHeader.tsx @@ -5,11 +5,11 @@ const BackOnlyHeader = () => { const navigate = useNavigate(); return (
-
- -
+
); diff --git a/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx b/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx index fc7b4088..665fb7f9 100644 --- a/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx +++ b/apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx @@ -29,7 +29,7 @@ const RemittancePage = () => { const { data: remittance, isLoading } = useQuery({ queryKey: ["remittance", storeId], - queryFn: () => getStorePayments(storeId!), + queryFn: () => getStorePayments(Number(storeId!)), enabled: !!storeId, select: (data) => data?.response, }); diff --git a/apps/nowait-user/src/pages/waiting/bookmark/components/BookmarkListItem.tsx b/apps/nowait-user/src/pages/waiting/bookmark/components/BookmarkListItem.tsx index 78023988..241144aa 100644 --- a/apps/nowait-user/src/pages/waiting/bookmark/components/BookmarkListItem.tsx +++ b/apps/nowait-user/src/pages/waiting/bookmark/components/BookmarkListItem.tsx @@ -57,7 +57,7 @@ const BookmarkListItem = ({ /> {waitingCount !== 0 && (

- {waitingCount} + 대기 {waitingCount}팀

)} diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothDetail.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothDetail.tsx index 8c383e1e..9b9c7c0c 100644 --- a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothDetail.tsx +++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothDetail.tsx @@ -2,25 +2,44 @@ import { useNavigate } from "react-router-dom"; import { Button } from "@repo/ui"; import Clock from "../../../../assets/icon/clock.svg?react"; import BookmarkIcon from "../../../../components/common/BookmarkIcon"; -import { useState } from "react"; import { motion } from "framer-motion"; +import { useBookmarkState } from "../../../../hooks/useBookmarkState"; +import { useBookmarkMutation } from "../../../../hooks/mutate/useBookmark"; interface PropsType { booth: any | undefined; } - const BoothDetail = ({ booth }: PropsType) => { - const navigate = useNavigate(); - const [isBookmarked, setIsBookmarked] = useState(false); + const { storeId, name, departmentName, waitingCount } = booth; + const { createBookmarkMutate, deleteBookmarkMutate } = useBookmarkMutation( + { + withInvalidate: true, + }, + Number(storeId) + ); + const { isBookmarked } = useBookmarkState(Number(storeId)); + + const handleBookmarkButton = async () => { + try { + if (isBookmarked) { + await deleteBookmarkMutate.mutate(); + } else { + await createBookmarkMutate.mutate(); + } + } catch (error) { + console.log(error); + } + }; + return ( @@ -32,10 +51,7 @@ const BoothDetail = ({ booth }: PropsType) => {

{departmentName}

- diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothListItem.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothListItem.tsx index 9582908b..3512ed01 100644 --- a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothListItem.tsx +++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothListItem.tsx @@ -53,7 +53,7 @@ const BoothListItem = ({ /> {waitingCount !== 0 && (

- {waitingCount} + 대기 {waitingCount}팀

)} diff --git a/apps/nowait-user/src/types/order/order.ts b/apps/nowait-user/src/types/order/order.ts index ee84526f..ce8ecb3b 100644 --- a/apps/nowait-user/src/types/order/order.ts +++ b/apps/nowait-user/src/types/order/order.ts @@ -46,7 +46,7 @@ export interface StorePaymentsResponse { success: boolean; response: { paymentMethodId: number; - storeId: string; + storeId: number; tossUrl?: string; kakaoPayUrl?: string; naverPayUrl?: string; diff --git a/packages/tailwind-config/shared-styles.css b/packages/tailwind-config/shared-styles.css index 7fe1c3cc..10704422 100644 --- a/packages/tailwind-config/shared-styles.css +++ b/packages/tailwind-config/shared-styles.css @@ -139,7 +139,7 @@ pre { .text-headline-24-bold { font-size: 24px; line-height: 136%; - letter-spacing: -0.01em; + letter-spacing: 0; font-weight: 700; }