feat:UserMEditAdded

AcademiaY4 · Oct 6, 2024 · 1b38748 · 1b38748
1 parent 09689ec
commit 1b38748
Show file tree

Hide file tree

Showing 25 changed files with 955 additions and 89 deletions.
diff --git a/index.html b/index.html
@@ -17,9 +17,16 @@
 <body>
   <div id="root"></div>
 
+  <script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
+    integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
+    crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
+    integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"
+    crossorigin="anonymous"></script>
+
   <script type="module" src="/src/main.jsx"></script>
   <!-- Libs JS -->
-  <script src="/assets/libs/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+  <!-- <script src="/assets/libs/bootstrap/dist/js/bootstrap.bundle.min.js"></script> -->
   <script src="/assets/libs/simplebar/dist/simplebar.min.js"></script>
 
   <!-- Theme JS -->

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "jspdf-autotable": "^3.8.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-loading-skeleton": "^3.5.0",
     "react-router-dom": "^6.26.1",
     "react-toastify": "^10.0.5",
     "sweetalert2": "^11.14.1",

diff --git a/public/assets/css/theme.min.css b/public/assets/css/theme.min.css
@@ -28493,7 +28493,7 @@ input::-webkit-outer-spin-button {
 
 .main-content-wrapper {
     flex-grow: 1;
-    padding: 100px 16px;
+    padding: 100px 16px 0px ;
     width: calc(100% - 280px)
 }
 

diff --git a/src/App.jsx b/src/App.jsx
@@ -14,7 +14,6 @@ import Customers from './Pages/AppStack/AdminStack/Customers/Customers';
 import Reviews from './Pages/AppStack/AdminStack/Reviews/Reviews';
 import Profile from './Pages/AppStack/AdminStack/Profile/Profile';
 import AppNotifications from './Pages/AppStack/AdminStack/AppNotifications/AppNotifications';
-import AddCustomers from './Pages/AppStack/AdminStack/AddCustomers/AddCustomers';
 import AddSeller from './Pages/AppStack/AdminStack/AddSeller/AddSeller';
 import AddProducts from './Pages/AppStack/AdminStack/AddProducts/AddProducts';
 import AddCategory from './Pages/AppStack/AdminStack/AddCategory/AddCategory';
@@ -28,6 +27,8 @@ import CsrDashboard from './Pages/AppStack/CsrStack/Dashboard/CsrDashboard';
 import VendorDashboard from './Pages/AppStack/VendorStack/Dashboard/VendorDashboard';
 import AdminDashboard from './Pages/AppStack/AdminStack/Dashboard/AdminDashboard';
 import AuthStack from './Pages/AuthStack/AuthStack';
+import AddCustomers from './Pages/AppStack/AdminStack/Customers/AddCustomers/AddCustomers';
+import EditCustomers from './Pages/AppStack/AdminStack/Customers/EditCustomers/EditCustomers';
 
 function App() {
   return (
@@ -64,8 +65,8 @@ function App() {
                 <Route path="addSeller" element={<AddSeller />} />
                 <Route path="editSeller/:id" element={<AddSeller />} />
                 <Route path="customers" element={<Customers />} />
-                <Route path="addCustomer" element={<AddCustomers />} />
-                <Route path="editCustomer/:id" element={<AddCustomers />} />
+                <Route path="customers/addCustomer" element={<AddCustomers />} />
+                <Route path="customers/editCustomer/:id" element={<EditCustomers />} />
                 <Route path="reviews" element={<Reviews />} />
               </Route>
             </Route>

diff --git a/src/Components/Paginator/Paginator.jsx b/src/Components/Paginator/Paginator.jsx
@@ -1,9 +1,9 @@
 import React from 'react'
 
-export default function Paginator() {
+export default function Paginator({total}) {
     return (
         <div className="border-top d-flex justify-content-between align-items-md-center px-6 py-6 flex-md-row flex-column gap-4">
-            <span>Showing 1 to 8 of 12 entries</span>
+            <span>Showing {total?total:0} entries</span>
             <nav>
                 <ul className="pagination mb-0">
                     <li className="page-item disabled"><a className="page-link" href="#!">Previous</a></li>

diff --git a/src/Components/SideBar/SideBar/SiedBar.jsx b/src/Components/SideBar/SideBar/SiedBar.jsx
@@ -5,7 +5,7 @@ import { useAuth } from '../../../Context/AuthContext'
 export default function SiedBar({role,logout}) {
 
     return (
-        <nav className="navbar-vertical-nav d-none d-xl-block">
+        <nav className="navbar-vertical-nav d-none d-xl-block" style={{zIndex:99}}>
             <div className="navbar-vertical">
                 <div className="px-4 py-5">
                     <NavLink to={`/app/${role.toLowerCase()}/dashboard`} end={true} className="navbar-brand">

diff --git a/.../AdminStack/AddCustomers/AddCustomers.jsx → ...k/Customers/AddCustomers/AddCustomers.jsx b/.../AdminStack/AddCustomers/AddCustomers.jsx → ...k/Customers/AddCustomers/AddCustomers.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import BreadCrumb from '../../../../Components/BreadCrumb/BreadCrumb'
+import BreadCrumb from '../../../../../Components/BreadCrumb/BreadCrumb'
 
 export default function AddCustomers() {
     return (