Další zoufalé pokusy o Typescript

.gitignore

@@ -1,2 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
 node_modules
-types/gen
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

.woodpecker/workflow.yaml

@@ -1,64 +0,0 @@
-variables:
-  - &node_image "node:22-alpine"
-  - &branch "master"
-
-when:
-  - event: push
-    branch: *branch
-
-steps:
-  - name: Generate TypeScript types
-    image: *node_image
-    commands:
-      - cd types
-      - yarn install --frozen-lockfile
-      - yarn openapi-ts
-  - name: Install server dependencies
-    image: *node_image
-    commands:
-      - cd server
-      - yarn install --frozen-lockfile
-    depends_on: [Generate TypeScript types]
-  - name: Install client dependencies
-    image: *node_image
-    commands:
-      - cd client
-      - yarn install --frozen-lockfile
-    depends_on: [Generate TypeScript types]
-  - name: Build server
-    depends_on: [Install server dependencies]
-    image: *node_image
-    commands:
-      - cd server
-      - yarn build
-  - name: Build client
-    depends_on: [Install client dependencies]
-    image: *node_image
-    commands:
-      - cd client
-      - yarn build
-  - name: Build Docker image
-    depends_on: [Build server, Build client]
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      dockerfile: Dockerfile-Woodpecker
-      platforms: linux/amd64
-      registry:
-        from_secret: REPO_URL
-      username:
-        from_secret: REPO_USERNAME
-      password:
-        from_secret: REPO_PASSWORD
-      repo:
-        from_secret: REPO_NAME
-  - name: Discord notification - build
-    image: appleboy/drone-discord
-    depends_on: [Build Docker image]
-    when:
-      - status: [success, failure]
-    settings:
-      webhook_id:
-        from_secret: DISCORD_WEBHOOK_ID
-      webhook_token:
-        from_secret: DISCORD_WEBHOOK_TOKEN
-      message: "{{#success build.status}}✅ Sestavení {{build.number}} proběhlo úspěšně.{{else}}❌ Sestavení {{build.number}} selhalo.{{/success}}\n\nPipeline: {{build.link}}\nPoslední commit: {{commit.message}}Autor: {{commit.author}}"

Dockerfile

@@ -1,18 +1,8 @@
-ARG NODE_VERSION="node:22-alpine"
-
 # Builder
-FROM ${NODE_VERSION} AS builder
+FROM node:18-alpine3.18 AS builder
 
 WORKDIR /build
 
-# Zkopírování závislostí - OpenAPI generátor
-COPY types/package.json ./types/
-COPY types/yarn.lock ./types/
-COPY types/api.yml ./types/
-COPY types/schemas ./types/schemas/
-COPY types/paths ./types/paths/
-COPY types/openapi-ts.config.ts ./types/
-
 # Zkopírování závislostí - server
 COPY server/package.json ./server/
 COPY server/yarn.lock ./server/
@@ -21,10 +11,6 @@ COPY server/yarn.lock ./server/
 COPY client/package.json ./client/
 COPY client/yarn.lock ./client/
 
-# Instalace závislostí - OpenAPI generátor
-WORKDIR /build/types
-RUN yarn install --frozen-lockfile
-
 # Instalace závislostí - server
 WORKDIR /build/server
 RUN yarn install --frozen-lockfile
@@ -48,11 +34,7 @@ COPY client/src ./client/src
 COPY client/public ./client/public
 
 # Zkopírování společných typů
-COPY types/index.ts ./types/
+COPY types ./types/
-
-# Vygenerování společných typů z OpenAPI
-WORKDIR /build/types
-RUN yarn openapi-ts
 
 # Sestavení serveru
 WORKDIR /build/server
@@ -63,18 +45,16 @@ WORKDIR /build/client
 RUN yarn build
 
 # Runner
-FROM ${NODE_VERSION}
+FROM node:18-alpine3.18
-
+ENV LANG cs_CZ.UTF-8
-RUN apk add --no-cache tzdata
+ENV NODE_ENV production
-ENV TZ=Europe/Prague \
-    LC_ALL=cs_CZ.UTF-8 \
-    NODE_ENV=production
 
 WORKDIR /app
 
 # Vykopírování sestaveného serveru
 COPY --from=builder /build/server/node_modules ./server/node_modules
 COPY --from=builder /build/server/dist ./
+COPY server/resources ./server/resources
 
 # Vykopírování sestaveného klienta
 COPY --from=builder /build/client/dist ./public
@@ -83,10 +63,8 @@ COPY --from=builder /build/client/dist ./public
 COPY /server/.env.production ./server/src
 
 # Zkopírování konfigurace easter eggů
-RUN if [ -f /server/.easter-eggs.json ]; then cp /server/.easter-eggs.json ./server/; fi
+# TODO tohle spadne když nebude existovat!
-
+COPY /server/.easter-eggs.json ./server/
-# Export /data/db.json do složky /data
-VOLUME ["/data"]
 
 EXPOSE 3000
 

Dockerfile-Woodpecker

@@ -1,26 +0,0 @@
-ARG NODE_VERSION="node:22-alpine"
-
-FROM ${NODE_VERSION}
-
-RUN apk add --no-cache tzdata
-ENV TZ=Europe/Prague \
-    LC_ALL=cs_CZ.UTF-8 \
-    NODE_ENV=production
-
-WORKDIR /app
-
-# Vykopírování sestaveného serveru
-COPY ./server/node_modules ./server/node_modules
-COPY ./server/dist ./
-# TODO tohle není dobře, má to být součástí serveru
-# COPY ./server/resources ./resources
-
-# Vykopírování sestaveného klienta
-COPY ./client/dist ./public
-
-# Zkopírování konfigurace easter eggů
-RUN if [ -f ./server/.easter-eggs.json ]; then cp ./server/.easter-eggs.json ./server/; fi
-
-EXPOSE 3000
-
-CMD [ "node", "./server/src/index.js" ]

README.md

@@ -1,9 +1,7 @@
 # Luncher
 Aplikace pro profesionální management obědů.
 
