diff --git a/src/App.js b/src/App.js index 5a7252c..cc74ef9 100644 --- a/src/App.js +++ b/src/App.js @@ -14,13 +14,13 @@ function App() { return (
- } /> + } /> } /> - } /> + } /> {/* protected routes */} }> - } /> + } />
diff --git a/src/component/auth/Login2.jsx b/src/component/auth/Login2.jsx index 1527128..59b6e11 100644 --- a/src/component/auth/Login2.jsx +++ b/src/component/auth/Login2.jsx @@ -1,12 +1,16 @@ import React, { useEffect, useState } from 'react' import LoginImg from '../../assets/bg/login.svg' -import MainLoader from '../loaders/MainLoader' +import BSMainLoader from '../loaders/BSMainLoader' +import { Link, useNavigate } from 'react-router-dom' +import siteLinks from '../../links/siteLinks' export default function Login() { const [loading, setLoading] = useState(true) + const navigate = useNavigate() + useEffect(()=>{ const timer = setTimeout(()=>{ setLoading(false) @@ -17,9 +21,8 @@ export default function Login() { return (
- {loading ? - + :
@@ -54,21 +57,21 @@ export default function Login() { Remember Me
- Forgot Password ? + Forgot Password ?
- Sign In +
-

Don't have an account ? Sign Up

+

Don't have an account ? Sign Up

-
+
diff --git a/src/component/authorization/UserExist.jsx b/src/component/authorization/UserExist.jsx index 813a938..5f99bef 100644 --- a/src/component/authorization/UserExist.jsx +++ b/src/component/authorization/UserExist.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react' import { Outlet } from 'react-router-dom' -import MainLoader from '../loaders/MainLoader' +import BSMainLoader from '../loaders/BSMainLoader' export default function UserExist() { @@ -17,7 +17,7 @@ export default function UserExist() { return ( <> {loading ? - + : } diff --git a/src/component/home/Home.jsx b/src/component/home/Home.jsx index 69b6426..660e1ad 100644 --- a/src/component/home/Home.jsx +++ b/src/component/home/Home.jsx @@ -37,12 +37,12 @@ export default function Home() {
  • - +
  • - @@ -147,25 +147,25 @@ export default function Home() {
  • -
  • - +
  • -
  • - View All Notifications + View All Notifications
  • - +
    @@ -385,7 +385,7 @@ export default function Home() {
  • -
    • + Profile - + Inbox 6 - + Settings - + Need help?
    @@ -577,7 +577,7 @@ export default function Home() { Export
    -
    +
    @@ -596,546 +596,544 @@ export default function Home() { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1185,7 +1183,7 @@ export default function Home() {
    -
    +
    @@ -1254,7 +1252,7 @@ export default function Home() {
    -
    +

    Total Sales

    @@ -1264,14 +1262,14 @@ export default function Home() {
    -
    -
    +
    -
    -
    -
    @@ -1471,8 +1469,8 @@ export default function Home() { Ordered: 45 Items available: 8
    -
    -
    +
    @@ -1489,7 +1487,7 @@ export default function Home() {
    -

    $272

    @@ -1501,7 +1499,7 @@ export default function Home() {
    -

    $450

    @@ -1514,7 +1512,7 @@ export default function Home() {
    -

    $135

    Quantity

    @@ -1526,7 +1524,7 @@ export default function Home() {
    -

    $7525

    Total Products

    diff --git a/src/component/loaders/BSMainLoader.jsx b/src/component/loaders/BSMainLoader.jsx new file mode 100644 index 0000000..77c1b77 --- /dev/null +++ b/src/component/loaders/BSMainLoader.jsx @@ -0,0 +1,15 @@ +import React from 'react' + +import Loader from '../../assets/loader/loader.svg' + +export default function BSMainLoader() { + return ( +
    +
    +
    + loader +
    +
    +
    + ) +} diff --git a/src/views/LoginPage.jsx b/src/views/LoginPage.jsx index d3643f0..09855af 100644 --- a/src/views/LoginPage.jsx +++ b/src/views/LoginPage.jsx @@ -1,8 +1,8 @@ import React from 'react' -import Login from '../component/auth/Login' +import Login2 from '../component/auth/Login2' export default function LoginPage() { return ( - + ) }
    Cold Shoulder Bling Dress $65.342 -
    -
    +
    		Active
    2 PlayStation 4 Pro 1TB Console $47.655 -
    -
    +
    +
    		Active
    3 Extra Fine Wool Jumpers $56.479 -
    -
    +
    +
    		Canceled
    4 Long Sleeve Bow Top $04.786 -
    -
    +
    		Active
    5 Shine Stripe Long Sleeve Ruffle $23.456 -
    -
    +
    		Active
    6 Long Sleeve Micro Thermal Shirt $65.598 -
    -
    +
    		info
    7 Standard Fit Bomber Sweater $87.659 -
    -
    +
    		Warning
    8 Standard Fit Crew T-Shirt $32.466 -
    -
    +
    		Active
    9 Standard Fit Short Sleeve V-Neck $03.544 -
    -
    +
    		Active
    10 Sanus classNameic Small Full Motion Wall $14.489 -
    -
    +
    		Active
    11 Jena Gaines $78.654 -
    -
    +
    		Active
    12 Quinn Flynn $23.486 -
    -
    +
    		Active
    13 Charde Marshall $65.453 -
    -
    +
    		Active
    14 Haley Kennedy $78.645 -
    -
    +
    		Active
    15 Tatyana Fitzpatrick $65.342 -
    -
    +
    		Active
    16 Michael Silva $07.456 -
    -
    +
    		Active
    17 Paul Byrd $36.478 -
    -
    +
    		Active
    18 Gloria Little $84.798 -
    -
    +
    		Active
    19 Bradley Greer $12.356 -
    -
    +
    		Active
    20 Dai Rios $45.655 -
    -
    +
    		Active
    21 Jenette Caldwell $47.586 -
    -
    +
    		Active
    22 Yuri Berry $36.756 -
    -
    +
    		Active
    23 Caesar Vance $78.659 -
    -
    +
    		Active
    24 Doris Wilder $56.484 -
    -
    +
    		Active
    25 Angelica Ramos $36.796 -
    -
    +
    		Active
    26 Gavin Joyce $25.365 -
    -
    +
    		Active
    27 Jennifer Chang $78.489 -
    -
    +
    		Active
    28 Brenden Wagner $35.987 -
    -
    +
    		Active
    29 Fiona Green $78.464 -
    -
    +
    		Active
    30 Shou Itou $61.444 -
    -
    +
    		Active
    31 Michelle House $85.488 -
    -
    +
    		Active
    32 Suki Burks $89.463 -
    -
    +
    		Active
    33 Prescott Bartlett $23.464 -
    -
    +
    		Active
    34 Gavin Cortez $12.254 -
    -
    +
    		Active
    35 Martena Mccray $24.478 -
    -
    +
    		Active
    36 Unity Butler $36.478 -
    -
    +
    		Active
    37 Howard Hatfield $48.654 -
    -
    +
    		Active
    38 Hope Fuentes $78.654 -
    -
    +
    		Active
    39 Vivian Harrell $26.154 -
    -
    +
    		Active