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

2023-10-18 00:30:33 +00:00
parent dca3104451 b5f0423fdb
commit c384764f72
14 changed files with 51 additions and 53 deletions
@@ -1,7 +1,10 @@
 .favicon {
  position: relative;
  top: 5px;
-  margin-left: 10px;
+  max-width: 250px;
+  max-height: 250px;
+  width: 100%;
+  height: 100%;
 }

 /* googleBtn */
@@ -8,6 +8,7 @@ import Button from "@mui/material/Button";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Checkbox from "@mui/material/Checkbox";
 import styles from "@/components/Authentication/Authentication.module.css";
+import WrenchBoardLogo from "@/public/images/logos/wrenchboard-logo.png";

 const SignInForm = () => {
  const handleSubmit = (event) => {
@@ -33,47 +34,21 @@ const SignInForm = () => {
        >
          <Grid item xs={12} md={12} lg={12} xl={12}>
            <Box>
-              <Typography as="h1" fontSize="28px" fontWeight="700" mb="65px">
-                Sign In{" "}
+              <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                mb="60px"
+              >
                <img
-                  src="/images/favicon.png"
-                  alt="favicon"
+                  src="/images/logos/wrenchboard-logo.png"
+                  alt="logo"
                  className={styles.favicon}
                />
-              </Typography>
-
-              {/* <Typography fontSize="15px" mb="30px">
-                Already have an account?{" "}
-                <Link
-                  href="/authentication/sign-up"
-                  className="primaryColor text-decoration-none"
-                >
-                  Sign up
-                </Link>
-              </Typography>
-
-              <Box
-                sx={{
-                  display: "flex",
-                  justifyContent: "space-between",
-                  alignItems: "center",
-                  mb: "30px",
-                }}
-              >
-                <Link href="#" className={styles.googleBtn}>
-                  <img src="/images/google-icon.png" />
-                  Sign in with Google
-                </Link>
-
-                <Link href="#" className={styles.fbBtn}>
-                  <img src="/images/fb-icon.png" />
-                  Sign in with Facebook
-                </Link>
              </Box>
-
-              <div className={styles.or}>
-                <span>or</span>
-              </div> */}
+              <Typography as="h1" fontSize="28px" fontWeight="700" mb="5px">
+                Sign In{" "}
+              </Typography>

              <Box component="form" noValidate onSubmit={handleSubmit}>
                <Box
@@ -11,7 +11,6 @@ import AuthRoute from "middlewares/AuthRoute";
 const Layout = ({ children }) => {
  const router = useRouter();
  const [active, setActive] = useState(false);
-  const isAuthenticated = false; // Replace with your authentication logic

  const toggleActive = () => {
    setActive(!active);
@@ -26,12 +25,12 @@ const Layout = ({ children }) => {
    "/authentication/logout",
  ].includes(router.pathname);

+  const title = isAuthenticationPage ? "CMC - Authentication" : "CMC - Client";
+
  return (
    <>
      <Head>
-        <title>
-          {isAuthenticated ? "CMC - Client" : "CMC - Authentication"}
-        </title>
+        <title>{title}</title>
        <meta name="viewport" content="initial-scale=1.0, width=device-width" />
      </Head>

@@ -46,13 +46,13 @@ const Sidebar = ({ toogleActive }) => {
            >
              <Link href='/'>
                <img 
-                  src="/images/logo.png" alt="Logo" 
+                  src="/images/logos/wrenchboard-logo.png" alt="Logo" 
                  className='black-logo' 
                />

                {/* For Dark Variation */}
                <img 
-                  src="/images/logo-white.png" alt="Logo" 
+                  src="/images/logos/wrenchboard-logo.png" alt="Logo" 
                  className='white-logo' 
                />
              </Link>
@@ -1,20 +1,21 @@
-"use client"
+"use client";
 import { useEffect } from "react";
 import { useRouter } from "next/router";

 /**
- * This is used to protect routes in a web application.
+ * This function is used to protect routes in a web application.
 * It checks if the user is authenticated and redirects them to the sign-in page if they are not.
+
 */
 const AuthRoute = ({ children }) => {
  const router = useRouter();

  useEffect(() => {
-    const isAuthenticated = false; // In a real application, this would be determined based on the user's authentication status.
+    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]);

  return <>{children}</>;
@@ -3,7 +3,6 @@ import '../styles/remixicon.css'
 import 'react-tabs/style/react-tabs.css';
 import "swiper/css";
 import "swiper/css/bundle";
-
 // Chat Styles
 import '../styles/chat.css'
 // Globals Styles
@@ -19,6 +18,7 @@ import { ThemeProvider, CssBaseline } from "@mui/material";
 import Layout from "@/components/_App/Layout";

 function MyApp({ Component, pageProps }) {
+
  return (
    <>
      <ThemeProvider theme={theme}>
@@ -7,11 +7,32 @@ class MyDocument extends Document {
    return (
      <Html dir={dir} lang={locale}>
        <Head>
-          <link rel="icon" href="/images/favicon.png" />
-          <link 
-            href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" 
+          <link
+            href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
            rel="stylesheet"
          />
+
+          {/* Icons */}
+          <link rel="icon" href="/images/icons/favicon.ico" />
+          <link
+            rel="icon"
+            href="/images/icons/favicon-16x16.png"
+            sizes="16x16"
+            type="image/png"
+          />
+          <link
+            rel="icon"
+            href="/images/icons/android-chrome-192x192.png"
+            sizes="192x192"
+            type="image/png"
+          />
+          <link rel="apple-touch-icon" href="/icons/apple-touch-icon.png" />
+          <link
+            rel="icon"
+            href="/images/icons/android-chrome-512x512.png"
+            sizes="512x512"
+            type="image/png"
+          />
        </Head>
        <body>
          <Main />
@@ -15,7 +15,6 @@ import RecentOrders from "@/components/Dashboard/eCommerce/RecentOrders";
 import TeamMembersList from "@/components/Dashboard/eCommerce/TeamMembersList";
 import BestSellingProducts from "@/components/Dashboard/eCommerce/BestSellingProducts";
 import LiveVisitsOnOurSite from "@/components/Dashboard/eCommerce/LiveVisitsOnOurSite";
-import AuthRoute from "middlewares/AuthRoute";

 function MainPage() {
  return (