-Aplikace sestává ze tří modulů.
+Aplikace sestává ze dvou modulů + společných TypeScript definic (adresář `types`).
-- types
-  - OpenAPI definice společných typů, generované přes [openapi-ts](https://github.com/hey-api/openapi-ts)
 - server
   - backend psaný v [node.js](https://nodejs.dev)
 - client
@@ -12,27 +10,19 @@ Aplikace sestává ze tří modulů.
 ## Spuštění pro vývoj
 ### Závislosti
 #### Klient/server
-- [Node.js 22.x (>= 22.11)](https://nodejs.dev)
+- [Node.js 18.x](https://nodejs.dev)
 - [Yarn 1.22.x (Classic)](https://classic.yarnpkg.com)
 
 ### Spuštění na *nix platformách
 - Nainstalovat závislosti viz předchozí bod
 - Zkopírovat `server/.env.template` do `server/.env.development` a upravit dle potřeby
-- Vygenerovat společné TypeScript typy
+- Spustit `./run_dev.sh`. Na jiných platformách se lze inspirovat jeho obsahem, postup by měl být víceméně stejný.
-  - `cd types && yarn install && yarn openapi-ts`
-- Server
-  - `cd server && yarn install && export NODE_ENV=development && yarn startReload`
-- Klient
-  - `cd client && yarn install && yarn start`
 
 ## Sestavení a spuštění produkční verze v Docker
 ### Závislosti
 - [Docker](https://www.docker.com)
 - [Docker Compose](https://docs.docker.com/compose)
 
-### Spuštění
-- `docker compose up --build -d`
-
 ### Spuštení s traefik
 - `docker compose -f compose-traefik.yml up --build -d`
 

client/.gitignore

@@ -1,2 +1,3 @@
 build
 dist
+src/types

client/package.json

@@ -21,12 +21,9 @@
     "react-dom": "^19.0.0",
     "react-jwt": "^1.2.0",
     "react-modal": "^3.16.1",
-    "react-router": "^7.2.0",
-    "react-router-dom": "^7.2.0",
     "react-select-search": "^4.1.6",
     "react-snowfall": "^2.2.0",
     "react-toastify": "^10.0.4",
-    "recharts": "^2.15.1",
     "sass": "^1.80.6",
     "socket.io-client": "^4.6.1",
     "typescript": "^5.3.3",
@@ -34,8 +31,9 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
-    "start": "yarn vite",
+    "copy-types": "cp -r ../types ./src",
-    "build": "tsc --noEmit && yarn vite build"
+    "start": "yarn copy-types && vite",
+    "build": "yarn copy-types && vite build"
   },
   "eslintConfig": {
     "extends": [

client/src/App.tsx

@@ -1,27 +1,29 @@
 import React, { useContext, useEffect, useMemo, useRef, useState, useCallback } from 'react';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import { EVENT_DISCONNECT, EVENT_MESSAGE, SocketContext } from './context/socket';
+import { addPizza, createPizzaDay, deletePizzaDay, finishDelivery, finishOrder, lockPizzaDay, removePizza, unlockPizzaDay, updatePizzaDayNote } from './api/PizzaDayApi';
 import { useAuth } from './context/auth';
 import Login from './Login';
 import { Alert, Button, Col, Form, Row, Table } from 'react-bootstrap';
 import Header from './components/Header';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import PizzaOrderList from './components/PizzaOrderList';
-import SelectSearch, { SelectedOptionValue, SelectSearchOption } from 'react-select-search';
+import SelectSearch, { SelectedOptionValue } from 'react-select-search';
 import 'react-select-search/style.css';
 import './App.scss';
+import { SelectSearchOption } from 'react-select-search';
 import { faCircleCheck, faNoteSticky, faTrashCan } from '@fortawesome/free-regular-svg-icons';
 import { useSettings } from './context/settings';
+import { ClientData, Restaurants, Food, Order, Locations, PizzaOrder, PizzaDayState, FoodChoices, DayMenu, DepartureTime, LocationKey } from './types';
 import Footer from './components/Footer';
 import { faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons';
 import Loader from './components/Loader';
+import { getData, errorHandler, getQrUrl } from './api/Api';
+import { addChoice, removeChoices, removeChoice, changeDepartureTime, jdemeObed, updateNote } from './api/FoodApi';
 import { getHumanDateTime, isInTheFuture } from './Utils';
 import NoteModal from './components/modals/NoteModal';
 import { useEasterEgg } from './context/eggs';
-import { Link } from 'react-router';
+import { getImage } from './api/EasterEggApi';
-import { STATS_URL } from './AppRoutes';
-import { ClientData, Food, PizzaOrder, DepartureTime, PizzaDayState, Restaurant, RestaurantDayMenu, RestaurantDayMenuMap, LunchChoice, UserLunchChoice, PizzaVariant, getData, getEasterEggImage, addPizza, removePizza, updatePizzaDayNote, createPizzaDay, deletePizzaDay, lockPizzaDay, unlockPizzaDay, finishOrder, finishDelivery, addChoice, jdemeObed, removeChoices, removeChoice, updateNote, changeDepartureTime } from '../../types';
-import { getLunchChoiceName } from './enums';
 
 const EVENT_CONNECT = "connect"
 
@@ -38,11 +40,11 @@ const EASTER_EGG_DEFAULT_DURATION = 0.75;
 function App() {
   const auth = useAuth();
   const settings = useSettings();
-  const [easterEgg, _] = useEasterEgg(auth);
+  const [easterEgg, easterEggLoading] = useEasterEgg(auth);
   const [isConnected, setIsConnected] = useState<boolean>(false);
   const [data, setData] = useState<ClientData>();
-  const [food, setFood] = useState<RestaurantDayMenuMap>();
+  const [food, setFood] = useState<{ [key in Restaurants]?: DayMenu }>();
-  const [myOrder, setMyOrder] = useState<PizzaOrder>();
+  const [myOrder, setMyOrder] = useState<Order>();
   const [foodChoiceList, setFoodChoiceList] = useState<Food[]>();
   const [closed, setClosed] = useState<boolean>(false);
   const socket = useContext(SocketContext);
@@ -62,17 +64,14 @@ function App() {
 
   // Načtení dat po přihlášení
   useEffect(() => {
-    if (!auth?.login) {
+    if (!auth || !auth.login) {
       return
     }
-    getData().then(response => {
+    getData().then((data: ClientData) => {
-      const data = response.data
-      if (data) {
       setData(data);
-        setDayIndex(data.dayIndex);
+      setDayIndex(data.weekIndex);
-        dayIndexRef.current = data.dayIndex;
+      dayIndexRef.current = data.weekIndex;
       setFood(data.menus);
-      }
     }).catch(e => {
       setFailure(true);
     })
@@ -80,15 +79,12 @@ function App() {
 
   // Přenačtení pro zvolený den
   useEffect(() => {
-    if (!auth?.login) {
+    if (!auth || !auth.login) {
       return
     }
-    getData({ query: { dayIndex: dayIndex } }).then(response => {
+    getData(dayIndex).then((data: ClientData) => {
-      const data = response.data;
       setData(data);
-      if (data) {
       setFood(data.menus);
-      }
     }).catch(e => {
       setFailure(true);
     })
@@ -97,15 +93,17 @@ function App() {
   // Registrace socket eventů
   useEffect(() => {
     socket.on(EVENT_CONNECT, () => {
+      // console.log("Connected!");
       setIsConnected(true);
     });
     socket.on(EVENT_DISCONNECT, () => {
+      // console.log("Disconnected!");
       setIsConnected(false);
     });
     socket.on(EVENT_MESSAGE, (newData: ClientData) => {
       // console.log("Přijata nová data ze socketu", newData);
       // Aktualizujeme pouze, pokud jsme dostali data pro den, který máme aktuálně zobrazený
-      if (dayIndexRef.current == null || newData.dayIndex === dayIndexRef.current) {
+      if (dayIndexRef.current == null || newData.weekIndex === dayIndexRef.current) {
         setData(newData);
       }
     });
@@ -118,7 +116,7 @@ function App() {
   }, [socket]);
 
   useEffect(() => {
-    if (!auth?.login) {
+    if (!auth || !auth.login) {
       return
     }
     // TODO tohle občas náhodně nezafunguje, nutno přepsat, viz https://medium.com/@teh_builder/ref-objects-inside-useeffect-hooks-eb7c15198780
@@ -143,10 +141,10 @@ function App() {
 
   useEffect(() => {
     if (choiceRef?.current?.value && choiceRef.current.value !== "") {
-      const locationKey = choiceRef.current.value as LunchChoice;
+      const locationKey = choiceRef.current.value as LocationKey;
-      const restaurantKey = Object.keys(Restaurant).indexOf(locationKey);
+      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
       if (restaurantKey > -1 && food) {
-        const restaurant = Object.keys(Restaurant)[restaurantKey] as Restaurant;
+        const restaurant = Object.values(Restaurants)[restaurantKey];
         setFoodChoiceList(food[restaurant]?.food);
         setClosed(food[restaurant]?.closed ?? false);
       } else {
@@ -178,9 +176,9 @@ function App() {
   // Stažení a nastavení easter egg obrázku
   useEffect(() => {
     if (auth?.login && easterEgg?.url && !eggImage) {
-      getEasterEggImage({ path: { url: easterEgg.url } }).then(response => {
+      getImage(easterEgg.url).then(data => {
-        if (response.data) {
+        if (data) {
-          setEggImage(response.data);
+          setEggImage(data);
           // Smazání obrázku z DOMu po animaci
           setTimeout(() => {
             if (eggRef?.current) {
@@ -192,18 +190,10 @@ function App() {
     }
   }, [auth?.login, easterEgg?.duration, easterEgg?.url, eggImage]);
 
-  const doAddClickFoodChoice = async (location: LunchChoice, foodIndex?: number) => {
-    if (document.getSelection()?.type !== 'Range') { // pouze pokud se nejedná o výběr textu
-      if (auth?.login) {
-        await addChoice({ body: { locationKey: location, foodIndex, dayIndex } });
-      }
-    }
-  }
-
   const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
-    const locationKey = event.target.value as LunchChoice;
+    const locationKey = event.target.value as LocationKey;
     if (auth?.login) {
-      await addChoice({ body: { locationKey, dayIndex } });
+      await errorHandler(() => addChoice(locationKey, undefined, dayIndex));
       if (foodChoiceRef.current?.value) {
         foodChoiceRef.current.value = "";
       }
@@ -218,16 +208,16 @@ function App() {
 
   const doAddFoodChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
     if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) {
-      const locationKey = choiceRef.current.value as LunchChoice;
+      const locationKey = choiceRef.current.value as LocationKey;
       if (auth?.login) {
-        await addChoice({ body: { locationKey, foodIndex: Number(event.target.value), dayIndex } });
+        await errorHandler(() => addChoice(locationKey, Number(event.target.value), dayIndex));
       }
     }
   }
 
-  const doRemoveChoices = async (locationKey: LunchChoice) => {
+  const doRemoveChoices = async (locationKey: LocationKey) => {
     if (auth?.login) {
-      await removeChoices({ body: { locationKey, dayIndex } });
+      await errorHandler(() => removeChoices(locationKey, dayIndex));
       // Vyresetujeme výběr, aby bylo jasné pro který případně vybíráme jídlo
       if (choiceRef?.current?.value) {
         choiceRef.current.value = "";
@@ -238,9 +228,9 @@ function App() {
     }
   }
 
-  const doRemoveFoodChoice = async (locationKey: LunchChoice, foodIndex: number) => {
+  const doRemoveFoodChoice = async (locationKey: LocationKey, foodIndex: number) => {
     if (auth?.login) {
-      await removeChoice({ body: { locationKey, foodIndex, dayIndex } });
+      await errorHandler(() => removeChoice(locationKey, foodIndex, dayIndex));
       if (choiceRef?.current?.value) {
         choiceRef.current.value = "";
       }
@@ -252,7 +242,7 @@ function App() {
 
   const saveNote = async (note?: string) => {
     if (auth?.login) {
-      await updateNote({ body: { note, dayIndex } });
+      await errorHandler(() => updateNote(note, dayIndex));
       setNoteModalOpen(false);
     }
   }
@@ -276,18 +266,18 @@ function App() {
 
   const handlePizzaChange = async (value: SelectedOptionValue | SelectedOptionValue[]) => {
     if (auth?.login && data?.pizzaList) {
-      if (typeof value !== 'string') {
+      if (!(typeof value === 'string')) {
         throw Error('Nepodporovaný typ hodnoty');
       }
       const s = value.split('|');
       const pizzaIndex = Number.parseInt(s[0]);
       const pizzaSizeIndex = Number.parseInt(s[1]);
-      await addPizza({ body: { pizzaIndex, pizzaSizeIndex } });
+      await addPizza(pizzaIndex, pizzaSizeIndex);
     }
   }
 
-  const handlePizzaDelete = async (pizzaOrder: PizzaVariant) => {
+  const handlePizzaDelete = async (pizzaOrder: PizzaOrder) => {
-    await removePizza({ body: { pizzaOrder } });
+    await removePizza(pizzaOrder);
   }
 
   const handlePizzaPoznamkaChange = async () => {
@@ -295,7 +285,7 @@ function App() {
       alert("Poznámka může mít maximálně 70 znaků");
       return;
     }
-    updatePizzaDayNote({ body: { note: pizzaPoznamkaRef.current?.value } });
+    updatePizzaDayNote(pizzaPoznamkaRef.current?.value);
   }
 
   // const addToCart = async () => {
@@ -324,7 +314,7 @@ function App() {
 
   const handleChangeDepartureTime = async (event: React.ChangeEvent<HTMLSelectElement>) => {
     if (foodChoiceList?.length && choiceRef.current?.value) {
-      await changeDepartureTime({ body: { time: event.target.value as DepartureTime, dayIndex } });
+      await changeDepartureTime(event.target.value, dayIndex);
     }
   }
 
@@ -342,17 +332,15 @@ function App() {
     }
   }
 
-  const renderFoodTable = (location: Restaurant, menu: RestaurantDayMenu) => {
+  const renderFoodTable = (name: string, menu: DayMenu) => {
     let content;
     if (menu?.closed) {
       content = <h3>Zavřeno</h3>
-    } else if (menu?.food?.length && menu.food.length > 0) {
+    } else if (menu?.food?.length > 0) {
-      const hideSoups = settings?.hideSoups;
       content = <Table striped bordered hover>
-        <tbody style={{ cursor: 'pointer' }}>
+        <tbody>
-          {menu.food.map((f: Food, index: number) =>
+          {menu.food.filter(f => (settings?.hideSoups ? !f.isSoup : true)).map((f: any, index: number) =>
-            (!hideSoups || !f.isSoup) &&
+            <tr key={index}>
-            <tr key={f.name} onClick={() => doAddClickFoodChoice(location, index)}>
               <td>{f.amount}</td>
               <td>{f.name}</td>
               <td>{f.price}</td>
@@ -363,14 +351,14 @@ function App() {
     } else {
       content = <h3>Chyba načtení dat</h3>
     }
-    return <Col md={12} lg={3} className='mt-3'>
+    return <Col md={12} lg={4} className='mt-3'>
-      <h3 style={{ cursor: 'pointer' }} onClick={() => doAddClickFoodChoice(location)}>{getLunchChoiceName(location)}</h3>
+      <h3>{name}</h3>
       {menu?.lastUpdate && <small>Poslední aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
       {content}
     </Col>
   }
 
-  if (!auth?.login) {
+  if (!auth || !auth.login) {
     return <Login />;
   }
 
@@ -399,7 +387,7 @@ function App() {
   }
 
   const noOrders = data?.pizzaDay?.orders?.length === 0;
-  const canChangeChoice = dayIndex == null || data.todayDayIndex == null || dayIndex >= data.todayDayIndex;
+  const canChangeChoice = dayIndex == null || data.todayWeekIndex == null || dayIndex >= data.todayWeekIndex;
 
   const { path, url, startOffset, endOffset, duration, ...style } = easterEgg || {};
 
@@ -410,47 +398,48 @@ function App() {
       <div className='wrapper'>
         {data.isWeekend ? <h4>Užívejte víkend :)</h4> : <>
           <Alert variant={'primary'}>
-            {/* <img alt="" src='hat.png' style={{ position: "absolute", width: "70px", rotate: "-45deg", left: -40, top: -58 }} />
+            <img src='hat.png' style={{ position: "absolute", width: "70px", rotate: "-45deg", left: -40, top: -58 }} />
-            <img alt="" src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} /> */}
+            <img src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} />
             Poslední změny:
             <ul>
-              <li>Migrace na generované <Link target='_blank' to="https://www.openapis.org">OpenAPI</Link></li>
+              <li>Zimní atmosféra</li>
-              <li>Odebrání zimní atmosféry</li>
+              <li>Odstranění podniku U Motlíků</li>
             </ul>
           </Alert>
           {dayIndex != null &&
             <div className='day-navigator'>
               <FontAwesomeIcon title="Předchozí den" icon={faChevronLeft} style={{ cursor: "pointer", visibility: dayIndex > 0 ? "initial" : "hidden" }} onClick={() => handleDayChange(dayIndex - 1)} />
-              <h1 className='title' style={{ color: dayIndex === data.todayDayIndex ? 'black' : 'gray' }}>{data.date}</h1>
+              <h1 className='title' style={{ color: dayIndex === data.todayWeekIndex ? 'black' : 'gray' }}>{data.date}</h1>
               <FontAwesomeIcon title="Následující den" icon={faChevronRight} style={{ cursor: "pointer", visibility: dayIndex < 4 ? "initial" : "hidden" }} onClick={() => handleDayChange(dayIndex + 1)} />
             </div>
           }
           <Row className='food-tables'>
-            {/* TODO zjednodušit, stačí iterovat klíče typu Restaurant */}
+            {food[Restaurants.SLADOVNICKA] && renderFoodTable('Sladovnická', food[Restaurants.SLADOVNICKA])}
-            {food['SLADOVNICKA'] && renderFoodTable('SLADOVNICKA', food['SLADOVNICKA'])}
+            {/* {food[Restaurants.UMOTLIKU] && renderFoodTable('U Motlíků', food[Restaurants.UMOTLIKU])} */}
-            {food['TECHTOWER'] && renderFoodTable('TECHTOWER', food['TECHTOWER'])}
+            {food[Restaurants.TECHTOWER] && renderFoodTable('TechTower', food[Restaurants.TECHTOWER])}
-            {food['ZASTAVKAUMICHALA'] && renderFoodTable('ZASTAVKAUMICHALA', food['ZASTAVKAUMICHALA'])}
+            {food[Restaurants.ZASTAVKAUMICHALA] && renderFoodTable('Zastávka u Michala', food[Restaurants.ZASTAVKAUMICHALA])}
-            {food['SENKSERIKOVA'] && renderFoodTable('SENKSERIKOVA', food['SENKSERIKOVA'])}
           </Row>
           <div className='content-wrapper'>
             <div className='content'>
               {canChangeChoice && <>
-                <p>{`Jak to ${dayIndex == null || dayIndex === data.todayDayIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
+                <p>{`Jak to ${dayIndex == null || dayIndex === data.todayWeekIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
                 <Form.Select ref={choiceRef} onChange={doAddChoice}>
                   <option></option>
-                  {Object.entries(LunchChoice)
+                  {Object.entries(Locations)
                     .filter(entry => {
-                      const locationKey = entry[0] as Restaurant;
+                      const locationKey = entry[0] as LocationKey;
-                      return !food[locationKey]?.closed;
+                      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
+                      const v = Object.values(Restaurants)[restaurantKey];
+                      return v == null || !food[v]?.closed;
                     })
-                    .map(entry => <option key={entry[0]} value={entry[0]}>{getLunchChoiceName(entry[1])}</option>)}
+                    .map(entry => <option key={entry[0]} value={entry[0]}>{entry[1]}</option>)}
                 </Form.Select>
                 <small>Je možné vybrat jen jednu možnost. Výběr jiné odstraní předchozí.</small>
                 {foodChoiceList && !closed && <>
                   <p style={{ marginTop: "10px" }}>Na co dobrého? <small>(nepovinné)</small></p>
                   <Form.Select ref={foodChoiceRef} onChange={doAddFoodChoice}>
                     <option></option>
-                    {foodChoiceList.map((food, index) => <option key={food.name} value={index}>{food.name}</option>)}
+                    {foodChoiceList.map((food, index) => <option key={index} value={index}>{food.name}</option>)}
                   </Form.Select>
                 </>}
                 {foodChoiceList && !closed && <>
@@ -467,29 +456,25 @@ function App() {
                 <Table bordered className='mt-5'>
                   <tbody>
                     {Object.keys(data.choices).map(key => {
-                      const locationKey = key as LunchChoice;
+                      const locationKey = key as LocationKey;
-                      const locationName = getLunchChoiceName(locationKey);
+                      const locationName = Locations[locationKey];
                       const loginObject = data.choices[locationKey];
                       if (!loginObject) {
                         return;
                       }
                       const locationLoginList = Object.entries(loginObject);
-                      const locationPickCount = locationLoginList.length
                       return (
                         <tr key={key}>
-                          {(locationPickCount ?? 0) > 1 ? (
+                          <td>{locationName}</td>
-                            <td>{locationName} ({locationPickCount})</td>
-                          ) : (
-                            <td>{locationName}</td>)}
                           <td className='p-0'>
                             <Table>
                               <tbody>
-                                {locationLoginList.map((entry: [string, UserLunchChoice], index) => {
+                                {locationLoginList.map((entry: [string, FoodChoices], index) => {
                                   const login = entry[0];
                                   const userPayload = entry[1];
-                                  const userChoices = userPayload?.selectedFoods;
+                                  const userChoices = userPayload?.options;
                                   const trusted = userPayload?.trusted || false;
-                                  return <tr key={entry[0]}>
+                                  return <tr key={index}>
                                     <td>
                                       {trusted && <span className='trusted-icon'>
                                         <FontAwesomeIcon title='Uživatel ověřený doménovým přihlášením' icon={faCircleCheck} style={{ cursor: "help" }} />
@@ -501,18 +486,20 @@ function App() {
                                         setNoteModalOpen(true);
                                       }} title='Upravit poznámku' className='action-icon' icon={faNoteSticky} />}
                                       {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
-                                        doRemoveChoices(key as LunchChoice);
+                                        doRemoveChoices(key as LocationKey);
                                       }} title={`Odstranit volbu ${locationName}, včetně případných zvolených jídel`} className='action-icon' icon={faTrashCan} />}
                                     </td>
                                     {userChoices?.length && food ? <td>
                                       <ul>
                                         {userChoices?.map(foodIndex => {
-                                          const restaurantKey = key as Restaurant;
+                                          // TODO narovnat, tohle je zbytečně složité
-                                          const foodName = food[restaurantKey]?.food?.[foodIndex].name;
+                                          const restaurantKey = Object.keys(Restaurants).indexOf(key);
+                                          const restaurant = Object.values(Restaurants)[restaurantKey];
+                                          const foodName = food[restaurant]?.food[foodIndex].name;
                                           return <li key={foodIndex}>
                                             {foodName}
                                             {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
-                                              doRemoveFoodChoice(restaurantKey, foodIndex);
+                                              doRemoveFoodChoice(key as LocationKey, foodIndex);
                                             }} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />}
                                           </li>
                                         })}
@@ -532,7 +519,7 @@ function App() {
                 : <div className='mt-5'><i>Zatím nikdo nehlasoval...</i></div>
               }
             </div>
-            {dayIndex === data.todayDayIndex &&
+            {dayIndex === data.todayWeekIndex &&
               <div className='mt-5'>
                 {!data.pizzaDay &&
                   <div style={{ textAlign: 'center' }}>
@@ -585,6 +572,9 @@ function App() {
                               <Button className='danger mb-3' title="Umožní znovu editovat objednávky." onClick={async () => {
                                 await unlockPizzaDay();
                               }}>Odemknout</Button>
+                              {/* <Button className='danger mb-3' style={{ marginLeft: '20px' }} onClick={async () => {
+                          await addToCart();
+                        }}>Přidat vše do košíku</Button> */}
                               <Button className='danger mb-3' style={{ marginLeft: '20px' }} title={noOrders ? "Nelze objednat - neexistuje žádná objednávka" : "Použij po objednání. Objednávky zůstanou zamčeny."} disabled={noOrders} onClick={async () => {
                                 await finishOrder();
                               }}>Objednáno</Button>
@@ -602,7 +592,7 @@ function App() {
                                 await lockPizzaDay();
                               }}>Vrátit do "uzamčeno"</Button>
                               <Button className='danger mb-3' style={{ marginLeft: '20px' }} title="Nastaví stav na 'Doručeno' - koncový stav." onClick={async () => {
-                                await finishDelivery({ body: { bankAccount: settings?.bankAccount, bankAccountHolder: settings?.holderName } });
+                                await finishDelivery(settings?.bankAccount, settings?.holderName);
                               }}>Doručeno</Button>
                             </div>
                           }
@@ -639,20 +629,20 @@ function App() {
                         </Button>
                       </div>
                     }
-                    <PizzaOrderList state={data.pizzaDay.state!} orders={data.pizzaDay.orders!} onDelete={handlePizzaDelete} creator={data.pizzaDay.creator!} />
+                    <PizzaOrderList state={data.pizzaDay.state} orders={data.pizzaDay.orders} onDelete={handlePizzaDelete} creator={data.pizzaDay.creator} />
                     {
-                      data.pizzaDay.state === PizzaDayState.DELIVERED && myOrder?.hasQr ?
+                      data.pizzaDay.state === PizzaDayState.DELIVERED && myOrder?.hasQr &&
                       <div className='qr-code'>
                         <h3>QR platba</h3>
-                          <img src={`/api/qr?login=${auth.login}`} alt='QR kód' />
+                        <img src={getQrUrl(auth.login)} alt='QR kód' />
-                        </div> : null
+                      </div>
                     }
                   </div>
                 }
               </div>
             }
           </div>
-        </> || "Jejda, něco se nám nepovedlo :("}
+        </>}
       </div>
       <Footer />
       <NoteModal isOpen={noteModalOpen} onClose={() => setNoteModalOpen(false)} onSave={saveNote} />

client/src/AppRoutes.tsx

@@ -1,33 +0,0 @@
-import { Routes, Route } from "react-router-dom";
-import { ProvideSettings } from "./context/settings";
-// import Snowfall from "react-snowfall";
-import { ToastContainer } from "react-toastify";
-import { SocketContext, socket } from "./context/socket";
-import StatsPage from "./pages/StatsPage";
-import App from "./App";
-
-export const STATS_URL = '/stats';
-
-export default function AppRoutes() {
-    return (
-        <Routes>
-            <Route path={STATS_URL} element={<StatsPage />} />
-            <Route path="/" element={
-                <ProvideSettings>
-                    <SocketContext.Provider value={socket}>
-                        <>
-                            {/* <Snowfall style={{
-                                zIndex: 2,
-                                position: 'fixed',
-                                width: '100vw',
-                                height: '100vh'
-                            }} /> */}
-                            <App />
-                        </>
-                        <ToastContainer />
-                    </SocketContext.Provider>
-                </ProvideSettings>
-            } />
-        </Routes>
-    );
-}

client/src/Login.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import { Button } from 'react-bootstrap';
 import { useAuth } from './context/auth';
-import { login } from '../../types';
+import { login } from './api/Api';
 import './Login.css';
 
 /**
@@ -14,10 +14,9 @@ export default function Login() {
   useEffect(() => {
     if (auth && !auth.login) {
       // Vyzkoušíme přihlášení "naprázdno", pokud projde, přihlásili nás trusted headers
-      login().then(response => {
+      login().then(token => {
-        const token = response.data;
         if (token) {
-          auth?.setToken(token as unknown as string); // TODO vyřešit, API definice je špatně, je to skutečně string
+          auth?.setToken(token);
         }
       }).catch(error => {
         // nezajímá nás
@@ -26,16 +25,17 @@ export default function Login() {
   }, [auth]);
 
   const doLogin = useCallback(async () => {
-    const length = loginRef?.current?.value.length && loginRef.current.value.replace(/\s/g, '').length
+    const length = loginRef?.current?.value && loginRef?.current?.value.length && loginRef.current.value.replace(/\s/g, '').length
     if (length) {
-      const response = await login({ body: { login: loginRef.current?.value } });
+      // TODO odchytávat cokoliv mimo 200
-      if (response.data) {
+      const token = await login(loginRef.current.value);
-        auth?.setToken(response.data as unknown as string); // TODO vyřešit
+      if (token) {
+        auth?.setToken(token);
       }
     }
   }, [auth]);
 
-  if (!auth?.login) {
+  if (!auth || !auth.login) {
     return <div className='login'>
       <h1>Luncher</h1>
       <h4 style={{ marginBottom: "50px" }}>Aplikace pro profesionální management obědů</h4>

client/src/Utils.tsx

@@ -1,4 +1,4 @@
-import { DepartureTime } from "../../types";
+import {DepartureTime} from "../../types";
 
 const TOKEN_KEY = "token";
 
@@ -16,8 +16,8 @@ export const storeToken = (token: string) => {
  * 
  * @returns token nebo null
  */
-export const getToken = (): string | undefined => {
+export const getToken = (): string | null => {
-    return localStorage.getItem(TOKEN_KEY) ?? undefined;
+    return localStorage.getItem(TOKEN_KEY);
 }
 
 /**
@@ -53,54 +53,7 @@ export function isInTheFuture(time: DepartureTime) {
     const now = new Date();
     const currentHours = now.getHours();
     const currentMinutes = now.getMinutes();
-    const currentDate = now.toDateString();
     const [hours, minutes] = time.split(':').map(Number);
-
-    if (currentDate === now.toDateString()) {
     return hours > currentHours || (hours === currentHours && minutes > currentMinutes);
-    }
-    return true;
 }
 
-/**
- * Vrátí index dne v týdnu, kde pondělí=0, neděle=6
- * 
- * @param date datum
- * @returns index dne v týdnu
- */
-export const getDayOfWeekIndex = (date: Date) => {
-    // https://stackoverflow.com/a/4467559
-    return (((date.getDay() - 1) % 7) + 7) % 7;
-}
-
-/** Vrátí první pracovní den v týdnu předaného data. */
-export function getFirstWorkDayOfWeek(date: Date) {
-    const firstDay = new Date(date.getTime());
-    firstDay.setDate(date.getDate() - getDayOfWeekIndex(date));
-    return firstDay;
-}
-
-/** Vrátí poslední pracovní den v týdnu předaného data. */
-export function getLastWorkDayOfWeek(date: Date) {
-    const lastDay = new Date(date.getTime());
-    lastDay.setDate(date.getDate() + (4 - getDayOfWeekIndex(date)));
-    return lastDay;
-}
-
-/** Vrátí datum v ISO formátu. */
-export function formatDate(date: Date, format?: string) {
-    let day = String(date.getDate()).padStart(2, '0');
-    let month = String(date.getMonth() + 1).padStart(2, "0");
-    let year = String(date.getFullYear());
-
-    const f = format ?? 'YYYY-MM-DD';
-    return f.replace('DD', day).replace('MM', month).replace('YYYY', year);
-}
-
-/** Vrátí human-readable reprezentaci předaného data pro zobrazení. */
-export function getHumanDate(date: Date) {
-    let currentDay = String(date.getDate()).padStart(2, '0');
-    let currentMonth = String(date.getMonth() + 1).padStart(2, "0");
-    let currentYear = date.getFullYear();
-    return `${currentDay}.${currentMonth}.${currentYear}`;
-}

client/src/api/Api.ts

@@ -0,0 +1,83 @@
+import { toast } from "react-toastify";
+import { getToken } from "../Utils";
+
+/**
+ * Wrapper pro volání API, u kterých chceme automaticky zobrazit toaster s chybou ze serveru.
+ * 
+ * @param apiFunction volaná API funkce
+ */
+export function errorHandler<T>(apiFunction: () => Promise<T>): Promise<T> {
+    return new Promise<T>((resolve, reject) => {
+        apiFunction().then((result) => {
+            resolve(result);
+        }).catch(e => {
+            toast.error(e.message, { theme: "colored" });
+        });
+    });
+}
+
+async function request<TResponse>(
+    url: string,
+    config: RequestInit = {}
+): Promise<TResponse> {
+    config.headers = config?.headers ? new Headers(config.headers) : new Headers();
+    config.headers.set("Authorization", `Bearer ${getToken()}`);
+    try {
+        const response = await fetch(url, config);
+        if (!response.ok) {
+            // TODO tohle je blbě, jelikož automaticky očekáváme, že v případě chyby přijde vždy JSON, což není pravda
+            const json = await response.json();
+            // Vyhodíme samotnou hlášku z odpovědi, odchytí si jí errorHandler
+            throw new Error(json.error);
+        }
+        const contentType = response.headers.get("content-type");
+        if (contentType && contentType.indexOf("application/json") !== -1) {
+            return response.json() as TResponse;
+        } else {
+            return response.text() as TResponse;
+        }
+    } catch (e) {
+        return Promise.reject(e);
+    }
+}
+
+async function blobRequest(
+    url: string,
+    config: RequestInit = {}
+): Promise<Blob> {
+    config.headers = config?.headers ? new Headers(config.headers) : new Headers();
+    config.headers.set("Authorization", `Bearer ${getToken()}`);
+    try {
+        const response = await fetch(url, config);
+        if (!response.ok) {
+            const json = await response.json();
+            // Vyhodíme samotnou hlášku z odpovědi, odchytí si jí errorHandler
+            throw new Error(json.error);
+        }
+        return response.blob()
+    } catch (e) {
+        return Promise.reject(e);
+    }
+}
+
+export const api = {
+    get: <TResponse>(url: string) => request<TResponse>(url),
+    blobGet: (url: string) => blobRequest(url),
+    post: <TBody, TResponse>(url: string, body?: TBody) => request<TResponse>(url, { method: 'POST', body: JSON.stringify(body), headers: { 'Content-Type': 'application/json' } }),
+}
+
+export const getQrUrl = (login: string) => {
+    return `/api/qr?login=${login}`;
+}
+
+export const getData = async (dayIndex?: number) => {
+    let url = '/api/data';
+    if (dayIndex != null) {
+        url += '?dayIndex=' + dayIndex;
+    }
+    return await api.get<any>(url);
+}
+
+export const login = async (login?: string) => {
+    return await api.post<any, any>('/api/login', { login });
+}

client/src/api/EasterEggApi.ts

@@ -0,0 +1,12 @@
+import { EasterEgg } from "../types";
+import { api } from "./Api";
+
+const EASTER_EGGS_API_PREFIX = '/api/easterEggs';
+
+export const getEasterEgg = async (): Promise<EasterEgg | undefined> => {
+    return await api.get<EasterEgg>(`${EASTER_EGGS_API_PREFIX}`);
+}
+
+export const getImage = async (url: string) => {
+    return await api.blobGet(`${EASTER_EGGS_API_PREFIX}/${url}`);
+}

client/src/api/FoodApi.ts

@@ -0,0 +1,28 @@
+import { AddChoiceRequest, ChangeDepartureTimeRequest, LocationKey, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../types";
+import { api } from "./Api";
+
+const FOOD_API_PREFIX = '/api/food';
+
+export const addChoice = async (locationKey: LocationKey, foodIndex?: number, dayIndex?: number) => {
+    return await api.post<AddChoiceRequest, void>(`${FOOD_API_PREFIX}/addChoice`, { locationKey, foodIndex, dayIndex });
+}
+
+export const removeChoices = async (locationKey: LocationKey, dayIndex?: number) => {
+    return await api.post<RemoveChoicesRequest, void>(`${FOOD_API_PREFIX}/removeChoices`, { locationKey, dayIndex });
+}
+
+export const removeChoice = async (locationKey: LocationKey, foodIndex: number, dayIndex?: number) => {
+    return await api.post<RemoveChoiceRequest, void>(`${FOOD_API_PREFIX}/removeChoice`, { locationKey, foodIndex, dayIndex });
+}
+
+export const updateNote = async (note?: string, dayIndex?: number) => {
+    return await api.post<UpdateNoteRequest, void>(`${FOOD_API_PREFIX}/updateNote`, { note, dayIndex });
+}
+
+export const changeDepartureTime = async (time: string, dayIndex?: number) => {
+    return await api.post<ChangeDepartureTimeRequest, void>(`${FOOD_API_PREFIX}/changeDepartureTime`, { time, dayIndex });
+}
+
+export const jdemeObed = async () => {
+    return await api.post<undefined, void>(`${FOOD_API_PREFIX}/jdemeObed`);
+}

client/src/api/PizzaDayApi.ts

@@ -0,0 +1,44 @@
+import { AddPizzaRequest, FinishDeliveryRequest, PizzaOrder, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../types";
+import { api } from "./Api";
+
+const PIZZADAY_API_PREFIX = '/api/pizzaDay';
+
+export const createPizzaDay = async () => {
+    return await api.post<undefined, void>(`${PIZZADAY_API_PREFIX}/create`);
+}
+
+export const deletePizzaDay = async () => {
+    return await api.post<undefined, void>(`${PIZZADAY_API_PREFIX}/delete`);
+}
+
+export const lockPizzaDay = async () => {
+    return await api.post<undefined, void>(`${PIZZADAY_API_PREFIX}/lock`);
+}
+
+export const unlockPizzaDay = async () => {
+    return await api.post<undefined, void>(`${PIZZADAY_API_PREFIX}/unlock`);
+}
+
+export const finishOrder = async () => {
+    return await api.post<undefined, void>(`${PIZZADAY_API_PREFIX}/finishOrder`);
+}
+
+export const finishDelivery = async (bankAccount?: string, bankAccountHolder?: string) => {
+    return await api.post<FinishDeliveryRequest, void>(`${PIZZADAY_API_PREFIX}/finishDelivery`, { bankAccount, bankAccountHolder });
+}
+
+export const addPizza = async (pizzaIndex: number, pizzaSizeIndex: number) => {
+    return await api.post<AddPizzaRequest, void>(`${PIZZADAY_API_PREFIX}/add`, { pizzaIndex, pizzaSizeIndex });
+}
+
+export const removePizza = async (pizzaOrder: PizzaOrder) => {
+    return await api.post<RemovePizzaRequest, void>(`${PIZZADAY_API_PREFIX}/remove`, { pizzaOrder });
+}
+
+export const updatePizzaDayNote = async (note?: string) => {
+    return await api.post<UpdatePizzaDayNoteRequest, void>(`${PIZZADAY_API_PREFIX}/updatePizzaDayNote`, { note });
+}
+
+export const updatePizzaFee = async (login: string, text?: string, price?: number) => {
+    return await api.post<UpdatePizzaFeeRequest, void>(`${PIZZADAY_API_PREFIX}/updatePizzaFee`, { login, text, price });
+}

client/src/api/VotingApi.ts

@@ -0,0 +1,12 @@
+import { FeatureRequest, UpdateFeatureVoteRequest } from "../types";
+import { api } from "./Api";
+
+const VOTING_API_PREFIX = '/api/voting';
+
+export const getFeatureVotes = async () => {
+    return await api.get<FeatureRequest[]>(`${VOTING_API_PREFIX}/getVotes`);
+}
+
+export const updateFeatureVote = async (option: FeatureRequest, active: boolean) => {
+    return await api.post<UpdateFeatureVoteRequest, void>(`${VOTING_API_PREFIX}/updateVote`, { option, active });
+}

client/src/components/Header.tsx

@@ -4,24 +4,24 @@ import { useAuth } from "../context/auth";
 import SettingsModal from "./modals/SettingsModal";
 import { useSettings } from "../context/settings";
 import FeaturesVotingModal from "./modals/FeaturesVotingModal";
+import { FeatureRequest } from "../types";
+import { errorHandler } from "../api/Api";
+import { getFeatureVotes, updateFeatureVote } from "../api/VotingApi";
 import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";
-import { useNavigate } from "react-router";
+
-import { STATS_URL } from "../AppRoutes";
-import { FeatureRequest, getVotes, updateVote } from "../../../types";
 
 export default function Header() {
     const auth = useAuth();
     const settings = useSettings();
-    const navigate = useNavigate();
     const [settingsModalOpen, setSettingsModalOpen] = useState<boolean>(false);
     const [votingModalOpen, setVotingModalOpen] = useState<boolean>(false);
     const [pizzaModalOpen, setPizzaModalOpen] = useState<boolean>(false);
-    const [featureVotes, setFeatureVotes] = useState<FeatureRequest[] | undefined>([]);
+    const [featureVotes, setFeatureVotes] = useState<FeatureRequest[]>([]);
 
     useEffect(() => {
         if (auth?.login) {
-            getVotes().then(response => {
+            getFeatureVotes().then(votes => {
-                setFeatureVotes(response.data);
+                setFeatureVotes(votes);
             })
         }
     }, [auth?.login]);
@@ -76,7 +76,7 @@ export default function Header() {
                     cislo = cislo.padStart(16, '0');
                 }
                 let sum = 0;
-                for (let i = 0; i < cislo.length; i++) {
+                for (var i = 0; i < cislo.length; i++) {
                     const char = cislo.charAt(i);
                     const order = (cislo.length - 1) - i;
                     const weight = (2 ** order) % 11;
@@ -97,8 +97,8 @@ export default function Header() {
     }
 
     const saveFeatureVote = async (option: FeatureRequest, active: boolean) => {
-        await updateVote({ body: { option, active } });
+        await errorHandler(() => updateFeatureVote(option, active));
-        const votes = [...featureVotes || []];
+        const votes = [...featureVotes];
         if (active) {
             votes.push(option);
         } else {
@@ -108,7 +108,7 @@ export default function Header() {
     }
 
     return <Navbar variant='dark' expand="lg">
-        <Navbar.Brand href="/">Luncher</Navbar.Brand>
+        <Navbar.Brand>Luncher</Navbar.Brand>
         <Navbar.Toggle aria-controls="basic-navbar-nav" />
         <Navbar.Collapse id="basic-navbar-nav">
             <Nav className="nav">
@@ -116,7 +116,6 @@ export default function Header() {
                     <NavDropdown.Item onClick={() => setSettingsModalOpen(true)}>Nastavení</NavDropdown.Item>
                     <NavDropdown.Item onClick={() => setVotingModalOpen(true)}>Hlasovat o nových funkcích</NavDropdown.Item>
                     <NavDropdown.Item onClick={() => setPizzaModalOpen(true)}>Pizza kalkulačka</NavDropdown.Item>
-                    <NavDropdown.Item onClick={() => navigate(STATS_URL)}>Statistiky</NavDropdown.Item>
                     <NavDropdown.Divider />
                     <NavDropdown.Item onClick={auth?.logout}>Odhlásit se</NavDropdown.Item>
                 </NavDropdown>

client/src/components/Loader.tsx

@@ -2,15 +2,15 @@ import { IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 type Props = {
-  title?: string,
+  title?: String,
   icon: IconDefinition,
-  description: string,
+  description: String,
-  animation?: string,
+  animation?: String,
 }
 
-function Loader(props: Readonly<Props>) {
+function Loader(props: Props) {
   return <div className='loader'>
-    <h1>{props.title ?? 'Prosím čekejte...'}</h1>
+    <h1>{props.title || 'Prosím čekejte...'}</h1>
     <FontAwesomeIcon icon={props.icon} className={`loader-icon mb-3 ` + (props.animation ?? '')} />
     <p>{props.description}</p>
   </div>

client/src/components/PizzaOrderList.tsx

@@ -1,17 +1,18 @@
 import { Table } from "react-bootstrap";
+import { Order, PizzaDayState, PizzaOrder } from "../types";
 import PizzaOrderRow from "./PizzaOrderRow";
-import { PizzaDayState, PizzaOrder, PizzaVariant, updatePizzaFee } from "../../../types";
+import { updatePizzaFee } from "../api/PizzaDayApi";
 
 type Props = {
     state: PizzaDayState,
-    orders: PizzaOrder[],
+    orders: Order[],
-    onDelete: (pizzaOrder: PizzaVariant) => void,
+    onDelete: (pizzaOrder: PizzaOrder) => void,
     creator: string,
 }
 
-export default function PizzaOrderList({ state, orders, onDelete, creator }: Readonly<Props>) {
+export default function PizzaOrderList({ state, orders, onDelete, creator }: Props) {
     const saveFees = async (customer: string, text?: string, price?: number) => {
-        await updatePizzaFee({ body: { login: customer, text, price } });
+        await updatePizzaFee(customer, text, price);
     }
 
     if (!orders?.length) {
@@ -20,7 +21,8 @@ export default function PizzaOrderList({ state, orders, onDelete, creator }: Rea
 
     const total = orders.reduce((total, order) => total + order.totalPrice, 0);
 
-    return <Table className="mt-3" striped bordered hover>
+    return <>
+        <Table className="mt-3" striped bordered hover>
             <thead>
                 <tr>
                     <th>Jméno</th>
@@ -40,4 +42,5 @@ export default function PizzaOrderList({ state, orders, onDelete, creator }: Rea
                 </tr>
             </tbody>
         </Table>
+    </>
 }

client/src/components/PizzaOrderRow.tsx

@@ -2,30 +2,30 @@ import React, { useState } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faMoneyBill1, faTrashCan } from "@fortawesome/free-regular-svg-icons";
 import { useAuth } from "../context/auth";
+import { Order, PizzaDayState, PizzaOrder } from "../types";
 import PizzaAdditionalFeeModal from "./modals/PizzaAdditionalFeeModal";
-import { PizzaDayState, PizzaOrder, PizzaVariant } from "../../../types";
 
 type Props = {
     creator: string,
-    order: PizzaOrder,
+    order: Order,
     state: PizzaDayState,
-    onDelete: (order: PizzaVariant) => void,
+    onDelete: (order: PizzaOrder) => void,
     onFeeModalSave: (customer: string, name?: string, price?: number) => void,
 }
 
-export default function PizzaOrderRow({ creator, order, state, onDelete, onFeeModalSave }: Readonly<Props>) {
+export default function PizzaOrderRow({ creator, order, state, onDelete, onFeeModalSave }: Props) {
     const auth = useAuth();
-    const [isFeeModalOpen, setIsFeeModalOpen] = useState<boolean>(false);
+    const [isFeeModalOpen, setFeeModalOpen] = useState<boolean>(false);
 
     const saveFees = (customer: string, text?: string, price?: number) => {
         onFeeModalSave(customer, text, price);
-        setIsFeeModalOpen(false);
+        setFeeModalOpen(false);
     }
 
     return <>
         <td>{order.customer}</td>
-        <td>{order.pizzaList!.map<React.ReactNode>(pizzaOrder =>
+        <td>{order.pizzaList.map<React.ReactNode>((pizzaOrder, index) =>
-            <span key={pizzaOrder.name}>
+            <span key={index}>
                 {`${pizzaOrder.name}, ${pizzaOrder.size} (${pizzaOrder.price} Kč)`}
                 {auth?.login === order.customer && state === PizzaDayState.CREATED &&
                     <FontAwesomeIcon onClick={() => {
@@ -35,11 +35,11 @@ export default function PizzaOrderRow({ creator, order, state, onDelete, onFeeMo
             </span>)
             .reduce((prev, curr, index) => [prev, <br key={`br-${index}`} />, curr])}
         </td>
-        <td style={{ maxWidth: "200px" }}>{order.note ?? '-'}</td>
+        <td style={{ maxWidth: "200px" }}>{order.note || '-'}</td>
         <td style={{ maxWidth: "200px" }}>{order.fee?.price ? `${order.fee.price} Kč${order.fee.text ? ` (${order.fee.text})` : ''}` : '-'}</td>
         <td>
-            {order.totalPrice} Kč{auth?.login === creator && state === PizzaDayState.CREATED && <FontAwesomeIcon onClick={() => { setIsFeeModalOpen(true) }} title='Nastavit příplatek' className='action-icon' icon={faMoneyBill1} />}
+            {order.totalPrice} Kč{auth?.login === creator && state === PizzaDayState.CREATED && <FontAwesomeIcon onClick={() => { setFeeModalOpen(true) }} title='Nastavit příplatek' className='action-icon' icon={faMoneyBill1} />}
         </td>
-        <PizzaAdditionalFeeModal customerName={order.customer} isOpen={isFeeModalOpen} onClose={() => setIsFeeModalOpen(false)} onSave={saveFees} initialValues={{ text: order.fee?.text, price: order.fee?.price?.toString() }} />
+        <PizzaAdditionalFeeModal customerName={order.customer} isOpen={isFeeModalOpen} onClose={() => setFeeModalOpen(false)} onSave={saveFees} initialValues={{ text: order.fee?.text, price: order.fee?.price?.toString() }} />
     </>
 }

client/src/components/modals/FeaturesVotingModal.tsx

@@ -1,5 +1,5 @@
 import { Modal, Button, Form } from "react-bootstrap"
-import { FeatureRequest } from "../../../../types";
+import { FeatureRequest } from "../../types";
 
 type Props = {
     isOpen: boolean,
@@ -9,7 +9,7 @@ type Props = {
 }
 
 /** Modální dialog pro hlasování o nových funkcích. */
-export default function FeaturesVotingModal({ isOpen, onClose, onChange, initialValues }: Readonly<Props>) {
+export default function FeaturesVotingModal({ isOpen, onClose, onChange, initialValues }: Props) {
 
     const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
         onChange(e.currentTarget.value as FeatureRequest, e.currentTarget.checked);
@@ -31,7 +31,7 @@ export default function FeaturesVotingModal({ isOpen, onClose, onChange, initial
                     label={FeatureRequest[key]}
                     onChange={handleChange}
                     value={key}
-                    defaultChecked={initialValues?.includes(key as FeatureRequest)}
+                    defaultChecked={initialValues && initialValues.includes(key as FeatureRequest)}
                 />
             })}
             <p className="mt-3" style={{ fontSize: '12px' }}>Něco jiného? Dejte vědět.</p>

client/src/components/modals/NoteModal.tsx

@@ -8,7 +8,7 @@ type Props = {
 }
 
 /** Modální dialog pro úpravu obecné poznámky. */
-export default function NoteModal({ isOpen, onClose, onSave }: Readonly<Props>) {
+export default function NoteModal({ isOpen, onClose, onSave }: Props) {
     const note = useRef<HTMLInputElement>(null);
 
     const save = () => {

client/src/components/modals/PizzaAdditionalFeeModal.tsx

@@ -10,17 +10,17 @@ type Props = {
 }
 
 /** Modální dialog pro nastavení příplatků za pizzu. */
-export default function PizzaAdditionalFeeModal({ customerName, isOpen, onClose, onSave, initialValues }: Readonly<Props>) {
+export default function PizzaAdditionalFeeModal({ customerName, isOpen, onClose, onSave, initialValues }: Props) {
     const textRef = useRef<HTMLInputElement>(null);
     const priceRef = useRef<HTMLInputElement>(null);
 
     const doSubmit = () => {
-        onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value ?? "0"));
+        onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value || "0"));
     }
 
     const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
         if (e.key === 'Enter') {
-            onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value ?? "0"));
+            onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value || "0"));
         }
     }
 

client/src/components/modals/PizzaCalculatorModal.tsx

@@ -23,7 +23,7 @@ type Result = {
 }
 
 /** Modální dialog pro výpočet výhodnosti pizzy. */
-export default function PizzaCalculatorModal({ isOpen, onClose }: Readonly<Props>) {
+export default function PizzaCalculatorModal({ isOpen, onClose }: Props) {
     const diameter1Ref = useRef<HTMLInputElement>(null);
     const price1Ref = useRef<HTMLInputElement>(null);
     const diameter2Ref = useRef<HTMLInputElement>(null);

client/src/components/modals/SettingsModal.tsx

@@ -9,7 +9,7 @@ type Props = {
 }
 
 /** Modální dialog pro uživatelská nastavení. */
-export default function SettingsModal({ isOpen, onClose, onSave }: Readonly<Props>) {
+export default function SettingsModal({ isOpen, onClose, onSave }: Props) {
     const settings = useSettings();
     const bankAccountRef = useRef<HTMLInputElement>(null);
     const nameRef = useRef<HTMLInputElement>(null);

client/src/context/auth.tsx

@@ -1,4 +1,5 @@
-import React, { ReactNode, useContext, useEffect, useState } from "react"
+import React, { ReactNode, useContext, useState } from "react"
+import { useEffect } from "react"
 import { useJwt } from "react-jwt";
 import { deleteToken, getToken, storeToken } from "../Utils";
 
@@ -15,7 +16,7 @@ type ContextProps = {
 
 const authContext = React.createContext<AuthContextProps | null>(null);
 
-export function ProvideAuth(props: Readonly<ContextProps>) {
+export function ProvideAuth(props: ContextProps) {
   const auth = useProvideAuth();
   return <authContext.Provider value={auth}>{props.children}</authContext.Provider>
 }
@@ -27,8 +28,8 @@ export const useAuth = () => {
 function useProvideAuth(): AuthContextProps {
   const [loginName, setLoginName] = useState<string | undefined>();
   const [trusted, setTrusted] = useState<boolean | undefined>();
-  const [token, setToken] = useState<string | undefined>(getToken());
+  const [token, setToken] = useState<string | null>(getToken());
-  const { decodedToken } = useJwt(token ?? '');
+  const { decodedToken } = useJwt(token || '');
 
   useEffect(() => {
     if (token && token.length > 0) {
@@ -51,7 +52,7 @@ function useProvideAuth(): AuthContextProps {
   function logout() {
     const trusted = (decodedToken as any).trusted;
     const logoutUrl = (decodedToken as any).logoutUrl;
-    setToken(undefined);
+    setToken(null);
     setLoginName(undefined);
     setTrusted(undefined);
     if (trusted && logoutUrl?.length) {

client/src/context/eggs.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from "react";
+import { getEasterEgg } from "../api/EasterEggApi";
 import { AuthContextProps } from "./auth";
-import { EasterEgg, getEasterEgg } from "../../../types";
+import { EasterEgg } from "../types";
 
 export const useEasterEgg = (auth?: AuthContextProps | null): [EasterEgg | undefined, boolean] => {
   const [result, setResult] = useState<EasterEgg | undefined>();
@@ -10,7 +11,7 @@ export const useEasterEgg = (auth?: AuthContextProps | null): [EasterEgg | undef
     async function fetchEasterEgg() {
       if (auth?.login) {
         setLoading(true);
-        const egg = (await getEasterEgg())?.data;
+        const egg = await getEasterEgg();
         setResult(egg);
         setLoading(false);
       }

client/src/context/settings.tsx

@@ -1,4 +1,5 @@
-import React, { ReactNode, useContext, useEffect, useState } from "react"
+import React, { ReactNode, useContext, useState } from "react"
+import { useEffect } from "react"
 
 const BANK_ACCOUNT_NUMBER_KEY = 'bank_account_number';
 const BANK_ACCOUNT_HOLDER_KEY = 'bank_account_holder_name';
@@ -19,7 +20,7 @@ type ContextProps = {
 
 const settingsContext = React.createContext<SettingsContextProps | null>(null);
 
-export function ProvideSettings(props: Readonly<ContextProps>) {
+export function ProvideSettings(props: ContextProps) {
   const settings = useProvideSettings();
   return <settingsContext.Provider value={settings}>{props.children}</settingsContext.Provider>
 }
@@ -44,7 +45,7 @@ function useProvideSettings(): SettingsContextProps {
     }
     const hideSoups = localStorage.getItem(HIDE_SOUPS_KEY);
     if (hideSoups !== null) {
-      setHideSoups(hideSoups === 'true');
+      setHideSoups(hideSoups === 'true' ? true : false);
     }
   }, [])
 

client/src/context/socket.js

@@ -18,3 +18,8 @@ export const SocketContext = React.createContext();
 export const EVENT_CONNECT = 'connect';
 export const EVENT_DISCONNECT = 'disconnect';
 export const EVENT_MESSAGE = 'message';
+// export const EVENT_CONFIG = 'config';
+// export const EVENT_TOASTER = 'toaster';
+// export const EVENT_VOTING = 'voting';
+// export const EVENT_VOTE_CONFIG = 'voteSettings';
+// export const EVENT_ADMIN = 'admin';

client/src/enums.ts

@@ -1,41 +0,0 @@
-import { LunchChoice, Restaurant } from "../../types";
-
-export function getRestaurantName(restaurant: Restaurant) {
-    switch (restaurant) {
-        case Restaurant.SLADOVNICKA:
-            return "Sladovnická";
-        case Restaurant.TECHTOWER:
-            return "TechTower";
-        case Restaurant.ZASTAVKAUMICHALA:
-            return "Zastávka u Michala";
-        case Restaurant.SENKSERIKOVA:
-            return "Šenk Šeříková";
-        default:
-            return restaurant;
-    }
-}
-
-export function getLunchChoiceName(location: LunchChoice) {
-    switch (location) {
-        case Restaurant.SLADOVNICKA:
-            return "Sladovnická";
-        case Restaurant.TECHTOWER:
-            return "TechTower";
-        case Restaurant.ZASTAVKAUMICHALA:
-            return "Zastávka u Michala";
-        case Restaurant.SENKSERIKOVA:
-            return "Šenk Šeříková";
-        case LunchChoice.SPSE:
-            return "SPŠE";
-        case LunchChoice.PIZZA:
-            return "Pizza day";
-        case LunchChoice.OBJEDNAVAM:
-            return "Budu objednávat";
-        case LunchChoice.NEOBEDVAM:
-            return "Mám vlastní/neobědvám";
-        case LunchChoice.ROZHODUJI:
-            return "Rozhoduji se";
-        default:
-            return location;
-    }
-}

client/src/index.tsx

@@ -1,38 +1,33 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+import App from './App';
+import { SocketContext, socket } from './context/socket';
 import { ProvideAuth } from './context/auth';
+import { ToastContainer } from 'react-toastify';
+import { ProvideSettings } from './context/settings';
 import 'react-toastify/dist/ReactToastify.css';
 import './index.css';
-import AppRoutes from './AppRoutes';
+import Snowfall from 'react-snowfall';
-import { BrowserRouter } from 'react-router';
-import { client } from '../../types/gen/client.gen';
-import { getToken } from './Utils';
-import { toast } from 'react-toastify';
-
-client.setConfig({
-  auth: () => getToken(),
-  baseUrl: '/api', // openapi-ts si to z nějakého důvodu neumí převzít z api.yml
-});
-
-// Interceptor na vyhození toasteru při chybě
-client.interceptors.response.use(async response => {
-  // TODO opravit - login je zatím výjimka, voláme ho "naprázdno" abychom zjistili, zda nás nepřihlásily trusted headers
-  if (!response.ok && response.url.indexOf("/login") == -1) {
-    const json = await response.json();
-    toast.error(json.error, { theme: "colored" });
-  }
-  return response;
-});
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement
 );
 root.render(
   <React.StrictMode>
-    <BrowserRouter>
     <ProvideAuth>
-        <AppRoutes />
+      <ProvideSettings>
+        <SocketContext.Provider value={socket}>
+          <>
+            <Snowfall style={{
+              zIndex: 2,
+              position: 'fixed',
+              width: '100vw',
+              height: '100vh'}} />
+            <App />
+          </>
+          <ToastContainer />
+        </SocketContext.Provider>
+      </ProvideSettings>
     </ProvideAuth>
-    </BrowserRouter>
   </React.StrictMode>
 );

client/src/pages/StatsPage.scss

@@ -1,16 +0,0 @@
-.stats-page {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 20px;
-
-  .week-navigator {
-    display: flex;
-    align-items: center;
-    font-size: xx-large;
-
-    .date-range {
-      margin: 5px 20px;
-    }
-  }
-}

client/src/pages/StatsPage.tsx

@@ -1,125 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import Footer from "../components/Footer";
-import Header from "../components/Header";
-import { useAuth } from "../context/auth";
-import Login from "../Login";
-import { formatDate, getFirstWorkDayOfWeek, getHumanDate, getLastWorkDayOfWeek } from "../Utils";
-import { WeeklyStats, LunchChoice, getStats } from "../../../types";
-import Loader from "../components/Loader";
-import { faChevronLeft, faChevronRight, faGear } from "@fortawesome/free-solid-svg-icons";
-import { Legend, Line, LineChart, Tooltip, XAxis, YAxis } from "recharts";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { getLunchChoiceName } from "../enums";
-import './StatsPage.scss';
-
-const CHART_WIDTH = 1400;
-const CHART_HEIGHT = 700;
-const STROKE_WIDTH = 2.5;
-
-const COLORS = [
-  // Komentáře jsou kvůli vizualizaci barev ve VS Code
-  '#ff1493', // #ff1493
-  '#1e90ff', // #1e90ff
-  '#c5a700', // #c5a700
-  '#006400', // #006400
-  '#b300ff', // #b300ff
-  '#ff4500', // #ff4500
-  '#bc8f8f', // #bc8f8f
-  '#00ff00', // #00ff00
-  '#7c7c7c', // #7c7c7c
-]
-
-export default function StatsPage() {
-  const auth = useAuth();
-  const [dateRange, setDateRange] = useState<Date[]>();
-  const [data, setData] = useState<WeeklyStats>();
-
-  // Prvotní nastavení aktuálního týdne
-  useEffect(() => {
-    const today = new Date();
-    setDateRange([getFirstWorkDayOfWeek(today), getLastWorkDayOfWeek(today)]);
-  }, []);
-
-  // Přenačtení pro zvolený týden
-  useEffect(() => {
-    if (dateRange) {
-      getStats({ query: { startDate: formatDate(dateRange[0]), endDate: formatDate(dateRange[1]) } }).then(response => {
-        setData(response.data);
-      });
-    }
-  }, [dateRange]);
-
-  const renderLine = (location: LunchChoice) => {
-    const index = Object.values(LunchChoice).indexOf(location);
-    return <Line key={location} name={getLunchChoiceName(location)} type="monotone" dataKey={data => data.locations[location] ?? 0} stroke={COLORS[index]} strokeWidth={STROKE_WIDTH} />
-  }
-
-  const handlePreviousWeek = () => {
-    if (dateRange) {
-      const previousStartDate = new Date(dateRange[0]);
-      previousStartDate.setDate(previousStartDate.getDate() - 7);
-      const previousEndDate = new Date(previousStartDate);
-      previousEndDate.setDate(previousEndDate.getDate() + 4);
-      setDateRange([previousStartDate, previousEndDate]);
-    }
-  }
-
-  const handleNextWeek = () => {
-    if (dateRange) {
-      const nextStartDate = new Date(dateRange[0]);
-      nextStartDate.setDate(nextStartDate.getDate() + 7);
-      const nextEndDate = new Date(nextStartDate);
-      nextEndDate.setDate(nextEndDate.getDate() + 4);
-      setDateRange([nextStartDate, nextEndDate]);
-    }
-  }
-
-  const handleKeyDown = useCallback((e: any) => {
-    if (e.keyCode === 37) {
-      handlePreviousWeek();
-    } else if (e.keyCode === 39) {
-      handleNextWeek()
-    }
-  }, [dateRange]);
-
-  useEffect(() => {
-    document.addEventListener('keydown', handleKeyDown);
-    return () => {
-      document.removeEventListener('keydown', handleKeyDown);
-    }
-  }, [handleKeyDown]);
-
-  if (!auth?.login) {
-    return <Login />;
-  }
-
-  if (!dateRange) {
-    return <Loader
-      icon={faGear}
-      description={'Načítám data...'}
-      animation={'fa-bounce'}
-    />
-  }
-
-  return (
-    <>
-      <Header />
-      <div className="stats-page">
-        <h1>Statistiky</h1>
-        <div className="week-navigator">
-          <FontAwesomeIcon title="Předchozí týden" icon={faChevronLeft} style={{ cursor: "pointer" }} onClick={handlePreviousWeek} />
-          <h2 className="date-range">{getHumanDate(dateRange[0])} - {getHumanDate(dateRange[1])}</h2>
-          <FontAwesomeIcon title="Následující týden" icon={faChevronRight} style={{ cursor: "pointer" }} onClick={handleNextWeek} />
-        </div>
-        <LineChart width={CHART_WIDTH} height={CHART_HEIGHT} data={data}>
-          {Object.values(LunchChoice).map(location => renderLine(location))}
-          <XAxis dataKey="date" />
-          <YAxis />
-          <Tooltip />
-          <Legend />
-        </LineChart>
-      </div>
-      <Footer />
-    </>
-  );
-}

client/yarn.lock

@@ -725,62 +725,6 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/cookie@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5"
-  integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==
-
-"@types/d3-array@^3.0.3":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
-  integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
-
-"@types/d3-color@*":
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.1.3.tgz#368c961a18de721da8200e80bf3943fb53136af2"
-  integrity sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==
-
-"@types/d3-ease@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-3.0.2.tgz#e28db1bfbfa617076f7770dd1d9a48eaa3b6c51b"
-  integrity sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==
-
-"@types/d3-interpolate@^3.0.1":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz#412b90e84870285f2ff8a846c6eb60344f12a41c"
-  integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==
-  dependencies:
-    "@types/d3-color" "*"
-
-"@types/d3-path@*":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.1.tgz#f632b380c3aca1dba8e34aa049bcd6a4af23df8a"
-  integrity sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==
-
-"@types/d3-scale@^4.0.2":
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.9.tgz#57a2f707242e6fe1de81ad7bfcccaaf606179afb"
-  integrity sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==
-  dependencies:
-    "@types/d3-time" "*"
-
-"@types/d3-shape@^3.1.0":
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.7.tgz#2b7b423dc2dfe69c8c93596e673e37443348c555"
-  integrity sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==
-  dependencies:
-    "@types/d3-path" "*"
-
-"@types/d3-time@*", "@types/d3-time@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.4.tgz#8472feecd639691450dd8000eb33edd444e1323f"
-  integrity sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==
-
-"@types/d3-timer@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.2.tgz#70bbda77dc23aa727413e22e214afa3f0e852f70"
-  integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
-
 "@types/estree@1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
@@ -941,7 +885,7 @@ classnames@^2.3.2:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
-clsx@^2.0.0, clsx@^2.1.0:
+clsx@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
@@ -963,87 +907,11 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
-  integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
-
 csstype@^3.0.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-"d3-array@2 - 3", "d3-array@2.10.0 - 3", d3-array@^3.1.6:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
-  integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
-  dependencies:
-    internmap "1 - 2"
-
-"d3-color@1 - 3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
-  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
-
-d3-ease@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
-  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
-
-"d3-format@1 - 3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
-  integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
-
-"d3-interpolate@1.2.0 - 3", d3-interpolate@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
-  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
-  dependencies:
-    d3-color "1 - 3"
-
-d3-path@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
-  integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
-
-d3-scale@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
-  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
-  dependencies:
-    d3-array "2.10.0 - 3"
-    d3-format "1 - 3"
-    d3-interpolate "1.2.0 - 3"
-    d3-time "2.1.1 - 3"
-    d3-time-format "2 - 4"
-
-d3-shape@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
-  integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
-  dependencies:
-    d3-path "^3.1.0"
-
-"d3-time-format@2 - 4":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
-  integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
-  dependencies:
-    d3-time "1 - 3"
-
-"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
-  integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
-  dependencies:
-    d3-array "2 - 3"
-
-d3-timer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
-  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
-
 debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
@@ -1058,11 +926,6 @@ debug@~4.3.1, debug@~4.3.2:
   dependencies:
     ms "^2.1.3"
 
-decimal.js-light@^2.4.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
-  integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
-
 dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
@@ -1147,11 +1010,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-eventemitter3@^4.0.1:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
 exenv@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
@@ -1168,11 +1026,6 @@ expect@^29.0.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-fast-equals@^5.0.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.2.2.tgz#885d7bfb079fac0ce0e8450374bce29e9b742484"
-  integrity sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -1215,11 +1068,6 @@ immutable@^5.0.2:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1"
   integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==
 
-"internmap@1 - 2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
-  integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
-
 invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -1311,11 +1159,6 @@ json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
 loose-envify@^1.0.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -1448,7 +1291,7 @@ react-is@^16.13.1, react-is@^16.3.2:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^18.0.0, react-is@^18.3.1:
+react-is@^18.0.0:
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
@@ -1480,37 +1323,11 @@ react-refresh@^0.14.2:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
   integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==
 
-react-router-dom@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.2.0.tgz#b8a7eae7827cd5207cf91e89807d01217737797d"
-  integrity sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==
-  dependencies:
-    react-router "7.2.0"
-
-react-router@7.2.0, react-router@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.2.0.tgz#a8f2729d39f634a7a870d14dd906a1b406f39d6f"
-  integrity sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==
-  dependencies:
-    "@types/cookie" "^0.6.0"
-    cookie "^1.0.1"
-    set-cookie-parser "^2.6.0"
-    turbo-stream "2.4.0"
-
 react-select-search@^4.1.6:
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/react-select-search/-/react-select-search-4.1.8.tgz#435bdd7893685d45332813ad65b000e0dafcfbac"
   integrity sha512-mzHhYzpaAJ3iYDjayydfb+grvvP59VWlLUWLqP26Trvm4xj2rzLnksopWZdkwWORB3dhAneqmXos3RWOMjFOxQ==
 
-react-smooth@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/react-smooth/-/react-smooth-4.0.4.tgz#a5875f8bb61963ca61b819cedc569dc2453894b4"
-  integrity sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==
-  dependencies:
-    fast-equals "^5.0.1"
-    prop-types "^15.8.1"
-    react-transition-group "^4.4.5"
-
 react-snowfall@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/react-snowfall/-/react-snowfall-2.2.0.tgz#0856a72c4d29d27a6a14301c0f5deb51296fb4df"
@@ -1545,27 +1362,6 @@ readdirp@^4.0.1:
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
   integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
 
-recharts-scale@^0.4.4:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/recharts-scale/-/recharts-scale-0.4.5.tgz#0969271f14e732e642fcc5bd4ab270d6e87dd1d9"
-  integrity sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==
-  dependencies:
-    decimal.js-light "^2.4.1"
-
-recharts@^2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.15.1.tgz#0941adf0402528d54f6d81997eb15840c893aa3c"
-  integrity sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==
-  dependencies:
-    clsx "^2.0.0"
-    eventemitter3 "^4.0.1"
-    lodash "^4.17.21"
-    react-is "^18.3.1"
-    react-smooth "^4.0.4"
-    recharts-scale "^0.4.4"
-    tiny-invariant "^1.3.1"
-    victory-vendor "^36.6.8"
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -1620,11 +1416,6 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-set-cookie-parser@^2.6.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
-  integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -1667,11 +1458,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-tiny-invariant@^1.3.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
-  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -1689,11 +1475,6 @@ tslib@^2.8.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-turbo-stream@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/turbo-stream/-/turbo-stream-2.4.0.tgz#1e4fca6725e90fa14ac4adb782f2d3759a5695f0"
-  integrity sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==
-
 typescript@^5.3.3:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
@@ -1732,26 +1513,6 @@ update-browserslist-db@^1.1.1:
     escalade "^3.2.0"
     picocolors "^1.1.0"
 
-victory-vendor@^36.6.8:
-  version "36.9.2"
-  resolved "https://registry.yarnpkg.com/victory-vendor/-/victory-vendor-36.9.2.tgz#668b02a448fa4ea0f788dbf4228b7e64669ff801"
-  integrity sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==
-  dependencies:
-    "@types/d3-array" "^3.0.3"
-    "@types/d3-ease" "^3.0.0"
-    "@types/d3-interpolate" "^3.0.1"
-    "@types/d3-scale" "^4.0.2"
-    "@types/d3-shape" "^3.1.0"
-    "@types/d3-time" "^3.0.0"
-    "@types/d3-timer" "^3.0.0"
-    d3-array "^3.1.6"
-    d3-ease "^3.0.1"
-    d3-interpolate "^3.0.1"
-    d3-scale "^4.0.2"
-    d3-shape "^3.1.0"
-    d3-time "^3.0.0"
-    d3-timer "^3.0.1"
-
 vite-tsconfig-paths@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz#d9a71106a7ff2c1c840c6f1708042f76a9212ed4"

run_dev.sh

@@ -1,5 +1,5 @@
 export NODE_ENV=development
-cd types && yarn install && yarn openapi-ts
+yarn install
-cd server && yarn install && yarn start &
+cd server && yarn start &
-cd client && yarn install && yarn start &
+cd client && yarn start &
 wait

server/.gitignore

@@ -1,6 +1,7 @@
+/node_modules
 /dist
-/resources/easterEggs
+data.json
-/src/gen
 .env.production
 .env.development
 .easter-eggs.json
+/resources/easterEggs

server/src/chefie.ts

@@ -49,16 +49,16 @@ export async function downloadPizzy(mock: boolean): Promise<Pizza[]> {
     const $ = load(html);
     const links = $('.vypisproduktu > div > h4 > a');
     const urls = [];
-    for (const element of links) {
+    for (let i = 0; i < links.length; i++) {
-        if (element.name === 'a' && element.attribs?.href) {
+        if (links[i].name === 'a' && links[i].attribs?.href) {
-            const pizzaUrl = element.attribs?.href;
+            const pizzaUrl = links[i].attribs?.href;
             urls.push(buildPizzaUrl(pizzaUrl));
         }
     }
     // Scrapneme jednotlivé pizzy
     const result: Pizza[] = [];
-    for (const element of urls) {
+    for (let i = 0; i < urls.length; i++) {
-        const pizzaUrl = element;
+        const pizzaUrl = urls[i];
         const pizzaHtml = await axios.get(pizzaUrl).then(res => res.data);
         // Název
         const name = $('.produkt > h2', pizzaHtml).first().text()

server/src/index.ts

@@ -12,9 +12,8 @@ import pizzaDayRoutes from "./routes/pizzaDayRoutes";
 import foodRoutes from "./routes/foodRoutes";
 import votingRoutes from "./routes/votingRoutes";
 import easterEggRoutes from "./routes/easterEggRoutes";
-import statsRoutes from "./routes/statsRoutes";
 
-const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
+const ENVIRONMENT = process.env.NODE_ENV || 'production';
 dotenv.config({ path: path.resolve(__dirname, `./.env.${ENVIRONMENT}`) });
 
 // Validace nastavení JWT tokenu - nemá bez něj smysl vůbec povolit server spustit
@@ -35,7 +34,7 @@ app.use(cors({
 
 // Zapínatelný login přes hlavičky - pokud je zapnutý nepovolí "basicauth"
 const HTTP_REMOTE_USER_ENABLED = process.env.HTTP_REMOTE_USER_ENABLED === 'true' || false;
-const HTTP_REMOTE_USER_HEADER_NAME = process.env.HTTP_REMOTE_USER_HEADER_NAME ?? 'remote-user';
+const HTTP_REMOTE_USER_HEADER_NAME = process.env.HTTP_REMOTE_USER_HEADER_NAME || 'remote-user';
 if (HTTP_REMOTE_USER_ENABLED) {
     if (!process.env.HTTP_REMOTE_TRUSTED_IPS) {
         throw new Error('Je zapnutý login z hlaviček, ale není nastaven rozsah adres ze kterých hlavička může přijít.');
@@ -54,10 +53,6 @@ app.get("/api/whoami", (req, res) => {
     if (!HTTP_REMOTE_USER_ENABLED) {
         res.status(403).json({ error: 'Není zapnuté přihlášení z hlaviček' });
     }
-    if(process.env.ENABLE_HEADERS_LOGGING === 'yes'){
-        delete req.headers["cookie"]
-        console.log(req.headers)
-    }
     res.send(req.header(HTTP_REMOTE_USER_HEADER_NAME));
 })
 
@@ -65,11 +60,11 @@ app.post("/api/login", (req, res) => {
     if (HTTP_REMOTE_USER_ENABLED) { // je rovno app.enabled('trust proxy')
         // Autentizace pomocí trusted headers
         const remoteUser = req.header(HTTP_REMOTE_USER_HEADER_NAME);
-        //const remoteName = req.header('remote-name');
+        const remoteName = req.header('remote-name');
-        if (remoteUser && remoteUser.length > 0 ) {
+        if (remoteUser && remoteUser.length > 0 && remoteName && remoteName.length > 0) {
-            res.status(200).json(generateToken(Buffer.from(remoteUser, 'latin1').toString(), true));
+            res.status(200).json(generateToken(Buffer.from(remoteName, 'latin1').toString(), true));
         } else {
-            throw Error("Je zapnuto přihlášení přes hlavičky, ale nepřišla hlavička nebo ??");
+            throw Error("Tohle nema nastat nekdo neco dela spatne.");
         }
     } else {
         // Klasická autentizace loginem
@@ -83,6 +78,7 @@ app.post("/api/login", (req, res) => {
 
 // TODO dočasné řešení - QR se zobrazuje přes <img>, nemáme sem jak dostat token
 app.get("/api/qr", (req, res) => {
+    // const login = getLogin(parseToken(req));
     if (!req.query?.login) {
         throw Error("Nebyl předán login");
     }
@@ -99,17 +95,12 @@ app.get("/api/qr", (req, res) => {
 /** Middleware ověřující JWT token */
 app.use("/api/", (req, res, next) => {
     if (HTTP_REMOTE_USER_ENABLED) {
-        // Autentizace pomocí trusted headers
+        const userHeader = req.header(HTTP_REMOTE_USER_HEADER_NAME);
-        const remoteUser = req.header(HTTP_REMOTE_USER_HEADER_NAME);
+        const nameHeader = req.header('remote-name');
-        if(process.env.ENABLE_HEADERS_LOGGING === 'yes'){
+        const emailHeader = req.header('remote-email');
-            delete req.headers["cookie"]
+        if (userHeader !== undefined && nameHeader !== undefined) {
-            console.log(req.headers)
+            const remoteName = Buffer.from(nameHeader, 'latin1').toString();
-        }
+            console.log("Tvuj username, name a email: %s, %s, %s.", userHeader, remoteName, emailHeader);
-        if (remoteUser && remoteUser.length > 0) {
-            const remoteName = Buffer.from(remoteUser, 'latin1').toString();
-            if (ENVIRONMENT !== "production") {
-                console.log("Tvuj username: %s.", remoteName);
-            }
         }
     }
     if (!req.headers.authorization) {
@@ -139,10 +130,7 @@ app.use("/api/pizzaDay", pizzaDayRoutes);
 app.use("/api/food", foodRoutes);
 app.use("/api/voting", votingRoutes);
 app.use("/api/easterEggs", easterEggRoutes);
-app.use("/api/stats", statsRoutes);
+app.use(express.static('public'))
-
-app.use('/stats', express.static('public'));
-app.use(express.static('public'));
 
 // Middleware pro zpracování chyb
 app.use((err: any, req: any, res: any, next: any) => {
@@ -154,8 +142,8 @@ app.use((err: any, req: any, res: any, next: any) => {
     next();
 });
 
-const PORT = process.env.PORT ?? 3001;
+const PORT = process.env.PORT || 3001;
-const HOST = process.env.HOST ?? '0.0.0.0';
+const HOST = process.env.HOST || '0.0.0.0';
 
 server.listen(PORT, () => {
     console.log(`Server listening on ${HOST}, port ${PORT}`);

server/src/mock.ts

@@ -1,9 +1,7 @@
-import { WeeklyStats, LunchChoice } from "../../types/gen/types.gen";
-
 // Mockovací data pro podporované podniky, na jeden týden
 const MOCK_DATA = {
-    'sladovnicka': [
+    'sladovnicka': {
-        [
+        'MONDAY': [
             {
                 amount: "0,25l",
                 name: "Kulajda",
@@ -29,7 +27,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ],
-        [
+        'TUESDAY': [
             {
                 amount: "0,25l",
                 name: "Hovězí vývar s kapáním",
@@ -55,7 +53,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ],
-        [
+        'WEDNESDAY': [
             {
                 amount: "0,25l",
                 name: "Zelná polévka s klobásou",
@@ -81,7 +79,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ],
-        [
+        'THURSDAY': [
             {
                 amount: "0,25l",
                 name: "Kuřecí vývar s nudlemi",
@@ -107,7 +105,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ],
-        [
+        'FRIDAY': [
             {
                 amount: "0,25l",
                 name: "Dršťková polévka",
@@ -133,7 +131,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ]
-    ],
+    },
     'uMotliku': [
         [
             {
@@ -517,91 +515,7 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ],
-    ],
+    ]
-    'senkSerikova': [
-        [
-            {
-                amount: "-",
-                name: "Drůbeží vývar s masem a nudlemi",
-                price: "45\xA0Kč",
-                isSoup: true,
-            },
-            {
-                amount: "-",
-                name: "Vepřová pečeně se zelím a houskovým knedlíkem",
-                price: "155\xA0Kč",
-                isSoup: false,
-            },
-            {
-                amount: "-",
-                name: "Špagety s kuřecím masem, špenátem a smetanou",
-                price: "145\xA0Kč",
-                isSoup: false,
-            },
-            {
-                amount: "-",
-                name: "Medailonky z vepřové panenky s fazolkami se slaninou, šťouchané brambory",
-                price: "185\xA0Kč",
-                isSoup: false,
-            }
-        ],
-        [
-            {
-                amount: "-",
-                name: "Mrkvová polévka se zázvorem a kokosovým mlékem",
-                price: "45\xA0Kč",
-                isSoup: true,
-            },
-            {
-                amount: "-",
-                name: "Hovězí po Burgundsku, bramborová kaše",
-                price: "155\xA0Kč",
-                isSoup: false,
-            }
-        ],
-        [
-            {
-                amount: "-",
-                name: "Hovězí vývar s játrovými knedlíčky",
-                price: "45\xA0Kč",
-                isSoup: true,
-            },
-            {
-                amount: "-",
-                name: "Kuřecí plátky na sušených rajčatech, bylinkách a česneku, bramborová kaše",
-                price: "155\xA0Kč",
-                isSoup: false,
-            }
-        ],
-        [
-            {
-                amount: "-",
-                name: "Kuřecí vývar s rýží",
-                price: "45\xA0Kč",
-                isSoup: true,
-            },
-            {
-                amount: "-",
-                name: "Rajská s plněnou paprikou, knedlík",
-                price: "170\xA0Kč",
-                isSoup: false,
-            }
-        ],
-        [
-            {
-                amount: "-",
-                name: "Mexická fazolová polévka",
-                price: "45\xA0Kč",
-                isSoup: true,
-            },
-            {
-                amount: "-",
-                name: "Ragú z trhané kachny, onsen vejce, soté ze špenátu a ředkvičky, bramborové pyré, lanýžová sůl, zelený olej",
-                price: "189\xA0Kč",
-                isSoup: false,
-            }
-        ],
-    ],
 }
 
 // Mockovací data pro Pizza day
@@ -1358,7 +1272,7 @@ const MOCK_PIZZA_LIST = [
  * Funkce vrací mock datu ve formátu YYYY-MM-DD
  */
 export const getTodayMock = (): Date => {
-    return new Date('2025-01-10'); // pátek
+    return new Date('2025-01-08'); // pátek
 }
 
 export const getMenuSladovnickaMock = () => {
@@ -1377,35 +1291,6 @@ export const getMenuZastavkaUmichalaMock = () => {
     return MOCK_DATA['zastavkaUmichala'];
 }
 
-export const getMenuSenkSerikovaMock = () => {
-    return MOCK_DATA['senkSerikova'];
-}
-
 export const getPizzaListMock = () => {
     return MOCK_PIZZA_LIST;
 }
-
-export const getStatsMock = (): WeeklyStats => {
-    return [
-        {
-            date: '24.02.',
-            locations: { ...Object.keys(LunchChoice).reduce((prev, cur) => ({ ...prev, [cur]: Math.floor(Math.random() * 10) }), {}) }
-        },
-        {
-            date: '25.02.',
-            locations: { ...Object.keys(LunchChoice).reduce((prev, cur) => ({ ...prev, [cur]: Math.floor(Math.random() * 10) }), {}) }
-        },
-        {
-            date: '26.02.',
-            locations: { ...Object.keys(LunchChoice).reduce((prev, cur) => ({ ...prev, [cur]: Math.floor(Math.random() * 10) }), {}) }
-        },
-        {
-            date: '27.02.',
-            locations: { ...Object.keys(LunchChoice).reduce((prev, cur) => ({ ...prev, [cur]: Math.floor(Math.random() * 10) }), {}) }
-        },
-        {
-            date: '28.02.',
-            locations: { ...Object.keys(LunchChoice).reduce((prev, cur) => ({ ...prev, [cur]: Math.floor(Math.random() * 10) }), {}) }
-        }
-    ];
-}

server/src/notifikace.ts

@@ -1,57 +1,60 @@
-import axios from 'axios';
+/** Notifikace pro gotify*/
+import { ClientData, GotifyServer, NotififaceInput, NotifikaceData } from '../../types';
+import axios, { AxiosError } from 'axios';
 import dotenv from 'dotenv';
 import path from 'path';
-import { getClientData, getToday } from "./service";
+import { getToday } from "./service";
-import { getUsersByLocation, getHumanTime } from "./utils";
+import { formatDate, getUsersByLocation } from "./utils";
-import { NotifikaceData, NotifikaceInput } from '../../types';
+import getStorage from "./storage";
 
-const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
+const storage = getStorage();
+const ENVIRONMENT = process.env.NODE_ENV || 'production'
 dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
 
-// const gotifyDataRaw = process.env.GOTIFY_SERVERS_AND_KEYS || "{}";
+const gotifyDataRaw = process.env.GOTIFY_SERVERS_AND_KEYS || "{}";
-// const gotifyData: GotifyServer[] = JSON.parse(gotifyDataRaw);
+const gotifyData: GotifyServer[] = JSON.parse(gotifyDataRaw);
-// export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifyServer[]): Promise<any[]> => {
+export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifyServer[]): Promise<any[]> => {
-//     if (!Array.isArray(gotifyServers)) {
+    if (!Array.isArray(gotifyServers)) {
-//         return []
+        return []
-//     }
+    }
-//     const urls = gotifyServers.flatMap(gotifyServer =>
+    const urls = gotifyServers.flatMap(gotifyServer =>
-//         gotifyServer.api_keys.map(apiKey => `${gotifyServer.server}/message?token=${apiKey}`));
+        gotifyServer.api_keys.map(apiKey => `${gotifyServer.server}/message?token=${apiKey}`));
-//
-//     const dataPayload = {
-//         title: "Luncher",
-//         message: `${data.udalost} - spustil:${data.user}`,
-//         priority: 7,
-//     };
-//
-//     const headers = { "Content-Type": "application/json" };
-//
-//     const promises = urls.map(url =>
-//         axios.post(url, dataPayload, { headers }).then(response => {
-//             response.data = {
-//                 success: true,
-//                 message: "Notifikace doručena",
-//             };
-//             return response;
-//         }).catch(error => {
-//             if (axios.isAxiosError(error)) {
-//                 const axiosError = error as AxiosError;
-//                 if (axiosError.response) {
-//                     axiosError.response.data = {
-//                         success: false,
-//                         message: "fail",
-//                     };
-//                     console.log(error)
-//                     return axiosError.response;
-//                 }
-//             }
-//             // Handle unknown error without a response
-//             console.log(error, "unknown error");
-//         })
-//     );
-//     return promises;
-// };
 
-export const ntfyCall = async (data: NotifikaceInput) => {
+    const dataPayload = {
+        title: "Luncher",
+        message: `${data.udalost} - spustil:${data.user}`,
+        priority: 7,
+    };
+
+    const headers = { "Content-Type": "application/json" };
+
+    const promises = urls.map(url =>
+        axios.post(url, dataPayload, { headers }).then(response => {
+            response.data = {
+                success: true,
+                message: "Notifikace doručena",
+            };
+            return response;
+        }).catch(error => {
+            if (axios.isAxiosError(error)) {
+                const axiosError = error as AxiosError;
+                if (axiosError.response) {
+                    axiosError.response.data = {
+                        success: false,
+                        message: "fail",
+                    };
+                    console.log(error)
+                    return axiosError.response;
+                }
+            }
+            // Handle unknown error without a response
+            console.log(error, "unknown error");
+        })
+    );
+    return promises;
+};
+
+export const ntfyCall = async (data: NotififaceInput) => {
     const url = process.env.NTFY_HOST
     const username = process.env.NTFY_USERNAME;
     const password = process.env.NTFY_PASSWD;
@@ -67,7 +70,8 @@ export const ntfyCall = async (data: NotifikaceInput) => {
         console.log("NTFY_PASSWD není definován v env")
         return
     }
-    let clientData = await getClientData(getToday());
+    const today = formatDate(getToday());
+    let clientData: ClientData = await storage.getData(today);
     const userByCLocation = getUsersByLocation(clientData.choices, data.user)
 
     const token = Buffer.from(`${username}:${password}`, 'utf8').toString('base64');
@@ -93,64 +97,27 @@ export const ntfyCall = async (data: NotifikaceInput) => {
     return promises;
 
 }
-
-export const teamsCall = async (data: NotifikaceInput) => {
-    const url = process.env.TEAMS_WEBHOOK_URL;
-    const title = data.udalost;
-    let time = new Date();
-    time.setTime(time.getTime() + 1000 * 60);
-    const message = 'Odcházíme v ' + getHumanTime(time) + ', ' + data.user;
-    const card = {
-        '@type': 'MessageCard',
-        '@context': 'http://schema.org/extensions',
-        'themeColor': "0072C6", // light blue
-        summary: 'Summary description',
-        sections: [
-            {
-                activityTitle: title,
-                text: message,
-            },
-        ],
-    };
-
-    if (!url) {
-        console.log("TEAMS_WEBHOOK_URL není definován v env")
-        return
-    }
-
-    try {
-        const response = await axios.post(url, card, {
-            headers: {
-                'content-type': 'application/vnd.microsoft.teams.card.o365connector'
-            },
-        });
-        return `${response.status} - ${response.statusText}`;
-    } catch (err) {
-        return err;
-    }
-}
-
 /** Zavolá notifikace na všechny konfigurované způsoby notifikace, přetížení proměných na false pro jednotlivé způsoby je vypne*/
 export const callNotifikace = async ({ input, teams = true, gotify = false, ntfy = true }: NotifikaceData) => {
     const notifications = [];
-
     if (ntfy) {
         const ntfyPromises = await ntfyCall(input);
         if (ntfyPromises) {
             notifications.push(...ntfyPromises);
         }
     }
+    /* Zatím není
     if (teams) {
-        const teamsPromises = await teamsCall(input);
+         notifications.push(teamsCall(input));
-        if (teamsPromises) {
+     }*/
-            notifications.push(teamsPromises);
+
+    // Add more notifications as necessary
+
+    //gotify bych řekl, že už je deprecated
+    if (gotify) {
+        const gotifyPromises = await gotifyCall(input, gotifyData);
+        notifications.push(...gotifyPromises);
     }
-    }
-    // gotify bych řekl, že už je deprecated
-    // if (gotify) {
-    //     const gotifyPromises = await gotifyCall(input, gotifyData);
-    //     notifications.push(...gotifyPromises);
-    // }
 
     try {
         const results = await Promise.all(notifications);

server/src/pizza.ts

@@ -1,10 +1,10 @@
 import { formatDate } from "./utils";
 import { callNotifikace } from "./notifikace";
 import { generateQr } from "./qr";
+import { ClientData, PizzaDayState, UdalostEnum, Pizza, PizzaSize, Order, PizzaOrder, DayData } from "../../types";
 import getStorage from "./storage";
 import { downloadPizzy } from "./chefie";
-import { getClientData, getToday, initIfNeeded } from "./service";
+import { getToday, initIfNeeded } from "./service";
-import { Pizza, ClientData, PizzaDayState, PizzaSize, PizzaOrder, PizzaVariant, UdalostEnum } from "../../types/gen/types.gen";
 
 const storage = getStorage();
 
@@ -14,7 +14,8 @@ const storage = getStorage();
  */
 export async function getPizzaList(): Promise<Pizza[] | undefined> {
     await initIfNeeded();
-    let clientData = await getClientData(getToday());
+    const today = formatDate(getToday());
+    let clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaList) {
         const mock = process.env.MOCK_DATA === 'true';
         clientData = await savePizzaList(await downloadPizzy(mock));
@@ -30,9 +31,9 @@ export async function getPizzaList(): Promise<Pizza[] | undefined> {
 export async function savePizzaList(pizzaList: Pizza[]): Promise<ClientData> {
     await initIfNeeded();
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     clientData.pizzaList = pizzaList;
-    clientData.pizzaListLastUpdate = formatDate(new Date());
+    clientData.pizzaListLastUpdate = new Date();
     await storage.setData(today, clientData);
     return clientData;
 }
@@ -42,14 +43,14 @@ export async function savePizzaList(pizzaList: Pizza[]): Promise<ClientData> {
  */
 export async function createPizzaDay(creator: string): Promise<ClientData> {
     await initIfNeeded();
-    const clientData = await getClientData(getToday());
+    const today = formatDate(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den již existuje");
     }
     // TODO berka rychlooprava, vyřešit lépe - stahovat jednou, na jediném místě!
     const pizzaList = await getPizzaList();
     const data: ClientData = { pizzaDay: { state: PizzaDayState.CREATED, creator, orders: [] }, pizzaList, ...clientData };
-    const today = formatDate(getToday());
     await storage.setData(today, data);
     callNotifikace({ input: { udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator } })
     return data;
@@ -59,7 +60,8 @@ export async function createPizzaDay(creator: string): Promise<ClientData> {
  * Smaže pizza day pro aktuální den.
  */
 export async function deletePizzaDay(login: string): Promise<ClientData> {
-    const clientData = await getClientData(getToday());
+    const today = formatDate(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -67,7 +69,6 @@ export async function deletePizzaDay(login: string): Promise<ClientData> {
         throw Error("Login uživatele se neshoduje se zakladatelem Pizza Day");
     }
     delete clientData.pizzaDay;
-    const today = formatDate(getToday());
     await storage.setData(today, clientData);
     return clientData;
 }
@@ -81,35 +82,28 @@ export async function deletePizzaDay(login: string): Promise<ClientData> {
  */
 export async function addPizzaOrder(login: string, pizza: Pizza, size: PizzaSize) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
     if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
         throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
     }
-    let order: PizzaOrder | undefined = clientData.pizzaDay?.orders?.find(o => o.customer === login);
+    let order: Order | undefined = clientData.pizzaDay.orders.find(o => o.customer === login);
     if (!order) {
         order = {
             customer: login,
             pizzaList: [],
             totalPrice: 0,
-            hasQr: false,
-        }
-        if (!clientData.pizzaDay.orders) {
-            clientData.pizzaDay.orders = [];
         }
         clientData.pizzaDay.orders.push(order);
     }
-    const pizzaOrder: PizzaVariant = {
+    const pizzaOrder: PizzaOrder = {
         varId: size.varId,
         name: pizza.name,
         size: size.size,
         price: size.price,
     }
-    if (!order.pizzaList) {
-        order.pizzaList = [];
-    }
     order.pizzaList.push(pizzaOrder);
     order.totalPrice += pizzaOrder.price;
     await storage.setData(today, clientData);
@@ -122,26 +116,26 @@ export async function addPizzaOrder(login: string, pizza: Pizza, size: PizzaSize
  * @param login login uživatele
  * @param pizzaOrder objednávka pizzy
  */
-export async function removePizzaOrder(login: string, pizzaOrder: PizzaVariant) {
+export async function removePizzaOrder(login: string, pizzaOrder: PizzaOrder) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
-    const orderIndex = clientData.pizzaDay.orders!.findIndex(o => o.customer === login);
+    const orderIndex = clientData.pizzaDay.orders.findIndex(o => o.customer === login);
     if (orderIndex < 0) {
         throw Error("Nebyly nalezeny žádné objednávky pro uživatele " + login);
     }
-    const order = clientData.pizzaDay.orders![orderIndex];
+    const order = clientData.pizzaDay.orders[orderIndex];
-    const index = order.pizzaList!.findIndex(o => o.name === pizzaOrder.name && o.size === pizzaOrder.size);
+    const index = order.pizzaList.findIndex(o => o.name === pizzaOrder.name && o.size === pizzaOrder.size);
     if (index < 0) {
         throw Error("Objednávka s danými parametry nebyla nalezena");
     }
-    const price = order.pizzaList![index].price;
+    const price = order.pizzaList[index].price;
-    order.pizzaList!.splice(index, 1);
+    order.pizzaList.splice(index, 1);
     order.totalPrice -= price;
-    if (order.pizzaList!.length == 0) {
+    if (order.pizzaList.length == 0) {
-        clientData.pizzaDay.orders!.splice(orderIndex, 1);
+        clientData.pizzaDay.orders.splice(orderIndex, 1);
     }
     await storage.setData(today, clientData);
     return clientData;
@@ -155,7 +149,7 @@ export async function removePizzaOrder(login: string, pizzaOrder: PizzaVariant)
  */
 export async function lockPizzaDay(login: string) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -178,7 +172,7 @@ export async function lockPizzaDay(login: string) {
  */
 export async function unlockPizzaDay(login: string) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -201,7 +195,7 @@ export async function unlockPizzaDay(login: string) {
  */
 export async function finishPizzaOrder(login: string) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -226,7 +220,7 @@ export async function finishPizzaOrder(login: string) {
  */
 export async function finishPizzaDelivery(login: string, bankAccount?: string, bankAccountHolder?: string) {
     const today = formatDate(getToday());
-    const clientData = await getClientData(getToday());
+    const clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -240,9 +234,9 @@ export async function finishPizzaDelivery(login: string, bankAccount?: string, b
 
     // Vygenerujeme QR kód, pokud k tomu máme data
     if (bankAccount?.length && bankAccountHolder?.length) {
-        for (const order of clientData.pizzaDay.orders!) {
+        for (const order of clientData.pizzaDay.orders) {
             if (order.customer !== login) { // zatím platí creator = objednávající, a pro toho nemá QR kód smysl
-                let message = order.pizzaList!.map(pizza => `Pizza ${pizza.name} (${pizza.size})`).join(', ');
+                let message = order.pizzaList.map(pizza => `Pizza ${pizza.name} (${pizza.size})`).join(', ');
                 await generateQr(order.customer, bankAccount, bankAccountHolder, order.totalPrice, message);
                 order.hasQr = true;
             }
@@ -261,15 +255,15 @@ export async function finishPizzaDelivery(login: string, bankAccount?: string, b
  */
 export async function updatePizzaDayNote(login: string, note?: string) {
     const today = formatDate(getToday());
-    let clientData = await getClientData(getToday());
+    let clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
     if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
         throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
     }
-    const myOrder = clientData.pizzaDay.orders!.find(o => o.customer === login);
+    const myOrder = clientData.pizzaDay.orders.find(o => o.customer === login);
-    if (!myOrder?.pizzaList?.length) {
+    if (!myOrder || !myOrder.pizzaList.length) {
         throw Error("Pizza day neobsahuje žádné objednávky uživatele " + login);
     }
     myOrder.note = note;
@@ -288,7 +282,7 @@ export async function updatePizzaDayNote(login: string, note?: string) {
  */
 export async function updatePizzaFee(login: string, targetLogin: string, text?: string, price?: number) {
     const today = formatDate(getToday());
-    let clientData = await getClientData(getToday());
+    let clientData: DayData = await storage.getData(today);
     if (!clientData.pizzaDay) {
         throw Error("Pizza day pro dnešní den neexistuje");
     }
@@ -298,8 +292,8 @@ export async function updatePizzaFee(login: string, targetLogin: string, text?:
     if (clientData.pizzaDay.creator !== login) {
         throw Error("Příplatky může měnit pouze zakladatel Pizza day");
     }
-    const targetOrder = clientData.pizzaDay.orders!.find(o => o.customer === targetLogin);
+    const targetOrder = clientData.pizzaDay.orders.find(o => o.customer === targetLogin);
-    if (!targetOrder?.pizzaList?.length) {
+    if (!targetOrder || !targetOrder.pizzaList.length) {
         throw Error(`Pizza day neobsahuje žádné objednávky uživatele ${targetLogin}`);
     }
     if (!price) {
@@ -308,7 +302,7 @@ export async function updatePizzaFee(login: string, targetLogin: string, text?:
         targetOrder.fee = { text, price };
     }
     // Přepočet ceny
-    targetOrder.totalPrice = targetOrder.pizzaList.reduce((price, pizzaOrder) => price + pizzaOrder.price, 0) + (targetOrder.fee?.price ?? 0);
+    targetOrder.totalPrice = targetOrder.pizzaList.reduce((price, pizzaOrder) => price + pizzaOrder.price, 0) + (targetOrder.fee?.price || 0);
     await storage.setData(today, clientData);
     return clientData;
 }

server/src/restaurants.ts

@@ -1,8 +1,7 @@
 import axios from "axios";
 import { load } from 'cheerio';
-import { getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock, getMenuSenkSerikovaMock } from "./mock";
+import { DayOfWeek, DayOfWeekEnum, DayOfWeekIndex, Food, RestaurantWeeklyMenu } from "../../types";
-import { formatDate } from "./utils";
+import { getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock } from "./mock";
-import { Food } from "../../types/gen/types.gen";
 
 // Fráze v názvech jídel, které naznačují že se jedná o polévku
 const SOUP_NAMES = [
@@ -70,7 +69,7 @@ const getHtml = async (url: string): Promise<any> => {
  * @param mock zda vrátit mock data
  * @returns seznam jídel pro daný týden
  */
-export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = false): Promise<Food[][]> => {
+export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = false): Promise<RestaurantWeeklyMenu> => {
     if (mock) {
         return getMenuSladovnickaMock();
     }
@@ -79,7 +78,8 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
     const $ = load(html);
 
     const list = $('ul.tab-links').children();
-    const result: Food[][] = [];
+    const result: RestaurantWeeklyMenu = {};
+    // TODO upravit až bude enum
     for (let dayIndex = 0; dayIndex < 5; dayIndex++) {
         const currentDate = new Date(firstDayOfWeek);
         currentDate.setDate(firstDayOfWeek.getDate() + dayIndex);
@@ -92,11 +92,13 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
             const rowText = $(dayRow).first().text().trim();
             if (rowText === searchedDayText) {
                 index = i;
+                return;
             }
         })
         if (index === undefined) {
             // Pravděpodobně svátek, nebo je zavřeno
-            result[dayIndex] = [{
+            const index: number = Object.keys(DayOfWeekEnum).indexOf('Casual'); // 1
+            result[dayIndex as DayOfWeekEnum] = [{
                 amount: undefined,
                 name: "Pro daný den nebyla nalezena denní nabídka",
                 price: "",
@@ -343,30 +345,28 @@ export const getMenuZastavkaUmichala = async (firstDayOfWeek: Date, mock: boolea
     }
 
     const nowDate = new Date().getDate();
-    const headers = {
-        "Cookie": "_nss=1; PHPSESSID=9e37de17e0326b0942613d6e67a30e69",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
-    };
     const result: Food[][] = [];
     for (let dayIndex = 0; dayIndex < 5; dayIndex++) {
         const currentDate = new Date(firstDayOfWeek);
         currentDate.setDate(firstDayOfWeek.getDate() + dayIndex);
 
-        if (currentDate.getDate() < nowDate || (currentDate.getDate() === nowDate && new Date().getHours() >= 14)) {
+        // if (currentDate < now) {
+        if (currentDate.getDate() !== nowDate) {
             result[dayIndex] = [{
                 amount: undefined,
                 name: "Pro tento den není uveřejněna nabídka jídel",
                 price: "",
                 isSoup: false,
             }];
+            continue;
         } else {
-            const url = (currentDate.getDate() === nowDate) ?
+            // let dateString = formatDate(currentDate, 'DD.MM.YYYY');
-                ZASTAVKAUMICHALA_URL : ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + formatDate(currentDate, 'DD.MM.YYYY');
+            // const html = await getHtml(ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + dateString);
-            const html = await axios.get(url, {
+            const html = await getHtml(ZASTAVKAUMICHALA_URL);
-                headers,
-            }).then(res => res.data).then(content => content);
             const $ = load(html);
 
+            // const row = $($('.foodsList li')[0]).text();
+
             const currentDayFood: Food[] = [];
             $('.foodsList li').each((index, element) => {
                 currentDayFood.push({
@@ -381,52 +381,3 @@ export const getMenuZastavkaUmichala = async (firstDayOfWeek: Date, mock: boolea
     }
     return result;
 }
-
-/**
- * Získá obědovou nabídku SenkSerikova pro jeden týden.
- *
- * @param firstDayOfWeek první den v týdnu, pro který získat menu
- * @param mock zda vrátit mock data
- * @returns seznam jídel pro dané datum
- */
-export const getMenuSenkSerikova = async (firstDayOfWeek: Date, mock: boolean = false): Promise<Food[][]> => {
-    if (mock) {
-        return getMenuSenkSerikovaMock();
-    }
-
-    const decoder = new TextDecoder('windows-1250');
-    const html = await axios.get(SENKSERIKOVA_URL, {
-        responseType: 'arraybuffer',
-        responseEncoding: 'binary'
-    }).then(res => decoder.decode(new Uint8Array(res.data))).then(content => content);
-    const $ = load(html);
-
-    const nowDate = new Date().getDate();
-    const currentDate = new Date(firstDayOfWeek);
-    const result: Food[][] = [];
-    let dayIndex = 0;
-    while (currentDate.getDate() < nowDate) {
-        result[dayIndex] = [{
-            amount: undefined,
-            name: "Pro tento den není uveřejněna nabídka jídel",
-            price: "",
-            isSoup: false,
-        }];
-        dayIndex = dayIndex + 1;
-        currentDate.setDate(firstDayOfWeek.getDate() + dayIndex);
-    }
-
-    $('.menicka').each((i, element) => {
-        const currentDayFood: Food[] = [];
-        $(element).find('.popup-gallery li').each((j, element) => {
-            currentDayFood.push({
-                amount: '-',
-                name: $(element).children('div.polozka').text(),
-                price: $(element).children('div.cena').text().replace(/ /g, '\xA0'),
-                isSoup: $(element).hasClass('polevka'),
-            });
-        });
-        result[dayIndex++] = currentDayFood;
-    });
-    return result;
-}

server/src/routes/easterEggRoutes.ts

@@ -1,9 +1,9 @@
 import express, { NextFunction } from "express";
-import { getLogin } from "../auth";
+import { getLogin, getTrusted } from "../auth";
 import { parseToken } from "../utils";
 import path from "path";
 import fs from "fs";
-import { EasterEgg } from "../../../types/gen/types.gen";
+import { EasterEgg } from "../../../types";
 
 const EASTER_EGGS_JSON_PATH = path.join(__dirname, "../../.easter-eggs.json");
 const IMAGES_PATH = '../../resources/easterEggs';
@@ -34,12 +34,17 @@ function generateUrl() {
  */
 function getEasterEggImage(req: any, res: any, next: NextFunction) {
     const login = getLogin(parseToken(req));
+    const trusted = getTrusted(parseToken(req));
     try {
+        // TODO vrátit!
+        // if (trusted) {
+        if (true) {
             if (login in easterEggs) {
                 const imagePath = easterEggs[login][Math.floor(Math.random() * easterEggs[login].length)].path;
                 res.sendFile(path.join(__dirname, IMAGES_PATH, imagePath));
                 return;
             }
+        }
         res.sendStatus(404);
     } catch (e: any) { next(e) }
 }
@@ -119,7 +124,7 @@ let easterEggs: EasterEggsJson;
 if (fs.existsSync(EASTER_EGGS_JSON_PATH)) {
     const content = fs.readFileSync(EASTER_EGGS_JSON_PATH, 'utf-8');
     easterEggs = JSON.parse(content);
-    for (const [_, eggs] of Object.entries(easterEggs)) {
+    for (const [key, eggs] of Object.entries(easterEggs)) {
         for (const easterEgg of eggs) {
             const url = generateUrl();
             easterEgg.url = url;
@@ -133,12 +138,17 @@ if (fs.existsSync(EASTER_EGGS_JSON_PATH)) {
 // Získání náhodného easter eggu pro přihlášeného uživatele
 router.get("/", async (req, res, next) => {
     const login = getLogin(parseToken(req));
+    const trusted = getTrusted(parseToken(req));
     try {
+        // TODO vrátit!
+        // if (trusted) {
+        if (true) {
             if (easterEggs && login in easterEggs) {
                 const randomEasterEgg = easterEggs[login][Math.floor(Math.random() * easterEggs[login].length)];
                 const { path, startOffset, endOffset, ...strippedEasterEgg } = randomEasterEgg; // Path klient k ničemu nepotřebuje a nemá ho znát
                 return res.status(200).json({ ...strippedEasterEgg, ...getRandomPosition(startOffset, endOffset) });
             }
+        }
         return res.status(200).send();
     } catch (e: any) { next(e) }
 });

server/src/routes/foodRoutes.ts

@@ -1,10 +1,10 @@
 import express, { Request } from "express";
 import { getLogin, getTrusted } from "../auth";
-import { addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote } from "../service";
+import { addChoice, addVolatileData, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote } from "../service";
 import { getDayOfWeekIndex, parseToken } from "../utils";
 import { getWebsocket } from "../websocket";
 import { callNotifikace } from "../notifikace";
-import { AddChoiceData, ChangeDepartureTimeData, RemoveChoiceData, RemoveChoicesData, UdalostEnum, UpdateNoteData } from "../../../types/gen/types.gen";
+import { AddChoiceRequest, ChangeDepartureTimeRequest, IDayIndex, RemoveChoiceRequest, RemoveChoicesRequest, UdalostEnum, UpdateNoteRequest } from "../../../types";
 
 /**
  * Ověří a vrátí index dne v týdnu z požadavku, za předpokladu, že byl předán, a je zároveň
@@ -13,7 +13,7 @@ import { AddChoiceData, ChangeDepartureTimeData, RemoveChoiceData, RemoveChoices
  * @param req request
  * @returns index dne v týdnu
  */
-const parseValidateFutureDayIndex = (req: Request<{}, any, AddChoiceData["body"] | UpdateNoteData["body"]>) => {
+const parseValidateFutureDayIndex = (req: Request<{}, any, IDayIndex>) => {
     if (req.body.dayIndex == null) {
         throw Error(`Nebyl předán index dne v týdnu.`);
     }
@@ -30,7 +30,7 @@ const parseValidateFutureDayIndex = (req: Request<{}, any, AddChoiceData["body"]
 
 const router = express.Router();
 
-router.post("/addChoice", async (req: Request<{}, any, AddChoiceData["body"]>, res, next) => {
+router.post("/addChoice", async (req: Request<{}, any, AddChoiceRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     const trusted = getTrusted(parseToken(req));
     let date = undefined;
@@ -45,12 +45,12 @@ router.post("/addChoice", async (req: Request<{}, any, AddChoiceData["body"]>, r
     }
     try {
         const data = await addChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         return res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
 
-router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesData["body"]>, res, next) => {
+router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     const trusted = getTrusted(parseToken(req));
     let date = undefined;
@@ -65,12 +65,12 @@ router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesData["bo
     }
     try {
         const data = await removeChoices(login, trusted, req.body.locationKey, date);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
 
-router.post("/removeChoice", async (req: Request<{}, any, RemoveChoiceData["body"]>, res, next) => {
+router.post("/removeChoice", async (req: Request<{}, any, RemoveChoiceRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     const trusted = getTrusted(parseToken(req));
     let date = undefined;
@@ -85,12 +85,12 @@ router.post("/removeChoice", async (req: Request<{}, any, RemoveChoiceData["body
     }
     try {
         const data = await removeChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
 
-router.post("/updateNote", async (req: Request<{}, any, UpdateNoteData["body"]>, res, next) => {
+router.post("/updateNote", async (req: Request<{}, any, UpdateNoteRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     const trusted = getTrusted(parseToken(req));
     const note = req.body.note;
@@ -109,12 +109,12 @@ router.post("/updateNote", async (req: Request<{}, any, UpdateNoteData["body"]>,
             date = getDateForWeekIndex(dayIndex);
         }
         const data = await updateNote(login, trusted, note, date);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
 
-router.post("/changeDepartureTime", async (req: Request<{}, any, ChangeDepartureTimeData["body"]>, res, next) => {
+router.post("/changeDepartureTime", async (req: Request<{}, any, ChangeDepartureTimeRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     let date = undefined;
     if (req.body.dayIndex != null) {
@@ -128,7 +128,7 @@ router.post("/changeDepartureTime", async (req: Request<{}, any, ChangeDeparture
     }
     try {
         const data = await updateDepartureTime(login, req.body?.time, date);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
@@ -136,7 +136,7 @@ router.post("/changeDepartureTime", async (req: Request<{}, any, ChangeDeparture
 router.post("/jdemeObed", async (req, res, next) => {
     const login = getLogin(parseToken(req));
     try {
-        await callNotifikace({ input: { user: login, udalost: UdalostEnum.JDEME_NA_OBED }, gotify: false })
+        await callNotifikace({ input: { user: login, udalost: UdalostEnum.JDEME_OBED }, gotify: false })
         res.status(200).json({});
     } catch (e: any) { next(e) }
 });

server/src/routes/pizzaDayRoutes.ts

@@ -3,7 +3,8 @@ import { getLogin } from "../auth";
 import { createPizzaDay, deletePizzaDay, getPizzaList, addPizzaOrder, removePizzaOrder, lockPizzaDay, unlockPizzaDay, finishPizzaOrder, finishPizzaDelivery, updatePizzaDayNote, updatePizzaFee } from "../pizza";
 import { parseToken } from "../utils";
 import { getWebsocket } from "../websocket";
-import { AddPizzaData, FinishDeliveryData, RemovePizzaData, UpdatePizzaDayNoteData, UpdatePizzaFeeData } from "../../../types";
+import { addVolatileData } from "../service";
+import { AddPizzaRequest, FinishDeliveryRequest, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../../../types";
 
 const router = express.Router();
 
@@ -12,17 +13,17 @@ router.post("/create", async (req: Request<{}, any, undefined>, res) => {
     const login = getLogin(parseToken(req));
     const data = await createPizzaDay(login);
     res.status(200).json(data);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
 });
 
 /** Smaže pizza day pro aktuální den, za předpokladu že existuje. */
 router.post("/delete", async (req: Request<{}, any, undefined>, res) => {
     const login = getLogin(parseToken(req));
     const data = await deletePizzaDay(login);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
 });
 
-router.post("/add", async (req: Request<{}, any, AddPizzaData["body"]>, res) => {
+router.post("/add", async (req: Request<{}, any, AddPizzaRequest>, res) => {
     const login = getLogin(parseToken(req));
     if (isNaN(req.body?.pizzaIndex)) {
         throw Error("Nebyl předán index pizzy");
@@ -43,68 +44,68 @@ router.post("/add", async (req: Request<{}, any, AddPizzaData["body"]>, res) =>
         throw Error("Neplatný index velikosti pizzy: " + pizzaSizeIndex);
     }
     const data = await addPizzaOrder(login, pizzy[pizzaIndex], pizzy[pizzaIndex].sizes[pizzaSizeIndex]);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
-router.post("/remove", async (req: Request<{}, any, RemovePizzaData["body"]>, res) => {
+router.post("/remove", async (req: Request<{}, any, RemovePizzaRequest>, res) => {
     const login = getLogin(parseToken(req));
     if (!req.body?.pizzaOrder) {
         throw Error("Nebyla předána objednávka");
     }
     const data = await removePizzaOrder(login, req.body?.pizzaOrder);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
 router.post("/lock", async (req: Request<{}, any, undefined>, res) => {
     const login = getLogin(parseToken(req));
     const data = await lockPizzaDay(login);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
 router.post("/unlock", async (req: Request<{}, any, undefined>, res) => {
     const login = getLogin(parseToken(req));
     const data = await unlockPizzaDay(login);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
 router.post("/finishOrder", async (req: Request<{}, any, undefined>, res) => {
     const login = getLogin(parseToken(req));
     const data = await finishPizzaOrder(login);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
-router.post("/finishDelivery", async (req: Request<{}, any, FinishDeliveryData["body"]>, res) => {
+router.post("/finishDelivery", async (req: Request<{}, any, FinishDeliveryRequest>, res) => {
     const login = getLogin(parseToken(req));
     const data = await finishPizzaDelivery(login, req.body.bankAccount, req.body.bankAccountHolder);
-    getWebsocket().emit("message", data);
+    getWebsocket().emit("message", await addVolatileData(data));
     res.status(200).json({});
 });
 
-router.post("/updatePizzaDayNote", async (req: Request<{}, any, UpdatePizzaDayNoteData["body"]>, res, next) => {
+router.post("/updatePizzaDayNote", async (req: Request<{}, any, UpdatePizzaDayNoteRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     try {
         if (req.body.note && req.body.note.length > 70) {
             throw Error("Poznámka může mít maximálně 70 znaků");
         }
         const data = await updatePizzaDayNote(login, req.body.note);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });
 
-router.post("/updatePizzaFee", async (req: Request<{}, any, UpdatePizzaFeeData["body"]>, res, next) => {
+router.post("/updatePizzaFee", async (req: Request<{}, any, UpdatePizzaFeeRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     if (!req.body.login) {
         return res.status(400).json({ error: "Nebyl předán login cílového uživatele" });
     }
     try {
         const data = await updatePizzaFee(login, req.body.login, req.body.text, req.body.price);
-        getWebsocket().emit("message", data);
+        getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
 });

server/src/routes/statsRoutes.ts

@@ -1,22 +0,0 @@
-import express, { Request, Response } from "express";
-import { getLogin } from "../auth";
-import { parseToken } from "../utils";
-import { getStats } from "../stats";
-import { WeeklyStats } from "../../../types/gen/types.gen";
-
-const router = express.Router();
-
-router.get("/", async (req: Request<{}, any, undefined>, res: Response<WeeklyStats>) => {
-    getLogin(parseToken(req));
-    if (typeof req.query.startDate === 'string' && typeof req.query.endDate === 'string') {
-        try {
-            const data = await getStats(req.query.startDate, req.query.endDate);
-            return res.status(200).json(data);
-        } catch (e) {
-            // necháme to zatím spadnout na 400
-        }
-    }
-    res.sendStatus(400);
-});
-
-export default router;

server/src/routes/votingRoutes.ts

@@ -1,18 +1,18 @@
-import express, { Request } from "express";
+import express, { Request, Response } from "express";
 import { getLogin } from "../auth";
 import { parseToken } from "../utils";
 import { getUserVotes, updateFeatureVote } from "../voting";
-import { GetVotesData, UpdateVoteData } from "../../../types";
+import { FeatureRequest, UpdateFeatureVoteRequest } from "../../../types";
 
 const router = express.Router();
 
-router.get("/getVotes", async (req: Request<{}, any, GetVotesData["body"]>, res) => {
+router.get("/getVotes", async (req: Request<{}, any, undefined>, res: Response<FeatureRequest[]>) => {
     const login = getLogin(parseToken(req));
     const data = await getUserVotes(login);
     res.status(200).json(data);
 });
 
-router.post("/updateVote", async (req: Request<{}, any, UpdateVoteData["body"]>, res, next) => {
+router.post("/updateVote", async (req: Request<{}, any, UpdateFeatureVoteRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     if (req.body?.option == null || req.body?.active == null) {
         res.status(400).json({ error: "Chybné parametry volání" });

server/src/service.ts

@@ -1,8 +1,8 @@
 import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getIsWeekend, getWeekNumber } from "./utils";
+import { ClientData, Restaurants, RestaurantDailyMenu, DepartureTime, DayData, WeekMenu, LocationKey, DayOfWeekIndex, daysOfWeeksIndices, DayOfWeekEnum, DayOfWeek } from "../../types";
 import getStorage from "./storage";
-import { getMenuSladovnicka, getMenuTechTower, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
+import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku, getMenuZastavkaUmichala } from "./restaurants";
 import { getTodayMock } from "./mock";
-import { ClientData, DepartureTime, LunchChoice, Restaurant, RestaurantDayMenu, WeekMenu } from "../../types/gen/types.gen";
 
 const storage = getStorage();
 const MENU_PREFIX = 'menu';
@@ -31,31 +31,44 @@ export const getDateForWeekIndex = (index: number) => {
 function getEmptyData(date?: Date): ClientData {
     const usedDate = date || getToday();
     return {
-        todayDayIndex: getDayOfWeekIndex(getToday()),
         date: getHumanDate(usedDate),
         isWeekend: getIsWeekend(usedDate),
-        dayIndex: getDayOfWeekIndex(usedDate),
+        weekIndex: getDayOfWeekIndex(usedDate),
         choices: {},
     };
 }
 
+/**
+ * Přidá k datům "dopočítaná" data, která nejsou přímo uložena v databázi.
+ * 
+ * @param data data z databáze
+ * @returns obohacená data
+ */
+export async function addVolatileData(data: ClientData): Promise<ClientData> {
+    data.todayWeekIndex = getDayOfWeekIndex(getToday());
+    return data;
+}
+
 /**
  * Vrátí veškerá klientská data pro předaný den, nebo aktuální den, pokud není předán.
  */
 export async function getData(date?: Date): Promise<ClientData> {
-    const clientData = await getClientData(date);
+    const targetDate = date ?? getToday();
+    const dateString = formatDate(targetDate);
+    const data: DayData = await storage.getData(dateString) || getEmptyData(date);
+    let clientData: ClientData = { ...data };
     clientData.menus = {
-        SLADOVNICKA: await getRestaurantMenu('SLADOVNICKA', date),
+        [Restaurants.SLADOVNICKA]: await getRestaurantMenu(Restaurants.SLADOVNICKA, date),
-        // UMOTLIKU: await getRestaurantMenu('UMOTLIKU', date),
+        // [Restaurants.UMOTLIKU]: await getRestaurantMenu(Restaurants.UMOTLIKU, date),
-        TECHTOWER: await getRestaurantMenu('TECHTOWER', date),
+        [Restaurants.TECHTOWER]: await getRestaurantMenu(Restaurants.TECHTOWER, date),
-        ZASTAVKAUMICHALA: await getRestaurantMenu('ZASTAVKAUMICHALA', date),
+        [Restaurants.ZASTAVKAUMICHALA]: await getRestaurantMenu(Restaurants.ZASTAVKAUMICHALA, date),
-        SENKSERIKOVA: await getRestaurantMenu('SENKSERIKOVA', date),
     }
+    clientData = await addVolatileData(clientData);
     return clientData;
 }
 
 /**
- * Vrátí klíč, pod kterým je uloženo menu pro týden příslušící předanému datu.
+ * Vrátí klíč, pod kterým je uloženo menu pro předané datum.
  *
  * @param date datum
  * @returns databázový klíč
@@ -66,13 +79,13 @@ function getMenuKey(date: Date) {
 }
 
 /**
- * Vrátí menu všech podniků pro celý týden do kterého spadá předané datum, pokud již existují.
+ * Vrátí menu restaurací pro předané datum, pokud již existují.
  * 
  * @param date datum
- * @returns menu restaurací pro týden příslušící předanému datu
+ * @returns menu restaurací pro předané datum
  */
 async function getMenu(date: Date): Promise<WeekMenu | undefined> {
-    return await storage.getData<WeekMenu | undefined>(getMenuKey(date));
+    return await storage.getData(getMenuKey(date));
 }
 
 // TODO přesun do restaurants.ts
@@ -84,7 +97,7 @@ async function getMenu(date: Date): Promise<WeekMenu | undefined> {
  * @param date datum, ke kterému získat menu
  * @param mock příznak, zda chceme pouze mock data
  */
-export async function getRestaurantMenu(restaurant: Restaurant, date?: Date): Promise<RestaurantDayMenu> {
+export async function getRestaurantMenu(restaurant: Restaurants, date?: Date): Promise<RestaurantDailyMenu> {
     const usedDate = date ?? getToday();
     const dayOfWeekIndex = getDayOfWeekIndex(usedDate);
     const now = new Date().getTime();
@@ -96,41 +109,52 @@ export async function getRestaurantMenu(restaurant: Restaurant, date?: Date): Pr
         };
     }
 
-    let weekMenu = await getMenu(usedDate);
+    let menus = await getMenu(usedDate);
-    if (weekMenu == null) {
+    if (menus == null) {
-        weekMenu = [{}, {}, {}, {}, {}];
+        menus = {};
     }
-    for (let i = 0; i < 5; i++) {
+    daysOfWeeksIndices.forEach(i => {
-        if (weekMenu[i] == null) {
+        if (menus[i] == null) {
-            weekMenu[i] = {};
+            menus[i] = {};
         }
-        if (weekMenu[i][restaurant] == null) {
+        if (menus[i][restaurant] == null) {
-            weekMenu[i][restaurant] = {
+            menus[i][restaurant] = {
                 lastUpdate: now,
                 closed: false,
                 food: [],
             };
         }
+    })
+    if (!menus[dayOfWeekIndex]) {
+        menus[dayOfWeekIndex] = {};
     }
-    if (!weekMenu[dayOfWeekIndex][restaurant]?.food?.length) {
+    if (!menus[dayOfWeekIndex][restaurant]?.food?.length) {
         const firstDay = getFirstWorkDayOfWeek(usedDate);
         const mock = process.env.MOCK_DATA === 'true';
         switch (restaurant) {
-            case 'SLADOVNICKA':
+            case Restaurants.SLADOVNICKA:
                 try {
+                    // TODO tady jsme v háji, protože z následujících metod vracíme arbitrárně dlouhé pole (musíme vracet omezené na maximálně 0-7 prvků)
                     const sladovnickaFood = await getMenuSladovnicka(firstDay, mock);
-                    for (let i = 0; i < sladovnickaFood.length; i++) {
+                    for (const i in DayOfWeekEnum) {
-                        weekMenu[i][restaurant]!.food = sladovnickaFood[i];
+                        menus[i][restaurant]!.food = sladovnickaFood[i];
                         // Velice chatrný a nespolehlivý způsob detekce uzavření...
                         if (sladovnickaFood[i].length === 1 && sladovnickaFood[i][0].name.toLowerCase() === 'pro daný den nebyla nalezena denní nabídka') {
-                            weekMenu[i][restaurant]!.closed = true;
+                            menus[i][restaurant]!.closed = true;
+                        }
+                    }
+                    for (let i = 0; i < sladovnickaFood.length; i++) {
+                        menus[i][restaurant]!.food = sladovnickaFood[i];
+                        // Velice chatrný a nespolehlivý způsob detekce uzavření...
+                        if (sladovnickaFood[i].length === 1 && sladovnickaFood[i][0].name.toLowerCase() === 'pro daný den nebyla nalezena denní nabídka') {
+                            menus[i][restaurant]!.closed = true;
                         }
                     }
                 } catch (e: any) {
                     console.error("Selhalo načtení jídel pro podnik Sladovnická", e);
                 }
                 break;
-            // case 'UMOTLIKU':
+            // case Restaurants.UMOTLIKU:
             //     try {
             //         const uMotlikuFood = await getMenuUMotliku(firstDay, mock);
             //         for (let i = 0; i < uMotlikuFood.length; i++) {
@@ -143,49 +167,36 @@ export async function getRestaurantMenu(restaurant: Restaurant, date?: Date): Pr
             //         console.error("Selhalo načtení jídel pro podnik U Motlíků", e);
             //     }
             //     break;
-            case 'TECHTOWER':
+            case Restaurants.TECHTOWER:
                 try {
                     const techTowerFood = await getMenuTechTower(firstDay, mock);
                     for (let i = 0; i < techTowerFood.length; i++) {
-                        weekMenu[i][restaurant]!.food = techTowerFood[i];
+                        menus[i][restaurant]!.food = techTowerFood[i];
                         if (techTowerFood[i]?.length === 1 && techTowerFood[i][0].name.toLowerCase() === 'svátek') {
-                            weekMenu[i][restaurant]!.closed = true;
+                            menus[i][restaurant]!.closed = true;
                         }
                     }
+                    break;
                 } catch (e: any) {
                     console.error("Selhalo načtení jídel pro podnik TechTower", e);
                 }
-                break;
+            case Restaurants.ZASTAVKAUMICHALA:
-            case 'ZASTAVKAUMICHALA':
                 try {
                     const zastavkaUmichalaFood = await getMenuZastavkaUmichala(firstDay, mock);
                     for (let i = 0; i < zastavkaUmichalaFood.length; i++) {
-                        weekMenu[i][restaurant]!.food = zastavkaUmichalaFood[i];
+                        menus[i][restaurant]!.food = zastavkaUmichalaFood[i];
                         if (zastavkaUmichalaFood[i]?.length === 1 && zastavkaUmichalaFood[i][0].name === 'Pro tento den není uveřejněna nabídka jídel.') {
-                            weekMenu[i][restaurant]!.closed = true;
+                            menus[i][restaurant]!.closed = true;
                         }
                     }
+                    break;
                 } catch (e: any) {
                     console.error("Selhalo načtení jídel pro podnik Zastávka u Michala", e);
                 }
-                break;
-            case 'SENKSERIKOVA':
-                try {
-                    const senkSerikovaFood = await getMenuSenkSerikova(firstDay, mock);
-                    for (let i = 0; i < senkSerikovaFood.length; i++) {
-                        weekMenu[i][restaurant]!.food = senkSerikovaFood[i];
-                        if (senkSerikovaFood[i]?.length === 1 && senkSerikovaFood[i][0].name === 'Pro tento den nebylo zadáno menu.') {
-                            weekMenu[i][restaurant]!.closed = true;
         }
+        await storage.setData(getMenuKey(usedDate), menus);
     }
-                } catch (e: any) {
+    return menus[dayOfWeekIndex][restaurant]!;
-                    console.error("Selhalo načtení jídel pro podnik Pivovarský šenk Šeříková", e);
-                }
-                break;
-        }
-        await storage.setData(getMenuKey(usedDate), weekMenu);
-    }
-    return weekMenu[dayOfWeekIndex][restaurant]!;
 }
 
 /**
@@ -210,9 +221,9 @@ export async function initIfNeeded(date?: Date) {
  * @param date datum, ke kterému se volba vztahuje
  * @returns 
  */
-export async function removeChoices(login: string, trusted: boolean, locationKey: LunchChoice, date?: Date) {
+export async function removeChoices(login: string, trusted: boolean, locationKey: LocationKey, date?: Date) {
     const selectedDay = formatDate(date ?? getToday());
-    let data = await getClientData(date);
+    let data: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
     if (locationKey in data.choices) {
         if (data.choices[locationKey] && login in data.choices[locationKey]) {
@@ -237,15 +248,15 @@ export async function removeChoices(login: string, trusted: boolean, locationKey
  * @param date datum, ke kterému se volba vztahuje
  * @returns 
  */
-export async function removeChoice(login: string, trusted: boolean, locationKey: LunchChoice, foodIndex: number, date?: Date) {
+export async function removeChoice(login: string, trusted: boolean, locationKey: LocationKey, foodIndex: number, date?: Date) {
     const selectedDay = formatDate(date ?? getToday());
-    let data = await getClientData(date);
+    let data: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
     if (locationKey in data.choices) {
         if (data.choices[locationKey] && login in data.choices[locationKey]) {
-            const index = data.choices[locationKey][login].selectedFoods?.indexOf(foodIndex);
+            const index = data.choices[locationKey][login].options.indexOf(foodIndex);
-            if (index != null && index > -1) {
+            if (index > -1) {
-                data.choices[locationKey][login].selectedFoods?.splice(index, 1);
+                data.choices[locationKey][login].options.splice(index, 1)
                 await storage.setData(selectedDay, data);
             }
         }
@@ -254,26 +265,20 @@ export async function removeChoice(login: string, trusted: boolean, locationKey:
 }
 
 /**
- * Odstraní kompletně volbu uživatele, vyjma ignoredLocationKey (pokud byla předána a existuje).
+ * Odstraní kompletně volbu uživatele.
  * 
  * @param login login uživatele
- * @param date datum, ke kterému se volby vztahují
- * @param ignoredLocationKey volba, která nebude odstraněna, pokud existuje
  */
-async function removeChoiceIfPresent(login: string, date?: Date, ignoredLocationKey?: LunchChoice) {
+async function removeChoiceIfPresent(login: string, date: string) {
-    const usedDate = date ?? getToday();
+    let data: DayData = await storage.getData(date);
-    let data = await getClientData(usedDate);
     for (const key of Object.keys(data.choices)) {
-        const locationKey = key as LunchChoice;
+        const locationKey = key as LocationKey;
-        if (ignoredLocationKey != null && ignoredLocationKey == locationKey) {
-            continue;
-        }
         if (data.choices[locationKey] && login in data.choices[locationKey]) {
             delete data.choices[locationKey][login];
             if (Object.keys(data.choices[locationKey]).length === 0) {
                 delete data.choices[locationKey];
             }
-            await storage.setData(formatDate(usedDate), data);
+            await storage.setData(date, data);
         }
     }
     return data;
@@ -312,18 +317,15 @@ function validateTrusted(data: ClientData, login: string, trusted: boolean) {
  * @param date datum, ke kterému se volba vztahuje
  * @returns aktuální data
  */
-export async function addChoice(login: string, trusted: boolean, locationKey: LunchChoice, foodIndex?: number, date?: Date) {
+export async function addChoice(login: string, trusted: boolean, locationKey: LocationKey, foodIndex?: number, date?: Date) {
     const usedDate = date ?? getToday();
     await initIfNeeded(usedDate);
-    let data = await getClientData(usedDate);
+    const selectedDate = formatDate(usedDate);
+    let data: DayData = await storage.getData(selectedDate);
     validateTrusted(data, login, trusted);
-    await validateFoodIndex(locationKey, foodIndex, date);
     // Pokud měníme pouze lokaci, mažeme případné předchozí
     if (foodIndex == null) {
-        data = await removeChoiceIfPresent(login, usedDate);
+        data = await removeChoiceIfPresent(login, selectedDate);
-    } else {
-        // Mažeme případné ostatní volby (měla by být maximálně jedna)
-        removeChoiceIfPresent(login, usedDate, locationKey);
     }
     // TODO vytáhnout inicializaci "prázdné struktury" do vlastní funkce
     if (!(data.choices[locationKey])) {
@@ -335,43 +337,16 @@ export async function addChoice(login: string, trusted: boolean, locationKey: Lu
         }
         data.choices[locationKey][login] = {
             trusted,
-            selectedFoods: []
+            options: []
         };
     }
-    if (foodIndex != null && !data.choices[locationKey][login].selectedFoods?.includes(foodIndex)) {
+    if (foodIndex != null && !data.choices[locationKey][login].options.includes(foodIndex)) {
-        data.choices[locationKey][login].selectedFoods?.push(foodIndex);
+        data.choices[locationKey][login].options.push(foodIndex);
     }
-    const selectedDate = formatDate(usedDate);
     await storage.setData(selectedDate, data);
     return data;
 }
 
-/**
- * Zvaliduje platnost indexu jídla pro vybranou lokalitu a datum.
- * 
- * @param locationKey vybraná lokalita
- * @param foodIndex index jídla pro danou lokalitu
- * @param date datum, pro které je validace prováděna
- */
-async function validateFoodIndex(locationKey: LunchChoice, foodIndex?: number, date?: Date) {
-    if (foodIndex != null) {
-        if (typeof foodIndex !== 'number') {
-            throw Error(`Neplatný index ${foodIndex} typu ${typeof foodIndex}`);
-        }
-        if (foodIndex < 0) {
-            throw Error(`Neplatný index ${foodIndex}`);
-        }
-        if (!Object.keys(Restaurant).includes(locationKey)) {
-            throw Error(`Neplatný index ${foodIndex} pro lokalitu ${locationKey} nepodporující indexy`);
-        }
-        const usedDate = date ?? getToday();
-        const menu = await getRestaurantMenu(locationKey as Restaurant, usedDate);
-        if (menu.food?.length && foodIndex > (menu.food.length - 1)) {
-            throw new Error(`Neplatný index ${foodIndex} pro lokalitu ${locationKey}`);
-        }
-    }
-}
-
 /**
  * Aktualizuje poznámku k aktuálně vybrané možnosti.
  * 
@@ -383,16 +358,16 @@ async function validateFoodIndex(locationKey: LunchChoice, foodIndex?: number, d
 export async function updateNote(login: string, trusted: boolean, note?: string, date?: Date) {
     const usedDate = date ?? getToday();
     await initIfNeeded(usedDate);
-    let data = await getClientData(usedDate);
+    const selectedDate = formatDate(usedDate);
+    let data: DayData = await storage.getData(selectedDate);
     validateTrusted(data, login, trusted);
     const userEntry = data.choices != null && Object.entries(data.choices).find(entry => entry[1][login] != null);
     if (userEntry) {
-        if (!note?.length) {
+        if (!note || !note.length) {
             delete userEntry[1][login].note;
         } else {
             userEntry[1][login].note = note;
         }
-        const selectedDate = formatDate(usedDate);
         await storage.setData(selectedDate, data);
     }
     return data;
@@ -406,8 +381,8 @@ export async function updateNote(login: string, trusted: boolean, note?: string,
  * @param date datum, ke kterému se čas vztahuje
  */
 export async function updateDepartureTime(login: string, time?: string, date?: Date) {
-    const usedDate = date ?? getToday();
+    const selectedDate = formatDate(date ?? getToday());
-    let clientData = await getClientData(usedDate);
+    let clientData: DayData = await storage.getData(selectedDate);
     const found = Object.values(clientData.choices).find(location => login in location);
     // TODO validace, že se jedná o restauraci
     if (found) {
@@ -419,23 +394,7 @@ export async function updateDepartureTime(login: string, time?: string, date?: D
             }
             found[login].departureTime = time;
         }
-        await storage.setData(formatDate(usedDate), clientData);
+        await storage.setData(selectedDate, clientData);
     }
     return clientData;
 }
-
-/**
- * Vrátí data pro klienta pro předaný nebo aktuální den.
- * 
- * @param date datum pro který vrátit data, pokud není vyplněno, je použit dnešní den
- * @returns data pro klienta
- */
-export async function getClientData(date?: Date): Promise<ClientData> {
-    const targetDate = date ?? getToday();
-    const dateString = formatDate(targetDate);
-    const clientData = await storage.getData<ClientData>(dateString) || getEmptyData(date);
-    return {
-        ...clientData,
-        todayDayIndex: getDayOfWeekIndex(getToday()),
-    }
-}

server/src/stats.ts

@@ -1,48 +0,0 @@
-import { DailyStats, LunchChoice, WeeklyStats } from "../../types/gen/types.gen";
-import { getStatsMock } from "./mock";
-import { getClientData } from "./service";
-import getStorage from "./storage";
-
-const storage = getStorage();
-
-/**
- * Vypočte a vrátí statistiky jednotlivých možností pro předaný rozsah dat.
- * 
- * @param startDate počáteční datum
- * @param endDate koncové datum
- * @returns statistiky pro zadaný rozsah dat
- */
-export async function getStats(startDate: string, endDate: string): Promise<WeeklyStats> {
-    if (process.env.MOCK_DATA === 'true') {
-        return getStatsMock();
-    }
-    const start = new Date(startDate);
-    const end = new Date(endDate);
-
-    // Dočasná validace, aby to někdo ručně neshodil
-    const daysDiff = ((end as any) - (start as any)) / (1000 * 60 * 60 * 24);
-    if (daysDiff > 4) {
-        throw Error('Neplatný rozsah');
-    }
-
-    const result = [];
-    for (const date = start; date <= end; date.setDate(date.getDate() + 1)) {
-        const locationsStats: DailyStats = {
-            // TODO vytáhnout do utils funkce
-            date: `${String(date.getDate()).padStart(2, "0")}.${String(date.getMonth() + 1).padStart(2, "0")}.`,
-            locations: {}
-        }
-        const data = await getClientData(date);
-        if (data?.choices) {
-            Object.keys(data.choices).forEach(locationKey => {
-                if (!locationsStats.locations) {
-                    locationsStats.locations = {}
-                }
-                // TODO dořešit, tohle je zmatek a té hlášce Sonaru nerozumím
-                locationsStats.locations[locationKey as LunchChoice] = Object.keys(data.choices[locationKey as LunchChoice]!).length;
-            })
-        }
-        result.push(locationsStats);
-    }
-    return result as WeeklyStats;
-}

server/src/storage/StorageInterface.ts

@@ -1,3 +1,5 @@
+import { ClientData } from "../../../types";
+
 /**
  * Interface pro úložiště dat.
  * 
@@ -15,7 +17,7 @@ export interface StorageInterface {
      * Vrátí veškerá data pro předaný klíč.
      * @param key klíč, pro který vrátit data (typicky datum)
      */
-    getData<Type>(key: string): Promise<Type | undefined>;
+    getData<Type>(key: string): Promise<Type>;
 
     /**
      * Uloží data pod předaný klíč.

server/src/storage/index.ts

@@ -4,7 +4,7 @@ import { StorageInterface } from "./StorageInterface";
 import JsonStorage from "./json";
 import RedisStorage from "./redis";
 
-const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
+const ENVIRONMENT = process.env.NODE_ENV || 'production';
 dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
 
 const JSON_KEY = 'json';

server/src/storage/json.ts

@@ -1,17 +1,8 @@
 import JSONdb from 'simple-json-db';
 import { StorageInterface } from "./StorageInterface";
-import * as fs from 'fs';
-import * as path from 'path';
 
-const dbPath = path.resolve(__dirname, '../../data/db.json');
+const db = new JSONdb('./data.json');
-const dbDir = path.dirname(dbPath);
 
-// Zajistěte, že adresář existuje
-if (!fs.existsSync(dbDir)) {
-    fs.mkdirSync(dbDir, { recursive: true });
-}
-
-const db = new JSONdb(dbPath);
 /**
  * Implementace úložiště používající JSON soubor.
  */

server/src/storage/redis.ts

@@ -8,15 +8,15 @@ let client: RedisClientType;
  */
 export default class RedisStorage implements StorageInterface {
     constructor() {
-        const HOST = process.env.REDIS_HOST ?? 'localhost';
+        const HOST = process.env.REDIS_HOST || 'localhost';
-        const PORT = process.env.REDIS_PORT ?? 6379;
+        const PORT = process.env.REDIS_PORT || 6379;
         client = createClient({ url: `redis://${HOST}:${PORT}` });
         client.connect();
     }
 
     async hasData(key: string) {
         const data = await client.json.get(key);
-        return (!!data);
+        return (data ? true : false);
     }
 
     async getData<Type>(key: string) {

server/src/utils.ts

@@ -1,6 +1,4 @@
-import { LunchChoice, LunchChoices } from "../../types/gen/types.gen";
+import { Choices, DayOfWeekIndex, LocationKey } from "../../types";
-
-const DAY_OF_WEEK_FORMAT = new Intl.DateTimeFormat(undefined, { weekday: 'long' });
 
 /** Vrátí datum v ISO formátu. */
 export function formatDate(date: Date, format?: string) {
@@ -8,7 +6,7 @@ export function formatDate(date: Date, format?: string) {
     let month = String(date.getMonth() + 1).padStart(2, "0");
     let year = String(date.getFullYear());
 
-    const f = format ?? 'YYYY-MM-DD';
+    const f = (format === undefined) ? 'YYYY-MM-DD' : format;
     return f.replace('DD', day).replace('MM', month).replace('YYYY', year);
 }
 
@@ -17,7 +15,7 @@ export function getHumanDate(date: Date) {
     let currentDay = String(date.getDate()).padStart(2, '0');
     let currentMonth = String(date.getMonth() + 1).padStart(2, "0");
     let currentYear = date.getFullYear();
-    let currentDayOfWeek = DAY_OF_WEEK_FORMAT.format(date);
+    let currentDayOfWeek = date.toLocaleDateString("CZ-cs", { weekday: 'long' });
     return `${currentDay}.${currentMonth}.${currentYear} (${currentDayOfWeek})`;
 }
 
@@ -34,9 +32,9 @@ export function getHumanTime(time: Date) {
  * @param date datum
  * @returns index dne v týdnu
  */
-export const getDayOfWeekIndex = (date: Date) => {
+export const getDayOfWeekIndex = (date: Date): DayOfWeekIndex => {
     // https://stackoverflow.com/a/4467559
-    return (((date.getDay() - 1) % 7) + 7) % 7;
+    return ((((date.getDay() - 1) % 7) + 7) % 7) as DayOfWeekIndex;
 }
 
 /** Vrátí true, pokud je předané datum o víkendu. */
@@ -61,10 +59,10 @@ export function getLastWorkDayOfWeek(date: Date) {
 
 /** Vrátí pořadové číslo týdne předaného data v roce dle ISO 8601. */
 export function getWeekNumber(inputDate: Date) {
-    const date = new Date(inputDate.getTime());
+    var date = new Date(inputDate.getTime());
     date.setHours(0, 0, 0, 0);
     date.setDate(date.getDate() + 3 - (date.getDay() + 6) % 7);
-    const week1 = new Date(date.getFullYear(), 0, 4);
+    var week1 = new Date(date.getFullYear(), 0, 4);
     return 1 + Math.round(((date.getTime() - week1.getTime()) / 86400000 - 3 + (week1.getDay() + 6) % 7) / 7);
 }
 
@@ -114,13 +112,13 @@ export const checkBodyParams = (req: any, paramNames: string[]) => {
 // TODO umístit do samostatného souboru
 export class InsufficientPermissions extends Error { }
 
-export const getUsersByLocation = (choices: LunchChoices, login?: string): string[] => {
+export const getUsersByLocation = (choices: Choices, login: string): string[] => {
     const result: string[] = [];
 
     for (const location of Object.entries(choices)) {
-        const locationKey = location[0] as LunchChoice;
+        const locationKey = location[0] as LocationKey;
         const locationValue = location[1];
-        if (login && locationValue[login]) {
+        if (locationValue[login]) {
             for (const username in choices[locationKey]) {
                 if (choices[locationKey].hasOwnProperty(username)) {
                     result.push(username);

server/src/voting.ts

@@ -1,4 +1,4 @@
-import { FeatureRequest } from "../../types/gen/types.gen";
+import { FeatureRequest } from "../../types";
 import getStorage from "./storage";
 
 interface VotingData {
@@ -15,7 +15,7 @@ const STORAGE_KEY = 'voting';
  * @returns pole voleb
  */
 export async function getUserVotes(login: string) {
-    const data = await storage.getData<VotingData>(STORAGE_KEY);
+    const data: VotingData = await storage.getData(STORAGE_KEY);
     return data?.[login] || [];
 }
 
@@ -28,7 +28,7 @@ export async function getUserVotes(login: string) {
  * @returns aktuální data
  */
 export async function updateFeatureVote(login: string, option: FeatureRequest, active: boolean): Promise<VotingData> {
-    let data = await storage.getData<VotingData>(STORAGE_KEY);
+    let data: VotingData = await storage.getData(STORAGE_KEY);
     if (data == null) {
         data = {};
     }

server/yarn.lock

@@ -3264,9 +3264,9 @@ node-releases@^2.0.18:
   integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
 
 nodemon@^3.1.0:
-  version "3.1.9"
+  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.1.9.tgz#df502cdc3b120e1c3c0c6e4152349019efa7387b"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.1.7.tgz#07cb1f455f8bece6a499e0d72b5e029485521a54"
-  integrity sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==
+  integrity sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==
   dependencies:
     chokidar "^3.5.2"
     debug "^4"

types/RequestTypes.ts

@@ -0,0 +1,56 @@
+import { FeatureRequest, LocationKey, PizzaOrder } from "./Types";
+
+export type ILocationKey = {
+    locationKey: LocationKey,
+}
+
+export type IDayIndex = {
+    dayIndex?: number,
+}
+
+export type AddChoiceRequest = IDayIndex & ILocationKey & {
+    foodIndex?: number,
+}
+
+export type RemoveChoicesRequest = IDayIndex & ILocationKey;
+
+export type RemoveChoiceRequest = IDayIndex & ILocationKey & {
+    foodIndex: number,
+}
+
+export type UpdateNoteRequest = IDayIndex & {
+    note?: string,
+}
+
+export type ChangeDepartureTimeRequest = IDayIndex & {
+    time: string,
+}
+
+export type FinishDeliveryRequest = {
+    bankAccount?: string,
+    bankAccountHolder?: string,
+}
+
+export type AddPizzaRequest = {
+    pizzaIndex: number,
+    pizzaSizeIndex: number,
+}
+
+export type RemovePizzaRequest = {
+    pizzaOrder: PizzaOrder,
+}
+
+export type UpdatePizzaDayNoteRequest = {
+    note?: string,
+}
+
+export type UpdatePizzaFeeRequest = {
+    login: string,
+    text?: string,
+    price?: number,
+}
+
+export type UpdateFeatureVoteRequest = {
+    option: FeatureRequest,
+    active: boolean,
+}

types/Types.ts

@@ -0,0 +1,236 @@
+/** Výčtový typ pro restaurace, pro které umíme získat a parsovat obědové menu. */
+export enum Restaurants {
+    SLADOVNICKA = 'sladovnicka',
+    // UMOTLIKU = 'uMotliku',
+    TECHTOWER = 'techTower',
+    ZASTAVKAUMICHALA = 'zastavkaUmichala',
+}
+
+export type FoodChoices = {
+    trusted: boolean,
+    options: number[],
+    departureTime?: string,
+    note?: string,
+}
+
+// TODO okomentovat / rozdělit
+export type Choices = {
+    [location in LocationKey]?: {
+        [login: string]: FoodChoices
+    }
+}
+
+/** Velikost konkrétní pizzy */
+export type PizzaSize = {
+    varId: number, // unikátní ID varianty pizzy
+    size: string, // velikost pizzy, např. "30cm"
+    pizzaPrice: number, // cena samotné pizzy
+    boxPrice: number, // cena krabice
+    price: number, // celková cena (pizza + krabice)
+}
+
+/** Jedna konkrétní pizza */
+export type Pizza = {
+    name: string, // název pizzy
+    ingredients: string[], // seznam ingrediencí
+    sizes: PizzaSize[], // dostupné velikosti pizzy
+}
+
+/** Objednávka jedné konkrétní pizzy */
+export type PizzaOrder = {
+    varId: number, // unikátní ID varianty pizzy
+    name: string, // název pizzy
+    size: string, // velikost pizzy jako string (30cm)
+    price: number, // cena pizzy v Kč, včetně krabice
+}
+
+/** Celková objednávka jednoho člověka */
+export type Order = {
+    customer: string, // jméno objednatele
+    pizzaList: PizzaOrder[], // seznam objednaných pizz
+    fee?: { text?: string, price: number }, // příplatek (např. za extra ingredience)
+    totalPrice: number, // celková cena všech objednaných pizz, krabic a příplatků
+    hasQr?: boolean, // true, pokud je k objednávce vygenerován QR kód pro platbu
+    note?: string, // volitelná uživatelská poznámka k objednávce
+}
+
+/** Stav pizza dne */
+export enum PizzaDayState {
+    NOT_CREATED, // Pizza day nebyl založen
+    CREATED, // Pizza day je založen
+    LOCKED, // Objednávky uzamčeny
+    ORDERED, // Pizzy objednány
+    DELIVERED // Pizzy doručeny
+}
+
+/** Informace o pizza day pro dnešní den */
+interface PizzaDay {
+    state: PizzaDayState, // stav pizza dne
+    creator: string, // jméno zakladatele
+    orders: Order[], // seznam objednávek jednotlivých lidí
+}
+
+/** Index dne v týdnu (0 = pondělí, 6 = neděle) */
+// TODO tohle by měl být (seřazený) enum MONDAY-SUNDAY, ne číslo
+export const daysOfWeeksIndices = [0, 1, 2, 3, 4, 5, 6] as const;
+export type DayOfWeekIndex = typeof daysOfWeeksIndices[number]
+
+const daysOfWeek = ['MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY'] as const;
+export type DayOfWeek = typeof daysOfWeek[number];
+
+/** Denní menu všech dostupných podniků. */
+export type DailyMenu = {
+    [restaurant in Restaurants]?: RestaurantDailyMenu
+}
+
+/** Týdenní menu jednotlivých restaurací. */
+export type WeekMenu = {
+    [dayIndex in DayOfWeek]?: DailyMenu
+}
+
+/** Týdenní menu jedné restaurace. */
+export type RestaurantWeeklyMenu = {
+    [key in DayOfWeek]?: Food[]
+}
+
+/** Data vztahující se k jednomu konkrétnímu dni. */
+export type DayData = {
+    date: string, // datum dne
+    isWeekend: boolean, // příznak, zda je datum víkend
+    weekIndex: DayOfWeekIndex, // index dne v týdnu (0-6)
+    choices: Choices, // seznam voleb uživatelů
+    menus?: { [restaurant in Restaurants]?: RestaurantDailyMenu }, // menu jednotlivých restaurací
+    pizzaDay?: PizzaDay, // pizza day pro dnešní den, pokud existuje
+    pizzaList?: Pizza[], // seznam dostupných pizz pro dnešní den
+    pizzaListLastUpdate?: Date, // datum a čas poslední aktualizace pizz
+}
+
+/** Veškerá data pro zobrazení na klientovi. */
+export type ClientData = DayData & {
+    todayWeekIndex?: DayOfWeekIndex, // index dnešního dne v týdnu (0-6)
+}
+
+/** Nabídka jídel jednoho podniku pro jeden konkrétní den. */
+export type RestaurantDailyMenu = {
+    lastUpdate: number, // UNIX timestamp poslední aktualizace menu
+    closed: boolean, // příznak, zda je daný podnik v tento den zavřený
+    food: Food[], // seznam jídel v menu
+}
+
+/** Jídlo z obědového menu restaurace. */
+export type Food = {
+    amount?: string, // množství standardní porce, např. 0,33l nebo 150g
+    name: string, // název/popis jídla
+    price: string, // cena ve formátu '135 Kč'
+    isSoup: boolean, // příznak, zda se jedná o polévku
+}
+
+// TODO tohle je dost špatné pojmenování, vzhledem k tomu co to obsahuje
+export enum Locations {
+    SLADOVNICKA = 'Sladovnická',
+    // UMOTLIKU = 'U Motlíků',
+    TECHTOWER = 'TechTower',
+    ZASTAVKAUMICHALA = 'Zastávka u Michala',
+    SPSE = 'SPŠE',
+    PIZZA = 'Pizza day',
+    OBJEDNAVAM = 'Budu objednávat',
+    NEOBEDVAM = 'Mám vlastní/neobědvám',
+    ROZHODUJI = 'Rozhoduji se',
+}
+
+// TODO totéž
+export type LocationKey = keyof typeof Locations;
+
+export enum UdalostEnum {
+    ZAHAJENA_PIZZA = "Zahájen pizza day",
+    OBJEDNANA_PIZZA = "Objednána pizza",
+    JDEME_OBED = "Jdeme oběd",
+}
+
+export type NotififaceInput = {
+    udalost: UdalostEnum,
+    user: string,
+}
+
+export type NotifikaceData = {
+    input: NotififaceInput,
+    gotify?: boolean,
+    teams?: boolean,
+    ntfy?: boolean,
+}
+
+export type GotifyServer = {
+    server: string;
+    api_keys: string[];
+}
+
+/** Čas preferovaného odchodu na oběd. */
+export enum DepartureTime {
+    T10_00 = "10:00",
+    T10_15 = "10:15",
+    T10_30 = "10:30",
+    T10_45 = "10:45",
+    T11_00 = "11:00",
+    T11_15 = "11:15",
+    T11_30 = "11:30",
+    T11_45 = "11:45",
+    T12_00 = "12:00",
+    T12_15 = "12:15",
+    T12_30 = "12:30",
+    T12_45 = "12:45",
+    T13_00 = "13:00",
+}
+
+export enum FeatureRequest {
+    CUSTOM_QR = "Ruční generování QR kódů mimo Pizza day (např. při objednávání)",
+    FAVORITES = "Možnost označovat si jídla jako oblíbená (taková jídla by se uživateli následně zvýrazňovala)",
+    SINGLE_PAYMENT = "Možnost úhrady v podniku za všechny jednou osobou a následné generování QR ostatním",
+    NO_WEEKENDS = "Zrušení \"užívejte víkend\", místo toho umožnit zpětně náhled na uplynulý týden",
+    QR_FOREVER = "Umožnění zobrazení vygenerovaného QR kódu i po následující dny (dokud ho uživatel ručně \"nezavře\", např. tlačítkem \"Zaplatil jsem\")",
+    PIZZA_PICTURES = "Zobrazování náhledů (fotografií) pizz v rámci Pizza day",
+    STATISTICS = "Statistiky (nejoblíbenější podnik, nejpopulárnější jídla, nejobjednávanější pizzy, nejčastější uživatelé, ...)",
+    RESPONSIVITY = "Vylepšení responzivního designu",
+    SECURITY = "Zvýšení zabezpečení aplikace",
+    SAFETY = "Zvýšená ochrana proti chybám uživatele (potvrzovací dialogy, překliky, ...)",
+    UI = "Celkové vylepšení UI/UX",
+    DEVELOPMENT = "Zlepšení dokumentace/postupů pro ostatní vývojáře"
+}
+
+export type EasterEgg = {
+    path: string;
+    url: string;
+    startOffset: number;
+    endOffset: number;
+    duration: number;
+    width?: string;
+    zIndex?: number;
+    position?: "absolute";
+    animationName?: string;
+    animationDuration?: string;
+    animationTimingFunction?: string;
+}
+
+// TODO aktuálně se k ničemu nepoužívá
+export type AnimationPosition = {
+    left?: string,
+    startLeft?: string,
+    "--start-left"?: string,
+    right?: string,
+    startRight?: string,
+    "--start-right"?: string,
+    top?: string,
+    startTop?: string,
+    "--start-top"?: string,
+    bottom?: string,
+    startBottom?: string,
+    "--start-bottom"?: string,
+    endLeft?: string,
+    "--end-left"?: string,
+    endRight?: string,
+    "--end-right"?: string,
+    endTop?: string,
+    "--end-top"?: string,
+    endBottom?: string,
+    "--end-bottom"?: string,
+    rotate?: string,
+}

types/api.yml

@@ -1,84 +0,0 @@
-openapi: 3.0.4
-info:
-  title: Luncher API
-  version: 1.0.0
-servers:
-  - url: /api
-paths:
-  # Obecné (/api)
-  /login:
-    $ref: "./paths/login.yml"
-  /qr:
-    $ref: "./paths/getPizzaQr.yml"
-  /data:
-    $ref: "./paths/getData.yml"
-
-  # Restaurace a jídla (/api/food)
-  /food/addChoice:
-    $ref: "./paths/food/addChoice.yml"
-  /food/removeChoice:
-    $ref: "./paths/food/removeChoice.yml"
-  /food/updateNote:
-    $ref: "./paths/food/updateNote.yml"
-  /food/removeChoices:
-    $ref: "./paths/food/removeChoices.yml"
-  /food/changeDepartureTime:
-    $ref: "./paths/food/changeDepartureTime.yml"
-  /food/jdemeObed:
-    $ref: "./paths/food/jdemeObed.yml"
-
-  # Pizza day (/api/pizzaDay)
-  /pizzaDay/create:
-    $ref: "./paths/pizzaDay/create.yml"
-  /pizzaDay/delete:
-    $ref: "./paths/pizzaDay/delete.yml"
-  /pizzaDay/lock:
-    $ref: "./paths/pizzaDay/lock.yml"
-  /pizzaDay/unlock:
-    $ref: "./paths/pizzaDay/unlock.yml"
-  /pizzaDay/finishOrder:
-    $ref: "./paths/pizzaDay/finishOrder.yml"
-  /pizzaDay/finishDelivery:
-    $ref: "./paths/pizzaDay/finishDelivery.yml"
-  /pizzaDay/add:
-    $ref: "./paths/pizzaDay/addPizza.yml"
-  /pizzaDay/remove:
-    $ref: "./paths/pizzaDay/removePizza.yml"
-  /pizzaDay/updatePizzaDayNote:
-    $ref: "./paths/pizzaDay/updatePizzaDayNote.yml"
-  /pizzaDay/updatePizzaFee:
-    $ref: "./paths/pizzaDay/updatePizzaFee.yml"
-
-  # Easter eggy (/api/easterEggs)
-  /easterEggs:
-    $ref: "./paths/easterEggs/easterEggs.yml"
-  /easterEggs/{url}:
-    $ref: "./paths/easterEggs/easterEgg.yml"
-
-  # Statistiky (/api/stats)
-  /stats:
-    $ref: "./paths/stats/stats.yml"
-
-  # Hlasování (/api/voting)
-  /voting/getVotes:
-    $ref: "./paths/voting/getVotes.yml"
-  /voting/updateVote:
-    $ref: "./paths/voting/updateVote.yml"
-
-components:
-  schemas:
-    $ref: "./schemas/_index.yml"
-  responses:
-    ClientDataResponse:
-      description: Aktuální data pro klienta
-      content:
-        application/json:
-          schema:
-            $ref: "./schemas/_index.yml#/ClientData"
-  securitySchemes:
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-security:
-  - bearerAuth: []

types/index.ts

@@ -1 +1,2 @@
-export * from './gen';
+export * from './Types';
+export * from './RequestTypes';

types/openapi-ts.config.ts

@@ -1,14 +0,0 @@
-import { defaultPlugins } from '@hey-api/openapi-ts';
-
-export default {
-    input: 'api.yml',
-    output: 'gen',
-    plugins: [
-        ...defaultPlugins,
-        '@hey-api/client-fetch',
-        {
-            enums: 'javascript',
-            name: '@hey-api/typescript',
-        },
-    ],
-};

types/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "@luncher/types",
-  "version": "1.0.0",
-  "license": "MIT",
-  "private": true,
-  "devDependencies": {
-    "@hey-api/client-fetch": "^0.8.2",
-    "@hey-api/openapi-ts": "^0.64.7",
-    "typescript": "^5.0.2"
-  }
-}

types/paths/easterEggs/easterEgg.yml

@@ -1,18 +0,0 @@
-get:
-  operationId: getEasterEggImage
-  summary: Vrátí obrázek konkrétního easter eggu
-  parameters:
-    - in: path
-      name: url
-      required: true
-      schema:
-        type: string
-      description: URL easter eggu
-  responses:
-    "200":
-      content:
-        image/png:
-          description: Obrázek easter eggu
-          schema:
-            type: string
-            format: binary

types/paths/easterEggs/easterEggs.yml

@@ -1,9 +0,0 @@
-get:
-  operationId: getEasterEgg
-  summary: Vrátí náhodně metadata jednoho z definovaných easter egg obrázků pro přihlášeného uživatele, nebo nic, pokud žádné definované nemá.
-  responses:
-    "200":
-      content:
-        application/json:
-          schema:
-            $ref: "../../schemas/_index.yml#/EasterEgg"

types/paths/food/addChoice.yml

@@ -1,20 +0,0 @@
-post:
-  operationId: addChoice
-  summary: Přidání či nahrazení volby uživatele pro zvolený den/podnik
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - locationKey
-          properties:
-            locationKey:
-              $ref: "../../schemas/_index.yml#/LunchChoice"
-            dayIndex:
-              $ref: "../../schemas/_index.yml#/DayIndex"
-            foodIndex:
-              $ref: "../../schemas/_index.yml#/FoodIndex"
-  responses:
-    "200":
-      $ref: "../../api.yml#/components/responses/ClientDataResponse"

types/paths/food/changeDepartureTime.yml

@@ -1,16 +0,0 @@
-post:
-  operationId: changeDepartureTime
-  summary: Úprava preferovaného času odchodu do aktuálně zvoleného podniku.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          properties:
-            dayIndex:
-              $ref: "../../schemas/_index.yml#/DayIndex"
-            time:
-              $ref: "../../schemas/_index.yml#/DepartureTime"
-  responses:
-    "200":
-      $ref: "../../api.yml#/components/responses/ClientDataResponse"

types/paths/food/jdemeObed.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: jdemeObed
-  summary: Odeslání notifikací "jdeme na oběd" dle konfigurace.
-  responses:
-    "200":
-      description: Notifikace byly odeslány.

types/paths/food/removeChoice.yml

@@ -1,21 +0,0 @@
-post:
-  operationId: removeChoice
-  summary: Odstranění jednoho zvoleného jídla uživatele pro zvolený den/podnik
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - foodIndex
-            - locationKey
-          properties:
-            foodIndex:
-              $ref: "../../schemas/_index.yml#/FoodIndex"
-            locationKey:
-              $ref: "../../schemas/_index.yml#/LunchChoice"
-            dayIndex:
-              $ref: "../../schemas/_index.yml#/DayIndex"
-  responses:
-    "200":
-      $ref: "../../api.yml#/components/responses/ClientDataResponse"

types/paths/food/removeChoices.yml

@@ -1,18 +0,0 @@
-post:
-  operationId: removeChoices
-  summary: Odstranění volby uživatele pro zvolený den/podnik, včetně případných jídel
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - locationKey
-          properties:
-            locationKey:
-              $ref: "../../schemas/_index.yml#/LunchChoice"
-            dayIndex:
-              $ref: "../../schemas/_index.yml#/DayIndex"
-  responses:
-    "200":
-      $ref: "../../api.yml#/components/responses/ClientDataResponse"

types/paths/food/updateNote.yml

@@ -1,16 +0,0 @@
-post:
-  operationId: updateNote
-  summary: Nastavení poznámky k volbě uživatele
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          properties:
-            dayIndex:
-              $ref: "../../schemas/_index.yml#/DayIndex"
-            note:
-              type: string
-  responses:
-    "200":
-      $ref: "../../api.yml#/components/responses/ClientDataResponse"

types/paths/getData.yml

@@ -1,14 +0,0 @@
-get:
-  operationId: getData
-  summary: Načtení klientských dat pro aktuální nebo předaný den
-  parameters:
-    - in: query
-      name: dayIndex
-      description: Index dne v týdnu. Pokud není předán, je použit aktuální den.
-      schema:
-        type: integer
-        minimum: 0
-        maximum: 4
-  responses:
-    "200":
-      $ref: "../api.yml#/components/responses/ClientDataResponse"

types/paths/getPizzaQr.yml

@@ -1,19 +0,0 @@
-get:
-  operationId: getPizzaQr
-  summary: Získání QR kódu pro platbu za Pizza day
-  security: [] # Nevyžaduje autentizaci
-  parameters:
-    - in: query
-      name: login
-      schema:
-        type: string
-      required: true
-      description: Přihlašovací jméno uživatele, pro kterého bude vrácen QR kód
-  responses:
-    "200":
-      description: Vygenerovaný QR kód pro platbu
-      content:
-        image/png:
-          schema:
-            type: string
-            format: binary

types/paths/login.yml

@@ -1,20 +0,0 @@
-post:
-  operationId: login
-  summary: Přihlášení uživatele
-  security: [] # Nevyžaduje autentizaci
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-          properties:
-            login:
-              type: string
-              description: Přihlašovací jméno uživatele. Vyžadováno pouze pokud není předáno pomocí hlaviček.
-  responses:
-    "200":
-      description: Přihlášení bylo úspěšné
-      content:
-        application/json:
-          schema:
-            $ref: "../schemas/_index.yml#/JWTToken"

types/paths/pizzaDay/addPizza.yml

@@ -1,21 +0,0 @@
-post:
-  operationId: addPizza
-  summary: Přidání pizzy do objednávky.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - pizzaIndex
-            - pizzaSizeIndex
-          properties:
-            pizzaIndex:
-              description: Index pizzy v nabídce
-              type: integer
-            pizzaSizeIndex:
-              description: Index velikosti pizzy v nabídce variant
-              type: integer
-  responses:
-    "200":
-      description: Přidání pizzy do objednávky proběhlo úspěšně.

types/paths/pizzaDay/create.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: createPizzaDay
-  summary: Založení pizza day.
-  responses:
-    "200":
-      description: Pizza day byl založen.

types/paths/pizzaDay/delete.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: deletePizzaDay
-  summary: Smazání pizza day.
-  responses:
-    "200":
-      description: Pizza day byl smazán.

types/paths/pizzaDay/finishDelivery.yml

@@ -1,18 +0,0 @@
-post:
-  operationId: finishDelivery
-  summary: Převod pizza day do stavu "Pizzy byly doručeny". Pokud má objednávající nastaveno číslo účtu, je ostatním uživatelům vygenerován a následně zobrazen QR kód pro úhradu jejich objednávky.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          properties:
-            bankAccount:
-              description: Číslo bankovního účtu objednávajícího
-              type: string
-            bankAccountHolder:
-              description: Jméno majitele bankovního účtu
-              type: string
-  responses:
-    "200":
-      description: Pizza day byl přepnut do stavu "Pizzy doručeny".

types/paths/pizzaDay/finishOrder.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: finishOrder
-  summary: Přepnutí pizza day do stavu "Pizzy objednány". Není možné měnit objednávky, příslušným uživatelům je odeslána notifikace o provedené objednávce.
-  responses:
-    "200":
-      description: Pizza day byl přepnut do stavu "Pizzy objednány".

types/paths/pizzaDay/lock.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: lockPizzaDay
-  summary: Uzamkne pizza day. Nebude možné přidávat či odebírat pizzy.
-  responses:
-    "200":
-      description: Pizza day byl uzamčen.

types/paths/pizzaDay/removePizza.yml

@@ -1,16 +0,0 @@
-post:
-  operationId: removePizza
-  summary: Odstranění pizzy z objednávky.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - pizzaOrder
-          properties:
-            pizzaOrder:
-              $ref: "../../schemas/_index.yml#/PizzaVariant"
-  responses:
-    "200":
-      description: Odstranění pizzy z objednávky proběhlo úspěšně.

types/paths/pizzaDay/unlock.yml

@@ -1,6 +0,0 @@
-post:
-  operationId: unlockPizzaDay
-  summary: Odemkne pizza day. Bude opět možné přidávat či odebírat pizzy.
-  responses:
-    "200":
-      description: Pizza day byl odemčen.

types/paths/pizzaDay/updatePizzaDayNote.yml

@@ -1,15 +0,0 @@
-post:
-  operationId: updatePizzaDayNote
-  summary: Nastavení poznámky k objednávkám pizz přihlášeného uživatele.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          properties:
-            note:
-              type: string
-              description: Poznámka k objednávkám pizz, např "bez oliv".
-  responses:
-    "200":
-      description: Nastavení poznámky k objednávkám pizz proběhlo úspěšně.

types/paths/pizzaDay/updatePizzaFee.yml

@@ -1,23 +0,0 @@
-post:
-  operationId: updatePizzaFee
-  summary: Nastavení přirážky/slevy k objednávce pizz uživatele.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          required:
-            - login
-          properties:
-            login:
-              type: string
-              description: Login cíleného uživatele
-            text:
-              type: string
-              description: Textový popis přirážky/slevy
-            price:
-              type: number
-              description: Částka přirážky/slevy v Kč
-  responses:
-    "200":
-      description: Nastavení přirážky/slevy proběhlo úspěšně.

types/paths/stats/stats.yml

@@ -1,23 +0,0 @@
-get:
-  operationId: getStats
-  summary: Vrátí statistiky způsobu stravování pro předaný rozsah dat.
-  parameters:
-    - in: query
-      name: startDate
-      required: true
-      schema:
-        type: string
-      description: Počáteční datum pro načtení statistik
-    - in: query
-      name: endDate
-      required: true
-      schema:
-        type: string
-      description: Koncové datum pro načtení statistik
-  responses:
-    "200":
-      description: Statistiky způsobu stravování. Každý prvek v poli představuje statistiky pro jeden den z předaného rozsahu dat.
-      content:
-        application/json:
-          schema:
-            $ref: "../../schemas/_index.yml#/WeeklyStats"

types/paths/voting/getVotes.yml

@@ -1,11 +0,0 @@
-get:
-  operationId: getVotes
-  summary: Vrátí statistiky hlasování o nových funkcích.
-  responses:
-    "200":
-      content:
-        application/json:
-          schema:
-            type: array
-            items:
-              $ref: "../../schemas/_index.yml#/FeatureRequest"

types/paths/voting/updateVote.yml

@@ -1,22 +0,0 @@
-post:
-  operationId: updateVote
-  summary: Aktualizuje hlasování uživatele o dané funkcionalitě.
-  requestBody:
-    required: true
-    content:
-      application/json:
-        schema:
-          type: object
-          required:
-            - option
-            - active
-          properties:
-            option:
-              description: Hlasovací možnost, kterou uživatel zvolil.
-              $ref: "../../schemas/_index.yml#/FeatureRequest"
-            active:
-              type: boolean
-              description: True, pokud uživatel hlasoval pro, jinak false.
-  responses:
-    "200":
-      description: Hlasování bylo úspěšně aktualizováno.

types/schemas/_index.yml

@@ -1,521 +0,0 @@
-# --- OBECNÉ ---
-JWTToken:
-  type: object
-  description: Klientský JWT token pro autentizaci a autorizaci
-  required:
-    - login
-    - trusted
-    - iat
-  properties:
-    login:
-      type: string
-      description: Přihlašovací jméno uživatele
-    trusted:
-      type: boolean
-      description: Příznak, zda se jedná o uživatele ověřeného doménovým přihlášením
-    iat:
-      type: number
-      description: Časové razítko vydání tokenu
-ClientData:
-  description: Klientská data pro jeden konkrétní den. Obsahuje menu všech načtených podniků a volby jednotlivých uživatelů.
-  type: object
-  additionalProperties: false
-  required:
-    - todayDayIndex
-    - date
-    - isWeekend
-    - choices
-  properties:
-    todayDayIndex:
-      description: Index dnešního dne v týdnu
-      $ref: "#/DayIndex"
-    date:
-      description: Human-readable datum dne
-      type: string
-    isWeekend:
-      description: Příznak, zda je tento den víkend
-      type: boolean
-    dayIndex:
-      description: Index dne v týdnu, ke kterému se vztahují tato data
-      $ref: "#/DayIndex"
-    choices:
-      $ref: "#/LunchChoices"
-    menus:
-      $ref: "#/RestaurantDayMenuMap"
-    pizzaDay:
-      $ref: "#/PizzaDay"
-    pizzaList:
-      description: Seznam dostupných pizz pro předaný den
-      type: array
-      items:
-        $ref: "#/Pizza"
-    pizzaListLastUpdate:
-      description: Datum a čas poslední aktualizace pizz
-      type: string
-      format: date-time
-
-# --- OBĚDY ---
-UserLunchChoice:
-  description: Konkrétní volba stravování jednoho uživatele v konkrétní den. Může se jednat jak o stravovací podnik, tak možnosti "budu objednávat", "neobědvám" apod.
-  additionalProperties: false
-  properties:
-    # TODO toto je tu z dost špatného důvodu, viz použití - mělo by se místo toho z loginu zjišťovat zda je uživatel trusted
-    trusted:
-      description: Příznak, zda byla tato volba provedena uživatelem ověřeným doménovým přihlášením
-      type: boolean
-    selectedFoods:
-      description: Pole indexů vybraných jídel v rámci dané restaurace. Index představuje pořadí jídla v menu dané restaurace.
-      type: array
-      items:
-        type: integer
-    departureTime:
-      description: Čas preferovaného odchodu do dané restaurace v human-readable formátu (např. 12:00)
-      type: string
-    note:
-      description: Volitelná, veřejně viditelná uživatelská poznámka k vybrané volbě
-      type: string
-LocationLunchChoicesMap:
-  description: Objekt, kde klíčem je možnost stravování ((#LunchChoice)) a hodnotou množina uživatelů s touto volbou ((#LunchChoices)).
-  type: object
-  additionalProperties:
-    $ref: "#/UserLunchChoice"
-LunchChoices:
-  description: Objekt, představující volby všech uživatelů pro konkrétní den. Klíčem je (#LunchChoice).
-  type: object
-  properties:
-    SLADOVNICKA:
-      $ref: "#/LocationLunchChoicesMap"
-    TECHTOWER:
-      $ref: "#/LocationLunchChoicesMap"
-    ZASTAVKAUMICHALA:
-      $ref: "#/LocationLunchChoicesMap"
-    SENKSERIKOVA:
-      $ref: "#/LocationLunchChoicesMap"
-    SPSE:
-      $ref: "#/LocationLunchChoicesMap"
-    PIZZA:
-      $ref: "#/LocationLunchChoicesMap"
-    OBJEDNAVAM:
-      $ref: "#/LocationLunchChoicesMap"
-    NEOBEDVAM:
-      $ref: "#/LocationLunchChoicesMap"
-    ROZHODUJI:
-      $ref: "#/LocationLunchChoicesMap"
-Restaurant:
-  description: Stravovací zařízení (restaurace, jídelna, hospoda, ...)
-  type: string
-  enum:
-    - SLADOVNICKA
-    - TECHTOWER
-    - ZASTAVKAUMICHALA
-    - SENKSERIKOVA
-LunchChoice:
-  description: Konkrétní možnost stravování (konkrétní restaurace, pizza day, objednání, neobědvání, rozhodování se, ...)
-  type: string
-  enum:
-    - SLADOVNICKA
-    - TECHTOWER
-    - ZASTAVKAUMICHALA
-    - SENKSERIKOVA
-    - SPSE
-    - PIZZA
-    - OBJEDNAVAM
-    - NEOBEDVAM
-    - ROZHODUJI
-DayIndex:
-  description: Index dne v týdnu (0 = pondělí, 4 = pátek)
-  type: integer
-  minimum: 0
-  maximum: 4
-FoodIndex:
-  description: Pořadový index jídla v menu konkrétní restaurace
-  type: integer
-  minimum: 0
-Food:
-  description: Konkrétní jídlo z menu restaurace
-  type: object
-  additionalProperties: false
-  required:
-    - name
-    - isSoup
-  properties:
-    amount:
-      description: Množství standardní porce, např. 0,33l nebo 150g
-      type: string
-    name:
-      description: Název/popis jídla
-      type: string
-    price:
-      description: Cena ve formátu '135 Kč'
-      type: string
-    isSoup:
-      description: Příznak, zda se jedná o polévku
-      type: boolean
-RestaurantDayMenu:
-  description: Menu restaurace na konkrétní den
-  type: object
-  additionalProperties: false
-  properties:
-    lastUpdate:
-      description: UNIX timestamp poslední aktualizace menu
-      type: integer
-    closed:
-      description: Příznak, zda je daný podnik v daný den zavřený
-      type: boolean
-    food:
-      description: Seznam jídel pro daný den
-      type: array
-      items:
-        $ref: "#/Food"
-RestaurantDayMenuMap:
-  description: Objekt, kde klíčem je podnik ((#Restaurant)) a hodnotou denní menu daného podniku ((#RestaurantDayMenu))
-  type: object
-  additionalProperties: false
-  properties:
-    SLADOVNICKA:
-      $ref: "#/RestaurantDayMenu"
-    TECHTOWER:
-      $ref: "#/RestaurantDayMenu"
-    ZASTAVKAUMICHALA:
-      $ref: "#/RestaurantDayMenu"
-    SENKSERIKOVA:
-      $ref: "#/RestaurantDayMenu"
-WeekMenu:
-  description: Pole týdenních menu jednotlivých podniků. Indexem je den v týdnu (0 = pondělí, 4 = pátek), hodnotou denní menu daného podniku.
-  type: array
-  minItems: 5
-  maxItems: 5
-  items:
-    $ref: "#/RestaurantDayMenuMap"
-DepartureTime:
-  description: Preferovaný čas odchodu na oběd
-  type: string
-  enum:
-    - "10:00"
-    - "10:15"
-    - "10:30"
-    - "10:45"
-    - "11:00"
-    - "11:15"
-    - "11:30"
-    - "11:45"
-    - "12:00"
-    - "12:15"
-    - "12:30"
-    - "12:45"
-    - "13:00"
-  x-enum-varnames:
-    - T10_00
-    - T10_15
-    - T10_30
-    - T10_45
-    - T11_00
-    - T11_15
-    - T11_30
-    - T11_45
-    - T12_00
-    - T12_15
-    - T12_30
-    - T12_45
-    - T13_00
-
-# --- HLASOVÁNÍ ---
-FeatureRequest:
-  type: string
-  enum:
-    - Ruční generování QR kódů mimo Pizza day (např. při objednávání)
-    - Možnost označovat si jídla jako oblíbená (taková jídla by se uživateli následně zvýrazňovala)
-    - Možnost úhrady v podniku za všechny jednou osobou a následné generování QR ostatním
-    - Zrušení \"užívejte víkend\", místo toho umožnit zpětně náhled na uplynulý týden
-    - Umožnění zobrazení vygenerovaného QR kódu i po následující dny (dokud ho uživatel ručně \"nezavře\", např. tlačítkem \"Zaplatil jsem\")
-    - Zobrazování náhledů (fotografií) pizz v rámci Pizza day
-    - Statistiky (nejoblíbenější podnik, nejpopulárnější jídla, nejobjednávanější pizzy, nejčastější uživatelé, ...)
-    - Vylepšení responzivního designu
-    - Zvýšení zabezpečení aplikace
-    - Zvýšená ochrana proti chybám uživatele (potvrzovací dialogy, překliky, ...)
-    - Celkové vylepšení UI/UX
-    - Zlepšení dokumentace/postupů pro ostatní vývojáře
-  x-enum-varnames:
-    - CUSTOM_QR
-    - FAVORITES
-    - SINGLE_PAYMENT
-    - NO_WEEKENDS
-    - QR_FOREVER
-    - PIZZA_PICTURES
-    - STATISTICS
-    - RESPONSIVITY
-    - SECURITY
-    - SAFETY
-    - UI
-    - DEVELOPMENT
-
-# --- EASTER EGGS ---
-EasterEgg:
-  description: Data pro zobrazení easter eggů ssss
-  type: object
-  additionalProperties: false
-  required:
-    - path
-    - url
-    - startOffset
-    - endOffset
-    - duration
-  properties:
-    path:
-      type: string
-    url:
-      type: string
-    startOffset:
-      type: number
-    endOffset:
-      type: number
-    duration:
-      type: number
-    width:
-      type: string
-    zIndex:
-      type: integer
-    position:
-      type: string
-      enum:
-        - absolute
-    animationName:
-      type: string
-    animationDuration:
-      type: string
-    animationTimingFunction:
-      type: string
-
-# --- STATISTIKY ---
-LocationStats:
-  description: Objekt, kde klíčem je zvolená možnost a hodnotou počet uživatelů, kteří tuto možnosti zvolili
-  type: object
-  additionalProperties: false
-  properties:
-    # Bohužel OpenAPI neumí nadefinovat objekt, kde klíčem může být pouze hodnota existujícího enumu :(
-    SLADOVNICKA:
-      type: number
-    TECHTOWER:
-      type: number
-    ZASTAVKAUMICHALA:
-      type: number
-    SENKSERIKOVA:
-      type: number
-    SPSE:
-      type: number
-    PIZZA:
-      type: number
-    OBJEDNAVAM:
-      type: number
-    NEOBEDVAM:
-      type: number
-    ROZHODUJI:
-      type: number
-DailyStats:
-  description: Statistika vybraných možností pro jeden konkrétní den
-  type: object
-  additionalProperties: false
-  required:
-    - date
-    - locations
-  properties:
-    date:
-      description: Datum v human-readable formátu
-      type: string
-    locations:
-      $ref: "#/LocationStats"
-WeeklyStats:
-  description: Pole statistik vybraných možností pro jeden konkrétní týden. Index představuje den v týdnu (0 = pondělí, 4 = pátek)
-  type: array
-  minItems: 5
-  maxItems: 5
-  items:
-    $ref: "#/DailyStats"
-
-# --- PIZZA DAY ---
-PizzaDayState:
-  description: Stav pizza day
-  type: string
-  enum:
-    - Pizza day nebyl založen
-    - Pizza day je založen
-    - Objednávky uzamčeny
-    - Pizzy objednány
-    - Pizzy doručeny
-  x-enum-varnames:
-    - NOT_CREATED
-    - CREATED
-    - LOCKED
-    - ORDERED
-    - DELIVERED
-# TODO toto je jen rozšířená varianta PizzaVariant - sloučit do jednoho objektu
-PizzaSize:
-  description: Údaje o konkrétní variantě pizzy
-  type: object
-  additionalProperties: false
-  required:
-    - varId
-    - size
-    - pizzaPrice
-    - boxPrice
-    - price
-  properties:
-    varId:
-      description: Unikátní identifikátor varianty pizzy
-      type: integer
-    size:
-      description: Velikost pizzy, např. "30cm"
-      type: string
-    pizzaPrice:
-      description: Cena samotné pizzy v Kč
-      type: number
-    boxPrice:
-      description: Cena krabice pizzy v Kč
-      type: number
-    price:
-      description: Celková cena (pizza + krabice)
-      type: number
-Pizza:
-  description: Údaje o konkrétní pizze.
-  type: object
-  additionalProperties: false
-  required:
-    - name
-    - ingredients
-    - sizes
-  properties:
-    name:
-      description: Název pizzy
-      type: string
-    ingredients:
-      description: Seznam obsažených ingrediencí
-      type: array
-      items:
-        type: string
-    sizes:
-      description: Dostupné velikosti pizzy
-      type: array
-      items:
-        $ref: "#/PizzaSize"
-PizzaVariant:
-  description: Konkrétní varianta (velikost) jedné pizzy.
-  type: object
-  additionalProperties: false
-  required:
-    - varId
-    - name
-    - size
-    - price
-  properties:
-    varId:
-      description: Unikátní identifikátor varianty pizzy
-      type: integer
-    name:
-      description: Název pizzy
-      type: string
-    size:
-      description: Velikost pizzy (např. "30cm")
-      type: string
-    price:
-      description: Cena pizzy v Kč, včetně krabice
-      type: number
-PizzaOrder:
-  description: Údaje o objednávce pizzy jednoho uživatele.
-  type: object
-  additionalProperties: false
-  required:
-    - customer
-    - totalPrice
-    - hasQr
-  properties:
-    customer:
-      description: Jméno objednávajícího uživatele
-      type: string
-    pizzaList:
-      description: Seznam variant pizz k objednání (typicky bývá jen jedna)
-      type: array
-      items:
-        $ref: "#/PizzaVariant"
-    fee:
-      description: Příplatek (např. za extra ingredience)
-      type: object
-      properties:
-        text:
-          description: Popis příplatku (např. "kuřecí maso navíc")
-          type: string
-        price:
-          description: Cena příplatku v Kč
-          type: number
-    totalPrice:
-      description: Celková cena všech objednaných pizz daného uživatele, včetně krabic a příplatků
-      type: number
-    hasQr:
-      description: |
-        Příznak, pokud je k této objednávce vygenerován QR kód pro platbu. To je typicky pravda, pokud:
-        - objednávající má v nastavení vyplněno číslo účtu
-        - pizza day je ve stavu DELIVERED (Pizzy byly doručeny)
-    note:
-      description: Volitelná uživatelská poznámka pro objednávajícího (např. "bez oliv")
-      type: string
-PizzaDay:
-  description: Data o Pizza day pro konkrétní den
-  type: object
-  additionalProperties: false
-  properties:
-    state:
-      $ref: "#/PizzaDayState"
-    creator:
-      description: "Jméno zakladatele pizza day"
-      type: string
-    orders:
-      description: Pole objednávek jednotlivých uživatelů
-      type: array
-      items:
-        $ref: "#/PizzaOrder"
-
-# --- NOTIFIKACE ---
-UdalostEnum:
-  type: string
-  enum:
-    - Zahájen pizza day
-    - Objednána pizza
-    - Jdeme na oběd
-  x-enum-varnames:
-    - ZAHAJENA_PIZZA
-    - OBJEDNANA_PIZZA
-    - JDEME_NA_OBED
-NotifikaceInput:
-  type: object
-  required:
-    - udalost
-    - user
-  properties:
-    udalost:
-      $ref: "#/UdalostEnum"
-    user:
-      type: string
-NotifikaceData:
-  type: object
-  required:
-    - input
-  properties:
-    input:
-      $ref: "#/NotifikaceInput"
-    gotify:
-      type: boolean
-    teams:
-      type: boolean
-    ntfy:
-      type: boolean
-GotifyServer:
-  type: object
-  required:
-    - server
-    - api_keys
-  properties:
-    server:
-      type: string
-    api_keys:
-      type: array
-      items:
-        type: string

types/tsconfig.json

@@ -1,6 +1,8 @@
 {
     "compilerOptions": {
         "declaration": true,
+        // "emitDeclarationOnly": true,
+        // "outDir": "./dist",
         "noEmit": true
     },
     "include": [

types/yarn.lock

@@ -1,309 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@hey-api/client-fetch@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@hey-api/client-fetch/-/client-fetch-0.8.2.tgz#675aadfbc9478bb8eef5679f11a9334258dff4c8"
-  integrity sha512-61T4UGfAzY5345vMxWDX8qnSTNRJcOpWuZyvNu3vNebCTLPwMQAM85mhEuBoACdWeRtLhNoUjU0UR5liRyD1bA==
-
-"@hey-api/json-schema-ref-parser@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@hey-api/json-schema-ref-parser/-/json-schema-ref-parser-1.0.2.tgz#c3824c5d9d531eeb5c2b2557857a8ad20b5c75a7"
-  integrity sha512-F6LSkttZcT/XiX3ydeDqTY3uRN3BLJMwyMTk4kg/ichZlKUp3+3Odv0WokSmXGSoZGTW/N66FROMYAm5NPdJlA==
-  dependencies:
-    "@jsdevtools/ono" "^7.1.3"
-    "@types/json-schema" "^7.0.15"
-    js-yaml "^4.1.0"
-
-"@hey-api/openapi-ts@^0.64.7":
-  version "0.64.7"
-  resolved "https://registry.yarnpkg.com/@hey-api/openapi-ts/-/openapi-ts-0.64.7.tgz#f239d268b4a35b91f5ff25479d15578feb01f365"
-  integrity sha512-xpaBzdGAKz7cPuGah1GZWl3zTZquOXRnwmpVCQKEUpvDtSYWBLjSxtAYIqDBjwJkuNHcakZBIWLcappx7slc2g==
-  dependencies:
-    "@hey-api/json-schema-ref-parser" "1.0.2"
-    c12 "2.0.1"
-    commander "13.0.0"
-    handlebars "4.7.8"
-
-"@jsdevtools/ono@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
-  integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
-
-"@types/json-schema@^7.0.15":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
-acorn@^8.14.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-c12@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/c12/-/c12-2.0.1.tgz#5702d280b31a08abba39833494c9b1202f0f5aec"
-  integrity sha512-Z4JgsKXHG37C6PYUtIxCfLJZvo6FyhHJoClwwb9ftUkLpPSkuYqn6Tr+vnaN8hymm0kIbcg6Ey3kv/Q71k5w/A==
-  dependencies:
-    chokidar "^4.0.1"
-    confbox "^0.1.7"
-    defu "^6.1.4"
-    dotenv "^16.4.5"
-    giget "^1.2.3"
-    jiti "^2.3.0"
-    mlly "^1.7.1"
-    ohash "^1.1.4"
-    pathe "^1.1.2"
-    perfect-debounce "^1.0.0"
-    pkg-types "^1.2.0"
-    rc9 "^2.1.2"
-
-chokidar@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
-  integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
-  dependencies:
-    readdirp "^4.0.1"
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-citty@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.6.tgz#0f7904da1ed4625e1a9ea7e0fa780981aab7c5e4"
-  integrity sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==
-  dependencies:
-    consola "^3.2.3"
-
-commander@13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-13.0.0.tgz#1b161f60ee3ceb8074583a0f95359a4f8701845c"
-  integrity sha512-oPYleIY8wmTVzkvQq10AEok6YcTC4sRUBl8F9gVuwchGVUCTbl/vhLTaQqutuuySYOsu8YTgV+OxKc/8Yvx+mQ==
-
-confbox@^0.1.7, confbox@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
-  integrity sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==
-
-consola@^3.2.3, consola@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-3.4.0.tgz#4cfc9348fd85ed16a17940b3032765e31061ab88"
-  integrity sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==
-
-defu@^6.1.4:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
-  integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
-
-destr@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449"
-  integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==
-
-dotenv@^16.4.5:
-  version "16.4.7"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
-  integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-giget@^1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/giget/-/giget-1.2.5.tgz#0bd4909356a0da75cc1f2b33538f93adec0d202f"
-  integrity sha512-r1ekGw/Bgpi3HLV3h1MRBIlSAdHoIMklpaQ3OQLFcRw9PwAj2rqigvIbg+dBUI51OxVI2jsEtDywDBjSiuf7Ug==
-  dependencies:
-    citty "^0.1.6"
-    consola "^3.4.0"
-    defu "^6.1.4"
-    node-fetch-native "^1.6.6"
-    nypm "^0.5.4"
-    pathe "^2.0.3"
-    tar "^6.2.1"
-
-handlebars@4.7.8:
-  version "4.7.8"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
-  integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
-  dependencies:
-    minimist "^1.2.5"
-    neo-async "^2.6.2"
-    source-map "^0.6.1"
-    wordwrap "^1.0.0"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-jiti@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
-  integrity sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==
-
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-minimist@^1.2.5:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minipass@^3.0.0:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mlly@^1.7.1, mlly@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.4.tgz#3d7295ea2358ec7a271eaa5d000a0f84febe100f"
-  integrity sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==
-  dependencies:
-    acorn "^8.14.0"
-    pathe "^2.0.1"
-    pkg-types "^1.3.0"
-    ufo "^1.5.4"
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-node-fetch-native@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.6.tgz#ae1d0e537af35c2c0b0de81cbff37eedd410aa37"
-  integrity sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==
-
-nypm@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/nypm/-/nypm-0.5.4.tgz#a5ab0d8d37f96342328479f88ef58699f29b3051"
-  integrity sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==
-  dependencies:
-    citty "^0.1.6"
-    consola "^3.4.0"
-    pathe "^2.0.3"
-    pkg-types "^1.3.1"
-    tinyexec "^0.3.2"
-    ufo "^1.5.4"
-
-ohash@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.4.tgz#ae8d83014ab81157d2c285abf7792e2995fadd72"
-  integrity sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==
-
-pathe@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
-  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
-
-pathe@^2.0.1, pathe@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
-  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
-
-perfect-debounce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz#9c2e8bc30b169cc984a58b7d5b28049839591d2a"
-  integrity sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==
-
-pkg-types@^1.2.0, pkg-types@^1.3.0, pkg-types@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.3.1.tgz#bd7cc70881192777eef5326c19deb46e890917df"
-  integrity sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==
-  dependencies:
-    confbox "^0.1.8"
-    mlly "^1.7.4"
-    pathe "^2.0.1"
-
-rc9@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.2.tgz#6282ff638a50caa0a91a31d76af4a0b9cbd1080d"
-  integrity sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==
-  dependencies:
-    defu "^6.1.4"
-    destr "^2.0.3"
-
-readdirp@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d"
-  integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
-
-source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-tar@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
-  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-tinyexec@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
-  integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
-
-typescript@^5.0.2:
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
-  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
-
-ufo@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754"
-  integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==
-
-uglify-js@^3.1.4:
-  version "3.19.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
-  integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==
-
-wordwrap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==