Merge pull request #108 from AkshataKatwal16/admin

Issue PS-986 feat: change menuItem icon at sidebar
tekdi · Aug 8, 2024 · 13d7ef9 · 13d7ef9
2 parents 8a13c41 + dffae70
commit 13d7ef9
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 12 deletions.
diff --git a/public/images/calendar.svg b/public/images/calendar.svg
diff --git a/public/images/centers.svg b/public/images/centers.svg
diff --git a/public/images/dashboard.svg b/public/images/dashboard.svg
diff --git a/public/images/database.svg b/public/images/database.svg
diff --git a/public/images/event_available.svg b/public/images/event_available.svg
diff --git a/public/images/group.svg b/public/images/group.svg
diff --git a/public/login.jpg b/public/login.jpg
diff --git a/public/6300830.jpg → public/loginImage.jpg b/public/6300830.jpg → public/loginImage.jpg
diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -116,7 +116,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     return errors?.map((error: any) => {
       switch (error.name) {
         case "required": {
-          console.log(submittedButtonStatus);
+         // console.log(submittedButtonStatus);
           error.message = submittedButtonStatus? t("FORM_ERROR_MESSAGES.THIS_IS_REQUIRED_FIELD") : "";
           break;
         }

diff --git a/src/components/layouts/sidebar/MenuItems.js b/src/components/layouts/sidebar/MenuItems.js
@@ -1,12 +1,23 @@
+import masterIcon  from '../../../../public/images/database.svg';
+import centerIcon  from '../../../../public/images/centers.svg';
+import dashboardIcon  from '../../../../public/images/dashboard.svg';
+import userIcon  from '../../../../public/images/group.svg';
+import coursePannerIcon  from '../../../../public/images/event_available.svg';
+
+
+
+// 
+
+
 const Menuitems = [
   {
     title: "SIDEBAR.DASHBOARD",
-    icon: "home",
+    icon: dashboardIcon,
     href: "/dashboard",
   },
   {
     title: "SIDEBAR.MANAGE_USERS",
-    icon: "user",
+    icon: userIcon,
     //  href: "/",
     subOptions: [
       {
@@ -26,13 +37,13 @@ const Menuitems = [
 
   {
     title: "SIDEBAR.CENTERS",
-    icon: "users",
+    icon: centerIcon,
     href: "/centers",
   },
 
   {
     title: "Master ",
-    icon: "database",
+    icon: masterIcon,
     // href: "/",
     subOptions: [
       {
@@ -51,7 +62,7 @@ const Menuitems = [
   },
   {
     title: "SIDEBAR.COURSE_PLANNER",
-    icon: "calendar",
+    icon: coursePannerIcon,
     href: "/course-planner",
     subOptions: [
       {

diff --git a/src/components/layouts/sidebar/Sidebar.tsx b/src/components/layouts/sidebar/Sidebar.tsx
@@ -19,6 +19,8 @@ import { useState } from "react";
 import LogoIcon from "../logo/LogoIcon";
 import Buynow from "./Buynow";
 import Menuitems from "./MenuItems";
+import Image from "next/image";
+import MasterIcon  from '../../../../public/images/database.svg';
 
 const Sidebar = ({
   isMobileSidebarOpen,
@@ -66,17 +68,22 @@ const Sidebar = ({
                   selected={location === item.href}
                   sx={{
                     mb: 1,
+
                     ...(location === item.href && {
                       color: "black",
                       backgroundColor: (theme) =>
                         `${theme.palette.primary.main}!important`,
                     }),
                   }}
                 >
-                  <ListItemIcon>
-                    <FeatherIcon icon={item.icon} />
-                  </ListItemIcon>
-                  <ListItemText>
+             {/* {  item.icon && (<ListItemIcon>
+  {item.icon}
+</ListItemIcon>) */}
+<ListItemIcon>
+<Image src={item.icon} alt="" />
+
+</ListItemIcon>
+      <ListItemText>
                     <Typography variant="h2" sx={{ fontWeight: "bold" }}>
                       {t(item.title)}
                     </Typography>
@@ -106,7 +113,7 @@ const Sidebar = ({
                           selected={location === subItem.href}
                           sx={{
                             pl: 8,
-                            ml: 2,
+                           ml: 2,
                             mb: 1,
                             ...(location === subItem.href && {
                               color: "black",

diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -28,7 +28,7 @@ import { telemetryFactory } from "@/utils/telemetry";
 import { logEvent } from "@/utils/googleAnalytics";
 import { showToastMessage } from "@/components/Toastify";
 import Link from "@mui/material/Link";
-import loginImage from "../../public/6300830.jpg";
+import loginImage from "../../public/loginImage.jpg";
 import { useUserIdStore } from "@/store/useUserIdStore";
 
 const LoginPage = () => {