From 00271e59e45ae09ed201de58f9fbdcaf071c9453 Mon Sep 17 00:00:00 2001 From: Brunobrno Date: Thu, 25 Dec 2025 04:54:44 +0100 Subject: [PATCH] Add state enums and HomeLayout styling improvements Introduced generated stateE15Enum and stateFdaEnum TypeScript types for both private and public API models. Updated HomeLayout to use a new CSS module for layout styling, and adjusted navbar centering logic. Commented out reset.css in index.html and made minor CSS cleanups. --- frontend/index.html | 2 +- .../generated/private/models/stateE15Enum.ts | 27 +++++++++++++++++++ .../generated/private/models/stateFdaEnum.ts | 21 +++++++++++++++ .../generated/public/models/stateE15Enum.ts | 27 +++++++++++++++++++ .../generated/public/models/stateFdaEnum.ts | 21 +++++++++++++++ .../src/components/navbar/navbar.module.css | 4 ++- frontend/src/layouts/HomeLayout.module.css | 12 +++++++++ frontend/src/layouts/HomeLayout.tsx | 6 +++-- frontend/src/pages/home/Home.module.css | 2 -- 9 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 frontend/src/api/generated/private/models/stateE15Enum.ts create mode 100644 frontend/src/api/generated/private/models/stateFdaEnum.ts create mode 100644 frontend/src/api/generated/public/models/stateE15Enum.ts create mode 100644 frontend/src/api/generated/public/models/stateFdaEnum.ts create mode 100644 frontend/src/layouts/HomeLayout.module.css diff --git a/frontend/index.html b/frontend/index.html index 31271be..7f3a76a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,7 +1,7 @@ - + diff --git a/frontend/src/api/generated/private/models/stateE15Enum.ts b/frontend/src/api/generated/private/models/stateE15Enum.ts new file mode 100644 index 0000000..e2ca3c9 --- /dev/null +++ b/frontend/src/api/generated/private/models/stateE15Enum.ts @@ -0,0 +1,27 @@ +/** + * Generated by orval v7.17.0 🍺 + * Do not edit manually. + * OpenAPI spec version: 0.0.0 + */ + +/** + * * `WAITING_FOR_ORDERING_SHIPMENT` - cz#Čeká na objednání zásilkovny + * `PENDING` - cz#Podáno + * `SENDED` - cz#Odesláno + * `ARRIVED` - cz#Doručeno + * `CANCELED` - cz#Zrušeno + * `RETURNING` - cz#Posláno zpátky + * `RETURNED` - cz#Vráceno + */ +export type StateE15Enum = (typeof StateE15Enum)[keyof typeof StateE15Enum]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const StateE15Enum = { + WAITING_FOR_ORDERING_SHIPMENT: "WAITING_FOR_ORDERING_SHIPMENT", + PENDING: "PENDING", + SENDED: "SENDED", + ARRIVED: "ARRIVED", + CANCELED: "CANCELED", + RETURNING: "RETURNING", + RETURNED: "RETURNED", +} as const; diff --git a/frontend/src/api/generated/private/models/stateFdaEnum.ts b/frontend/src/api/generated/private/models/stateFdaEnum.ts new file mode 100644 index 0000000..d76f293 --- /dev/null +++ b/frontend/src/api/generated/private/models/stateFdaEnum.ts @@ -0,0 +1,21 @@ +/** + * Generated by orval v7.17.0 🍺 + * Do not edit manually. + * OpenAPI spec version: 0.0.0 + */ + +/** + * * `ordered` - cz#Objednávka se připravuje + * `shipped` - cz#Odesláno + * `delivered` - cz#Doručeno + * `ready_to_pickup` - cz#Připraveno k vyzvednutí + */ +export type StateFdaEnum = (typeof StateFdaEnum)[keyof typeof StateFdaEnum]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const StateFdaEnum = { + ordered: "ordered", + shipped: "shipped", + delivered: "delivered", + ready_to_pickup: "ready_to_pickup", +} as const; diff --git a/frontend/src/api/generated/public/models/stateE15Enum.ts b/frontend/src/api/generated/public/models/stateE15Enum.ts new file mode 100644 index 0000000..e2ca3c9 --- /dev/null +++ b/frontend/src/api/generated/public/models/stateE15Enum.ts @@ -0,0 +1,27 @@ +/** + * Generated by orval v7.17.0 🍺 + * Do not edit manually. + * OpenAPI spec version: 0.0.0 + */ + +/** + * * `WAITING_FOR_ORDERING_SHIPMENT` - cz#Čeká na objednání zásilkovny + * `PENDING` - cz#Podáno + * `SENDED` - cz#Odesláno + * `ARRIVED` - cz#Doručeno + * `CANCELED` - cz#Zrušeno + * `RETURNING` - cz#Posláno zpátky + * `RETURNED` - cz#Vráceno + */ +export type StateE15Enum = (typeof StateE15Enum)[keyof typeof StateE15Enum]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const StateE15Enum = { + WAITING_FOR_ORDERING_SHIPMENT: "WAITING_FOR_ORDERING_SHIPMENT", + PENDING: "PENDING", + SENDED: "SENDED", + ARRIVED: "ARRIVED", + CANCELED: "CANCELED", + RETURNING: "RETURNING", + RETURNED: "RETURNED", +} as const; diff --git a/frontend/src/api/generated/public/models/stateFdaEnum.ts b/frontend/src/api/generated/public/models/stateFdaEnum.ts new file mode 100644 index 0000000..d76f293 --- /dev/null +++ b/frontend/src/api/generated/public/models/stateFdaEnum.ts @@ -0,0 +1,21 @@ +/** + * Generated by orval v7.17.0 🍺 + * Do not edit manually. + * OpenAPI spec version: 0.0.0 + */ + +/** + * * `ordered` - cz#Objednávka se připravuje + * `shipped` - cz#Odesláno + * `delivered` - cz#Doručeno + * `ready_to_pickup` - cz#Připraveno k vyzvednutí + */ +export type StateFdaEnum = (typeof StateFdaEnum)[keyof typeof StateFdaEnum]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const StateFdaEnum = { + ordered: "ordered", + shipped: "shipped", + delivered: "delivered", + ready_to_pickup: "ready_to_pickup", +} as const; diff --git a/frontend/src/components/navbar/navbar.module.css b/frontend/src/components/navbar/navbar.module.css index 1a04774..6920783 100644 --- a/frontend/src/components/navbar/navbar.module.css +++ b/frontend/src/components/navbar/navbar.module.css @@ -1,7 +1,9 @@ .navbar { width: 50%; width: max-content; - margin: auto; + margin: 0; + margin-left: auto; + margin-right: auto; padding: 0 2em; background-color: var(--c-boxes); color: white; diff --git a/frontend/src/layouts/HomeLayout.module.css b/frontend/src/layouts/HomeLayout.module.css new file mode 100644 index 0000000..8d00b7f --- /dev/null +++ b/frontend/src/layouts/HomeLayout.module.css @@ -0,0 +1,12 @@ +/* Root container for the entire layout */ +.root { + min-height: 100vh; + width: 100%; + margin: 0; + padding: 0; + box-sizing: border-box; + + display: flex; + flex-direction: column; + justify-content: space-between; +} \ No newline at end of file diff --git a/frontend/src/layouts/HomeLayout.tsx b/frontend/src/layouts/HomeLayout.tsx index 3210ac8..a94a094 100644 --- a/frontend/src/layouts/HomeLayout.tsx +++ b/frontend/src/layouts/HomeLayout.tsx @@ -9,12 +9,14 @@ const userexists: User = { avatarUrl: "", }; +import styles from "./HomeLayout.module.css"; + export default function HomeLayout(){ return( - <> +
{}} onLogout={() => {}} />
) } \ No newline at end of file diff --git a/frontend/src/pages/home/Home.module.css b/frontend/src/pages/home/Home.module.css index c20db16..92fea39 100644 --- a/frontend/src/pages/home/Home.module.css +++ b/frontend/src/pages/home/Home.module.css @@ -7,8 +7,6 @@ --c-other: #70A288; /*other*/ } - - body{ overflow-x: hidden;