diff --git a/src/App.tsx b/src/App.tsx index b2c7804..2f57c17 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -20,6 +20,7 @@ import FoodList from '@pages/BranchManager/FoodList'; import { Gallery } from '@components/Gallery/Gallery'; import DiscountList from './pages/BranchManager/FoodList/DiscountList'; import Cart from '@pages/Cart'; +import Checkout from '@pages/Checkout'; import { OrderHistory } from './components/User/OrderHistory/OrderHistory'; import User from '@pages/BranchManager/Users'; import UserAdd from '@pages/BranchManager/Users/AddUser'; @@ -67,6 +68,16 @@ const routes = createRoutesFromElements( } /> + + + + + + } + /> -
+
diff --git a/src/components/User/Cart/index.tsx b/src/components/User/Cart/index.tsx index 5b2b28c..cf89ab3 100644 --- a/src/components/User/Cart/index.tsx +++ b/src/components/User/Cart/index.tsx @@ -2,7 +2,8 @@ import React from 'react'; import Food from '@images/product/pizza.png'; import { Checkbox } from '@nextui-org/react'; import QtySelector from './QtySelector'; -import { Link } from '@nextui-org/react'; +// import { Link } from '@nextui-org/react'; +import { Link } from 'react-router-dom'; import { Button } from "@nextui-org/react"; function index() { @@ -45,6 +46,27 @@ function index() { }, ]; + const alsoBoughtItems = [ + { + id: '01', + name: 'Cheese Pizza', + description: 'Indulge in our classic Cheese Pizza', + price: 3500, + }, + { + id: '02', + name: 'Saussage Pizza', + description: 'Indulge in our classic Cheese Pizza', + price: 4500, + }, + { + id: '03', + name: 'Margherita Pizza', + description: 'Indulge in our classic Cheese Pizza', + price: 3000, + }, + ]; + return (
@@ -66,7 +88,10 @@ function index() { className="rounded-xl border dark:border-foodbg dark:bg-foodbg p-2 shadow-sm md:px-6 backdrop-blur-md" style={{ backgroundColor: 'rgba(255, 255, 255, 0.01)' }} > + +
+ @@ -113,57 +138,62 @@ function index() {
-
- - imac image - -
- - Cheese Pizza + + {alsoBoughtItems.map((_: any) => { + return ( +
+ + imac image -

- Indulge in our classic Cheese Pizza, featuring.. -

-
-
-

- Rs. - 3500 -

-
-
- + Cheese Pizza + +

+ Indulge in our classic Cheese Pizza, featuring.. +

+
+
+

+ Rs. + 3500 +

+
+
+ +
-
+ ); + })}
@@ -179,7 +209,7 @@ function index() {
-
+
Original price
@@ -188,7 +218,7 @@ function index() {
-
+
Savings
@@ -197,7 +227,7 @@ function index() {
-
+
Store Pickup
@@ -206,7 +236,7 @@ function index() {
-
+
Tax
@@ -216,7 +246,7 @@ function index() {
-
+
Total
@@ -226,9 +256,14 @@ function index() {
- + + +
diff --git a/src/components/User/Checkout/index.tsx b/src/components/User/Checkout/index.tsx index dff2b0e..a0c7d2d 100644 --- a/src/components/User/Checkout/index.tsx +++ b/src/components/User/Checkout/index.tsx @@ -1,468 +1,460 @@ -import React from 'react' +import React from 'react'; +import { Link } from 'react-router-dom'; +import { Button } from '@nextui-org/react'; function index() { return ( -
-
-
    -
  1. - - - Cart - -
    2. - -
  2. - - - Checkout - -
    3. - -
  3. - - Order summary -
    4. -
- -
-
-
-

Delivery Details

- -
-
- {/* */} - -
- -
- {/* */} - -
- -
-
- {/* */} -
- -
- -
-
- {/* */} -
- -
- -
- {/* */} -
- - -
- +
+ +
    +
  1. + + + Cart + +
    2. + +
  2. + + + Checkout + +
    3. + +
  3. + + Order summary +
    4. +
+ +
+
+ {/* Form */} +
+

+ Delivery Details +

+ +
+
+ +
-
-
- -
- {/* */} - -
-
- {/* */} - -
- -
- {/* */} - -
- -
- -
-
-
- -
-

Payment

- -
-
-
-
- +
+ +
-
- {/* */} -

Pay with your credit card

+
+ +
-
- -
- - -
- - -
-
-
-
-
- +
+
+ +
+
-
- {/* */} -

+$15 payment processing fee

-
-
- -
- + {/* phone number */} +
+ +
+ -
-
+ -
-
-
- + + + + + + + + + + + + + +94 + +
+ +
+
-
- {/* */} -

Connect to your account

+
+ +
-
- -
- - -
- + {/*
+ +
*/}
-
-
- -
-

Delivery Methods

-
-
-
-
- + {/* Card details */} +
+

+ Payment Details +

+ +
+
+ +
-
- {/* */} -

Get it by Tommorow

+
+
+ +
+
-
-
-
-
-
- +
+ +
-
- {/* */} -

Get it by Friday, 13 Dec 2023

+
+
+ + +
+ +
+ + +
+ + {/*
+ +
*/}
+
-
-
-
- -
- -
- {/* */} -

Get it today

-
+
+
+
+
+
+ Subtotal +
+
+ $8,094.00 +
+
+ +
+
+ Savings +
+
0
+
+ +
+
+ Store Pickup +
+
+ $99 +
+
+ +
+
+ Tax +
+
+ $199 +
+
+ +
+
+ Total +
+
+ $8,392.00 +
+
-
-
-
- {/* */} -
- - -
-
-
- -
-
-
-
-
Subtotal
-
$8,094.00
-
- -
-
Savings
-
0
-
- -
-
Store Pickup
-
$99
-
- -
-
Tax
-
$199
-
- -
-
Total
-
$8,392.00
-
+
+ + + +
- -
- - -

One or more items in your cart require an account. Sign in or create an account now..

-
-
-
- -
- ) + +
+ ); } -export default index \ No newline at end of file +export default index; diff --git a/src/components/User/Header/index.tsx b/src/components/User/Header/index.tsx index 9934eac..6f2b8c6 100644 --- a/src/components/User/Header/index.tsx +++ b/src/components/User/Header/index.tsx @@ -13,6 +13,7 @@ const Header = (props: { { name: 'About Us', href: '#', showOnLarge: true }, { name: 'Meet Chefs', href: '#', showOnLarge: true }, { name: 'Foods', href: '/foodItems', showOnLarge: true }, + { name: 'Order History', href: '/orderhistory', showOnLarge: true }, { name: 'Gallery', href: '/gallery', showOnLarge: true }, { name: 'Contact Us', href: '#', showOnLarge: true }, ]; diff --git a/src/pages/Checkout/index.tsx b/src/pages/Checkout/index.tsx new file mode 100644 index 0000000..19403f5 --- /dev/null +++ b/src/pages/Checkout/index.tsx @@ -0,0 +1,10 @@ +import React from 'react' +import Checkout from '@components/User/Checkout/index.tsx' + +function index() { + return ( + + ) +} + +export default index \ No newline at end of file