diff --git a/dev-dist/sw.js b/dev-dist/sw.js index f05faaf..b003956 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", - "revision": "0.r4rebmaausg" + "revision": "0.jlpvaemfr1" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/index.html b/index.html index 5da213a..a289c81 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - ReGroup Admin + SEO Admin
diff --git a/public/icon-128x128.png b/public/icon-128x128.png index bfae856..0bf5639 100644 Binary files a/public/icon-128x128.png and b/public/icon-128x128.png differ diff --git a/public/icon-144x144.png b/public/icon-144x144.png index 2019178..51b7a9e 100644 Binary files a/public/icon-144x144.png and b/public/icon-144x144.png differ diff --git a/public/icon-152x152.png b/public/icon-152x152.png index da8ab94..736d410 100644 Binary files a/public/icon-152x152.png and b/public/icon-152x152.png differ diff --git a/public/icon-192x192.png b/public/icon-192x192.png index 5665c21..d6ec144 100644 Binary files a/public/icon-192x192.png and b/public/icon-192x192.png differ diff --git a/public/icon-384x384.png b/public/icon-384x384.png index 67d4e3b..fba4539 100644 Binary files a/public/icon-384x384.png and b/public/icon-384x384.png differ diff --git a/public/icon-512x512.png b/public/icon-512x512.png index 0f8ab70..6fa8c8d 100644 Binary files a/public/icon-512x512.png and b/public/icon-512x512.png differ diff --git a/public/icon-72x72.png b/public/icon-72x72.png index ff23f39..7d6fa9f 100644 Binary files a/public/icon-72x72.png and b/public/icon-72x72.png differ diff --git a/public/icon-96x96.png b/public/icon-96x96.png index be8528c..a0e71d4 100644 Binary files a/public/icon-96x96.png and b/public/icon-96x96.png differ diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest index 3a41eca..8ff7fdc 100644 --- a/public/manifest.webmanifest +++ b/public/manifest.webmanifest @@ -1,6 +1,6 @@ { - "name": "ReGroup", - "short_name": "RG", + "name": "SEO", + "short_name": "SEO", "description": "Join your community now", "start_url": "/", "display": "standalone", diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index 8503a54..896453b 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -3,7 +3,7 @@ import React, { FC } from "react"; import { GiHamburgerMenu } from "react-icons/gi"; import { RiNotificationLine } from "react-icons/ri"; import { nav } from "../Routes/Nav"; -import logo from '../assets/redogo.svg'; +import logo from '../assets/logo.svg' import { Avatar } from "../components/ui/avatar"; import { NavLink, useLocation, useNavigate, useParams } from "react-router-dom"; import { AccordionItem, AccordionItemContent, AccordionItemTrigger, AccordionRoot } from "../components/ui/accordion"; @@ -16,28 +16,19 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { return ( - - {/* ✅ Spheres */} - - - - - - - - - - - + + + + + - Menu {nav?.map(({ title, path, Icon, type, children }, index) => type === 'single' ? - {title} : - - - navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #222935', fontSize: '14px' }}> {title} - {children?.map(({ title, path, Icon }, index) => {title})} + {title} : + + + navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px' }}> {title} + {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} )} diff --git a/src/Layouts/animations.tsx b/src/Layouts/animations.tsx index 5e6cb67..04242c7 100644 --- a/src/Layouts/animations.tsx +++ b/src/Layouts/animations.tsx @@ -4,6 +4,7 @@ export const OPACITY_ON_LOAD = { as: motion.div, initial: { opacity: 0 }, animate: { opacity: 1 }, + transition: { duration: 0.5, ease: "easeInOut" } } export const SLIDE_IN_BOTTOM = { diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx index be3c187..ea2c5dd 100644 --- a/src/Pages/Login.tsx +++ b/src/Pages/Login.tsx @@ -1,25 +1,19 @@ -import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react" -import logo from '../assets/logo.svg' -import bgImage from '../assets/bgImage.png' -import { Field } from "../components/ui/field" -import { useForm } from "react-hook-form" -import { InputGroup } from "../components/ui/input-group" -import { MdEmail } from "react-icons/md" -import { BiLock } from "react-icons/bi" -import { PasswordInput } from "../components/ui/password-input" -import GlobalStateContext from "../Contexts/GlobalStateContext" +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react" import { useContext, useState } from "react" +import { useForm } from "react-hook-form" +import GlobalStateContext from "../Contexts/GlobalStateContext" +import logo from '../assets/logo.svg' import { Button } from "../components/ui/button" +import { Field } from "../components/ui/field" import { Toaster, toaster } from "../components/ui/toaster" interface FormValues { - email: string - password: string + mobileNumber: number } const Login = () => { - const [ isLoading, setIsLoading ] = useState(false) + const [isLoading, setIsLoading] = useState(false) const context = useContext(GlobalStateContext); if (!context) { throw new Error('App must be used within a GlobalStateProvider'); @@ -34,12 +28,12 @@ const Login = () => { const onSubmit = handleSubmit((data) => { setIsLoading(true) - if (data?.email === 'Admin' && data?.password === 'Admin') { + if (data?.mobileNumber === 1234567890) { setTimeout(() => { - setIsAuthenticate(true); + setIsAuthenticate(true); setIsLoading(false) }, 3000); // 3-second delay - + } else { toaster.create({ title: `Invalid Credentials`, @@ -51,42 +45,51 @@ const Login = () => { return ( - -
- -
-
- - Hello Again! - Welcome Back - - - }> - - - - - }> - - - - - - Forgot password + + + + + + + + + + + + + +
+ +
+ + + + + +
+ + LOGIN + + + + + {/* Forget password */} + + + + Forgot password + + + - - - -
- - +
+ + + ) } diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index fcd757f..f225b1a 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -1,8 +1,10 @@ import { LiaUsersSolid } from "react-icons/lia"; import { LuBellDot } from "react-icons/lu"; import { MdOutlineSupportAgent, MdPostAdd } from "react-icons/md"; -import { RiUserSettingsLine } from "react-icons/ri"; +import { GoDotFill } from "react-icons/go"; + import { TbFileSettings, TbLayoutDashboard, TbReport, TbUsers, TbUsersGroup } from "react-icons/tb"; +import { RiUserSettingsLine } from "react-icons/ri"; export const nav = [ @@ -30,15 +32,15 @@ export const nav = [ Icon: LiaUsersSolid, type:'multiple', children: [ - // { - // title: "Manage Community", - // path: "/manage-community", - // Icon: RiUserCommunityLine, - // }, + { + title: "Manage Community", + path: "/manage-community", + Icon: GoDotFill, + }, { title: "Manage Post", path: "/manage-post", - Icon: MdPostAdd, + Icon: GoDotFill, }, ], }, diff --git a/src/assets/favIcon.png b/src/assets/favIcon.png index 6f3d3f7..773842e 100644 Binary files a/src/assets/favIcon.png and b/src/assets/favIcon.png differ diff --git a/src/assets/logo.svg b/src/assets/logo.svg index f5f02b4..5cfa736 100644 --- a/src/assets/logo.svg +++ b/src/assets/logo.svg @@ -1,11 +1,6 @@ - - - - - - - - - - + + + + + diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx index 549876f..32c5f64 100644 --- a/src/components/MainFrame.tsx +++ b/src/components/MainFrame.tsx @@ -13,18 +13,13 @@ interface MainFrameProps { const MainFrame: FC = ({ children, title }) => { return ( - - - {title} - + {children} diff --git a/src/index.css b/src/index.css index c099b6a..1ac4b6c 100644 --- a/src/index.css +++ b/src/index.css @@ -6,31 +6,44 @@ .active { - background-color: #434A53; - color: #fff; - border: 1px solid #ffffff20 !important; + background-color: #02A0A0 !important; + color: #fff !important; + border: 1px solid #02A0A0 !important; transition: all 0.5s; border-radius: 8px; /* background-color: #e2e8f01c; */ } .active:hover { - background-color: #434A53; - color: #fff; - border: 1px solid #ffffff20 !important; + border: 1px solid #02A0A0 !important; transition: all 0.5s; border-radius: 8px; /* background-color: #e2e8f01c !important; */ } + + +.linkChild:hover{ + color: #02A0A0 !important; + transition: all 0.5s; +} + +.activeChild{ + + color: #02A0A0 !important; + /* border: 1px solid #02A0A0 !important; */ + transition: all 0.5s; + border-radius: 8px; +} + .link{ transition: all 0.5s; } .link:hover { - background-color: #434A53; + background-color: #02A0A0; color: #fff; - border: 1px solid #ffffff20 !important; + border: 1px solid #02A0A0 !important; /* color: #fff; */ /* background-color: #e2e8f01c !important; */ }