-
+
);
}
diff --git a/src/components/footer/Footer.js b/src/components/footer/Footer.js
index c00b8b2..29a8e35 100644
--- a/src/components/footer/Footer.js
+++ b/src/components/footer/Footer.js
@@ -1,9 +1,9 @@
import React from 'react'
import "./footer.css"
import { useState } from 'react';
-import Divider from '@material-ui/core/Divider';
+// import Divider from '@material-ui/core/Divider';
-import amnLogo from '../src/assets/amazon-logo.png';
+import amnLogo from '../../assets/amazon-logo.png';
import logo from './amazon-logo.png';
diff --git a/src/components/header/Header.js b/src/components/header/Header.js
index a5be9f8..0aabc8b 100644
--- a/src/components/header/Header.js
+++ b/src/components/header/Header.js
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
import './Header.css';
import logo from '../../assets/amazon-logo.png';
import { ReactComponent as LocationSvg } from '../../assets/Location.svg';
@@ -21,7 +21,7 @@ function Header(props) {
/*this will help you
signout*/
// }
- let history=useHistory();
+ let navigate=useNavigate();
const handleAuthentication = () => {
if (user) {
auth.signOut();
@@ -73,17 +73,17 @@ function Header(props) {
{/*this will handle the authentication
if user is already signed in it will show
signout*/}
- history.push('/login')}>
+ navigate('/login')}>
{user ? 'Sign Out' : 'Sign In'}
{(value) ? <>
-
history.push('/login')}>
+
navigate('/login')}>
Sign In
- New customer?history.push('/login')}> Start here.
+ New customer?navigate('/login')}> Start here.
:null}
diff --git a/src/components/layout/Layout.js b/src/components/layout/Layout.js
new file mode 100644
index 0000000..e7e3d04
--- /dev/null
+++ b/src/components/layout/Layout.js
@@ -0,0 +1,17 @@
+import React from 'react'
+import Footer from '../footer/Footer'
+import Header from '../header/Header'
+import Navbar from '../navbar/Navbar'
+
+const Layout = ({children}) => {
+ return (
+
+
+
+ {children}
+
+
+ )
+}
+
+export default Layout
\ No newline at end of file
diff --git a/src/components/payment/Payment.js b/src/components/payment/Payment.js
index bf1b2a4..d9fe096 100644
--- a/src/components/payment/Payment.js
+++ b/src/components/payment/Payment.js
@@ -2,7 +2,7 @@ import React, { useState,useEffect} from 'react'
import CheckoutProduct from '../checkOut/CheckoutProduct';
import "./Payment.css"
import { useStateValue } from "../../context/StateProvider";
-import {Link,useHistory} from "react-router-dom";
+import {Link,useNavigate} from "react-router-dom";
import {loadStripe} from "@stripe/stripe-js";
import {CardElement, useStripe, useElements} from '@stripe/react-stripe-js';
import CurrencyFormat from "react-currency-format";
@@ -20,7 +20,7 @@ const promise=loadStripe('pk_test_51JdCsbSDjgMnau9ncKpDOaddNIWtdhVTTV92V4ShkTzLe
function Payment() {
usePageMeta("Payments - Amazon Clone","Shop with us")
const[{basket,user},dispatch]=useStateValue();
- const history=useHistory();
+ const navigate=useNavigate();
//hooks from stripe
@@ -84,8 +84,7 @@ const[error,setError]=useState(null);
setSucceeded(true);
setError(null);
setProcessing(false);
- history.replace("./orders");
-
+ navigate('./orders', { replace: true });
})
diff --git a/src/components/subTotal/Subtotal.js b/src/components/subTotal/Subtotal.js
index af56ee3..127a415 100644
--- a/src/components/subTotal/Subtotal.js
+++ b/src/components/subTotal/Subtotal.js
@@ -4,12 +4,12 @@ import './Subtotal.css'
import CurrencyFormat from "react-currency-format";
import { useStateValue } from "../../context/StateProvider";
import { getBasketTotal } from "../../reducer/reducer";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
import { ReactComponent as TickSvg } from "../../assets/tick.svg";
function Subtotal() {
//provide browser history
- const history = useHistory();
+ const navigate = useNavigate();
const [{ basket }, dispatch] = useStateValue();
return (