diff --git a/src/components/ColoredCube/ColoredCube.tsx b/src/components/ColoredCube/ColoredCube.tsx index 4fe7715..6e34a1f 100644 --- a/src/components/ColoredCube/ColoredCube.tsx +++ b/src/components/ColoredCube/ColoredCube.tsx @@ -11,8 +11,8 @@ export default function ColoredCube(props: props) {
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index d91ad75..ae28727 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 65122d5..4926766 100644 --- a/src/components/Icons/AppLogo/AppLogo.tsx +++ b/src/components/Icons/AppLogo/AppLogo.tsx @@ -10,8 +10,8 @@ export default function AppLogo(props: props) { +
@@ -54,24 +54,24 @@ 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 c40d145..65a1242 100644 --- a/src/routes/Dashboard/Dashboard.tsx +++ b/src/routes/Dashboard/Dashboard.tsx @@ -11,47 +11,38 @@ export default function Dashboard() { return (
- +

Dashboard

-
+
- +

Total Products

2546 Unique Items

In inventory

-
- -
- -

Widget 2

-
-

Placeholder

-
-
- +

Current Session

- +

Added

254

- +

Removed

64

@@ -60,10 +51,20 @@ export default function Dashboard() {
- -

Widget 4

+ +

Low Stock Items

-

Placeholder

+

Canned Pagmamahal

+

In Stock: 3

+
+
+ +
+ +

Recently Added

+
+

Zidane's Water

+

Added 02/17/2023

@@ -72,10 +73,40 @@ export default function Dashboard() {
- -

Widget 5

+ +
+

Recent

+

Transactions

+
-

Placeholder

+
+

Kopiko Blanca (Sack)

+

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

+
+

Added: 0

+

Removed: 60

+

02/17/2023

+
+

Dan's Beefed Corn

+

Added: 32

+

Removed: 64

+

02/17/2023

diff --git a/src/routes/Products/Products.tsx b/src/routes/Products/Products.tsx index 607cdc2..79345bc 100644 --- a/src/routes/Products/Products.tsx +++ b/src/routes/Products/Products.tsx @@ -5,7 +5,7 @@ import AppLogo from "../../Components/Icons/AppLogo/AppLogo"; export default function Products() { return (
- +

Ivy - Inventory Manager

Products Page

diff --git a/src/styles.tsx b/src/styles.tsx index 8ff115f..62fd1ee 100644 --- a/src/styles.tsx +++ b/src/styles.tsx @@ -16,6 +16,16 @@ const styles: { [key: string]: React.CSSProperties } = { paddingTop: 0, paddingLeft: 16, }, + text_tiny: { + fontSize: "0.6vw", + color: "white", + fontWeight: "bold", + }, + text_small: { + fontSize: "0.8vw", + color: "white", + fontWeight: "bold", + }, text: { fontSize: "1.3vw", color: "white", @@ -34,6 +44,7 @@ const styles: { [key: string]: React.CSSProperties } = { text_extra_large: { fontSize: "3.2vw", color: "white", + fontWeight: "bold", }, logo_title: { color: "#6c9575", @@ -74,8 +85,8 @@ const styles: { [key: string]: React.CSSProperties } = { }, logout_button: { backgroundColor: "#0b2322", - height: 64, - width: 192, + width: "30vh", + height: "6vh", border: "none", padding: 8, borderRadius: 16, @@ -114,8 +125,9 @@ const styles: { [key: string]: React.CSSProperties } = { wrapper_column: { display: "flex", flexDirection: "column", - alignItems: "center", alignSelf: "flex-start", + justifyContent: "left", + lineHeight: 0, }, DashboardWidget_WrapperColumn: { justifyContent: "center",