diff --git a/package-lock.json b/package-lock.json index e3e5ed7..da8b570 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "axios": "^0.24.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", @@ -4456,6 +4457,14 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "dependencies": { + "follow-redirects": "^1.14.4" + } + }, "node_modules/axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -9836,16 +9845,15 @@ } }, "node_modules/follow-redirects": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz", - "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==", + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", + "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -25746,6 +25754,14 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.2.tgz", "integrity": "sha512-V+Nq70NxKhYt89ArVcaNL9FDryB3vQOd+BFXZIfO3RP6rwtj+2yqqqdHEkacutglPaZLkJeuXKCjCJDMGPtPqg==" }, + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "requires": { + "follow-redirects": "^1.14.4" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -29720,9 +29736,9 @@ } }, "follow-redirects": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz", - "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==" + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", + "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" }, "for-in": { "version": "1.0.2", diff --git a/src/modules/Inventory/common_styles.css b/src/modules/Inventory/common_styles.css index b71c8ff..d5c57e7 100644 --- a/src/modules/Inventory/common_styles.css +++ b/src/modules/Inventory/common_styles.css @@ -2,8 +2,8 @@ padding: 1rem; } :root { - --primary: #6a60a9; - --secondary: #ffbc42; + --primary: #4d57e7; + --secondary: white; --gray: #e0e0e0; --light: #fff; --dark: rgb(35, 35, 35); @@ -210,4 +210,4 @@ h2 { font-family: verdana; font-size: 150%; - } \ No newline at end of file + } diff --git a/src/modules/Inventory/pages/IssuedItems/IssuedItems.js b/src/modules/Inventory/pages/IssuedItems/IssuedItems.js index 6d90eee..22b51cc 100644 --- a/src/modules/Inventory/pages/IssuedItems/IssuedItems.js +++ b/src/modules/Inventory/pages/IssuedItems/IssuedItems.js @@ -1,5 +1,4 @@ import React, { useState, useEffect } from "react"; -import { SearchIcon } from "@heroicons/react/solid" import "../../common_styles.css"; import axios from "axios"; const IssuedItems = () => { @@ -26,7 +25,7 @@ const IssuedItems = () => { }) setIssuedItems((previtems) => { return previtems.filter((items) => { - return item._id != items._id; + return item._id !== items._id; }); }); } diff --git a/src/modules/Inventory/pages/OrderHistory/orderhistory.js b/src/modules/Inventory/pages/OrderHistory/orderhistory.js index b1fe74c..500d62f 100644 --- a/src/modules/Inventory/pages/OrderHistory/orderhistory.js +++ b/src/modules/Inventory/pages/OrderHistory/orderhistory.js @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import { SearchIcon } from "@heroicons/react/solid" import "../../common_styles.css"; import Modal from "../../components/OrderHistoryDetailsModal/OrderHistoryDetailsModal" import axios from "axios"; diff --git a/src/modules/Inventory/pages/OrderHistoryAdmin/orderhistoryAdmin.js b/src/modules/Inventory/pages/OrderHistoryAdmin/orderhistoryAdmin.js index 2102a4c..9013bc0 100644 --- a/src/modules/Inventory/pages/OrderHistoryAdmin/orderhistoryAdmin.js +++ b/src/modules/Inventory/pages/OrderHistoryAdmin/orderhistoryAdmin.js @@ -54,9 +54,9 @@ export default function OrderHistoryAdmin() { - - - + + + diff --git a/src/modules/Inventory/pages/dashboard/Dashboard.css b/src/modules/Inventory/pages/dashboard/Dashboard.css index 54c2797..48a1401 100644 --- a/src/modules/Inventory/pages/dashboard/Dashboard.css +++ b/src/modules/Inventory/pages/dashboard/Dashboard.css @@ -2,9 +2,7 @@ height: 100% !important; width: 100%; } -.card{ - width: 100%; - height: 90%; - background-color: white; - padding: 1rem; + +.order-details{ + font-size: 18px !important; } \ No newline at end of file diff --git a/src/modules/Inventory/pages/dashboard/Dashboard.js b/src/modules/Inventory/pages/dashboard/Dashboard.js index 65b25c3..7ce72bb 100644 --- a/src/modules/Inventory/pages/dashboard/Dashboard.js +++ b/src/modules/Inventory/pages/dashboard/Dashboard.js @@ -1,22 +1,33 @@ import axios from 'axios' import React, { useEffect, useState } from 'react' -import Modal from "../../components/OrderHistoryDetailsModal/OrderHistoryDetailsModal" +import "./Dashboard.css" export default function Dashboard() { const [order, setOrder] = useState(null); - useEffect(async () => { + useEffect(() => { + getRecentOrder(); + }, []) + + async function getRecentOrder(){ const userId = localStorage.getItem('userId'); const response = await axios.get(`http://localhost:8080/user/dashboard/${userId}`); console.log(response.data); setOrder(response.data.order); - }, []) + } function date(dateto){ - const date_to_be = new Date(dateto) return date_to_be.toDateString() + } + function isVerified(status){ + if(status){ + return Status: Accepted + } + else{ + return Status: Pending + } } return ( @@ -26,37 +37,30 @@ export default function Dashboard() {
{Object.keys(order ?? {}).length > 0 ? - (
-

Recent Order Details

-
SnoOrderDateTotalCostS.NoOrder DateTotal Cost Status Actions
- - - - - - - - - + (
+ Recent Order Details +
+ {order.remark} +
+ Items: +
+
- - - - - - -
SnoOrder DateTotal CostActions
{1} - - { date(order.order_date) } - - - - {order.total_cost} - - - -
+ ItemCount : {item.item_count} +
+ Description : {item.description} + + ))} + + Order Date: {date(order.order_date)} +
+ Total Cost: ₹{order.total_cost} +
+ {isVerified(order.isVerified)} ) : (

No orders found

) } diff --git a/src/modules/Inventory/pages/inventory/inventory.js b/src/modules/Inventory/pages/inventory/inventory.js index 5bd477e..dd8f88c 100644 --- a/src/modules/Inventory/pages/inventory/inventory.js +++ b/src/modules/Inventory/pages/inventory/inventory.js @@ -120,7 +120,7 @@ const Inventory = () => { {i + 1} {item.item_name} - + {item.expected_cost} @@ -132,7 +132,7 @@ const Inventory = () => { ))} - :

