Přesun json databaze (souboru db.json) do složky data, související úpravy v Dockerfile

.gitignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-node_modules
+/node_modules
 /.pnp
 .pnp.js
 

Dockerfile

@@ -54,7 +54,6 @@ 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
@@ -63,8 +62,11 @@ COPY --from=builder /build/client/dist ./public
 COPY /server/.env.production ./server/src
 
 # Zkopírování konfigurace easter eggů
-# TODO tohle spadne když nebude existovat!
-COPY /server/.easter-eggs.json ./server/
+RUN if [ -f /server/.easter-eggs.json ]; then cp /server/.easter-eggs.json ./server/; fi
+
+# Export /data/db.json do složky /data
+VOLUME ["/data"]
+COPY /data/db.json /data/db.json
 
 EXPOSE 3000
 

client/.gitignore

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

client/package.json

@@ -31,9 +31,8 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
-    "copy-types": "cp -r ../types ./src",
-    "start": "yarn copy-types && vite",
-    "build": "yarn copy-types && vite build"
+    "start": "yarn vite",
+    "build": "yarn vite build"
   },
   "eslintConfig": {
     "extends": [

client/src/App.tsx

@@ -8,19 +8,18 @@ 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 } from 'react-select-search';
+import SelectSearch, {SelectedOptionValue, SelectSearchOption} 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 } from './types';
+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 } from './Utils';
+import { getHumanDateTime, isInTheFuture } from './Utils';
 import NoteModal from './components/modals/NoteModal';
 import { useEasterEgg } from './context/eggs';
 import { getImage } from './api/EasterEggApi';
