some changes

faatima30 · Sep 6, 2024 · 17f83b0 · 17f83b0
1 parent ade8748
commit 17f83b0
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 50 deletions.
diff --git a/Backend/index.js b/Backend/index.js
@@ -400,7 +400,7 @@ app.delete("/Purchase/delete/:id", async (req, res) => {
 //Sale part
 
 app.get("/Sale", async (req, res) => {
-  const getData = await SalesModel.find();
+  const getData = await SalesModel.find()
   // .populate({
   //   path: "customerID",
   //   model: "Customers",

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -11,7 +11,7 @@ import Forgotpwd from "./pages/Forgotpwd";
 import Sale from "./pages/Sale";
 import Purchase from "./pages/Purchase";
 import Employee from "./pages/Employee";
-import Gallery from "./components/Gallery";
+// import Gallery from "./components/Gallery";
 function App() {
   return (
     <Routes>
@@ -27,7 +27,7 @@ function App() {
       <Route path="/login" element={<Login />} />
       <Route path="/Signup" element={<Signup />} />
       <Route path="/Forgotpwd" element={<Forgotpwd />} />
-      <Route path="/Gallery" element={<Gallery />} />
+      {/* <Route path="/Gallery" element={<Gallery />} /> */}
     </Routes>
   );
 }

diff --git a/frontend/src/components/SideNav.js b/frontend/src/components/SideNav.js
@@ -8,9 +8,10 @@ import { RiLogoutBoxRLine } from "react-icons/ri";
 import { BsBox2Fill, BsFillPeopleFill } from "react-icons/bs";
 import { AiOutlineClose } from "react-icons/ai";
 import { ImMenu } from "react-icons/im";
-import { TfiGallery } from "react-icons/tfi";
+// import { TfiGallery } from "react-icons/tfi";
 
 function Sidenav() {
+  // const localStorageData = JSON.parse(localStorage.getItem("user"));
   const [isOpen, setIsOpen] = useState(false);
   const logout = () => {
     localStorage.clear();

diff --git a/frontend/src/pages/Customer.js b/frontend/src/pages/Customer.js
@@ -145,12 +145,12 @@ export default function Customer() {
         width: 100,
       },
 
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Employee.js b/frontend/src/pages/Employee.js
@@ -158,12 +158,12 @@ export default function Customer() {
         width: 100,
       },
 
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Inventory.js b/frontend/src/pages/Inventory.js
@@ -38,12 +38,12 @@ export default function Inventory() {
         sort: "asc",
         width: 100,
       },
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Product.js b/frontend/src/pages/Product.js
@@ -176,9 +176,8 @@ export default function Product() {
       //   sort: "asc",
       //   width: 200,
       // },
-
       {
-        label: "date created",
+        label: "date added",
         field: "createdAt",
         sort: "asc",
         width: 100,

diff --git a/frontend/src/pages/Purchase.js b/frontend/src/pages/Purchase.js
@@ -148,12 +148,12 @@ export default function Sale() {
         sort: "asc",
         width: 100,
       },
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Sale.js b/frontend/src/pages/Sale.js
@@ -156,12 +156,12 @@ export default function Sale() {
         sort: "asc",
         width: 100,
       },
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Supplier.js b/frontend/src/pages/Supplier.js
@@ -134,13 +134,12 @@ export default function Supplier() {
         sort: "asc",
         width: 100,
       },
-
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",

diff --git a/frontend/src/pages/Warehouse.js b/frontend/src/pages/Warehouse.js
@@ -142,13 +142,12 @@ export default function Warehouse() {
         sort: "asc",
         width: 100,
       },
-
-      {
-        label: "date created",
-        field: "createdAt",
-        sort: "asc",
-        width: 100,
-      },
+      // {
+      //   label: "date created",
+      //   field: "createdAt",
+      //   sort: "asc",
+      //   width: 100,
+      // },
       {
         label: "date updated",
         field: "updatedAt",