From 45c2f9e2646fe1bc712583ec55d8d0c1b5bff22d Mon Sep 17 00:00:00 2001 From: Martin Berka Date: Sat, 17 Jun 2023 09:29:15 +0200 Subject: [PATCH] =?UTF-8?q?Oprava=20zobrazov=C3=A1n=C3=AD=20textu,=20narov?= =?UTF-8?q?n=C3=A1n=C3=AD=20code=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/App.tsx | 21 +++++++++++++-------- client/src/components/PizzaOrderList.tsx | 2 +- server/src/service.ts | 2 +- server/src/types.ts | 22 ++++++++++++---------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/client/src/App.tsx b/client/src/App.tsx index b4b48f4..f8cad23 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -51,7 +51,6 @@ function App() { setIsConnected(false); }); socket.on(EVENT_MESSAGE, (newData: ClientData) => { - // const data: any = JSON.parse(payload); // console.log("Přijata nová data ze socketu", newData); setData(newData); }); @@ -246,16 +245,22 @@ function App() { {data.pizzaDay &&
+

Pizza day

{ - data.pizzaDay.state === State.CREATED && data.pizzaDay.creator === auth.login && + data.pizzaDay.state === State.CREATED &&

Pizza Day je založen a spravován uživatelem {data.pizzaDay.creator}.
Můžete upravovat své objednávky.

- - + { + data.pizzaDay.creator === auth.login && + <> + + + + }
} { diff --git a/client/src/components/PizzaOrderList.tsx b/client/src/components/PizzaOrderList.tsx index cc8d710..e9b3ce0 100644 --- a/client/src/components/PizzaOrderList.tsx +++ b/client/src/components/PizzaOrderList.tsx @@ -9,7 +9,7 @@ export default function PizzaOrderList({ state, orders, onDelete }: { state: Sta const auth = useAuth(); if (!orders?.length) { - return

Zatím žádné objednávky...

+ return

Zatím žádné objednávky...

} return diff --git a/server/src/service.ts b/server/src/service.ts index 39f72e0..921cb12 100644 --- a/server/src/service.ts +++ b/server/src/service.ts @@ -36,7 +36,7 @@ export function createPizzaDay(creator: string): ClientData { } const data: ClientData = { pizzaDay: { state: PizzaDayState.CREATED, creator, orders: [] }, ...clientData }; db.set(today, data); - callNotifikace({input:{udalost:UdalostEnum.ZAHAJENA_PIZZA,user:creator}}) + callNotifikace({ input: { udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator } }) return data; } diff --git a/server/src/types.ts b/server/src/types.ts index 5662189..0671901 100644 --- a/server/src/types.ts +++ b/server/src/types.ts @@ -69,20 +69,22 @@ export enum Locations { NEOBEDVAM = 'Neobědvám', } -export enum UdalostEnum{ - ZAHAJENA_PIZZA="Zahájen pizza day", - OBJEDNANA_PIZZA="Objednána pizza" +export enum UdalostEnum { + ZAHAJENA_PIZZA = "Zahájen pizza day", + OBJEDNANA_PIZZA = "Objednána pizza" } -export interface NotififaceInput{ - udalost:UdalostEnum, - user:string, +export interface NotififaceInput { + udalost: UdalostEnum, + user: string, } -export interface NotifikaceData{ - input:NotififaceInput, - gotify?:boolean, - teams?:boolean, + +export interface NotifikaceData { + input: NotififaceInput, + gotify?: boolean, + teams?: boolean, } + export interface GotifyServer { server: string; api_keys: string[];