feat: část refaktoru databáze

2025-11-25 13:42:06 +01:00
24 changed files with 1604 additions and 1446 deletions
--- a/client/index.html
+++ b/client/index.html
@@ -10,17 +10,6 @@
  <link rel="apple-touch-icon" href="/logo192.png" />
  <link rel="manifest" href="/manifest.json" />
  <title>Luncher</title>
-  <script>
-    (function() {
-      var saved = localStorage.getItem('theme_preference');
-      var theme = 'light';
-      if (saved === 'dark') theme = 'dark';
-      else if (saved === 'system' || !saved) {
-        theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-      }
-      document.documentElement.setAttribute('data-bs-theme', theme);
-    })();
-  </script>
 </head>

 <body>
--- a/client/package.json
+++ b/client/package.json
@@ -24,7 +24,6 @@
    "react-router": "^7.9.5",
    "react-router-dom": "^7.9.5",
    "react-select-search": "^4.1.6",
-    "react-snow-overlay": "^1.0.14",
    "react-snowfall": "^2.3.0",
    "react-toastify": "^11.0.5",
    "recharts": "^3.4.1",
--- a/client/src/App.scss
+++ b/client/src/App.scss
@@ -1,17 +1,3 @@
-:root, [data-bs-theme="light"] {
-  --luncher-navbar-bg: #3c3c3c;
-  --luncher-action-icon: rgb(0, 89, 255);
-  --luncher-buyer-icon: #dbba00;
-  --luncher-text-muted: gray;
-}
-
-[data-bs-theme="dark"] {
-  --luncher-navbar-bg: #1a1d21;
-  --luncher-action-icon: #5c9aff;
-  --luncher-buyer-icon: #ffd700;
-  --luncher-text-muted: #9ca3af;
-}
-
 .App {
  text-align: center;
 }
@@ -101,7 +87,7 @@ body,
 }

 .navbar {
-  background-color: var(--luncher-navbar-bg);
+  background-color: #3c3c3c;
  padding-left: 20px;
  padding-right: 20px;
 }
@@ -114,19 +100,11 @@ body,
  margin-bottom: 0;
 }

