Skip to content

feat: 주문 페이지 UI 수정 #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hwangdae merged 2 commits into from
Sep 20, 2025
Merged

feat: 주문 페이지 UI 수정 #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
239f879
feat: 주문 페이지 UI 수정
hwangdae Sep 20, 2025
cd06e03
Merge pull request #512 from GTable/fix/user/order
hwangdae Sep 20, 2025
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
2 changes: 1 addition & 1 deletion apps/nowait-user/src/components/BackHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface PropsType {
const BackHeader = ({ title }: PropsType) => {
const navigate = useNavigate()
return (
<header className="w-full sticky left-0 top-0 bg-white z-40">
<header className="w-full fixed left-0 top-0 bg-white z-40">
<div className="flex justify-between items-center">
<button onClick={()=>navigate(-1)} className="p-2.5">
<Back />
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/components/common/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const MenuItem = ({ data, mode }: PropsType) => {
{data.name}
</h2>
{data.isSoldOut && (
<span className="text-[12px] font-bold text-primary bg-[#FFF0EB] rounded-[6px] px-2 py-1.5 align-middle">
<span className="text-[12px] font-bold text-primary bg-[#FFF0EB] rounded-[6px] px-2 py-1.5 align-middle break-keep">
품절
</span>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/components/common/MenuList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const MenuList = ({
}) => {

return (
<div className="pt-[30px] pb-[10px]">
<div className="pt-[30px] pb-[14px]">
<h1 className="text-title-20-semibold mb-3">메뉴</h1>
<ul>
{!isLoading ? (
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/pages/order/home/StorePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const StorePage = () => {
console.log(menus, "asd");
return (
<div>
<div className="flex flex-col flex-grow min-h-dvh pt-7.5 px-5">
<div className={`flex flex-col flex-grow min-h-dvh pt-7.5 ${cart && cart.length > 0 ? "pb-[116px]" : ""} px-5`}>
<div className="flex-grow">
<StoreHeader storeName={menus?.storeName} isLoading={isLoading} />
<SectionDivider />
Expand Down
4 changes: 2 additions & 2 deletions apps/nowait-user/src/pages/order/orderList/OrderListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ const OrderListPage = () => {
return (
<div>
<BackHeader title="장바구니" />
<section className="flex flex-col flex-grow min-h-[calc(100dvh-164px)] pt-7 px-5">
<section className="flex flex-col flex-grow min-h-[calc(100dvh-164px)] pt-7 px-5 mt-[48px]">
<h1 className="text-headline-22-bold mb-5">
주문 총 <span className="text-primary">{cart.length}건</span>
</h1>
<motion.ul className="flex justify-center flex-col" layout>
<motion.ul className="flex justify-center flex-col mb-[116px]" layout>
<AnimatePresence mode="sync">
{cart.map((item) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/pages/order/remittance/RemittancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const RemittancePage = () => {
};
console.log(remittance);
return (
<div className="flex flex-col flex-grow">
<div className="flex flex-col flex-grow mt-[48px] mb-[116px]">
<BackHeader title="주문하기" />
<section className="px-5">
<OrderSummary cart={cart} />
Expand Down