From c9b18608a1959a9f31a59946a064f7a00d9a808b Mon Sep 17 00:00:00 2001 From: keannu125 Date: Fri, 3 Mar 2023 12:35:32 +0800 Subject: [PATCH] Made icon sizing based on px rather than vh --- src/Components/ColoredCube/ColoredCube.tsx | 4 +- src/Components/Header/Header.tsx | 2 +- src/Components/Icons/AppLogo/AppLogo.tsx | 4 +- src/Components/Icons/HomeIcon/HomeIcon.tsx | 4 +- .../Icons/InventoryIcon/InventoryIcon.tsx | 4 +- .../Icons/LogoutIcon/LogoutIcon.tsx | 4 +- src/Components/Icons/LogsIcon/LogsIcon.tsx | 4 +- .../Icons/LowStockIcon/LowStockIcon.tsx | 4 +- .../Icons/NotFoundIcon/NotFoundIcon.tsx | 4 +- .../Icons/ProductIcon/ProductIcon.tsx | 4 +- .../Icons/ProductsIcon/ProductsIcon.tsx | 4 +- .../RecentlyAddedIcon/RecentlyAddedIcon.tsx | 4 +- src/Components/Icons/StatsIcon/StatsIcon.tsx | 4 +- .../TotalProductsIcon/TotalProductsIcon.tsx | 4 +- src/Components/Sidebar/Sidebar.tsx | 16 +++--- src/Routes/Dashboard/Dashboard.tsx | 50 +++++++++++++------ src/Routes/Error/Error.tsx | 4 +- src/Routes/Logs/Logs.tsx | 2 +- src/Routes/Products/Products.tsx | 4 +- src/components/Icons/AddIcon/AddIcon.tsx | 4 +- .../Icons/CancelIcon/CancelIcon.tsx | 4 +- .../Icons/DeleteIcon/DeleteIcon.tsx | 4 +- src/components/Icons/EditIcon/EditIcon.tsx | 4 +- src/routes/Inventory/Inventory.tsx | 2 +- 24 files changed, 83 insertions(+), 65 deletions(-) diff --git a/src/Components/ColoredCube/ColoredCube.tsx b/src/Components/ColoredCube/ColoredCube.tsx index 9db5e10..ae02a4c 100644 --- a/src/Components/ColoredCube/ColoredCube.tsx +++ b/src/Components/ColoredCube/ColoredCube.tsx @@ -10,8 +10,8 @@ export default function ColoredCube(props: props) {
diff --git a/src/Components/Header/Header.tsx b/src/Components/Header/Header.tsx index 7c3e850..2c2e826 100644 --- a/src/Components/Header/Header.tsx +++ b/src/Components/Header/Header.tsx @@ -7,7 +7,7 @@ export default function Header() { return (
- +

Ivy

diff --git a/src/Components/Icons/AppLogo/AppLogo.tsx b/src/Components/Icons/AppLogo/AppLogo.tsx index ff57b7b..24b7f9c 100644 --- a/src/Components/Icons/AppLogo/AppLogo.tsx +++ b/src/Components/Icons/AppLogo/AppLogo.tsx @@ -9,8 +9,8 @@ export default function AppLogo(props: props) { navigate("/")} name="Dashboard"> - + navigate("/Products")} name="Products" > - + navigate("/Inventory")} name="Inventory" > - +
@@ -75,25 +75,25 @@ export default function Sidebar() { }} > navigate("/")} name="Dashboard"> - + navigate("/Products")} name="Products" > - + navigate("/Inventory")} name="Inventory" > - + navigate("/Logs")} name="Logs"> - + - + diff --git a/src/Routes/Dashboard/Dashboard.tsx b/src/Routes/Dashboard/Dashboard.tsx index 55f11f1..8abbd5c 100644 --- a/src/Routes/Dashboard/Dashboard.tsx +++ b/src/Routes/Dashboard/Dashboard.tsx @@ -13,7 +13,7 @@ export default function Dashboard() { return (
- +

Dashboard

@@ -21,7 +21,7 @@ export default function Dashboard() {
- +

Total Products

2546 Unique Items

@@ -30,31 +30,49 @@ export default function Dashboard() {
- +

Current Session

- +

Added

254

- -

Removed

{" "} + +

Removed

+

118

-
-
+
+
- +

Low Stock

Canned Pagmamahal

In Stock: 3

-
+
- +

Recently Added

Zidane's Water

@@ -67,28 +85,28 @@ export default function Dashboard() {
- +

Recent

Transactions

-
+

Kopiko Blanca

Added: 96

Removed: 105

02/17/2023

-
+

Zidane's Water

Added: 49

Removed: 24

02/17/2023

-
+

Dan's Beefed Corn

Added: 32

Removed: 64

02/17/2023

-
+

Canned

Pagmamahal

diff --git a/src/Routes/Error/Error.tsx b/src/Routes/Error/Error.tsx index cc094c3..4aae12f 100644 --- a/src/Routes/Error/Error.tsx +++ b/src/Routes/Error/Error.tsx @@ -5,8 +5,8 @@ import NotFoundIcon from "../../Components/Icons/NotFoundIcon/NotFoundIcon"; export default function Error() { return (
-
- +
+

Could not find the requested page

diff --git a/src/Routes/Logs/Logs.tsx b/src/Routes/Logs/Logs.tsx index 559eb18..7650b5b 100644 --- a/src/Routes/Logs/Logs.tsx +++ b/src/Routes/Logs/Logs.tsx @@ -22,7 +22,7 @@ export default function Logs() { return (
- +

Logs

- +

Products

navigate("/Products/AddProduct")} style={styles.button_add_product} > - +

Add Product

diff --git a/src/components/Icons/AddIcon/AddIcon.tsx b/src/components/Icons/AddIcon/AddIcon.tsx index 8054588..a1d1843 100644 --- a/src/components/Icons/AddIcon/AddIcon.tsx +++ b/src/components/Icons/AddIcon/AddIcon.tsx @@ -8,8 +8,8 @@ export default function AddIcon(props: props) { return (
- +

Inventory