Skip to content

Commit

Permalink
update review advence, Ongoing detail
Browse files Browse the repository at this point in the history
  • Loading branch information
@ntnhan90
ntnhan90 committed Jan 12, 2024
1 parent b101e1a commit 1218474
Show file tree
Hide file tree
Showing 17 changed files with 841 additions and 5 deletions.
Binary file added public/images/6387ec276a4eb-62aa10dfb2adca268416cf2fd03d82f5transformed-3@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Group 36984.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/images/camera-plus (1).svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/images/camera-plus.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/food-rating.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/images/marker-pin-02.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/shipper.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/step-base-done.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/images/step-base-in-progress.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/step-base.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/app/order/my-order-food/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

const MyOrderPage = () =>{
const MyOrderFoodPage = () =>{
return (
<section className="body-section container py-3">
<div className="my-order-wrapper d-flex flex-column">
Expand All @@ -25,10 +25,10 @@ const MyOrderPage = () =>{

<div className="filter-and-sort d-flex gap-3">
<div className="filter-dish-and-restaurant d-flex">
<div className="filter-button">
<div className="filter-button active">
Món ăn
</div>
<div className="filter-button active">
<div className="filter-button ">
Nhà hàng
</div>
</div>
Expand Down Expand Up @@ -220,4 +220,4 @@ const MyOrderPage = () =>{
)
}

export default MyOrderPage;
export default MyOrderFoodPage;
9 changes: 9 additions & 0 deletions src/app/order/ongoing/layout.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Header from '../../ui/header';

export default function Layout({children,}: {children: React.ReactNode;}) {
return (
<div className="dark-mode">
{children}
</div>
)
}
225 changes: 225 additions & 0 deletions src/app/order/ongoing/page.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@

const OngoingPage = () =>{
return (
<section className="body-section container">
<div className="order-steps py-4 d-flex justify-content-center gap-3 position-relative">
<div className="step-base">
<div className="step-base-icon">
<img src="/images/step-base-done.svg" alt="" />
</div>
<div className="step-base-text">
<div className="status">Xác Nhận Đơn Hàng</div>
<div className="time">11:05 AM</div>
</div>
</div>

<div className="step-base">
<div className="step-base-icon">
<img src="/images/step-base-in-progress.svg" alt=""/>
</div>
<div className="step-base-text">
<div className="status">Tài Xế Đã Tới Nhà Hàng</div>
<div className="time">11:15 AM</div>
</div>
</div>

<div className="step-base">
<div className="step-base-icon">
<img src="/images/step-base.svg" alt="" />
</div>
<div className="step-base-text">
<div className="status">Tài Xế Đã Rời Nhà Hàng</div>
<div className="time">11:25 AM</div>
</div>
</div>

<div className="step-base">
<div className="step-base-icon">
<img src="/images/step-base.svg" alt="" />
</div>
<div className="step-base-text">
<div className="status">Tài Xế Đã Đến Nơi</div>
<div className="time">11:40 AM</div>
</div>
</div>

<span className="position-absolute progress-line active"></span>
<span className="position-absolute progress-line"></span>
<span className="position-absolute progress-line"></span>
</div>

<div className="address-and-order-detail d-flex gap-3">
<div className="google-map-wrapper flex-grow-1">
<img className="max-width" src="/images/Group%2036984.png" alt="" />
</div>

<div className="order-details d-flex flex-column mb-4">
<div className="order d-flex flex-column gap-2">
<div className="label">
Đơn hàng
</div>
<div>
ID: #1234567
</div>
<div>
Ngày: 26/07/2023
</div>
</div>

<div className="shipper d-flex flex-column gap-2">
<div className="label">
Tài xế
</div>
<div className="shipper-detail d-flex gap-3 py-3">
<img className="shipper-avatar" src="/images/shipper.png" alt="" />
<div className="shipper-info d-flex flex-column">
<div className="shipper-name mb-1">
Nguyễn Văn A
</div>
<div>
+84 909 123 123
</div>
<div>
Honda Wave | 54-XI 125.55
</div>
</div>
</div>
<div className="note-to-shipper">
<div className="font-weight-600">
Ghi chú dành cho tài xế:
</div>
<div className="">
Gặp tại sảnh A toà nhà
</div>
</div>
</div>

<div className="destination d-flex flex-column gap-2">
<div className="label">
Giao đến
</div>
<div className="d-flex gap-3 align-items-center">
<img className="marker-icon" src="/images/marker-pin-02.svg" alt="" />
<div className="font-weight-500">
24 Nguyễn Đình Thi, P. Phước Long B, Tp. Thủ Đức, Tp. Hồ Chí Minh
</div>
</div>
</div>

<div className="cart-info d-flex flex-column gap-2">
<div className="label-section">
<img src="/images/chef-icon.png" alt="" />
<div>The Chef Town</div>
</div>

<div className="cart-item px-3 d-flex">
<img className="me-2" src="/images/6387ec276a4eb-62aa10dfb2adca268416cf2fd03d82f5transformed-3@2x.png"
alt="" />
<div className="cart-item-info d-flex flex-column">
<div className="cart-item-name">
Mỳ Cá Cờ Sốt Yakitori
</div>
<div className="cart-item-description">
Ghi chú 1 - Lorem ipsum dolor sit amet Ghi chú 1 - Lorem ipsum dolor sit amet Lorem ipsum
dolor sit ametLorem ipsum dolor sit ametLorem ipsum dolor sit ametLorem ipsum dolor sit
ametLorem ipsum dolor sit amet
</div>
</div>
<div className="quantity d-flex justify-content-center">1</div>
<div className="price d-flex flex-column align-items-end">
<span className="price-after">80,000</span>
<span className="price-before">95.000</span>
</div>
</div>
<div className="cart-item px-3 d-flex">
<img className="me-2" src="/images/6387ec276a4eb-62aa10dfb2adca268416cf2fd03d82f5transformed-3@2x.png"
alt="" />
<div className="cart-item-info d-flex flex-column">
<div className="cart-item-name">
Mỳ Cá Cờ Sốt Yakitori
</div>
<div className="cart-item-description">
Ghi chú 1 - Lorem ipsum dolor sit amet Ghi chú 1 - Lorem ipsum dolor sit amet
</div>
</div>
<div className="quantity d-flex justify-content-center">1</div>
<div className="price d-flex flex-column align-items-end">
<span className="price-after">50,000</span>
<span className="price-before">90.000</span>
</div>
</div>

<div className="payment-detail d-flex flex-column gap-1">
<div className="label px-3">
Thông tin thanh toán
</div>

<div className="general-fee mx-3 pb-1">
<div className="d-flex justify-content-between">
<span>Tổng món ăn</span>
<span>130,000 đ</span>
</div>
<div className="d-flex justify-content-between">
<span>Phí đóng gói</span>
<span>6,000 đ</span>
</div>
<div className="d-flex justify-content-between">
<span>Dụng cụ ăn</span>
<span>0 đ</span>
</div>
</div>

<div className="delivery-fee mx-3 py-1">
<div className="d-flex justify-content-between">
<span>Phí giao hàng | 0.8 km</span>
<span>10,000 đ</span>
</div>
<div className="d-flex justify-content-between">
<span>Phí nền tảng</span>
<span>2,000 đ</span>
</div>
</div>

<div className="promo mx-3 py-1">
<div className="d-flex justify-content-between">
<span>Khuyến mãi</span>
<span>-1,000 đ</span>
</div>
</div>

<div className="total-amount p-3">
<div className="d-flex justify-content-between">
<span>Tổng thanh toán </span>
<span>147,000 đ</span>
</div>
</div>
</div>
</div>

<div className="packing d-flex flex-column gap-2">
<div className="label">
Đóng gói
</div>
<div>
Đóng gói bằng hộp bã mía
</div>
<div>
Không lấy dụng cụ ăn uống
</div>
</div>

<div className="payment-method d-flex flex-column gap-2">
<div className="label">
Phương thức thanh toán
</div>
<div>
Đã thanh toán bằng Momo
</div>
</div>
</div>
</div>
</section>
)
}

export default OngoingPage;
9 changes: 9 additions & 0 deletions src/app/order/order-detail/layout.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Header from '../../ui/header';

export default function Layout({children,}: {children: React.ReactNode;}) {
return (
<div className="dark-mode">
{children}
</div>
)
}
Loading

0 comments on commit 1218474

Please sign in to comment.