diff --git a/src/App.js b/src/App.js index 979f2d7..87e9961 100644 --- a/src/App.js +++ b/src/App.js @@ -7,6 +7,7 @@ import HomePage from './views/HomePage'; import SignupPage from './views/SignupPage'; import ForgetpwdPage from './views/ForgetpwdPage'; import UserExist from './component/authorization/UserExist'; +import AuthLayout from './component/auth/AuthLayout'; @@ -14,11 +15,14 @@ function App() { return (
- } /> - } /> - } /> - } /> - } /> + {/* auth routes wrapper */} + }> + } /> + } /> + } /> + } /> + } /> + {/* protected routes */} }> diff --git a/src/component/auth/AuthLayout.jsx b/src/component/auth/AuthLayout.jsx new file mode 100644 index 0000000..1525d07 --- /dev/null +++ b/src/component/auth/AuthLayout.jsx @@ -0,0 +1,25 @@ +import React, { useEffect, useState } from 'react' +import { Outlet } from 'react-router-dom' +import MainLoaderBS from '../loaders/MainLoaderBS' + +export default function AuthLayout() { + + const [loading, setLoading] = useState(true) + + useEffect(()=>{ + const timer = setTimeout(()=>{ + setLoading(false) + },500) + + return () => clearTimeout(timer) + },[]) + return ( +
+ {loading ? + + : + + } +
+ ) +} diff --git a/src/component/auth/Forgetpwd.jsx b/src/component/auth/Forgetpwd.jsx index e4e4e9c..e52ebae 100644 --- a/src/component/auth/Forgetpwd.jsx +++ b/src/component/auth/Forgetpwd.jsx @@ -23,10 +23,6 @@ export default function Forgetpwd() { return (
- - {loading ? - - :
@@ -61,7 +57,6 @@ export default function Forgetpwd() {
- }
) } diff --git a/src/component/auth/Forgetpwd2.jsx b/src/component/auth/Forgetpwd2.jsx index 1393e99..f506561 100644 --- a/src/component/auth/Forgetpwd2.jsx +++ b/src/component/auth/Forgetpwd2.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import LoginImg from '../../assets/bg/login.svg' -import BSMainLoader from '../loaders/BSMainLoader' +import MainLoaderBS from '../loaders/MainLoaderBS' import { Link, useNavigate } from 'react-router-dom' import siteLinks from '../../links/siteLinks' @@ -20,56 +20,49 @@ export default function Forgetpwd2() { },[]) return ( -
- - {loading ? - - : -
-
-
-
-
-
-
-
-
-

Recover Password

-

Please enter your email.

-
-
-
-
- - -
-
-
- -
-
-

Go Back

+
+
+
+
+
+
+
+
+
+

Recover Password

+

Please enter your email.

+ +
+
+
+ +
- -
+
+ +
+
+

Go Back

+
+
+
-
-
-
- -
+
+
+
+
+
-
+
- }
) } diff --git a/src/component/auth/Login.jsx b/src/component/auth/Login.jsx index 1991f73..d70eaa3 100644 --- a/src/component/auth/Login.jsx +++ b/src/component/auth/Login.jsx @@ -23,10 +23,6 @@ export default function Login() { return (
- - {loading ? - - :
@@ -77,7 +73,6 @@ export default function Login() {
- }
) } diff --git a/src/component/auth/Login2.jsx b/src/component/auth/Login2.jsx index 32cf313..d48b822 100644 --- a/src/component/auth/Login2.jsx +++ b/src/component/auth/Login2.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import LoginImg from '../../assets/bg/login.svg' -import BSMainLoader from '../loaders/BSMainLoader' +import MainLoaderBS from '../loaders/MainLoaderBS' import { Link, useNavigate } from 'react-router-dom' import siteLinks from '../../links/siteLinks' @@ -20,73 +20,66 @@ export default function Login() { },[]) return ( -
- - {loading ? - - : -
-
-
-
-
-
-
-
-
-

MERMS Panel

-

Welcome back, please login to your account.

-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- - -
- Forgot Password ? -
-
-
- -
-
-

Don't have an account ? Sign Up

+
+
+
+
+
+
+
+
+
+

MERMS Panel

+

Welcome back, please login to your account.

+ +
+
+
+ +
- -
+
+
+ + +
+
+
+
+
+ + +
+ Forgot Password ? +
+
+
+ +
+
+

Don't have an account ? Sign Up

+
+
+
-
-
-
- -
+
+
+
+
+
-
+
- }
) } diff --git a/src/component/auth/Signup.jsx b/src/component/auth/Signup.jsx index 54de4a4..d0229e6 100644 --- a/src/component/auth/Signup.jsx +++ b/src/component/auth/Signup.jsx @@ -23,10 +23,6 @@ export default function Signup() { return (
- - {loading ? - - :
@@ -96,7 +92,6 @@ export default function Signup() {
- }
) } diff --git a/src/component/auth/Signup2.jsx b/src/component/auth/Signup2.jsx index f79415f..3b66c55 100644 --- a/src/component/auth/Signup2.jsx +++ b/src/component/auth/Signup2.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import LoginImg from '../../assets/bg/login.svg' -import BSMainLoader from '../loaders/BSMainLoader' +import MainLoaderBS from '../loaders/MainLoaderBS' import { Link, useNavigate } from 'react-router-dom' import siteLinks from '../../links/siteLinks' @@ -20,88 +20,81 @@ export default function Signup2() { },[]) return ( -
- - {loading ? - - : -
-
-
-
-
-
-
-
-
-

MERMS Panel

-

Welcome, Please create your account.

-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-

Already have an account ? Sign In

+
+
+
+
+
+
+
+
+
+

MERMS Panel

+

Welcome, Please create your account.

+ +
+
+
+ +
- -
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+

Already have an account ? Sign In

+
+
+
-
-
-
- -
+
+
+
+
+
-
+
- }
) } diff --git a/src/component/authorization/UserExist.jsx b/src/component/authorization/UserExist.jsx index b755fbd..c742ac3 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 BSMainLoader from '../loaders/BSMainLoader' +import MainLoaderBS from '../loaders/MainLoaderBS' import Layout from '../layout/Layout' @@ -19,7 +19,7 @@ export default function UserExist() { return ( <> {loading ? - + : diff --git a/src/component/breadcrumb/BreadcrumbComBS.jsx b/src/component/breadcrumb/BreadcrumbComBS.jsx new file mode 100644 index 0000000..271cb78 --- /dev/null +++ b/src/component/breadcrumb/BreadcrumbComBS.jsx @@ -0,0 +1,34 @@ +import React from 'react' +import { MdKeyboardDoubleArrowRight } from 'react-icons/md' +import { TiHomeOutline } from 'react-icons/ti' +import siteLinks from '../../links/siteLinks' +import { Link } from 'react-router-dom' + +export default function BreadcrumbComBS({title='Home', paths=[]}) { + return ( + <> +
+
+
+
+

{title}

+
+
+ +
+
+
+
+ + ) +} diff --git a/src/component/home/Home.jsx b/src/component/home/Home.jsx index b96313a..ace5834 100644 --- a/src/component/home/Home.jsx +++ b/src/component/home/Home.jsx @@ -1,9 +1,5 @@ import React from 'react' -import UserMenu from "../../parts/UserMenu"; -import UserHeader from "../../parts/UserHeader"; -import HomeSections from "../../parts/HomeSections"; -import UserFooter from "../../parts/UserFooter"; -import LoaderImage from "../../parts/LoaderImage"; +import HomeSections from "./HomeSections"; export default function Home() { return ( diff --git a/src/parts/HomeSections.jsx b/src/component/home/HomeSections.jsx similarity index 99% rename from src/parts/HomeSections.jsx rename to src/component/home/HomeSections.jsx index 39d2270..584aaea 100644 --- a/src/parts/HomeSections.jsx +++ b/src/component/home/HomeSections.jsx @@ -1,10 +1,11 @@ import React from "react"; +import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS"; export default function HomeSections(){ return <> -
+ {/*
@@ -25,7 +26,8 @@ export default function HomeSections(){
-
+
*/} +
diff --git a/src/component/layout/Layout.jsx b/src/component/layout/Layout.jsx index 6795f2d..1895e9c 100644 --- a/src/component/layout/Layout.jsx +++ b/src/component/layout/Layout.jsx @@ -1,7 +1,7 @@ import React from 'react' -import UserMenu from "../../parts/UserMenu"; -import UserHeader from "../../parts/UserHeader"; -import UserFooter from "../../parts/UserFooter"; +import UserMenu from "./layoutcom/UserMenu"; +import UserHeader from "./layoutcom/UserHeader"; +import UserFooter from "./layoutcom/UserFooter"; import { Outlet } from 'react-router-dom'; diff --git a/src/parts/UserFooter.jsx b/src/component/layout/layoutcom/UserFooter.jsx similarity index 100% rename from src/parts/UserFooter.jsx rename to src/component/layout/layoutcom/UserFooter.jsx diff --git a/src/parts/UserHeader.jsx b/src/component/layout/layoutcom/UserHeader.jsx similarity index 100% rename from src/parts/UserHeader.jsx rename to src/component/layout/layoutcom/UserHeader.jsx diff --git a/src/parts/UserMenu.jsx b/src/component/layout/layoutcom/UserMenu.jsx similarity index 98% rename from src/parts/UserMenu.jsx rename to src/component/layout/layoutcom/UserMenu.jsx index 5ec0fa2..688c42a 100644 --- a/src/parts/UserMenu.jsx +++ b/src/component/layout/layoutcom/UserMenu.jsx @@ -1,6 +1,6 @@ import React from 'react' import { Link, useLocation } from 'react-router-dom' -import siteLinks from '../links/siteLinks' +import siteLinks from '../../../links/siteLinks' export default function UserMenu() { const {pathname} = useLocation() diff --git a/src/component/loaders/BSMainLoader.jsx b/src/component/loaders/MainLoaderBS.jsx similarity index 88% rename from src/component/loaders/BSMainLoader.jsx rename to src/component/loaders/MainLoaderBS.jsx index 4ff404f..2464d6a 100644 --- a/src/component/loaders/BSMainLoader.jsx +++ b/src/component/loaders/MainLoaderBS.jsx @@ -1,7 +1,7 @@ import React from 'react' import Loader from '../../assets/loader/loader.svg' -export default function BSMainLoader() { +export default function MainLoaderBS() { return (