No items found

} + :

No items found

} diff --git a/src/modules/Inventory/pages/orders/Orders.js b/src/modules/Inventory/pages/orders/Orders.js index a37131b..555dc7e 100644 --- a/src/modules/Inventory/pages/orders/Orders.js +++ b/src/modules/Inventory/pages/orders/Orders.js @@ -1,6 +1,5 @@ import React, { useState, useEffect } from "react"; import "../../common_styles.css"; -import { SearchIcon } from "@heroicons/react/solid" import Modal from "../../components/OrderDetailsModal/OrderDetailsModal"; import axios from "axios"; @@ -37,7 +36,7 @@ function Orders() { alert("Order Rejected!"); setAllOrders((prevOrders) => { return prevOrders.filter((order) => { - return order._id != order_id; + return order._id !== order_id; }); }); @@ -82,7 +81,7 @@ function Orders() { - + {order.total_cost} diff --git a/yarn.lock b/yarn.lock index 34bbf35..a089d63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2818,7 +2818,7 @@ axe-core@^4.0.2: axios@^0.24.0: version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + resolved "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz" integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== dependencies: follow-redirects "^1.14.4" @@ -5490,14 +5490,9 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: - version "1.13.2" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz" - integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== - -follow-redirects@^1.14.4: +follow-redirects@^1.0.0, follow-redirects@^1.14.4: version "1.14.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz" integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== for-in@^1.0.2: