Controls/CMS-Client
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Olusesan Ameye
2023-10-18 00:30:33 +00:00
committed by Gogs
parent dca3104451 b5f0423fdb
commit c384764f72
14 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/Authentication/Authentication.module.css
+4 -1
View File
@@ -1,7 +1,10 @@
.favicon { .favicon {
position: relative; position: relative;
top: 5px; top: 5px;
margin-left: 10px; max-width: 250px;
max-height: 250px;
width: 100%;
height: 100%;
} }
/* googleBtn */ /* googleBtn */
components/Authentication/SignInForm.js
+12 -37
View File
@@ -8,6 +8,7 @@ import Button from "@mui/material/Button";
import FormControlLabel from "@mui/material/FormControlLabel"; import FormControlLabel from "@mui/material/FormControlLabel";
import Checkbox from "@mui/material/Checkbox"; import Checkbox from "@mui/material/Checkbox";
import styles from "@/components/Authentication/Authentication.module.css"; import styles from "@/components/Authentication/Authentication.module.css";
import WrenchBoardLogo from "@/public/images/logos/wrenchboard-logo.png";
const SignInForm = () => { const SignInForm = () => {
const handleSubmit = (event) => { const handleSubmit = (event) => {
@@ -33,47 +34,21 @@ const SignInForm = () => {
> >
<Grid item xs={12} md={12} lg={12} xl={12}> <Grid item xs={12} md={12} lg={12} xl={12}>
<Box> <Box>
<Typography as="h1" fontSize="28px" fontWeight="700" mb="65px"> <Box
Sign In{" "} display="flex"
alignItems="center"
justifyContent="center"
mb="60px"
>
<img <img
src="/images/favicon.png" src="/images/logos/wrenchboard-logo.png"
alt="favicon" alt="logo"
className={styles.favicon} 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> </Box>
<Typography as="h1" fontSize="28px" fontWeight="700" mb="5px">
<div className={styles.or}> Sign In{" "}
<span>or</span> </Typography>
</div> */}
<Box component="form" noValidate onSubmit={handleSubmit}> <Box component="form" noValidate onSubmit={handleSubmit}>
<Box <Box
components/_App/Layout.js
+3 -4
View File
@@ -11,7 +11,6 @@ import AuthRoute from "middlewares/AuthRoute";
const Layout = ({ children }) => { const Layout = ({ children }) => {
const router = useRouter(); const router = useRouter();
const [active, setActive] = useState(false); const [active, setActive] = useState(false);
const isAuthenticated = false; // Replace with your authentication logic
const toggleActive = () => { const toggleActive = () => {
setActive(!active); setActive(!active);
@@ -26,12 +25,12 @@ const Layout = ({ children }) => {
"/authentication/logout", "/authentication/logout",
].includes(router.pathname); ].includes(router.pathname);
const title = isAuthenticationPage ? "CMC - Authentication" : "CMC - Client";
return ( return (
<> <>
<Head> <Head>
<title> <title>{title}</title>
{isAuthenticated ? "CMC - Client" : "CMC - Authentication"}
</title>
<meta name="viewport" content="initial-scale=1.0, width=device-width" /> <meta name="viewport" content="initial-scale=1.0, width=device-width" />
</Head> </Head>
components/_App/LeftSidebar/index.js
+2 -2
View File
@@ -46,13 +46,13 @@ const Sidebar = ({ toogleActive }) => {
> >
<Link href='/'> <Link href='/'>
<img <img
src="/images/logo.png" alt="Logo" src="/images/logos/wrenchboard-logo.png" alt="Logo"
className='black-logo' className='black-logo'
/> />
{/* For Dark Variation */} {/* For Dark Variation */}
<img <img
src="/images/logo-white.png" alt="Logo" src="/images/logos/wrenchboard-logo.png" alt="Logo"
className='white-logo' className='white-logo'
/> />
</Link> </Link>
middlewares/AuthRoute.js
+5 -4
View File
@@ -1,20 +1,21 @@
"use client" "use client";
import { useEffect } from "react"; import { useEffect } from "react";
import { useRouter } from "next/router"; 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. * It checks if the user is authenticated and redirects them to the sign-in page if they are not.
*/ */
const AuthRoute = ({ children }) => { const AuthRoute = ({ children }) => {
const router = useRouter(); const router = useRouter();
useEffect(() => { 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) { if (!isAuthenticated) {
router.push("/authentication/sign-in/"); router.push("/authentication/sign-in/");
} }
}, [router]); }, [router]);
return <>{children}</>; return <>{children}</>;
pages/_app.js
+1 -1
View File
@@ -3,7 +3,6 @@ import '../styles/remixicon.css'
import 'react-tabs/style/react-tabs.css'; import 'react-tabs/style/react-tabs.css';
import "swiper/css"; import "swiper/css";
import "swiper/css/bundle"; import "swiper/css/bundle";
// Chat Styles // Chat Styles
import '../styles/chat.css' import '../styles/chat.css'
// Globals Styles // Globals Styles
@@ -19,6 +18,7 @@ import { ThemeProvider, CssBaseline } from "@mui/material";
import Layout from "@/components/_App/Layout"; import Layout from "@/components/_App/Layout";
function MyApp({ Component, pageProps }) { function MyApp({ Component, pageProps }) {
return ( return (
<> <>
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
pages/_document.js
+24 -3
View File
@@ -7,11 +7,32 @@ class MyDocument extends Document {
return ( return (
<Html dir={dir} lang={locale}> <Html dir={dir} lang={locale}>
<Head> <Head>
<link rel="icon" href="/images/favicon.png" /> <link
<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"
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" 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> </Head>
<body> <body>
<Main /> <Main />
pages/index.js
-1
View File
@@ -15,7 +15,6 @@ import RecentOrders from "@/components/Dashboard/eCommerce/RecentOrders";
import TeamMembersList from "@/components/Dashboard/eCommerce/TeamMembersList"; import TeamMembersList from "@/components/Dashboard/eCommerce/TeamMembersList";
import BestSellingProducts from "@/components/Dashboard/eCommerce/BestSellingProducts"; import BestSellingProducts from "@/components/Dashboard/eCommerce/BestSellingProducts";
import LiveVisitsOnOurSite from "@/components/Dashboard/eCommerce/LiveVisitsOnOurSite"; import LiveVisitsOnOurSite from "@/components/Dashboard/eCommerce/LiveVisitsOnOurSite";
import AuthRoute from "middlewares/AuthRoute";
function MainPage() { function MainPage() {
return ( return (
public/images/icons/android-chrome-192x192.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

public/images/icons/android-chrome-512x512.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

public/images/icons/apple-touch-icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

public/images/icons/favicon-16x16.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 713 B

public/images/icons/favicon.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

public/images/logos/wrenchboard-logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB