diff --git a/package.json b/package.json index 66df8f3..9a1e775 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "license": "MIT", "author": "The CoreUI Team (https://github.com/orgs/coreui/people)", "scripts": { - "dev": "react-scripts --openssl-legacy-provider start", + "dev": "react-scripts start", "build": "react-scripts --openssl-legacy-provider build", "changelog": "auto-changelog --starting-version 4.1.0 --commit-limit false --hide-credit", "eject": "react-scripts eject", diff --git a/src/components/AppFooter.js b/src/components/AppFooter.js index 12dd7fd..5cf9d82 100644 --- a/src/components/AppFooter.js +++ b/src/components/AppFooter.js @@ -23,7 +23,7 @@ const AppFooter = () => { }, []); return ( - +
{/* {new Date().getFullYear()} © {copyright ? copyright : ""} . */} diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index d269634..0f3b037 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -40,7 +40,7 @@ const AppHeader = () => { getConfiguration(); }, []); return ( - + { - - {/* */} + {/* */} + {/* */} ); }; diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js index 3a82add..7308de5 100644 --- a/src/components/AppSidebar.js +++ b/src/components/AppSidebar.js @@ -1,11 +1,13 @@ import React, { useEffect, useState } from "react"; import { useSelector, useDispatch } from "react-redux"; - import { + CCloseButton, CSidebar, CSidebarBrand, - CSidebarNav, + CSidebarFooter, + CSidebarHeader, CSidebarToggler, + CSidebarNav, } from "@coreui/react"; import CIcon from "@coreui/icons-react"; @@ -15,7 +17,8 @@ import { logoNegative } from "src/assets/brand/logo-negative"; import { sygnet } from "src/assets/brand/sygnet"; import SimpleBar from "simplebar-react"; -import "simplebar/dist/simplebar.min.css"; +import "simplebar-react/dist/simplebar.min.css"; +// import "simplebar/dist/simplebar.min.css"; // sidebar nav config import navigation from "../_nav"; @@ -108,43 +111,112 @@ const AppSidebar = () => { //---------------------------// return ( { dispatch({ type: "set", sidebarShow: visible }); }} > - - {/* */} + {/* */} + {/* */} + {/* */} + {/* {AdminlogoUrl ? ( + + + + ) : { AppName } ? ( +

Cheminova

