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!
+RUN if [ -f /server/.easter-eggs.json ]; then cp /server/.easter-eggs.json ./server/; fi
-COPY /server/.easter-eggs.json ./server/
+
+# 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 vite",
-    "start": "yarn copy-types && vite",
+    "build": "yarn vite build"
-    "build": "yarn copy-types && vite build"
   },
   "eslintConfig": {
     "extends": [

client/src/App.tsx

@@ -8,13 +8,12 @@ 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, LocationKey } 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';
@@ -351,7 +350,7 @@ function App() {
     } else {
       content = <h3>Chyba načtení dat</h3>
     }
-    return <Col md={12} lg={4} 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}
@@ -402,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>Přidání restaurace Zastávka u Michala</li>
-              <li>Odstranění podniku U Motlíků</li>
+              <li>Přidání restaurace Pivovarský šenk Šeříková</li>
             </ul>
           </Alert>
           {dayIndex != null &&
@@ -418,6 +417,7 @@ function App() {
             {/* {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'>

client/src/Utils.tsx

@@ -53,7 +53,12 @@ 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,4 +1,4 @@
-import { AddChoiceRequest, ChangeDepartureTimeRequest, LocationKey, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../types";
+import { AddChoiceRequest, ChangeDepartureTimeRequest, LocationKey, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../../../types";
 import { api } from "./Api";
 
 const FOOD_API_PREFIX = '/api/food';

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

@@ -517,7 +517,91 @@ 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
@@ -1293,6 +1377,10 @@ 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,8 +1,8 @@
 import axios from "axios";
 import { load } from 'cheerio';
 import { Food } from "../../types";
-import {getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock} from "./mock";
+import {getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock, getMenuSenkSerikovaMock} from "./mock";
-import {formatDate, getDayOfWeekIndex, getIsWeekend} from "./utils";
+import {formatDate} from "./utils";
 
 // Fráze v názvech jídel, které naznačují že se jedná o polévku
 const SOUP_NAMES = [
@@ -344,13 +344,16 @@ 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 < now) {
+        if (currentDate.getDate() < nowDate || (currentDate.getDate() === nowDate && new Date().getHours() >= 14)) {
-        if (currentDate.getDate() !== nowDate) {
             result[dayIndex] = [{
                 amount: undefined,
                 name: "Pro tento den není uveřejněna nabídka jídel",
@@ -359,13 +362,13 @@ export const getMenuZastavkaUmichala = async (firstDayOfWeek: Date, mock: boolea
             }];
             continue;
         } else {
-            // let dateString = formatDate(currentDate, 'DD.MM.YYYY');
+            const url = (currentDate.getDate() === nowDate) ?
-            // const html = await getHtml(ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + dateString);
+                ZASTAVKAUMICHALA_URL : ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + formatDate(currentDate, 'DD.MM.YYYY');
-            const html = await getHtml(ZASTAVKAUMICHALA_URL);
+            const html = await axios.get(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({
@@ -380,3 +383,52 @@ 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/service.ts

@@ -1,7 +1,7 @@
 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, getMenuZastavkaUmichala } from "./restaurants";
+import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
 import { getTodayMock } from "./mock";
 
 const storage = getStorage();
@@ -62,6 +62,7 @@ export async function getData(date?: Date): Promise<ClientData> {
         // [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;
@@ -182,6 +183,19 @@ export async function getRestaurantMenu(restaurant: Restaurants, date?: Date): P
                 } 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);
     }

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.
  */

types/Types.ts

@@ -4,6 +4,7 @@ export enum Restaurants {
     // UMOTLIKU = 'uMotliku',
     TECHTOWER = 'techTower',
     ZASTAVKAUMICHALA = 'zastavkaUmichala',
+    SENKSERIKOVA = 'senkSerikova',
 }
 
 export type FoodChoices = {
@@ -115,6 +116,7 @@ export enum Locations {
     // 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',