Merge branch 'Logo-addition' of Controls/CMS-Client into master

components/Authentication/ForgotPasswordForm.js

@@ -104,7 +104,7 @@ const ForgotPasswordForm = () => {
 
               <Box as="div" textAlign="center" mt="20px">
                 <Link
-                  href="/authentication/sign-in/"
+                  href="/auth/sign-in/"
                   className="primaryColor text-decoration-none"
                 >
                   <i className="ri-arrow-left-s-line"></i> Back to Sign in

components/Authentication/SignInForm.js

@@ -128,7 +128,7 @@ const SignInForm = () => {
 
                   <Grid item xs={6} sm={6} textAlign="end">
                     <Link
-                      href="/authentication/forgot-password"
+                      href="/auth/forgot-password"
                       className="primaryColor text-decoration-none"
                     >
                       Forgot your password?

components/Authentication/SignUpForm.js

@@ -45,7 +45,7 @@ const SignUpForm = () => {
               <Typography fontSize="15px" mb="30px">
                 Already have an account?{" "}
                 <Link
-                  href="/authentication/sign-in/"
+                  href="/auth/sign-in/"
                   className="primaryColor text-decoration-none"
                 >
                   Sign in
@@ -204,7 +204,7 @@ const SignUpForm = () => {
 
                   <Grid item xs={6} sm={6} textAlign="end">
                     <Link
-                      href="/authentication/forgot-password"
+                      href="/auth/forgot-password"
                       className="primaryColor text-decoration-none"
                     >
                       Forgot your password?

components/_App/Layout.js

@@ -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 = [
+  useEffect(() => {
-    "/authentication/sign-in",
+    const authenticationPages = [
-    "/authentication/sign-up",
+      "/auth",
-    "/authentication/forgot-password",
+      "/auth/sign-in",
-    "/authentication/lock-screen",
+      "/auth/sign-up",
-    "/authentication/confirm-mail",
+      "/auth/forgot-password",
-    "/authentication/logout",
+      "/auth/lock-screen",
-  ].includes(router.pathname);
+      "/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" : ""}`}>
-        <div className={`main-wrapper-content ${active ? "active" : ""}`}>
+        {!isAuthenticationPage && (
-          {!isAuthenticationPage && (
+          <>
-            <>
+            <TopNavbar toggleActive={toggleActive} />
-              <TopNavbar toggleActive={toggleActive} />
+            <LeftSidebar toggleActive={toggleActive} />
-              <LeftSidebar toggleActive={toggleActive} />
+          </>
-            </>
+        )}
-          )}
 
-          <div className="main-content">{children}</div>
+        <div className="main-content">{children}</div>
 
-          {!isAuthenticationPage && <Footer />}
+        {!isAuthenticationPage && <Footer />}
-        </div>
+      </div>
 
-        <ScrollToTop />
+      <ScrollToTop />
 
-        {!isAuthenticationPage && <ControlPanelModal />}
+      {!isAuthenticationPage && <ControlPanelModal />}
-      </AuthRoute>
     </>
   );
 };

components/_App/LeftSidebar/SidebarData.js

@@ -450,7 +450,7 @@ export const SidebarData = [
   },
   {
     title: "Authentication",
-    path: "/authentication/sign-in/",
+    path: "/auth/sign-in/",
     icon: <LockIcon />,
     iconClosed: <KeyboardArrowRightIcon />,
     iconOpened: <KeyboardArrowDownIcon />,
@@ -458,23 +458,23 @@ export const SidebarData = [
     subNav: [
       {
         title: "Sign Up",
-        path: "/authentication/sign-up/",
+        path: "/auth/sign-up/",
       },
       {
         title: "Forgot Password",
-        path: "/authentication/forgot-password/",
+        path: "/auth/forgot-password/",
       },
       {
         title: "Lock Screen",
-        path: "/authentication/lock-screen/",
+        path: "/auth/lock-screen/",
       },
       {
         title: "Confirm Mail",
-        path: "/authentication/confirm-mail/",
+        path: "/auth/confirm-mail/",
       },
       {
         title: "Logout",
-        path: "/authentication/logout/",
+        path: "/auth/logout/",
       },
     ],
   },

components/_App/LeftSidebar/index.js

@@ -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 />

components/_App/TopNavbar/Profile.js

@@ -183,7 +183,7 @@ const Profile = () => {
           </ListItemIcon>
 
           <Link
-            href="/authentication/logout/"
+            href="/auth/logout/"
             fontSize="13px"
             color="inherit"
             underline="none"

components/_App/TopNavbar/index.js

@@ -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>

docker/Dockerfile

@@ -96,7 +96,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && yarn --version
 
 COPY docker-entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["docker-entrypoint.sh"]
+# ENTRYPOINT ["docker-entrypoint.sh"]
 # COPY docker-entrypoint.sh /usr/local/bin/
 # ENTRYPOINT ["docker-entrypoint.sh"]
 

middlewares/AuthRoute.js

@@ -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]);
 

pages/_app.js

@@ -1,34 +1,36 @@
-import React from 'react';
+import React from "react";
-import '../styles/remixicon.css'
+import "../styles/remixicon.css";
-import 'react-tabs/style/react-tabs.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>
+        <AuthRoute>
-          <Component {...pageProps} />
+          <Layout>
-        </Layout>
+            <Component {...pageProps} />
+          </Layout>
+        </AuthRoute>
       </ThemeProvider>
     </>
   );
 }
 
-export default MyApp
+export default MyApp;

pages/auth/index.js

@@ -0,0 +1,5 @@
+import SignInForm from "@/components/Authentication/SignInForm";
+
+export default function Index() {
+  return <SignInForm />;
+}

pages/auth/logout.js

@@ -51,7 +51,7 @@ export default function Logout() {
             </Typography>
 
             <Button
-              href="/authentication/sign-in/"
+              href="/auth/sign-in/"
               fullWidth
               variant="contained"
               sx={{