+ ) : ( + "" + )} */} + {/* */} + {/* */} + {/* */} + {/* dispatch({ type: 'set', sidebarShow: false })} + /> */} + {/* */} + {AdminlogoUrl ? ( - + Admin Logo - ) : { AppName } ? ( -

Cheminova

+ ) : AppName ? ( +

Cheminova

) : ( "" )} - {/* */} - - + + + {/* + + + + */} - +
+ +
- +
+ Powered by + + Codeology.solutions + +
+ + {/* dispatch({ type: 'set', sidebarUnfoldable: !unfoldable })} + /> */} + + {/* dispatch({ type: "set", sidebarUnfoldable: !unfoldable }) } - /> + /> */} ); }; diff --git a/src/components/AppSidebarNav.css b/src/components/AppSidebarNav.css new file mode 100644 index 0000000..ea8e151 --- /dev/null +++ b/src/components/AppSidebarNav.css @@ -0,0 +1,104 @@ +/* Base styles for nav-link, nav-group, and nav-item */ +.sidebar-nav .nav-link, +.sidebar-nav .nav-group, +.sidebar-nav .nav-item { + background-color: white; + color: black; + transition: all 0.3s ease; + margin-top: 10px; + border-radius: 5px; +} + +/* Hover styles for nav-link, nav-group, and nav-item */ +.sidebar-nav .nav-link:hover, +.sidebar-nav .nav-group:hover, +.sidebar-nav .nav-item:hover { + background-color: #0b0689; + color: white; +} + +/* Active state styles for nav-link */ +.sidebar-nav .nav-link.active { + background-color: #0b0689; + color: white; +} + +/* Active state styles for nav-group and nav-item */ +.sidebar-nav .nav-group.active, +.sidebar-nav .nav-item.active { + /* background-color: #0B0689; */ + color: white; +} + +/* Styles for expanded nav-group to ensure name remains black */ +.sidebar-nav .nav-group.show > .nav-link { + color: black; +} + +/* Badge styling inside nav items */ +.sidebar-nav .nav-link .ms-auto, +.sidebar-nav .nav-group .ms-auto, +.sidebar-nav .nav-item .ms-auto { + background-color: transparent; + color: black; + transition: color 0.3s ease; +} + +/* Hover and active styles for badges */ +.sidebar-nav .nav-link:hover .ms-auto, +.sidebar-nav .nav-group:hover .ms-auto, +.sidebar-nav .nav-item:hover .ms-auto, +.sidebar-nav .nav-link.active .ms-auto, +.sidebar-nav .nav-group.active .ms-auto, +.sidebar-nav .nav-item.active .ms-auto { + color: white; /* White badge text */ +} +.sidebar-nav .nav-group.show { + background-color: #b4d1e5; +} +/* Icon styling */ +.sidebar-nav .nav-link .nav-icon, +.sidebar-nav .nav-group .nav-icon, +.sidebar-nav .nav-item .nav-icon { + color: black; /* Black icon */ + transition: color 0.3s ease; +} + +/* Hover and active styles for icons */ +.sidebar-nav .nav-link:hover .nav-icon, +.sidebar-nav .nav-group:hover .nav-icon, +.sidebar-nav .nav-item:hover .nav-icon, +.sidebar-nav .nav-link.active .nav-icon, +.sidebar-nav .nav-group.active .nav-icon, +.sidebar-nav .nav-item.active .nav-icon { + color: white; /* White icon */ +} +/* .sidebar-nav .nav-group.show .nav-item:hover .nav-icon, +.sidebar-nav .nav-group.show .nav-link:hover .nav-icon { + color: white; +} */ +/* Toggle styling for nav-group */ +.sidebar-nav .nav-group-toggle::after { + display: block; + flex: 0 1 12px; + height: 12px; + margin-left: auto; + content: ""; + background-image: var(--cui-sidebar-nav-group-indicator); + background-repeat: no-repeat; + background-position: center; + transition: transform 0.15s, color 0.3s ease; + color: white; /* Default toggle color */ +} + +/* Hover and active styles for toggle */ +.sidebar-nav .nav-group:hover > .nav-group-toggle::after, +.sidebar-nav .nav-group.active > .nav-group-toggle::after { + color: black; +} + +/* Rotate toggle when nav-group is expanded */ +.sidebar-nav .nav-group.show > .nav-group-toggle::after { + transform: rotate(180deg); + color: black; +} diff --git a/src/components/AppSidebarNav.js b/src/components/AppSidebarNav.js index fd3092e..0df1ec1 100644 --- a/src/components/AppSidebarNav.js +++ b/src/components/AppSidebarNav.js @@ -1,15 +1,23 @@ import React from "react"; import { NavLink, useLocation } from "react-router-dom"; import PropTypes from "prop-types"; - -import { CBadge } from "@coreui/react"; +import "simplebar-react/dist/simplebar.min.css"; +import { CBadge, CNavLink } from "@coreui/react"; +import "./AppSidebarNav.css"; export const AppSidebarNav = ({ items }) => { const location = useLocation(); - const navLink = (name, icon, badge) => { + + const navLink = (name, icon, badge, indent = false) => { return ( <> - {icon && icon} + {icon + ? icon + : indent && ( + + + + )} {name && name} {badge && ( @@ -20,25 +28,25 @@ export const AppSidebarNav = ({ items }) => { ); }; - const navItem = (item, index) => { + const navItem = (item, index, indent = false) => { const { component, name, badge, icon, ...rest } = item; const Component = component; return ( - <> - - {navLink(name, icon, badge)} - - + + {navLink(name, icon, badge)} + ); }; + const navGroup = (item, index) => { const { component, name, icon, to, ...rest } = item; const Component = component; @@ -58,12 +66,12 @@ export const AppSidebarNav = ({ items }) => { }; return ( - + <> {items && items.map((item, index) => item.items ? navGroup(item, index) : navItem(item, index) )} - + ); }; diff --git a/src/components/header/AppHeaderDropdown.js b/src/components/header/AppHeaderDropdown.js index 4f38b7f..fd1d70f 100644 --- a/src/components/header/AppHeaderDropdown.js +++ b/src/components/header/AppHeaderDropdown.js @@ -1,4 +1,4 @@ -import React from 'react' +import React from "react"; import { CAvatar, CBadge, @@ -8,7 +8,7 @@ import { CDropdownItem, CDropdownMenu, CDropdownToggle, -} from '@coreui/react' +} from "@coreui/react"; import { cilBell, cilCreditCard, @@ -20,29 +20,29 @@ import { cilTask, cilUser, cilPencil, -} from '@coreui/icons' -import CIcon from '@coreui/icons-react' -import swal from 'sweetalert'; +} from "@coreui/icons"; +import CIcon from "@coreui/icons-react"; +import swal from "sweetalert"; -import userImage from './../../assets/images/avatars/1.jpeg' -import { Link } from 'react-router-dom' +import userImage from "./../../assets/images/avatars/1.jpeg"; +import { Link } from "react-router-dom"; // import { signout } from 'src/auth' import { useNavigate } from "react-router-dom"; -import { useEffect } from 'react'; -import axios from 'axios'; -import { useState } from 'react'; - +import { useEffect } from "react"; +import axios from "axios"; +import { useState } from "react"; +import { use } from "react"; const AppHeaderDropdown = () => { - const [userData, setUserData] = useState() + const [userData, setUserData] = useState(); let history = useNavigate(); const signout = async () => { - localStorage.removeItem('authToken') + localStorage.removeItem("authToken"); swal("success!", "Logged Out", "success"); history("/"); - } + }; - //for user image + //for user image const getUser = async () => { let token = localStorage.getItem("authToken"); @@ -51,32 +51,35 @@ const AppHeaderDropdown = () => { headers: { Authorization: `Bearer ${token}`, }, - }) + }); if (response.data.success === true) { - setUserData(response.data.user) - + setUserData(response.data.user); } - } - catch (err) { - + } catch (err) { console.log(err); - }; - } - + } + }; useEffect(() => { - getUser() - }, []) - + getUser(); + }, []); return ( {/* {userData && userData ? : */} - + - Account + + Account + {/* Updates @@ -129,13 +132,13 @@ const AppHeaderDropdown = () => { */} {/* */} - + Edit Profile - + Change Password @@ -143,11 +146,11 @@ const AppHeaderDropdown = () => { - Log Out + Log Out - ) -} + ); +}; -export default AppHeaderDropdown +export default AppHeaderDropdown; diff --git a/src/layout/DefaultLayout.js b/src/layout/DefaultLayout.js index d2e83fe..0371534 100644 --- a/src/layout/DefaultLayout.js +++ b/src/layout/DefaultLayout.js @@ -10,7 +10,7 @@ const DefaultLayout = () => { return (
-
+
diff --git a/src/views/Announcment/announcement.js b/src/views/Announcment/announcement.js index aaf14ab..828da3a 100644 --- a/src/views/Announcment/announcement.js +++ b/src/views/Announcment/announcement.js @@ -37,7 +37,7 @@ const Announcements = () => { Authorization: `Bearer ${token}`, // if token is necessary for authorization }, }); - console.log(response); + // console.log(response); const { announcements, totalAnnouncements } = response.data; setAnnouncements(announcements); setTotalAnnouncements(totalAnnouncements); @@ -87,9 +87,20 @@ const Announcements = () => { diff --git a/src/views/Announcment/createAnnouncement.js b/src/views/Announcment/createAnnouncement.js index bfdbaa9..0aa2c01 100644 --- a/src/views/Announcment/createAnnouncement.js +++ b/src/views/Announcment/createAnnouncement.js @@ -155,7 +155,7 @@ const CreateAnnouncement = () => { diff --git a/src/views/Attendance/AttendanceSalesCoordinator.js b/src/views/Attendance/AttendanceSalesCoordinator.js index 65b7a41..53726ae 100644 --- a/src/views/Attendance/AttendanceSalesCoordinator.js +++ b/src/views/Attendance/AttendanceSalesCoordinator.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef,useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; diff --git a/src/views/Attendance/AttendanceTerritoryManager.js b/src/views/Attendance/AttendanceTerritoryManager.js index 637ff86..7e2982f 100644 --- a/src/views/Attendance/AttendanceTerritoryManager.js +++ b/src/views/Attendance/AttendanceTerritoryManager.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef,useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; diff --git a/src/views/Attendance/SingleUserAttendance.js b/src/views/Attendance/SingleUserAttendance.js index 47ef5ac..378524b 100644 --- a/src/views/Attendance/SingleUserAttendance.js +++ b/src/views/Attendance/SingleUserAttendance.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { useParams, useNavigate } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -28,7 +28,7 @@ const SingleUserAttendance = () => { show: itemPerPage, }, }); - console.log(res.data); + // console.log(res.data); setuser(res.data?.user); setAttendanceData(res.data?.attendance); setUserType(res.data?.userType); @@ -71,7 +71,7 @@ const SingleUserAttendance = () => {
- - - - )) + onClick={() => handleDelete(item._id)} + > + Delete + + + + )) )} diff --git a/src/views/Leaves/LeaveSalesCoordinator.js b/src/views/Leaves/LeaveSalesCoordinator.js index da47329..e29f2f3 100644 --- a/src/views/Leaves/LeaveSalesCoordinator.js +++ b/src/views/Leaves/LeaveSalesCoordinator.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef,useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; diff --git a/src/views/Leaves/LeaveTerritoryManager.js b/src/views/Leaves/LeaveTerritoryManager.js index b02b53a..dcf4c2a 100644 --- a/src/views/Leaves/LeaveTerritoryManager.js +++ b/src/views/Leaves/LeaveTerritoryManager.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef,useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; diff --git a/src/views/Leaves/SingleUserLeave.js b/src/views/Leaves/SingleUserLeave.js index a4fce93..a3c2d00 100644 --- a/src/views/Leaves/SingleUserLeave.js +++ b/src/views/Leaves/SingleUserLeave.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { useParams, useNavigate } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -67,7 +67,7 @@ const [userType, setUserType] = useState("");
+
Add Multiple Principal Distributor
diff --git a/src/views/PrincipalDistributors/ViewRetailDistributorPD.js b/src/views/PrincipalDistributors/ViewRetailDistributorPD.js index 2b119b8..0b438d9 100644 --- a/src/views/PrincipalDistributors/ViewRetailDistributorPD.js +++ b/src/views/PrincipalDistributors/ViewRetailDistributorPD.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef, useCallback } from "react"; import { Link, useParams } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -266,12 +266,20 @@ const ViewRetailDistributorPD = () => {
@@ -223,7 +229,7 @@ useEffect(() => { htmlFor="SBU" className="form-label" > - SBU* + SBU* @@ -492,7 +498,7 @@ useEffect(() => { {...params} fullWidth variant="outlined" - label="Select City" + label="Select City" // error={!selectedCity} // helperText={!selectedCity ? "Select a city" : null} /> diff --git a/src/views/PrincipalDistributors/principalDistributor.js b/src/views/PrincipalDistributors/principalDistributor.js index b393c61..07096a1 100644 --- a/src/views/PrincipalDistributors/principalDistributor.js +++ b/src/views/PrincipalDistributors/principalDistributor.js @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef, useCallback } from "react"; import { Link } from "react-router-dom"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import axios from "axios"; import { isAutheticated } from "src/auth"; @@ -203,8 +203,16 @@ const principalDistributor = () => {
- +
diff --git a/src/views/ProductManual/ProductManual.js b/src/views/ProductManual/ProductManual.js index 6ec960f..b7aa25c 100644 --- a/src/views/ProductManual/ProductManual.js +++ b/src/views/ProductManual/ProductManual.js @@ -222,8 +222,20 @@ const ProductManual = () => {
+
Add Multiple Products
diff --git a/src/views/Products/Products.js b/src/views/Products/Products.js index 8e9beb0..43ff905 100644 --- a/src/views/Products/Products.js +++ b/src/views/Products/Products.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef, useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -211,16 +211,41 @@ const Products = () => {
+
Add Multiple Retailers
diff --git a/src/views/RetailDistributors/DistributorOrders.js b/src/views/RetailDistributors/DistributorOrders.js index 8958a13..1cc92dd 100644 --- a/src/views/RetailDistributors/DistributorOrders.js +++ b/src/views/RetailDistributors/DistributorOrders.js @@ -61,15 +61,15 @@ const SingleDistributorOrder = () => { const handleSearchFieldChange = (event) => { const newSearchField = event.target.value; setSearchField(newSearchField); - + // Clear the search text and references setSearchText(""); searchOrderIdRef.current = ""; searchStatusRef.current = ""; - + // Reset page to 0 setPage(0); - + // Fetch total orders without any search filters fetchOrdersDebounced(1, rowsPerPage, "", ""); }; @@ -133,7 +133,9 @@ const SingleDistributorOrder = () => { }, } ); - distributortype === "principaldistributor"? setdistributorDetails(response.data.user): setdistributorDetails(response.data); + distributortype === "principaldistributor" + ? setdistributorDetails(response.data.user) + : setdistributorDetails(response.data); } catch (error) { console.error("Error fetching data: ", error); } @@ -241,10 +243,22 @@ const SingleDistributorOrder = () => { mb: 3, }} > - {distributortype === "principaldistributor" ? "Principal Distributor Details":"Retailers Details"} - - Cancel - + + {distributortype === "principaldistributor" + ? "Principal Distributor Details" + : "Retailers Details"} + + diff --git a/src/views/RetailDistributors/EditRetailDistributor.js b/src/views/RetailDistributors/EditRetailDistributor.js index 9626646..f7ea344 100644 --- a/src/views/RetailDistributors/EditRetailDistributor.js +++ b/src/views/RetailDistributors/EditRetailDistributor.js @@ -341,7 +341,13 @@ const EditRetailDistributor = () => { variant="outlined" color="secondary" onClick={handleCancel} - sx={{ position: "absolute", top: "10px", right: "10px" }} + style={{ + fontWeight: "bold", + textTransform: "capitalize", + position: "absolute", + top: "10px", + right: "10px", + }} > Cancel diff --git a/src/views/RetailDistributors/RetailDistributor.js b/src/views/RetailDistributors/RetailDistributor.js index 14d32f3..a3c6b60 100644 --- a/src/views/RetailDistributors/RetailDistributor.js +++ b/src/views/RetailDistributors/RetailDistributor.js @@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback, useRef } from "react"; import { Link } from "react-router-dom"; import { useNavigate } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; import debounce from "lodash.debounce"; @@ -156,8 +156,20 @@ const RetailDistributor = () => {
+ + {/* Cancel - + */} diff --git a/src/views/RetailDistributors/addRetailDistributor.js b/src/views/RetailDistributors/addRetailDistributor.js index c9ebf2b..58312e9 100644 --- a/src/views/RetailDistributors/addRetailDistributor.js +++ b/src/views/RetailDistributors/addRetailDistributor.js @@ -213,7 +213,13 @@ useEffect(() => { variant="outlined" color="secondary" onClick={handleCancel} - sx={{ position: "absolute", top: "10px", right: "10px" }} + style={{ + fontWeight: "bold", + textTransform: "capitalize", + position: "absolute", + top: "10px", + right: "10px", + }} > Cancel diff --git a/src/views/SalesCoOrdinators/AddMultipleSC.js b/src/views/SalesCoOrdinators/AddMultipleSC.js index 985a595..596b946 100644 --- a/src/views/SalesCoOrdinators/AddMultipleSC.js +++ b/src/views/SalesCoOrdinators/AddMultipleSC.js @@ -4,6 +4,7 @@ import swal from "sweetalert"; import { isAutheticated } from "src/auth"; import { useNavigate } from "react-router-dom"; import { toast } from "react-hot-toast"; +import { Button } from "@mui/material"; const AddMultiplesc = () => { const [file, setFile] = useState(null); const [loading, setLoading] = useState(false); @@ -110,12 +111,17 @@ const AddMultiplesc = () => { return (
- +
Add Multiple Sales Coordinators
diff --git a/src/views/SalesCoOrdinators/EditSalesCoOrdinator.js b/src/views/SalesCoOrdinators/EditSalesCoOrdinator.js index fecaf39..130e476 100644 --- a/src/views/SalesCoOrdinators/EditSalesCoOrdinator.js +++ b/src/views/SalesCoOrdinators/EditSalesCoOrdinator.js @@ -3,7 +3,7 @@ import axios from "axios"; import { useNavigate, useParams } from "react-router-dom"; import { isAutheticated } from "src/auth"; import Modal from "react-bootstrap/Modal"; -import Button from "react-bootstrap/Button"; +import { Button } from "@mui/material"; import Form from "react-bootstrap/Form"; import swal from "sweetalert"; @@ -71,7 +71,7 @@ const EditSalesCoOrdinator = () => { .patch( `/api/salescoordinator/profile/update/${id}`, { - uniqueId:formData.uniqueId, + uniqueId: formData.uniqueId, name: formData.name, email: formData.email, }, @@ -209,13 +209,18 @@ const EditSalesCoOrdinator = () => {

Edit Sales Coordinator

- +
diff --git a/src/views/SalesCoOrdinators/SalesCoOrdinator.js b/src/views/SalesCoOrdinators/SalesCoOrdinator.js index 7fb286c..a2ccef2 100644 --- a/src/views/SalesCoOrdinators/SalesCoOrdinator.js +++ b/src/views/SalesCoOrdinators/SalesCoOrdinator.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef, useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -148,8 +148,21 @@ const SalesCoOrdinator = () => {
+
Add Multiple Territory Managers
diff --git a/src/views/TerritoryManager/EditTerritoryManager.js b/src/views/TerritoryManager/EditTerritoryManager.js index 6c7c621..af12d85 100644 --- a/src/views/TerritoryManager/EditTerritoryManager.js +++ b/src/views/TerritoryManager/EditTerritoryManager.js @@ -212,7 +212,7 @@ const EditTerritoryManager = () => { diff --git a/src/views/TerritoryManager/TerritoryManager.js b/src/views/TerritoryManager/TerritoryManager.js index 44be7a1..79003ff 100644 --- a/src/views/TerritoryManager/TerritoryManager.js +++ b/src/views/TerritoryManager/TerritoryManager.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef, useCallback } from "react"; import { Link } from "react-router-dom"; import axios from "axios"; -import Button from "@material-ui/core/Button"; +import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import { isAutheticated } from "src/auth"; import swal from "sweetalert"; @@ -148,8 +148,20 @@ const TerritoryManager = () => {