-.table> :not(caption) {
-  .action-icon {
-    color: var(--luncher-action-icon);
-    cursor: pointer;
-    margin-left: 10px;
-    padding: 0;
-  }
-
-  .buyer-icon {
-    color: var(--luncher-buyer-icon);
-    margin-left: 10px;
-    padding: 0;
-  }
+.table> :not(caption) .action-icon {
+  color: rgb(0, 89, 255);
+  cursor: pointer;
+  margin-left: 10px;
+  padding: 0;
 }

 .table ul {
@@ -153,7 +131,7 @@ body,
 }

 .trusted-icon {
-  color: var(--luncher-action-icon);
+  color: rgb(0, 89, 255);
  margin-right: 10px;
 }

--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -13,15 +13,15 @@ import './App.scss';
 import { faCircleCheck, faNoteSticky, faTrashCan, faComment } from '@fortawesome/free-regular-svg-icons';
 import { useSettings } from './context/settings';
 import Footer from './components/Footer';
-import { faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons';
 import Loader from './components/Loader';
-import { getHumanDateTime, isInTheFuture } from './Utils';
+import { getDayOfWeekIndex, getHumanDate, getHumanDateTime, getIsWeekend, isInTheFuture } from './Utils';
 import NoteModal from './components/modals/NoteModal';
 import { useEasterEgg } from './context/eggs';
-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, setBuyer } from '../../types';
+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';
-// import FallingLeaves, { LEAF_PRESETS, LEAF_COLOR_THEMES } from './FallingLeaves';
-// import './FallingLeaves.scss';
+import FallingLeaves, { LEAF_PRESETS, LEAF_COLOR_THEMES } from './FallingLeaves';
+import './FallingLeaves.scss';

 const EVENT_CONNECT = "connect"

@@ -71,7 +71,10 @@ function App() {
  const departureChoiceRef = useRef<HTMLSelectElement>(null);
  const pizzaPoznamkaRef = useRef<HTMLInputElement>(null);
  const [failure, setFailure] = useState<boolean>(false);
-  const [dayIndex, setDayIndex] = useState<number>();
+  const [dayIndex, setDayIndex] = useState<number>(); // Index zobrazovaného dne
+  // TODO berka zde je nutné dořešit mocking pro testování
+  const [todayDayIndex, setTodayDayIndex] = useState<number>(getDayOfWeekIndex(new Date())); // Index dnešního dne
+  const [isTodayWeekend, setIsTodayWeekend] = useState<boolean>(getIsWeekend(new Date()));
  const [loadingPizzaDay, setLoadingPizzaDay] = useState<boolean>(false);
  const [noteModalOpen, setNoteModalOpen] = useState<boolean>(false);
  const [eggImage, setEggImage] = useState<Blob>();
@@ -89,8 +92,9 @@ function App() {
      const data = response.data
      if (data) {
        setData(data);
-        setDayIndex(data.dayIndex);
-        dayIndexRef.current = data.dayIndex;
+        const dayIndex = getDayOfWeekIndex(new Date(data.date));
+        setDayIndex(dayIndex);
+        dayIndexRef.current = dayIndex;
        setFood(data.menus);
      }
    }).catch(e => {
@@ -103,6 +107,8 @@ function App() {
    if (!auth?.login) {
      return
    }
+    setTodayDayIndex(getDayOfWeekIndex(new Date()));
+    setIsTodayWeekend(getIsWeekend(new Date()));
    getData({ query: { dayIndex: dayIndex } }).then(response => {
      const data = response.data;
      setData(data);
@@ -125,7 +131,7 @@ function App() {
    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 || getDayOfWeekIndex(new Date(newData.date)) === dayIndexRef.current) {
        setData(newData);
      }
    });
@@ -141,6 +147,16 @@ function App() {
    if (!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
+    // TODO nutno opravit
+    // if (data?.choices && choiceRef.current) {
+    //   for (let entry of Object.entries(data.choices)) {
+    //     if (entry[1].includes(auth.login)) {
+    //       const value = entry[0] as any as number; // TODO tohle je absurdní
+    //       choiceRef.current.value = Object.values(Locations)[value];
+    //     }
+    //   }
+    // }
  }, [auth, auth?.login, data?.choices])

  // Reference na mojí objednávku
@@ -204,7 +220,7 @@ function App() {

  const doAddClickFoodChoice = async (location: LunchChoice, foodIndex?: number) => {
    if (document.getSelection()?.type !== 'Range') { // pouze pokud se nejedná o výběr textu
-      if (canChangeChoice && auth?.login) {
+      if (auth?.login) {
        await addChoice({ body: { locationKey: location, foodIndex, dayIndex } });
      }
    }
@@ -212,7 +228,7 @@ function App() {

  const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
    const locationKey = event.target.value as LunchChoice;
-    if (canChangeChoice && auth?.login) {
+    if (auth?.login) {
      await addChoice({ body: { locationKey, dayIndex } });
      if (foodChoiceRef.current?.value) {
        foodChoiceRef.current.value = "";
@@ -274,12 +290,6 @@ function App() {
    }
  }

-  const markAsBuyer = async () => {
-    if (auth?.login) {
-      await setBuyer();
-    }
-  }
-
  const pizzaSuggestions = useMemo(() => {
    if (!data?.pizzaList) {
      return [];
@@ -300,7 +310,7 @@ function App() {
  const handlePizzaChange = async (value: SelectedOptionValue | SelectedOptionValue[]) => {
    if (auth?.login && data?.pizzaList) {
      if (typeof value !== 'string') {
-        throw new TypeError('Nepodporovaný typ hodnoty: ' + typeof value);
+        throw Error('Nepodporovaný typ hodnoty');
      }
      const s = value.split('|');
      const pizzaIndex = Number.parseInt(s[0]);
@@ -321,6 +331,30 @@ function App() {
    updatePizzaDayNote({ body: { note: pizzaPoznamkaRef.current?.value } });
  }

+  // const addToCart = async () => {
+  // TODO aktuálně nefunkční - nedokážeme poslat PHPSESSIONID cookie
+  // if (data?.pizzaDay?.orders) {
+  //   for (const order of data?.pizzaDay?.orders) {
+  //     for (const pizzaOrder of order.pizzaList) {
+  //       const url = 'https://www.pizzachefie.cz/pridat.html';
+  //       const payload = new URLSearchParams();
+  //       payload.append('varId', pizzaOrder.varId.toString());
+  //       await fetch(url, {
+  //         method: "POST",
+  //         mode: "no-cors",
+  //         cache: "no-cache",
+  //         credentials: "same-origin",
+  //         headers: {
+  //           'Content-Type': 'application/x-www-form-urlencoded',
+  //         },
+  //         body: payload,
+  //       })
+  //     }
+  //   }
+  //   // TODO otevřít košík v nové záložce
+  // }
+  // }
+
  const handleChangeDepartureTime = async (event: React.ChangeEvent<HTMLSelectElement>) => {
    if (foodChoiceList?.length && choiceRef.current?.value) {
      await changeDepartureTime({ body: { time: event.target.value as DepartureTime, dayIndex } });
@@ -348,7 +382,7 @@ function App() {
    } else if (menu?.food?.length && menu.food.length > 0) {
      const hideSoups = settings?.hideSoups;
      content = <Table striped bordered hover>
-        <tbody style={{ cursor: canChangeChoice ? 'pointer' : 'default' }}>
+        <tbody style={{ cursor: 'pointer' }}>
          {menu.food.map((f: Food, index: number) =>
            (!hideSoups || !f.isSoup) &&
            <tr key={f.name} onClick={() => doAddClickFoodChoice(location, index)}>
@@ -376,7 +410,7 @@ function App() {
      content = <h3>Chyba načtení dat</h3>
    }
    return <Col md={12} lg={3} className='mt-3'>
-      <h3 style={{ cursor: canChangeChoice ? 'pointer' : 'default' }} onClick={() => doAddClickFoodChoice(location)}>{getLunchChoiceName(location)}</h3>
+      <h3 style={{ cursor: 'pointer' }} onClick={() => doAddClickFoodChoice(location)}>{getLunchChoiceName(location)}</h3>
      {menu?.lastUpdate && <small>Poslední aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
      {content}
    </Col>
@@ -411,7 +445,7 @@ function App() {
  }

  const noOrders = data?.pizzaDay?.orders?.length === 0;
-  const canChangeChoice = dayIndex == null || data.todayDayIndex == null || dayIndex >= data.todayDayIndex;
+  const canChangeChoice = dayIndex == null || dayIndex >= todayDayIndex;

  const { path, url, startOffset, endOffset, duration, ...style } = easterEgg || {};

@@ -420,15 +454,15 @@ function App() {
      {easterEgg && eggImage && <img ref={eggRef} alt='' src={URL.createObjectURL(eggImage)} style={{ position: 'absolute', ...EASTER_EGG_STYLE, ...style, animationDuration: `${duration ?? EASTER_EGG_DEFAULT_DURATION}s` }} />}
      <Header />
      <div className='wrapper'>
-        {data.isWeekend ? <h4>Užívejte víkend :)</h4> : <>
+        {isTodayWeekend ? <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 alt="" src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} />
+            {/* <img alt="" 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 }} /> */}
            Poslední změny:
            <ul>
-              <li>Oprava parsování Sladovnické a TechTower</li>
-              <li>Zimní atmosféra</li>
-              <li>Možnost označit se jako objednávající u volby "budu objednávat"</li>
+              <li>Zobrazení alergenu při najetí myší a proklik na seznam alergenů</li>
+              <li>Přesun přenačtení menu do samostatného dialogu</li>
+              <li>Podzimní atmosféra</li>
            </ul>
          </Alert>
          {dayIndex != null &&
@@ -436,22 +470,23 @@ function App() {
              <span title='Předchozí den'>
                <FontAwesomeIcon icon={faChevronLeft} style={{ cursor: "pointer", visibility: dayIndex > 0 ? "initial" : "hidden" }} onClick={() => handleDayChange(dayIndex - 1)} />
              </span>
-              <h1 className={`title ${dayIndex !== data.todayDayIndex ? 'text-muted' : ''}`}>{data.date}</h1>
+              <h1 className='title' style={{ color: dayIndex === todayDayIndex ? 'black' : 'gray' }}>{getHumanDate(new Date(data.date))}</h1>
              <span title="Následující den">
                <FontAwesomeIcon icon={faChevronRight} style={{ cursor: "pointer", visibility: dayIndex < 4 ? "initial" : "hidden" }} onClick={() => handleDayChange(dayIndex + 1)} />
              </span>
            </div>
          }
          <Row className='food-tables'>
-            {Object.keys(Restaurant).map(key => {
-              const locationKey = key as Restaurant;
-              return food[locationKey] && renderFoodTable(locationKey, food[locationKey]);
-            })}
+            {/* TODO zjednodušit, stačí iterovat klíče typu Restaurant */}
+            {food['SLADOVNICKA'] && renderFoodTable('SLADOVNICKA', food['SLADOVNICKA'])}
+            {food['TECHTOWER'] && renderFoodTable('TECHTOWER', food['TECHTOWER'])}
+            {food['ZASTAVKAUMICHALA'] && renderFoodTable('ZASTAVKAUMICHALA', food['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 === todayDayIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
                <Form.Select ref={choiceRef} onChange={doAddChoice}>
                  <option></option>
                  {Object.entries(LunchChoice)
@@ -505,26 +540,14 @@ function App() {
                                  const userPayload = entry[1];
                                  const userChoices = userPayload?.selectedFoods;
                                  const trusted = userPayload?.trusted || false;
-                                  const isBuyer = userPayload?.isBuyer || false;
                                  return <tr key={entry[0]}>
                                    <td>
-                                      {/* TODO zrefaktorovat, oddělit řádek do samostatné komponenty (a akce možná zvlášť) */}
                                      {trusted && <span className='trusted-icon' title='Uživatel ověřený doménovým přihlášením'>
                                        <FontAwesomeIcon icon={faCircleCheck} style={{ cursor: "help" }} />
                                      </span>}
                                      {login}
                                      {userPayload.departureTime && <small> ({userPayload.departureTime})</small>}
                                      {userPayload.note && <span style={{ fontSize: 'small' }}> ({userPayload.note})</span>}
-                                      {login === auth.login && canChangeChoice && locationKey === LunchChoice.OBJEDNAVAM && <span title='Označit/odznačit se jako objednávající'>
-                                        <FontAwesomeIcon onClick={() => {
-                                        markAsBuyer();
-                                      }} icon={faBasketShopping} className={isBuyer ? 'buyer-icon' : 'action-icon'} style={{cursor: 'pointer'}} />
-                                      </span>}
-                                      {login !== auth.login && locationKey === LunchChoice.OBJEDNAVAM && isBuyer && <span title='Objednávající'>
-                                        <FontAwesomeIcon onClick={() => {
-                                        copyNote(userPayload.note!);
-                                      }} icon={faBasketShopping} className='buyer-icon' />
-                                      </span>}
                                      {login !== auth.login && canChangeChoice && userPayload?.note?.length && <span title='Převzít poznámku'>
                                        <FontAwesomeIcon onClick={() => {
                                        copyNote(userPayload.note!);
@@ -572,7 +595,7 @@ function App() {
                : <div className='mt-5'><i>Zatím nikdo nehlasoval...</i></div>
              }
            </div>
-            {dayIndex === data.todayDayIndex &&
+            {dayIndex === todayDayIndex &&
              <div className='mt-5'>
                {!data.pizzaDay &&
                  <div style={{ textAlign: 'center' }}>
@@ -651,10 +674,7 @@ function App() {
                      {
                        data.pizzaDay.state === PizzaDayState.DELIVERED &&
                        <div>
-                          <p>
-                            Pizzy byly doručeny.
-                            {myOrder?.hasQr ? ` Objednávku můžete uživateli ${data.pizzaDay.creator} uhradit pomocí QR kódu níže.` : ''}
-                          </p>
+                          <p>{`Pizzy byly doručeny.${myOrder?.hasQr ? ` Objednávku můžete uživateli ${data.pizzaDay.creator} uhradit pomocí QR kódu níže.` : ''}`}</p>
                        </div>
                      }
                    </div>
@@ -697,10 +717,10 @@ function App() {
          </div>
        </> || "Jejda, něco se nám nepovedlo :("}
      </div>
-      {/* <FallingLeaves
+      <FallingLeaves
        numLeaves={LEAF_PRESETS.NORMAL}
        leafVariants={LEAF_COLOR_THEMES.AUTUMN}
-      /> */}
+      />
      <Footer />
      <NoteModal isOpen={noteModalOpen} onClose={() => setNoteModalOpen(false)} onSave={saveNote} />
    </div>
--- a/client/src/AppRoutes.tsx
+++ b/client/src/AppRoutes.tsx
@@ -1,7 +1,6 @@
 import { Routes, Route } from "react-router-dom";
 import { ProvideSettings } from "./context/settings";
 // import Snowfall from "react-snowfall";
-import { SnowOverlay } from 'react-snow-overlay';
 import { ToastContainer } from "react-toastify";
 import { SocketContext, socket } from "./context/socket";
 import StatsPage from "./pages/StatsPage";
@@ -23,7 +22,6 @@ export default function AppRoutes() {
                                width: '100vw',
                                height: '100vh'
                            }} /> */}
-                            <SnowOverlay color={'rgba(240, 240, 240, 0.9)'} disabledOnSingleCpuDevices={true} />
                            <App />
                        </>
                        <ToastContainer />
--- a/client/src/Login.tsx
+++ b/client/src/Login.tsx
@@ -26,7 +26,7 @@ export default function Login() {
  }, [auth]);

  const doLogin = useCallback(async () => {
-    const length = loginRef?.current?.value.length && loginRef.current.value.replaceAll(/\s/g, '').length
+    const length = loginRef?.current?.value.length && loginRef.current.value.replace(/\s/g, '').length
    if (length) {
      const response = await login({ body: { login: loginRef.current?.value } });
      if (response.data) {
--- a/client/src/Utils.tsx
+++ b/client/src/Utils.tsx
@@ -73,16 +73,22 @@ export const getDayOfWeekIndex = (date: Date) => {
    return (((date.getDay() - 1) % 7) + 7) % 7;
 }

+/** Vrátí true, pokud je předané datum o víkendu. */
+export function getIsWeekend(date: Date) {
+    const index = getDayOfWeekIndex(date);
+    return index == 5 || index == 6;
+}
+
 /** Vrátí první pracovní den v týdnu předaného data. */
 export function getFirstWorkDayOfWeek(date: Date) {
-    const firstDay = new 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);
+    const lastDay = new Date(date.getTime());
    lastDay.setDate(date.getDate() + (4 - getDayOfWeekIndex(date)));
    return lastDay;
 }
--- a/client/src/components/Header.tsx
+++ b/client/src/components/Header.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { Navbar, Nav, NavDropdown } from "react-bootstrap";
 import { useAuth } from "../context/auth";
 import SettingsModal from "./modals/SettingsModal";
-import { useSettings, ThemePreference } from "../context/settings";
+import { useSettings } from "../context/settings";
 import FeaturesVotingModal from "./modals/FeaturesVotingModal";
 import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";
 import RefreshMenuModal from "./modals/RefreshMenuModal";
@@ -54,19 +54,19 @@ export default function Header() {
        return n !== Infinity && String(n) === str && n >= 0;
    }

-    const saveSettings = (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean, themePreference?: ThemePreference) => {
+    const saveSettings = (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean) => {
        if (bankAccountNumber) {
            try {
                // Validace kódu banky
-                if (!bankAccountNumber.includes('/')) {
-                    throw new Error("Číslo účtu neobsahuje lomítko/kód banky")
+                if (bankAccountNumber.indexOf('/') < 0) {
+                    throw Error("Číslo účtu neobsahuje lomítko/kód banky")
                }
                const split = bankAccountNumber.split("/");
                if (split[1].length !== 4) {
-                    throw new Error("Kód banky musí být 4 číslice")
+                    throw Error("Kód banky musí být 4 číslice")
                }
                if (!isValidInteger(split[1])) {
-                    throw new Error("Kód banky není číslo")
+                    throw Error("Kód banky není číslo")
                }

                // Validace čísla a předčíslí
@@ -76,7 +76,7 @@ export default function Header() {
                    cislo = cislo.replace('-', '');
                }
                if (!isValidInteger(cislo)) {
-                    throw new Error("Předčíslí nebo číslo účtu neobsahuje pouze číslice")
+                    throw Error("Předčíslí nebo číslo účtu neobsahuje pouze číslice")
                }
                if (cislo.length < 16) {
                    cislo = cislo.padStart(16, '0');
@@ -89,7 +89,7 @@ export default function Header() {
                    sum += Number.parseInt(char) * weight
                }
                if (sum % 11 !== 0) {
-                    throw new Error("Číslo účtu je neplatné")
+                    throw Error("Číslo účtu je neplatné")
                }
            } catch (e: any) {
                alert(e.message)
@@ -99,9 +99,6 @@ export default function Header() {
        settings?.setBankAccountNumber(bankAccountNumber);
        settings?.setBankAccountHolderName(bankAccountHolderName);
        settings?.setHideSoupsOption(hideSoupsOption);
-        if (themePreference) {
-            settings?.setThemePreference(themePreference);
-        }
        closeSettingsModal();
    }

--- a/client/src/components/modals/PizzaAdditionalFeeModal.tsx
+++ b/client/src/components/modals/PizzaAdditionalFeeModal.tsx
@@ -15,12 +15,12 @@ export default function PizzaAdditionalFeeModal({ customerName, isOpen, onClose,
    const priceRef = useRef<HTMLInputElement>(null);

    const doSubmit = () => {
-        onSave(customerName, textRef.current?.value, Number.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, Number.parseInt(priceRef.current?.value ?? "0"));
+            onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value ?? "0"));
        }
    }

--- a/client/src/components/modals/PizzaCalculatorModal.tsx
+++ b/client/src/components/modals/PizzaCalculatorModal.tsx
@@ -36,13 +36,13 @@ export default function PizzaCalculatorModal({ isOpen, onClose }: Readonly<Props

        // 1. pizza
        if (diameter1Ref.current?.value) {
-            const diameter1 = Number.parseInt(diameter1Ref.current?.value);
+            const diameter1 = parseInt(diameter1Ref.current?.value);
            r.pizza1 ??= {};
            if (diameter1 && diameter1 > 0) {
                r.pizza1.diameter = diameter1;
                r.pizza1.area = Math.PI * Math.pow(diameter1 / 2, 2);
                if (price1Ref.current?.value) {
-                    const price1 = Number.parseInt(price1Ref.current?.value);
+                    const price1 = parseInt(price1Ref.current?.value);
                    if (price1) {
                        r.pizza1.pricePerM = price1 / r.pizza1.area;
                    } else {
@@ -56,13 +56,13 @@ export default function PizzaCalculatorModal({ isOpen, onClose }: Readonly<Props

        // 2. pizza
        if (diameter2Ref.current?.value) {
-            const diameter2 = Number.parseInt(diameter2Ref.current?.value);
+            const diameter2 = parseInt(diameter2Ref.current?.value);
            r.pizza2 ??= {};
            if (diameter2 && diameter2 > 0) {
                r.pizza2.diameter = diameter2;
                r.pizza2.area = Math.PI * Math.pow(diameter2 / 2, 2);
                if (price2Ref.current?.value) {
-                    const price2 = Number.parseInt(price2Ref.current?.value);
+                    const price2 = parseInt(price2Ref.current?.value);
                    if (price2) {
                        r.pizza2.pricePerM = price2 / r.pizza2.area;
                    } else {
@@ -77,8 +77,8 @@ export default function PizzaCalculatorModal({ isOpen, onClose }: Readonly<Props
        // Srovnání
        if (r.pizza1?.pricePerM && r.pizza2?.pricePerM && r.pizza1.diameter && r.pizza2.diameter) {
            r.choice = r.pizza1.pricePerM < r.pizza2.pricePerM ? 1 : 2;
-            const bigger = Math.max(r.pizza1.pricePerM, r.pizza2.pricePerM);
-            const smaller = Math.min(r.pizza1.pricePerM, r.pizza2.pricePerM);
+            const bigger = r.pizza1.pricePerM > r.pizza2.pricePerM ? r.pizza1.pricePerM : r.pizza2.pricePerM;
+            const smaller = r.pizza1.pricePerM < r.pizza2.pricePerM ? r.pizza1.pricePerM : r.pizza2.pricePerM;
            r.ratio = (bigger / smaller) - 1;
            r.diameterDiff = Math.abs(r.pizza1.diameter - r.pizza2.diameter);
        } else {
--- a/client/src/components/modals/SettingsModal.tsx
+++ b/client/src/components/modals/SettingsModal.tsx
@@ -1,11 +1,11 @@
 import { useRef } from "react";
-import { Modal, Button, Form } from "react-bootstrap"
-import { useSettings, ThemePreference } from "../../context/settings";
+import { Modal, Button } from "react-bootstrap"
+import { useSettings } from "../../context/settings";

 type Props = {
    isOpen: boolean,
    onClose: () => void,
-    onSave: (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean, themePreference?: ThemePreference) => void,
+    onSave: (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean) => void,
 }

 /** Modální dialog pro uživatelská nastavení. */
@@ -14,23 +14,12 @@ export default function SettingsModal({ isOpen, onClose, onSave }: Readonly<Prop
    const bankAccountRef = useRef<HTMLInputElement>(null);
    const nameRef = useRef<HTMLInputElement>(null);
    const hideSoupsRef = useRef<HTMLInputElement>(null);
-    const themeRef = useRef<HTMLSelectElement>(null);

    return <Modal show={isOpen} onHide={onClose} size="lg">
        <Modal.Header closeButton>
            <Modal.Title><h2>Nastavení</h2></Modal.Title>
        </Modal.Header>
        <Modal.Body>
-            <h4>Vzhled</h4>
-            <Form.Group className="mb-3">
-                <Form.Label>Barevný motiv</Form.Label>
-                <Form.Select ref={themeRef} defaultValue={settings?.themePreference}>
-                    <option value="system">Podle systému</option>
-                    <option value="light">Světlý</option>
-                    <option value="dark">Tmavý</option>
-                </Form.Select>
-            </Form.Group>
-            <hr />
            <h4>Obecné</h4>
            <span title="V nabídkách nebudou zobrazovány polévky. Tato funkce je experimentální, a zejména u TechTower bývá často problém polévky spolehlivě rozeznat. V případě využití této funkce průběžně nahlašujte stále se zobrazující polévky." style={{ "cursor": "help" }}>
                <input ref={hideSoupsRef} type="checkbox" defaultChecked={settings?.hideSoups} /> Skrýt polévky
@@ -45,7 +34,7 @@ export default function SettingsModal({ isOpen, onClose, onSave }: Readonly<Prop
            <Button variant="secondary" onClick={onClose}>
                Storno
            </Button>
-            <Button variant="primary" onClick={() => onSave(bankAccountRef.current?.value, nameRef.current?.value, hideSoupsRef.current?.checked, themeRef.current?.value as ThemePreference)}>
+            <Button variant="primary" onClick={() => onSave(bankAccountRef.current?.value, nameRef.current?.value, hideSoupsRef.current?.checked)}>
                Uložit
            </Button>
        </Modal.Footer>
--- a/client/src/context/auth.tsx
+++ b/client/src/context/auth.tsx
@@ -55,7 +55,7 @@ function useProvideAuth(): AuthContextProps {
    setLoginName(undefined);
    setTrusted(undefined);
    if (trusted && logoutUrl?.length) {
-      globalThis.location.replace(logoutUrl);
+      window.location.replace(logoutUrl);
    }
  }

--- a/client/src/context/settings.tsx
+++ b/client/src/context/settings.tsx
@@ -3,19 +3,14 @@ import React, { ReactNode, useContext, useEffect, useState } from "react"
 const BANK_ACCOUNT_NUMBER_KEY = 'bank_account_number';
 const BANK_ACCOUNT_HOLDER_KEY = 'bank_account_holder_name';
 const HIDE_SOUPS_KEY = 'hide_soups';
-const THEME_KEY = 'theme_preference';
-
-export type ThemePreference = 'system' | 'light' | 'dark';

 export type SettingsContextProps = {
  bankAccount?: string,
  holderName?: string,
  hideSoups?: boolean,
-  themePreference: ThemePreference,
  setBankAccountNumber: (accountNumber?: string) => void,
  setBankAccountHolderName: (holderName?: string) => void,
  setHideSoupsOption: (hideSoups?: boolean) => void,
-  setThemePreference: (theme: ThemePreference) => void,
 }

 type ContextProps = {
@@ -37,7 +32,6 @@ function useProvideSettings(): SettingsContextProps {
  const [bankAccount, setBankAccount] = useState<string | undefined>();
  const [holderName, setHolderName] = useState<string | undefined>();
  const [hideSoups, setHideSoups] = useState<boolean | undefined>();
-  const [themePreference, setTheme] = useState<ThemePreference>('system');

  useEffect(() => {
    const accountNumber = localStorage.getItem(BANK_ACCOUNT_NUMBER_KEY);
@@ -52,10 +46,6 @@ function useProvideSettings(): SettingsContextProps {
    if (hideSoups !== null) {
      setHideSoups(hideSoups === 'true');
    }
-    const savedTheme = localStorage.getItem(THEME_KEY) as ThemePreference | null;
-    if (savedTheme && ['system', 'light', 'dark'].includes(savedTheme)) {
-      setTheme(savedTheme);
-    }
  }, [])

  useEffect(() => {
@@ -82,29 +72,6 @@ function useProvideSettings(): SettingsContextProps {
    }
  }, [hideSoups]);

-  useEffect(() => {
-    localStorage.setItem(THEME_KEY, themePreference);
-  }, [themePreference]);
-
-  useEffect(() => {
-    const applyTheme = (theme: 'light' | 'dark') => {
-      document.documentElement.setAttribute('data-bs-theme', theme);
-    };
-
-    if (themePreference === 'system') {
-      const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-      applyTheme(mediaQuery.matches ? 'dark' : 'light');
-
-      const handler = (e: MediaQueryListEvent) => {
-        applyTheme(e.matches ? 'dark' : 'light');
-      };
-      mediaQuery.addEventListener('change', handler);
-      return () => mediaQuery.removeEventListener('change', handler);
-    } else {
-      applyTheme(themePreference);
-    }
-  }, [themePreference]);
-
  function setBankAccountNumber(bankAccount?: string) {
    setBankAccount(bankAccount);
  }
@@ -117,18 +84,12 @@ function useProvideSettings(): SettingsContextProps {
    setHideSoups(hideSoups);
  }

-  function setThemePreference(theme: ThemePreference) {
-    setTheme(theme);
-  }
-
  return {
    bankAccount,
    holderName,
    hideSoups,
-    themePreference,
    setBankAccountNumber,
    setBankAccountHolderName,
    setHideSoupsOption,
-    setThemePreference,
  }
 }
--- a/client/src/context/socket.js
+++ b/client/src/context/socket.js
@@ -7,8 +7,8 @@ if (process.env.NODE_ENV === 'development') {
    socketUrl = `http://localhost:3001`;
    socketPath = undefined;
 } else {
-    socketUrl = `${globalThis.location.host}`;
-    socketPath = `${globalThis.location.pathname}socket.io`;
+    socketUrl = `${window.location.host}`;
+    socketPath = `${window.location.pathname}socket.io`;
 }

 export const socket = socketio.connect(socketUrl, { path: socketPath, transports: ["websocket"] });
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -17,7 +17,7 @@ client.setConfig({
 // 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.includes("/login")) {
+  if (!response.ok && response.url.indexOf("/login") == -1) {
    const json = await response.json();
    toast.error(json.error, { theme: "colored" });
  }
--- a/client/src/pages/StatsPage.tsx
+++ b/client/src/pages/StatsPage.tsx
@@ -17,15 +17,16 @@ const CHART_HEIGHT = 700;
 const STROKE_WIDTH = 2.5;

 const COLORS = [
-  '#ff1493',
-  '#1e90ff',
-  '#c5a700',
-  '#006400',
-  '#b300ff',
-  '#ff4500',
-  '#bc8f8f',
-  '#00ff00',
-  '#7c7c7c',
+  // 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() {
--- a/client/yarn.lock
+++ b/client/yarn.lock
--- a/server/src/restaurants.ts
+++ b/server/src/restaurants.ts
@@ -100,7 +100,7 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
    const html = await getHtml(SLADOVNICKA_URL);
    const $ = load(html);

-    // Zjistíme, které dny jsou k dispozici z tab elementů
+    // Nejdříve zjistíme, které dny jsou k dispozici z tab elementů
    const tabElements = $('#daily-menu-tab-list').children('button[id^="daily-menu-tab-"]');
    const availableDays: { [dayIndex: number]: number } = {}; // mapování dayIndex -> contentIndex
    
@@ -112,7 +112,7 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
        }
    });

-    const menuContentElements = $('#daily-menu-content-list').children('.daily-menu-content__content').not('.daily-menu-content__content--static');
+    const menuContentElements = $('#daily-menu-content-list').children('[id^="daily-menu-content-"]');
    
    const result: Food[][] = [];
    
@@ -130,32 +130,59 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
            continue; // Přeskočíme, pokud content element neexistuje
        }
        
-        const contentElement = $(menuContentElements[contentIndexNum]);
-        const itemElement = contentElement.find('.daily-menu-content__item');
-        const table = itemElement.find('table.daily-menu-content__table tbody');
-        const rows = table.children('tr');
+        const dayChildren = $(menuContentElements[contentIndexNum]).children();
+        
+        // Ověříme, že má element očekávanou strukturu
+        if (dayChildren.length < 2) {
+            console.warn(`Neočekávaný počet children v menu Sladovnické pro den ${dayIndexNum}: ${dayChildren.length}, očekávány alespoň 2 (polévka a hlavní jídlo)`);
+            continue;
+        }
+
+        // Parsování polévky
+        const soupElement = dayChildren.get(0);
+        const soupTable = $(soupElement).find('table tbody tr');
+        const soupCells = soupTable.children('td');
+        if (soupCells.length !== 3) {
+            console.warn(`Neočekávaný počet buněk v tabulce polévky pro den ${dayIndexNum}: ${soupCells.length}, ale očekávány byly 3`);
+            continue;
+        }
+        
+        const soupAmount = sanitizeText($(soupCells.get(0)).text());
+        const soupNameRaw = sanitizeText($(soupCells.get(1)).text());
+        const soupPrice = sanitizeText($(soupCells.get(2)).text().replace(' ', '\xA0'));
+        const soupParsed = parseAllergens(soupNameRaw);
+        
+        // Parsování hlavních jídel
+        const mainCourseElement = dayChildren.get(1);
+        const mainCourseTable = $(mainCourseElement).find('table tbody');
+        const mainCourseRows = mainCourseTable.children('tr');
        
        const currentDayFood: Food[] = [];
        
-        // Projdeme všechny řádky - první je polévka, zbytek jsou hlavní jídla
-        rows.each((i, row) => {
+        // Přidáme polévku do seznamu jídel
+        currentDayFood.push({
+            amount: soupAmount,
+            name: soupParsed.cleanName,
+            price: soupPrice,
+            isSoup: true,
+            allergens: soupParsed.allergens.length > 0 ? soupParsed.allergens : undefined,
+        });
+        
+        // Projdeme všechny řádky hlavních jídel
+        mainCourseRows.each((i, row) => {
            const cells = $(row).children('td');
-            if (cells.length !== 3) {
-                return; // Přeskočíme řádky s nesprávnou strukturou
-            }
-            
            const amount = sanitizeText($(cells.get(0)).text());
            const nameRaw = sanitizeText($(cells.get(1)).text());
            const price = sanitizeText($(cells.get(2)).text().replace(' ', '\xA0'));
            const parsed = parseAllergens(nameRaw);
            
-            // Přeskočíme prázdné řádky
+            // Přeskočíme prázdné řádky (první řádek může být prázdný)
            if (parsed.cleanName.trim().length > 0) {
                currentDayFood.push({
                    amount,
                    name: parsed.cleanName,
                    price,
-                    isSoup: i === 0, // První řádek je polévka
+                    isSoup: false,
                    allergens: parsed.allergens.length > 0 ? parsed.allergens : undefined,
                });
            }
@@ -324,13 +351,8 @@ export const getMenuTechTower = async (firstDayOfWeek: Date, mock: boolean = fal
                const split = [tmp.slice(0, -2).join(' ')].concat(tmp.slice(-2));
                price = `${split.slice(1)[0]}\xA0Kč`
                nameRaw = split[0].replace('•', '');
-            } else if (text.toLowerCase().endsWith(',-')) {
-                const tmp = text.replace('\xA0', ' ').split(' ');
-                const split = [tmp.slice(0, -1).join(' ')].concat(tmp.slice(-1));
-                price = `${split.slice(1)[0].replace(',-', '')}\xA0Kč`
-                nameRaw = split[0].replace('•', '');
            }
-            if (nameRaw.endsWith('–')|| nameRaw.endsWith('—')) {
+            if (nameRaw.endsWith('–')) {
                nameRaw = nameRaw.slice(0, -1).trim();
            }

--- a/server/src/routes/foodRoutes.ts
+++ b/server/src/routes/foodRoutes.ts
@@ -1,6 +1,6 @@
 import express, { Request, Response } from "express";
 import { getLogin, getTrusted } from "../auth";
-import { addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote, fetchRestaurantWeekMenuData, saveRestaurantWeekMenu, updateBuyer } from "../service";
+import { addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote, fetchRestaurantWeekMenuData, saveRestaurantWeekMenu } from "../service";
 import { getDayOfWeekIndex, parseToken, getFirstWorkDayOfWeek } from "../utils";
 import { getWebsocket } from "../websocket";
 import { callNotifikace } from "../notifikace";
@@ -182,15 +182,6 @@ router.post("/jdemeObed", async (req, res, next) => {
    } catch (e: any) { next(e) }
 });

-router.post("/updateBuyer", async (req, res, next) => {
-    const login = getLogin(parseToken(req));
-    try {
-        const data = await updateBuyer(login);
-        getWebsocket().emit("message", data);
-        res.status(200).json({});
-    } catch (e: any) { next(e) }
-});
-
 // /api/food/refresh?type=week&heslo=docasnyheslo
 export const refreshMetoda = async (req: Request, res: Response) => {
    const { type, heslo } = req.query as { type?: string; heslo?: string };
--- a/server/src/service.ts
+++ b/server/src/service.ts
@@ -1,4 +1,4 @@
-import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getIsWeekend, getWeekNumber } from "./utils";
+import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getIsWeekend, getWeekNumber } from "./utils";
 import getStorage from "./storage";
 import { getMenuSladovnicka, getMenuTechTower, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
 import { getTodayMock } from "./mock";
@@ -31,10 +31,7 @@ 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),
+        date: usedDate.toISOString().split('T')[0],
        choices: {},
    };
 }
@@ -477,24 +474,6 @@ export async function updateDepartureTime(login: string, time?: string, date?: D
    return clientData;
 }

-/**
- * Nastaví/odnastaví uživatele jako objednatele pro dnešní den.
- * Objednatelů může být více.
- * 
- * @param login přihlašovací jméno uživatele
- */
-export async function updateBuyer(login: string) {
-    const usedDate = getToday();
-    let clientData = await getClientData(usedDate);
-    const userEntry = clientData.choices?.['OBJEDNAVAM']?.[login];
-    if (!userEntry) {
-        throw new Error("Nelze nastavit objednatele pro uživatele s jinou volbou než \"Budu objednávat\"");
-    }
-    userEntry.isBuyer = !(userEntry.isBuyer || false);
-    await storage.setData(formatDate(usedDate), clientData);
-    return clientData;
-}
-
 /**
 * Vrátí data pro klienta pro předaný nebo aktuální den.
 * 
@@ -504,9 +483,5 @@ export async function updateBuyer(login: string) {
 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()),
-    }
+    return await storage.getData<ClientData>(dateString) || getEmptyData(date);
 }
--- a/server/yarn.lock
+++ b/server/yarn.lock
--- a/types/api.yml
+++ b/types/api.yml
@@ -26,8 +26,6 @@ paths:
    $ref: "./paths/food/changeDepartureTime.yml"
  /food/jdemeObed:
    $ref: "./paths/food/jdemeObed.yml"
-  /food/updateBuyer:
-    $ref: "./paths/food/updateBuyer.yml"

  # Pizza day (/api/pizzaDay)
  /pizzaDay/create:
--- a/types/paths/food/updateBuyer.yml
+++ b/types/paths/food/updateBuyer.yml
@@ -1,6 +0,0 @@
-post:
-  operationId: setBuyer
-  summary: Nastavení/odnastavení aktuálně přihlášeného uživatele jako objednatele pro stav "Budu objednávat" pro aktuální den.
-  responses:
-    "200":
-      description: Stav byl úspěšně změněn.
--- a/types/schemas/_index.yml
+++ b/types/schemas/_index.yml
@@ -21,23 +21,13 @@ ClientData:
  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
+      description: Datum konkrétního 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"
+      format: date
    choices:
      $ref: "#/LunchChoices"
    menus:
@@ -74,9 +64,6 @@ UserLunchChoice:
    note:
      description: Volitelná, veřejně viditelná uživatelská poznámka k vybrané volbě
      type: string
-    isBuyer:
-      description: Příznak, zda je tento uživatel objednatelem pro stav "Budu objednávat"
-      type: boolean
 LocationLunchChoicesMap:
  description: Objekt, kde klíčem je možnost stravování ((#LunchChoice)) a hodnotou množina uživatelů s touto volbou ((#LunchChoices)).
  type: object