shortened the url of the auth, fixed sidebar toggle issue and fixed browser tab
This commit is contained in:
+32
-24
@@ -1,4 +1,4 @@
|
||||
import React, { useState } from "react";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import Head from "next/head";
|
||||
import { useRouter } from "next/router";
|
||||
import LeftSidebar from "@/components/_App/LeftSidebar";
|
||||
@@ -12,20 +12,30 @@ const Layout = ({ children }) => {
|
||||
const router = useRouter();
|
||||
const [active, setActive] = useState(false);
|
||||
|
||||
const [isAuthenticationPage, setIsAuthenticationPage] = useState(false);
|
||||
|
||||
const toggleActive = () => {
|
||||
setActive(!active);
|
||||
};
|
||||
|
||||
const isAuthenticationPage = [
|
||||
"/authentication/sign-in",
|
||||
"/authentication/sign-up",
|
||||
"/authentication/forgot-password",
|
||||
"/authentication/lock-screen",
|
||||
"/authentication/confirm-mail",
|
||||
"/authentication/logout",
|
||||
].includes(router.pathname);
|
||||
useEffect(() => {
|
||||
const authenticationPages = [
|
||||
"/auth",
|
||||
"/auth/sign-in",
|
||||
"/auth/sign-up",
|
||||
"/auth/forgot-password",
|
||||
"/auth/lock-screen",
|
||||
"/auth/confirm-mail",
|
||||
"/auth/logout",
|
||||
];
|
||||
|
||||
const title = isAuthenticationPage ? "CMC - Authentication" : "CMC - Client";
|
||||
setIsAuthenticationPage(authenticationPages.includes(router.pathname));
|
||||
}, [router.pathname]);
|
||||
|
||||
// Debugging: Log the value of isAuthenticationPage
|
||||
console.log("isAuthenticationPage:", isAuthenticationPage, router.pathname);
|
||||
|
||||
const title = isAuthenticationPage ? "CMC - auth" : "CMC - dashboard";
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -34,24 +44,22 @@ const Layout = ({ children }) => {
|
||||
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
|
||||
</Head>
|
||||
|
||||
<AuthRoute>
|
||||
<div className={`main-wrapper-content ${active ? "active" : ""}`}>
|
||||
{!isAuthenticationPage && (
|
||||
<>
|
||||
<TopNavbar toggleActive={toggleActive} />
|
||||
<LeftSidebar toggleActive={toggleActive} />
|
||||
</>
|
||||
)}
|
||||
<div className={`main-wrapper-content ${active ? "active" : ""}`}>
|
||||
{!isAuthenticationPage && (
|
||||
<>
|
||||
<TopNavbar toggleActive={toggleActive} />
|
||||
<LeftSidebar toggleActive={toggleActive} />
|
||||
</>
|
||||
)}
|
||||
|
||||
<div className="main-content">{children}</div>
|
||||
<div className="main-content">{children}</div>
|
||||
|
||||
{!isAuthenticationPage && <Footer />}
|
||||
</div>
|
||||
{!isAuthenticationPage && <Footer />}
|
||||
</div>
|
||||
|
||||
<ScrollToTop />
|
||||
<ScrollToTop />
|
||||
|
||||
{!isAuthenticationPage && <ControlPanelModal />}
|
||||
</AuthRoute>
|
||||
{!isAuthenticationPage && <ControlPanelModal />}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -29,7 +29,7 @@ const SidebarWrap = styled("div")(({ theme }) => ({
|
||||
width: '100%'
|
||||
}));
|
||||
|
||||
const Sidebar = ({ toogleActive }) => {
|
||||
const Sidebar = ({ toggleActive }) => {
|
||||
return (
|
||||
<>
|
||||
<div className='leftSidebarDark'>
|
||||
@@ -58,11 +58,12 @@ const Sidebar = ({ toogleActive }) => {
|
||||
</Link>
|
||||
|
||||
<IconButton
|
||||
onClick={toogleActive}
|
||||
onClick={toggleActive}
|
||||
size="small"
|
||||
sx={{
|
||||
background: 'rgb(253, 237, 237)',
|
||||
display: { lg: 'none' }
|
||||
display: { lg: 'none' },
|
||||
marginLeft: "1rem"
|
||||
}}
|
||||
>
|
||||
<ClearIcon />
|
||||
|
||||
@@ -7,7 +7,7 @@ import Profile from "./Profile";
|
||||
import Tooltip from "@mui/material/Tooltip";
|
||||
import CurrentDate from "./CurrentDate";
|
||||
|
||||
const TopNavbar = ({ toogleActive }) => {
|
||||
const TopNavbar = ({ toggleActive }) => {
|
||||
return (
|
||||
<>
|
||||
<div className="topNavbarDark">
|
||||
@@ -28,7 +28,7 @@ const TopNavbar = ({ toogleActive }) => {
|
||||
size="sm"
|
||||
edge="start"
|
||||
color="inherit"
|
||||
onClick={toogleActive}
|
||||
onClick={toggleActive}
|
||||
>
|
||||
<i className="ri-align-left"></i>
|
||||
</IconButton>
|
||||
|
||||
@@ -14,7 +14,7 @@ const AuthRoute = ({ children }) => {
|
||||
const isAuthenticated = true; // In a real application, this would be determined based on the user's authentication status.
|
||||
|
||||
if (!isAuthenticated) {
|
||||
router.push("/authentication/sign-in/");
|
||||
router.push("/auth/");
|
||||
}
|
||||
}, [router]);
|
||||
|
||||
|
||||
+15
-13
@@ -1,34 +1,36 @@
|
||||
import React from 'react';
|
||||
import '../styles/remixicon.css'
|
||||
import 'react-tabs/style/react-tabs.css';
|
||||
import React from "react";
|
||||
import "../styles/remixicon.css";
|
||||
import "react-tabs/style/react-tabs.css";
|
||||
import "swiper/css";
|
||||
import "swiper/css/bundle";
|
||||
// Chat Styles
|
||||
import '../styles/chat.css'
|
||||
import "../styles/chat.css";
|
||||
// Globals Styles
|
||||
import '../styles/globals.css'
|
||||
import "../styles/globals.css";
|
||||
// Rtl Styles
|
||||
import '../styles/rtl.css'
|
||||
import "../styles/rtl.css";
|
||||
// Dark Mode Styles
|
||||
import '../styles/dark.css'
|
||||
import "../styles/dark.css";
|
||||
// Theme Styles
|
||||
import theme from '../styles/theme'
|
||||
import theme from "../styles/theme";
|
||||
|
||||
import { ThemeProvider, CssBaseline } from "@mui/material";
|
||||
import Layout from "@/components/_App/Layout";
|
||||
import AuthRoute from "middlewares/AuthRoute";
|
||||
|
||||
function MyApp({ Component, pageProps }) {
|
||||
|
||||
return (
|
||||
<>
|
||||
<ThemeProvider theme={theme}>
|
||||
<CssBaseline />
|
||||
<Layout>
|
||||
<Component {...pageProps} />
|
||||
</Layout>
|
||||
<AuthRoute>
|
||||
<Layout>
|
||||
<Component {...pageProps} />
|
||||
</Layout>
|
||||
</AuthRoute>
|
||||
</ThemeProvider>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default MyApp
|
||||
export default MyApp;
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
import SignInForm from "@/components/Authentication/SignInForm";
|
||||
|
||||
export default function Index() {
|
||||
return <SignInForm />;
|
||||
}
|
||||
Reference in New Issue
Block a user