From 6d917c6cfa0fc62481489fe940f67a92a0714692 Mon Sep 17 00:00:00 2001 From: Mohammadali Date: Sun, 30 Aug 2026 10:44:04 +0330 Subject: [PATCH] change more files --- .../orders/{ => (routes)/(landing)}/page.tsx | 27 ++++++++----- .../(shop)/orders/(routes)/[orderId]/page.tsx | 9 +++++ src/app/(customer)/(shop)/orders/layout.tsx | 15 +++++++ .../{OrderEmpty.tsx => order-empty.tsx} | 0 src/components/orders/order-header.tsx | 39 +++++++++++++++++++ .../orders/{OrderItem.tsx => order-item.tsx} | 12 +++++- ...ServerError.tsx => order-server-error.tsx} | 0 ...OrdersSkeleton.tsx => orders-skeleton.tsx} | 0 src/proxy.ts | 2 +- 9 files changed, 93 insertions(+), 11 deletions(-) rename src/app/(customer)/(shop)/orders/{ => (routes)/(landing)}/page.tsx (79%) create mode 100644 src/app/(customer)/(shop)/orders/(routes)/[orderId]/page.tsx create mode 100644 src/app/(customer)/(shop)/orders/layout.tsx rename src/components/orders/{OrderEmpty.tsx => order-empty.tsx} (100%) create mode 100644 src/components/orders/order-header.tsx rename src/components/orders/{OrderItem.tsx => order-item.tsx} (88%) rename src/components/orders/{OrderServerError.tsx => order-server-error.tsx} (100%) rename src/components/orders/{OrdersSkeleton.tsx => orders-skeleton.tsx} (100%) diff --git a/src/app/(customer)/(shop)/orders/page.tsx b/src/app/(customer)/(shop)/orders/(routes)/(landing)/page.tsx similarity index 79% rename from src/app/(customer)/(shop)/orders/page.tsx rename to src/app/(customer)/(shop)/orders/(routes)/(landing)/page.tsx index 42f4ee1..36b7e6e 100644 --- a/src/app/(customer)/(shop)/orders/page.tsx +++ b/src/app/(customer)/(shop)/orders/(routes)/(landing)/page.tsx @@ -2,18 +2,27 @@ import Link from "next/link"; import { requireSession } from "@/lib/auth/session"; import { getOrderGroups } from "@/lib/api/orders"; import { PAYMENT_STATUS_LABELS_FA } from "@/lib/order-status"; -import OrderItem from "@/components/orders/OrderItem"; -import OrderEmpty from "@/components/orders/OrderEmpty"; -import OrderServerError from "@/components/orders/OrderServerError"; -import OrdersSkeleton from "@/components/orders/OrdersSkeleton"; +import OrderItem from "@/components/orders/order-item"; +import OrderEmpty from "@/components/orders/order-empty"; +import OrderServerError from "@/components/orders/order-server-error"; +import OrdersSkeleton from "@/components/orders/orders-skeleton"; +import OrderHeader from "@/components/orders/order-header"; export default async function OrdersPage() { - return
- + return
+ + { + Array.from({ length: 20 }, (_, index) => ) + } + {/* + + */} + + {/* */} {/* */} {/* */} -{/* */} - + {/* */} + {/* @@ -26,7 +35,7 @@ export default async function OrdersPage() { */} -
+ // await requireSession("/orders"); // const orderGroups = await getOrderGroups(); diff --git a/src/app/(customer)/(shop)/orders/(routes)/[orderId]/page.tsx b/src/app/(customer)/(shop)/orders/(routes)/[orderId]/page.tsx new file mode 100644 index 0000000..c2039ef --- /dev/null +++ b/src/app/(customer)/(shop)/orders/(routes)/[orderId]/page.tsx @@ -0,0 +1,9 @@ +import React from 'react' + +const OrderDetail = () => { + return ( +
OrderDetail
+ ) +} + +export default OrderDetail \ No newline at end of file diff --git a/src/app/(customer)/(shop)/orders/layout.tsx b/src/app/(customer)/(shop)/orders/layout.tsx new file mode 100644 index 0000000..a4562ae --- /dev/null +++ b/src/app/(customer)/(shop)/orders/layout.tsx @@ -0,0 +1,15 @@ +import OrderHeader from '@/components/orders/order-header'; +import React from 'react' + +interface OrderLayoutInterface { + children: React.ReactNode; +} + +const OrderLayout = async ({ children }: OrderLayoutInterface) => { + return
+ + {children} +
+} + +export default OrderLayout \ No newline at end of file diff --git a/src/components/orders/OrderEmpty.tsx b/src/components/orders/order-empty.tsx similarity index 100% rename from src/components/orders/OrderEmpty.tsx rename to src/components/orders/order-empty.tsx diff --git a/src/components/orders/order-header.tsx b/src/components/orders/order-header.tsx new file mode 100644 index 0000000..bc46b24 --- /dev/null +++ b/src/components/orders/order-header.tsx @@ -0,0 +1,39 @@ +'use client'; + +import { ArrowRight, ShoppingBagIcon } from 'lucide-react' +import { usePathname, useRouter } from 'next/navigation'; + +const OrderHeader = () => { + + const router = useRouter(); + const pathname = usePathname(); + const isExactOrders = pathname === '/orders' + + const onBackHandler = () => { + router.back(); + } + + const goToCartPage = () => { + router.push('/cart'); + } + + return
+
+ +

سفارش‌ها

+
+ {isExactOrders && +
+
+ +
+ + + 90 + +
+ } +
+} + +export default OrderHeader \ No newline at end of file diff --git a/src/components/orders/OrderItem.tsx b/src/components/orders/order-item.tsx similarity index 88% rename from src/components/orders/OrderItem.tsx rename to src/components/orders/order-item.tsx index e721e62..2aecb68 100644 --- a/src/components/orders/OrderItem.tsx +++ b/src/components/orders/order-item.tsx @@ -1,6 +1,13 @@ +'use client'; + +import { useRouter } from 'next/navigation'; import React from 'react'; const OrderItem = () => { + const router = useRouter(); + + const goToOrderDetail = () => router.push(`/orders/uuid`) + const order = { id: 1, restaurant: 'فست‌فود برگر', @@ -64,7 +71,10 @@ const OrderItem = () => { - diff --git a/src/components/orders/OrderServerError.tsx b/src/components/orders/order-server-error.tsx similarity index 100% rename from src/components/orders/OrderServerError.tsx rename to src/components/orders/order-server-error.tsx diff --git a/src/components/orders/OrdersSkeleton.tsx b/src/components/orders/orders-skeleton.tsx similarity index 100% rename from src/components/orders/OrdersSkeleton.tsx rename to src/components/orders/orders-skeleton.tsx diff --git a/src/proxy.ts b/src/proxy.ts index 25033f6..c834035 100644 --- a/src/proxy.ts +++ b/src/proxy.ts @@ -8,7 +8,7 @@ const AUTH_REQUIRED_PREFIXES = [ "/seller", "/cart", "/checkout", - // "/orders", + "/orders", "/order-groups", "/addresses", "/account",