@@ -141,11 +140,8 @@ function App() {
 
   useEffect(() => {
     if (choiceRef?.current?.value && choiceRef.current.value !== "") {
-      // TODO: wtf, cos pil, když jsi tohle psal?
-      const key = choiceRef?.current?.value;
-      const locationIndex = Object.keys(Locations).indexOf(key as unknown as Locations);
-      const locationsKey = Object.keys(Locations)[locationIndex];
-      const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+      const locationKey = choiceRef.current.value as LocationKey;
+      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
       if (restaurantKey > -1 && food) {
         const restaurant = Object.values(Restaurants)[restaurantKey];
         setFoodChoiceList(food[restaurant]?.food);
@@ -194,7 +190,7 @@ function App() {
   }, [auth?.login, easterEgg?.duration, easterEgg?.url, eggImage]);
 
   const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
-    const locationKey = event.target.value as Locations;
+    const locationKey = event.target.value as LocationKey;
     if (auth?.login) {
       await errorHandler(() => addChoice(locationKey, undefined, dayIndex));
       if (foodChoiceRef.current?.value) {
@@ -211,14 +207,14 @@ function App() {
 
   const doAddFoodChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
     if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) {
-      const locationKey = choiceRef.current.value as Locations;
+      const locationKey = choiceRef.current.value as LocationKey;
       if (auth?.login) {
         await errorHandler(() => addChoice(locationKey, Number(event.target.value), dayIndex));
       }
     }
   }
 
-  const doRemoveChoices = async (locationKey: Locations) => {
+  const doRemoveChoices = async (locationKey: LocationKey) => {
     if (auth?.login) {
       await errorHandler(() => removeChoices(locationKey, dayIndex));
       // Vyresetujeme výběr, aby bylo jasné pro který případně vybíráme jídlo
@@ -231,7 +227,7 @@ function App() {
     }
   }
 
-  const doRemoveFoodChoice = async (locationKey: Locations, foodIndex: number) => {
+  const doRemoveFoodChoice = async (locationKey: LocationKey, foodIndex: number) => {
     if (auth?.login) {
       await errorHandler(() => removeChoice(locationKey, foodIndex, dayIndex));
       if (choiceRef?.current?.value) {
@@ -354,7 +350,7 @@ function App() {
     } else {
       content = <h3>Chyba načtení dat</h3>
     }
-    return <Col md={12} lg={6} className='mt-3'>
+    return <Col md={12} lg={3} className='mt-3'>
       <h3>{name}</h3>
       {menu?.lastUpdate && <small>Poslední aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
       {content}
@@ -405,8 +401,8 @@ function App() {
             <img src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} />
             Poslední změny:
             <ul>
-              <li>Zimní atmosféra</li>
-              <li>Odstranění podniku U Motlíků</li>
+              <li>Přidání restaurace Zastávka u Michala</li>
+              <li>Přidání restaurace Pivovarský šenk Šeříková</li>
             </ul>
           </Alert>
           {dayIndex != null &&
@@ -420,6 +416,8 @@ function App() {
             {food[Restaurants.SLADOVNICKA] && renderFoodTable('Sladovnická', food[Restaurants.SLADOVNICKA])}
             {/* {food[Restaurants.UMOTLIKU] && renderFoodTable('U Motlíků', food[Restaurants.UMOTLIKU])} */}
             {food[Restaurants.TECHTOWER] && renderFoodTable('TechTower', food[Restaurants.TECHTOWER])}
+            {food[Restaurants.ZASTAVKAUMICHALA] && renderFoodTable('Zastávka u Michala', food[Restaurants.ZASTAVKAUMICHALA])}
+            {food[Restaurants.SENKSERIKOVA] && renderFoodTable('Pivovarský šenk Šeříková', food[Restaurants.SENKSERIKOVA])}
           </Row>
           <div className='content-wrapper'>
             <div className='content'>
@@ -429,11 +427,8 @@ function App() {
                   <option></option>
                   {Object.entries(Locations)
                     .filter(entry => {
-                      // TODO: wtf, cos pil, když jsi tohle psal? v2
-                      const key = entry[0];
-                      const locationIndex = Object.keys(Locations).indexOf(key as unknown as Locations);
-                      const locationsKey = Object.keys(Locations)[locationIndex];
-                      const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+                      const locationKey = entry[0] as LocationKey;
+                      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
                       const v = Object.values(Restaurants)[restaurantKey];
                       return v == null || !food[v]?.closed;
                     })
@@ -451,7 +446,9 @@ function App() {
                   <p style={{ marginTop: "10px" }}>V kolik hodin preferuješ odchod?</p>
                   <Form.Select ref={departureChoiceRef} onChange={handleChangeDepartureTime}>
                     <option></option>
-                    {Object.values(DepartureTime).map(time => <option key={time} value={time}>{time}</option>)}
+                    {Object.values(DepartureTime)
+                        .filter(time => isInTheFuture(time))
+                        .map(time => <option key={time} value={time}>{time}</option>)}
                   </Form.Select>
                 </>}
               </>}
@@ -459,18 +456,13 @@ function App() {
                 <Table bordered className='mt-5'>
                   <tbody>
                     {Object.keys(data.choices).map(key => {
-                      const locationKey = key as keyof typeof Locations;
-                      console.log("Mapuji location key", locationKey);
+                      const locationKey = key as LocationKey;
                       const locationName = Locations[locationKey];
-                      console.log("Location name", locationName);
-                      console.log("Obsah data.choices", data.choices);
                       const loginObject = data.choices[locationKey];
-                      // TODO toto je hovnokód, mělo by to být napsané tak, aby si na to TypeScript nemohl stěžovat
                       if (!loginObject) {
                         return;
                       }
                       const locationLoginList = Object.entries(loginObject);
-                      console.log("Entries", locationLoginList);
                       return (
                         <tr key={key}>
                           <td>{locationName}</td>
@@ -494,20 +486,20 @@ function App() {
                                         setNoteModalOpen(true);
                                       }} title='Upravit poznámku' className='action-icon' icon={faNoteSticky} />}
                                       {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
-                                        doRemoveChoices(key as Locations); // TODO dořešit
+                                        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 locationsKey = Object.keys(Locations)[Number(key)]
-                                          const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+                                          // TODO narovnat, tohle je zbytečně složité
+                                          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(key as Locations, foodIndex); // TODO dořešit
+                                              doRemoveFoodChoice(key as LocationKey, foodIndex);
                                             }} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />}
                                           </li>
                                         })}

client/src/Utils.tsx

@@ -1,3 +1,5 @@
+import {DepartureTime} from "../../types";
+
 const TOKEN_KEY = "token";
 
 /**
@@ -43,3 +45,20 @@ export function getHumanDateTime(datetime: Date) {
         return `${day}.${month}.${year} ${hours}:${minutes}`;
     }
 }
+
+/**
+ * Vrátí true, pokud je předaný čas větší než aktuální čas.
+ */
+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;
+}
+

client/src/api/EasterEggApi.ts

@@ -1,4 +1,4 @@
-import { EasterEgg } from "../types";
+import { EasterEgg } from "../../../types";
 import { api } from "./Api";
 
 const EASTER_EGGS_API_PREFIX = '/api/easterEggs';

client/src/api/FoodApi.ts

@@ -1,17 +1,17 @@
-import { AddChoiceRequest, ChangeDepartureTimeRequest, Locations, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../types";
+import { AddChoiceRequest, ChangeDepartureTimeRequest, LocationKey, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../../../types";
 import { api } from "./Api";
 
 const FOOD_API_PREFIX = '/api/food';
 
-export const addChoice = async (locationKey: keyof typeof Locations, foodIndex?: number, dayIndex?: number) => {
+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: keyof typeof Locations, dayIndex?: number) => {
+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: keyof typeof Locations, foodIndex: number, dayIndex?: number) => {
+export const removeChoice = async (locationKey: LocationKey, foodIndex: number, dayIndex?: number) => {
     return await api.post<RemoveChoiceRequest, void>(`${FOOD_API_PREFIX}/removeChoice`, { locationKey, foodIndex, dayIndex });
 }
 

client/src/api/PizzaDayApi.ts

@@ -1,4 +1,4 @@
-import { AddPizzaRequest, FinishDeliveryRequest, PizzaOrder, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../types";
+import { AddPizzaRequest, FinishDeliveryRequest, PizzaOrder, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../../../types";
 import { api } from "./Api";
 
 const PIZZADAY_API_PREFIX = '/api/pizzaDay';

client/src/api/VotingApi.ts

@@ -1,4 +1,4 @@
-import { FeatureRequest, UpdateFeatureVoteRequest } from "../types";
+import { FeatureRequest, UpdateFeatureVoteRequest } from "../../../types";
 import { api } from "./Api";
 
 const VOTING_API_PREFIX = '/api/voting';

client/src/components/Header.tsx

@@ -4,7 +4,7 @@ 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 { FeatureRequest } from "../../../types";
 import { errorHandler } from "../api/Api";
 import { getFeatureVotes, updateFeatureVote } from "../api/VotingApi";
 import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";

client/src/components/PizzaOrderList.tsx

@@ -1,5 +1,5 @@
 import { Table } from "react-bootstrap";
-import { Order, PizzaDayState, PizzaOrder } from "../types";
+import { Order, PizzaDayState, PizzaOrder } from "../../../types";
 import PizzaOrderRow from "./PizzaOrderRow";
 import { updatePizzaFee } from "../api/PizzaDayApi";
 

client/src/components/PizzaOrderRow.tsx

@@ -2,7 +2,7 @@ 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 { Order, PizzaDayState, PizzaOrder } from "../../../types";
 import PizzaAdditionalFeeModal from "./modals/PizzaAdditionalFeeModal";
 
 type Props = {

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,

client/src/context/eggs.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { getEasterEgg } from "../api/EasterEggApi";
 import { AuthContextProps } from "./auth";
-import { EasterEgg } from "../types";
+import { EasterEgg } from "../../../types";
 
 export const useEasterEgg = (auth?: AuthContextProps | null): [EasterEgg | undefined, boolean] => {
   const [result, setResult] = useState<EasterEgg | undefined>();

server/.gitignore

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

server/src/mock.ts

@@ -427,7 +427,181 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ]
-    ]
+    ],
+    'zastavkaUmichala': [
+        [
+            {
+                amount: "-",
+                name: "Fazolačka s klobásou & zakysačkou",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Zeleninová musaka – lilek, cuketa, tomatové sugo & sýrový bešamel",
+                price: "135\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Slovácké strapačky s uzenou slaninou, zelím, mletým pepřem & sekanou petrželkou",
+                price: "140\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Hovězí guláš s vejcem, zeleninovou garniturkou & žemlovými knedlíky",
+                price: "145\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Kuřecí roláda s kaštanovou nádivkou, demi-glace & smetanovou bramborovou kaší",
+                price: "150\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Hovězí vývar se zeleninou a játrovou rýží",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Pečené vepřové koleno, křen, hořčice, chléb",
+                price: "320\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Zeleninová polévka s kuskusem",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Poutine (trhané vepřové, hranolky, sýr, čalamáda, pikantní omáčka)",
+                price: "190\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Hrachová polévka s uzeninou",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Vepřový řízek z kotlety, domácí bramborový salát",
+                price: "170\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Cibulačka se sýrem",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Burger z Chuck rollu, hranolky, tatarská omáčka",
+                price: "200\xA0Kč",
+                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
@@ -1180,8 +1354,11 @@ const MOCK_PIZZA_LIST = [
     }
 ]
 
-export const getTodayMock = () => {
-    return '2023-05-31'; // středa
+/**
+ * Funkce vrací mock datu ve formátu YYYY-MM-DD
+ */
+export const getTodayMock = (): Date => {
+    return new Date('2025-01-10'); // pátek
 }
 
 export const getMenuSladovnickaMock = () => {
@@ -1196,6 +1373,14 @@ export const getMenuTechTowerMock = () => {
     return MOCK_DATA['techTower'];
 }
 
+export const getMenuZastavkaUmichalaMock = () => {
+    return MOCK_DATA['zastavkaUmichala'];
+}
+
+export const getMenuSenkSerikovaMock = () => {
+    return MOCK_DATA['senkSerikova'];
+}
+
 export const getPizzaListMock = () => {
     return MOCK_PIZZA_LIST;
 }

server/src/restaurants.ts

@@ -1,7 +1,8 @@
 import axios from "axios";
 import { load } from 'cheerio';
 import { Food } from "../../types";
-import { getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock } from "./mock";
+import {getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock, getMenuSenkSerikovaMock} from "./mock";
+import {formatDate} from "./utils";
 
 // Fráze v názvech jídel, které naznačují že se jedná o polévku
 const SOUP_NAMES = [
@@ -13,9 +14,9 @@ const SOUP_NAMES = [
     'fazolová',
     'cuketový krém',
     'boršč',
-    'slepičí s',
-    'zeleninová s',
-    'hovězí s',
+    'slepičí s ',
+    'zeleninová s ',
+    'hovězí s ',
     'kachní kaldoun',
     'dršťková'
 ];
@@ -25,6 +26,8 @@ const DAYS_IN_WEEK = ['pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', '
 const SLADOVNICKA_URL = 'https://sladovnicka.unasplzenchutna.cz/cz/denni-nabidka';
 const U_MOTLIKU_URL = 'https://www.umotliku.cz/menu';
 const TECHTOWER_URL = 'https://www.equifarm.cz/restaurace-techtower';
+const ZASTAVKAUMICHALA_URL = 'https://www.zastavkaumichala.cz';
+const SENKSERIKOVA_URL = 'https://www.menicka.cz/6561-pivovarsky-senk-serikova.html';
 
 /**
  * Vrátí true, pokud předaný text obsahuje některé ze slov, které naznačuje, že se jedná o polévku.
@@ -327,3 +330,105 @@ export const getMenuTechTower = async (firstDayOfWeek: Date, mock: boolean = fal
     }
     return result;
 }
+
+/**
+ * Získá obědovou nabídku ZastavkaUmichala 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 getMenuZastavkaUmichala = async (firstDayOfWeek: Date, mock: boolean = false): Promise<Food[][]> => {
+    if (mock) {
+        return getMenuZastavkaUmichalaMock();
+    }
+
+    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)) {
+            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) ?
+                ZASTAVKAUMICHALA_URL : ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + formatDate(currentDate, 'DD.MM.YYYY');
+            const html = await axios.get(url, {
+                headers,
+            }).then(res => res.data).then(content => content);
+            const $ = load(html);
+
+            const currentDayFood: Food[] = [];
+            $('.foodsList li').each((index, element) => {
+                currentDayFood.push({
+                    amount: '-',
+                    name: sanitizeText($(element).contents().not('span').text()),
+                    price: sanitizeText($(element).find('span').text()),
+                    isSoup: (index === 0),
+                });
+            });
+            result[dayIndex] = currentDayFood;
+        }
+    }
+    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/service.ts

@@ -1,7 +1,7 @@
-import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getHumanTime, getIsWeekend, getLastWorkDayOfWeek, getWeekNumber } from "./utils";
-import { ClientData, Locations, Restaurants, DayMenu, DepartureTime, DayData, WeekMenu } from "../../types";
+import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getIsWeekend, getWeekNumber } from "./utils";
+import { ClientData, Restaurants, DayMenu, DepartureTime, DayData, WeekMenu, LocationKey } from "../../types";
 import getStorage from "./storage";
-import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku } from "./restaurants";
+import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
 import { getTodayMock } from "./mock";
 
 const storage = getStorage();
@@ -10,7 +10,7 @@ const MENU_PREFIX = 'menu';
 /** Vrátí dnešní datum, případně fiktivní datum pro účely vývoje a testování. */
 export function getToday(): Date {
     if (process.env.MOCK_DATA === 'true') {
-        return new Date(getTodayMock());
+        return getTodayMock();
     }
     return new Date();
 }
@@ -61,6 +61,8 @@ export async function getData(date?: Date): Promise<ClientData> {
         [Restaurants.SLADOVNICKA]: await getRestaurantMenu(Restaurants.SLADOVNICKA, date),
         // [Restaurants.UMOTLIKU]: await getRestaurantMenu(Restaurants.UMOTLIKU, date),
         [Restaurants.TECHTOWER]: await getRestaurantMenu(Restaurants.TECHTOWER, date),
+        [Restaurants.ZASTAVKAUMICHALA]: await getRestaurantMenu(Restaurants.ZASTAVKAUMICHALA, date),
+        [Restaurants.SENKSERIKOVA]: await getRestaurantMenu(Restaurants.SENKSERIKOVA, date),
     }
     clientData = await addVolatileData(clientData);
     return clientData;
@@ -168,6 +170,32 @@ export async function getRestaurantMenu(restaurant: Restaurants, date?: Date): P
                 } catch (e: any) {
                     console.error("Selhalo načtení jídel pro podnik TechTower", e);
                 }
+            case Restaurants.ZASTAVKAUMICHALA:
+                try {
+                    const zastavkaUmichalaFood = await getMenuZastavkaUmichala(firstDay, mock);
+                    for (let i = 0; i < zastavkaUmichalaFood.length; 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.') {
+                            menus[i][restaurant]!.closed = true;
+                        }
+                    }
+                    break;
+                } catch (e: any) {
+                    console.error("Selhalo načtení jídel pro podnik Zastávka u Michala", e);
+                }
+            case Restaurants.SENKSERIKOVA:
+                try {
+                    const senkSerikovaFood = await getMenuSenkSerikova(firstDay, mock);
+                    for (let i = 0; i < senkSerikovaFood.length; i++) {
+                        menus[i][restaurant]!.food = senkSerikovaFood[i];
+                        if (senkSerikovaFood[i]?.length === 1 && senkSerikovaFood[i][0].name === 'Pro tento den nebylo zadáno menu.') {
+                            menus[i][restaurant]!.closed = true;
+                        }
+                    }
+                    break;
+                } catch (e: any) {
+                    console.error("Selhalo načtení jídel pro podnik Pivovarský šenk Šeříková", e);
+                }
         }
         await storage.setData(getMenuKey(usedDate), menus);
     }
@@ -196,7 +224,7 @@ 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: keyof typeof Locations, date?: Date) {
+export async function removeChoices(login: string, trusted: boolean, locationKey: LocationKey, date?: Date) {
     const selectedDay = formatDate(date ?? getToday());
     let data: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
@@ -223,7 +251,7 @@ 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: keyof typeof Locations, 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: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
@@ -247,7 +275,7 @@ export async function removeChoice(login: string, trusted: boolean, locationKey:
 async function removeChoiceIfPresent(login: string, date: string) {
     let data: DayData = await storage.getData(date);
     for (const key of Object.keys(data.choices)) {
-        const locationKey = key as keyof typeof Locations;
+        const locationKey = key as LocationKey;
         if (data.choices[locationKey] && login in data.choices[locationKey]) {
             delete data.choices[locationKey][login];
             if (Object.keys(data.choices[locationKey]).length === 0) {
@@ -292,7 +320,7 @@ 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: keyof typeof Locations, 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);
     const selectedDate = formatDate(usedDate);
@@ -302,29 +330,22 @@ export async function addChoice(login: string, trusted: boolean, locationKey: ke
     if (foodIndex == null) {
         data = await removeChoiceIfPresent(login, selectedDate);
     }
-    if (!data.choices) {
-        console.log("Klíč", Locations[locationKey]); // TODO smazat
-        data.choices = {
-            [Locations[locationKey]]: {}
-        }
+    // TODO vytáhnout inicializaci "prázdné struktury" do vlastní funkce
+    if (!(data.choices[locationKey])) {
+        data.choices[locationKey] = {}
+    }
+    if (!(login in data.choices[locationKey])) {
+        if (!data.choices[locationKey]) {
+            data.choices[locationKey] = {}
+        }
+        data.choices[locationKey][login] = {
+            trusted,
+            options: []
+        };
+    }
+    if (foodIndex != null && !data.choices[locationKey][login].options.includes(foodIndex)) {
+        data.choices[locationKey][login].options.push(foodIndex);
     }
-    console.log("Máme choices", data.choices);
-    console.log("Hodnota locationKey", locationKey);
-    // if (!(data.choices[locationKey])) {
-    //     data?.choices[locationKey] = {}
-    // }
-    // if (!(login in data.choices[locationKey])) {
-    //     if (!data.choices[locationKey]) {
-    //         data.choices[locationKey] = {}
-    //     }
-    //     data.choices[locationKey][login] = {
-    //         trusted,
-    //         options: []
-    //     };
-    // }
-    // if (foodIndex != null && !data.choices[locationKey][login].options.includes(foodIndex)) {
-    //     data.choices[locationKey][login].options.push(foodIndex);
-    // }
     await storage.setData(selectedDate, data);
     return data;
 }

server/src/storage/json.ts

@@ -1,8 +1,7 @@
 import JSONdb from 'simple-json-db';
 import { StorageInterface } from "./StorageInterface";
 
-const db = new JSONdb('./data.json');
-
+const db = new JSONdb('../data/db.json');
 /**
  * Implementace úložiště používající JSON soubor.
  */

server/src/utils.ts

@@ -1,11 +1,13 @@
-import { Choices, Locations } from "../../types";
+import { Choices, LocationKey } from "../../types";
 
 /** Vrátí datum v ISO formátu. */
-export function formatDate(date: Date) {
-    let currentDay = String(date.getDate()).padStart(2, '0');
-    let currentMonth = String(date.getMonth() + 1).padStart(2, "0");
-    let currentYear = date.getFullYear();
-    return `${currentYear}-${currentMonth}-${currentDay}`;
+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 === undefined) ? 'YYYY-MM-DD' : format;
+    return f.replace('DD', day).replace('MM', month).replace('YYYY', year);
 }
 
 /** Vrátí human-readable reprezentaci předaného data pro zobrazení. */
@@ -114,18 +116,16 @@ export const getUsersByLocation = (choices: Choices, login: string): string[] =>
     const result: string[] = [];
 
     for (const location of Object.entries(choices)) {
-        const locationKey = location[0];
+        const locationKey = location[0] as LocationKey;
         const locationValue = location[1];
-        console.log("locationKey", locationKey);
-        console.log("locationValue", locationValue);
-        // if (locationValues[login]) {
-        //     for (const username in choices[locationKey]) {
-        //         if (choices[locationKey].hasOwnProperty(username)) {
-        //             result.push(username);
-        //         }
-        //     }
-        //     break;
-        // }
+        if (locationValue[login]) {
+            for (const username in choices[locationKey]) {
+                if (choices[locationKey].hasOwnProperty(username)) {
+                    result.push(username);
+                }
+            }
+            break;
+        }
     }
 
     return result;

types/RequestTypes.ts

@@ -1,7 +1,7 @@
-import { FeatureRequest, Locations, PizzaOrder } from "./Types";
+import { FeatureRequest, LocationKey, PizzaOrder } from "./Types";
 
 export type ILocationKey = {
-    locationKey: keyof typeof Locations,
+    locationKey: LocationKey,
 }
 
 export type IDayIndex = {

types/Types.ts

@@ -3,6 +3,8 @@ export enum Restaurants {
     SLADOVNICKA = 'sladovnicka',
     // UMOTLIKU = 'uMotliku',
     TECHTOWER = 'techTower',
+    ZASTAVKAUMICHALA = 'zastavkaUmichala',
+    SENKSERIKOVA = 'senkSerikova',
 }
 
 export type FoodChoices = {
@@ -12,8 +14,9 @@ export type FoodChoices = {
     note?: string,
 }
 
+// TODO okomentovat / rozdělit
 export type Choices = {
-    [location in keyof typeof Locations]?: {
+    [location in LocationKey]?: {
         [login: string]: FoodChoices
     }
 }
@@ -112,6 +115,8 @@ export enum Locations {
     SLADOVNICKA = 'Sladovnická',
     // UMOTLIKU = 'U Motlíků',
     TECHTOWER = 'TechTower',
+    ZASTAVKAUMICHALA = 'Zastávka u Michala',
+    SENKSERIKOVA = 'Pivovarský šenk Šeříková',
     SPSE = 'SPŠE',
     PIZZA = 'Pizza day',
     OBJEDNAVAM = 'Budu objednávat',
@@ -119,6 +124,9 @@ export enum Locations {
     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",