Compare commits
17 Commits
feat/gener
...
f13cd4ffa9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f13cd4ffa9 | ||
| 086646fd1c | |||
| b8629afef2 | |||
| d366ac39d4 | |||
| fdd42dc46a | |||
| 2b7197eff6 | |||
| 6f43c74769 | |||
|
|
d85c764c88 | ||
|
|
37cacd895a | ||
| 6a1da97ef1 | |||
|
f91973f1a4
|
|||
|
7cf9179a87
|
|||
|
54e5be6b6a
|
|||
|
c264f9921e
|
|||
|
e03ba45415
|
|||
|
20f4ee0427
|
|||
|
be4cee4cdb
|
@@ -10,6 +10,26 @@
|
||||
<link rel="apple-touch-icon" href="/logo192.png" />
|
||||
<link rel="manifest" href="/manifest.json" />
|
||||
<title>Luncher</title>
|
||||
<script>
|
||||
(function() {
|
||||
try {
|
||||
var saved = localStorage.getItem('theme_preference');
|
||||
var theme;
|
||||
if (saved === 'dark') {
|
||||
theme = 'dark';
|
||||
} else if (saved === 'light') {
|
||||
theme = 'light';
|
||||
} else {
|
||||
// 'system' nebo neuloženo - použij systémové nastavení
|
||||
theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
|
||||
}
|
||||
document.documentElement.setAttribute('data-bs-theme', theme);
|
||||
} catch (e) {
|
||||
// Fallback pokud localStorage není dostupný
|
||||
document.documentElement.setAttribute('data-bs-theme', 'light');
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
"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",
|
||||
|
||||
1129
client/src/App.scss
1129
client/src/App.scss
File diff suppressed because it is too large
Load Diff
@@ -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 { faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons';
|
||||
import { faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
|
||||
import Loader from './components/Loader';
|
||||
import { getDayOfWeekIndex, getHumanDate, getHumanDateTime, getIsWeekend, isInTheFuture } from './Utils';
|
||||
import { getHumanDateTime, 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 } 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, setBuyer, dismissQr } 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,10 +71,7 @@ function App() {
|
||||
const departureChoiceRef = useRef<HTMLSelectElement>(null);
|
||||
const pizzaPoznamkaRef = useRef<HTMLInputElement>(null);
|
||||
const [failure, setFailure] = useState<boolean>(false);
|
||||
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 [dayIndex, setDayIndex] = useState<number>();
|
||||
const [loadingPizzaDay, setLoadingPizzaDay] = useState<boolean>(false);
|
||||
const [noteModalOpen, setNoteModalOpen] = useState<boolean>(false);
|
||||
const [eggImage, setEggImage] = useState<Blob>();
|
||||
@@ -92,9 +89,8 @@ function App() {
|
||||
const data = response.data
|
||||
if (data) {
|
||||
setData(data);
|
||||
const dayIndex = getDayOfWeekIndex(new Date(data.date));
|
||||
setDayIndex(dayIndex);
|
||||
dayIndexRef.current = dayIndex;
|
||||
setDayIndex(data.dayIndex);
|
||||
dayIndexRef.current = data.dayIndex;
|
||||
setFood(data.menus);
|
||||
}
|
||||
}).catch(e => {
|
||||
@@ -107,8 +103,6 @@ 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);
|
||||
@@ -131,7 +125,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 || getDayOfWeekIndex(new Date(newData.date)) === dayIndexRef.current) {
|
||||
if (dayIndexRef.current == null || newData.dayIndex === dayIndexRef.current) {
|
||||
setData(newData);
|
||||
}
|
||||
});
|
||||
@@ -144,19 +138,33 @@ function App() {
|
||||
}, [socket]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth?.login) {
|
||||
if (!auth?.login || !data?.choices) {
|
||||
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];
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// Pre-fill form refs from existing choices
|
||||
let foundKey: LunchChoice | undefined;
|
||||
let foundChoice: UserLunchChoice | undefined;
|
||||
for (const key of Object.keys(data.choices)) {
|
||||
const locationKey = key as LunchChoice;
|
||||
const locationChoices = data.choices[locationKey];
|
||||
if (locationChoices && auth.login in locationChoices) {
|
||||
foundKey = locationKey;
|
||||
foundChoice = locationChoices[auth.login];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (foundKey && choiceRef.current) {
|
||||
choiceRef.current.value = foundKey;
|
||||
const restaurantKey = Object.keys(Restaurant).indexOf(foundKey);
|
||||
if (restaurantKey > -1 && food) {
|
||||
const restaurant = Object.keys(Restaurant)[restaurantKey] as Restaurant;
|
||||
setFoodChoiceList(food[restaurant]?.food);
|
||||
setClosed(food[restaurant]?.closed ?? false);
|
||||
}
|
||||
}
|
||||
if (foundChoice?.departureTime && departureChoiceRef.current) {
|
||||
departureChoiceRef.current.value = foundChoice.departureTime;
|
||||
}
|
||||
}, [auth, auth?.login, data?.choices])
|
||||
|
||||
// Reference na mojí objednávku
|
||||
@@ -220,7 +228,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 (auth?.login) {
|
||||
if (canChangeChoice && auth?.login) {
|
||||
await addChoice({ body: { locationKey: location, foodIndex, dayIndex } });
|
||||
}
|
||||
}
|
||||
@@ -228,7 +236,7 @@ function App() {
|
||||
|
||||
const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
|
||||
const locationKey = event.target.value as LunchChoice;
|
||||
if (auth?.login) {
|
||||
if (canChangeChoice && auth?.login) {
|
||||
await addChoice({ body: { locationKey, dayIndex } });
|
||||
if (foodChoiceRef.current?.value) {
|
||||
foodChoiceRef.current.value = "";
|
||||
@@ -290,6 +298,12 @@ function App() {
|
||||
}
|
||||
}
|
||||
|
||||
const markAsBuyer = async () => {
|
||||
if (auth?.login) {
|
||||
await setBuyer();
|
||||
}
|
||||
}
|
||||
|
||||
const pizzaSuggestions = useMemo(() => {
|
||||
if (!data?.pizzaList) {
|
||||
return [];
|
||||
@@ -310,7 +324,7 @@ function App() {
|
||||
const handlePizzaChange = async (value: SelectedOptionValue | SelectedOptionValue[]) => {
|
||||
if (auth?.login && data?.pizzaList) {
|
||||
if (typeof value !== 'string') {
|
||||
throw Error('Nepodporovaný typ hodnoty');
|
||||
throw new TypeError('Nepodporovaný typ hodnoty: ' + typeof value);
|
||||
}
|
||||
const s = value.split('|');
|
||||
const pizzaIndex = Number.parseInt(s[0]);
|
||||
@@ -331,30 +345,6 @@ 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 } });
|
||||
@@ -378,41 +368,58 @@ function App() {
|
||||
const renderFoodTable = (location: Restaurant, menu: RestaurantDayMenu) => {
|
||||
let content;
|
||||
if (menu?.closed) {
|
||||
content = <h3>Zavřeno</h3>
|
||||
content = <div className="restaurant-closed">Zavřeno</div>
|
||||
} else if (menu?.food?.length && menu.food.length > 0) {
|
||||
const hideSoups = settings?.hideSoups;
|
||||
content = <Table striped bordered hover>
|
||||
<tbody style={{ cursor: 'pointer' }}>
|
||||
content = <Table className="food-table">
|
||||
<tbody style={{ cursor: canChangeChoice ? 'pointer' : 'default' }}>
|
||||
{menu.food.map((f: Food, index: number) =>
|
||||
(!hideSoups || !f.isSoup) &&
|
||||
<tr key={f.name} onClick={() => doAddClickFoodChoice(location, index)}>
|
||||
<td>{f.amount}</td>
|
||||
<td>
|
||||
<div className="food-name">
|
||||
{f.name}
|
||||
{f.allergens && f.allergens.length > 0 && (
|
||||
<> ({f.allergens.map((a, idx) => (
|
||||
<span className="food-allergens">
|
||||
{' '}({f.allergens.map((a, idx) => (
|
||||
<span key={a}>
|
||||
<span title={ALLERGENS[a]} style={{ cursor: 'help', textDecoration: 'underline' }} onClick={e => {
|
||||
<span className="allergen-link" title={ALLERGENS[a]} onClick={e => {
|
||||
e.stopPropagation();
|
||||
window.open(LINK_ALLERGENS, '_blank');
|
||||
}}>{a}</span>
|
||||
{idx < f.allergens!.length - 1 && ','}
|
||||
{idx < f.allergens!.length - 1 && ', '}
|
||||
</span>
|
||||
))})
|
||||
</span>
|
||||
))})</>
|
||||
)}
|
||||
</div>
|
||||
<div className="food-meta">
|
||||
{f.amount && f.amount !== '-' && <span className="food-amount">{f.amount}</span>}
|
||||
<span className="food-price">{f.price}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>{f.price}</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</Table>
|
||||
} else {
|
||||
content = <h3>Chyba načtení dat</h3>
|
||||
content = <div className="restaurant-error">Chyba načtení dat</div>
|
||||
}
|
||||
return <Col md={12} lg={3} className='mt-3'>
|
||||
<h3 style={{ cursor: 'pointer' }} onClick={() => doAddClickFoodChoice(location)}>{getLunchChoiceName(location)}</h3>
|
||||
{menu?.lastUpdate && <small>Poslední aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
|
||||
return <Col md={6} lg={3} className='mt-3'>
|
||||
<div className="restaurant-card">
|
||||
<div className="restaurant-header" style={{ cursor: canChangeChoice ? 'pointer' : 'default' }} onClick={() => doAddClickFoodChoice(location)}>
|
||||
<h3>
|
||||
{getLunchChoiceName(location)}
|
||||
</h3>
|
||||
{menu?.lastUpdate && <small>Aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
|
||||
{menu?.warnings && menu.warnings.length > 0 && (
|
||||
<span className="restaurant-warning" title={menu.warnings.join('\n')}>
|
||||
<FontAwesomeIcon icon={faTriangleExclamation} />
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{content}
|
||||
</div>
|
||||
</Col>
|
||||
}
|
||||
|
||||
@@ -445,50 +452,44 @@ function App() {
|
||||
}
|
||||
|
||||
const noOrders = data?.pizzaDay?.orders?.length === 0;
|
||||
const canChangeChoice = dayIndex == null || dayIndex >= todayDayIndex;
|
||||
const canChangeChoice = dayIndex == null || data.todayDayIndex == null || dayIndex >= data.todayDayIndex;
|
||||
|
||||
const { path, url, startOffset, endOffset, duration, ...style } = easterEgg || {};
|
||||
|
||||
return (
|
||||
<div className="app-container">
|
||||
{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 dayIndex={dayIndex} />
|
||||
<Header />
|
||||
<div className='wrapper'>
|
||||
{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 }} /> */}
|
||||
Poslední změny:
|
||||
<ul>
|
||||
<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>
|
||||
{data.todayDayIndex != null && data.todayDayIndex > 4 &&
|
||||
<Alert variant="info" className="mb-3">
|
||||
Zobrazujete uplynulý týden
|
||||
</Alert>
|
||||
}
|
||||
<>
|
||||
{dayIndex != null &&
|
||||
<div className='day-navigator'>
|
||||
<span title='Předchozí den'>
|
||||
<FontAwesomeIcon icon={faChevronLeft} style={{ cursor: "pointer", visibility: dayIndex > 0 ? "initial" : "hidden" }} onClick={() => handleDayChange(dayIndex - 1)} />
|
||||
</span>
|
||||
<h1 className='title' style={{ color: dayIndex === todayDayIndex ? 'black' : 'gray' }}>{getHumanDate(new Date(data.date))}</h1>
|
||||
<h1 className={`title ${dayIndex !== data.todayDayIndex ? 'text-muted' : ''}`}>{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'>
|
||||
{/* 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'])}
|
||||
{Object.keys(Restaurant).map(key => {
|
||||
const locationKey = key as Restaurant;
|
||||
return food[locationKey] && renderFoodTable(locationKey, food[locationKey]);
|
||||
})}
|
||||
</Row>
|
||||
<div className='content-wrapper'>
|
||||
<div className='content'>
|
||||
{canChangeChoice && <>
|
||||
<p>{`Jak to ${dayIndex == null || dayIndex === todayDayIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
|
||||
{canChangeChoice && <div className="choice-section fade-in">
|
||||
<p>{`Jak to ${dayIndex == null || dayIndex === data.todayDayIndex ? 'dnes' : 'tento den'} vidíš s obědem?`}</p>
|
||||
<Form.Select ref={choiceRef} onChange={doAddChoice}>
|
||||
<option></option>
|
||||
<option value="">Vyber možnost...</option>
|
||||
{Object.entries(LunchChoice)
|
||||
.filter(entry => {
|
||||
const locationKey = entry[0] as Restaurant;
|
||||
@@ -498,56 +499,71 @@ function App() {
|
||||
</Form.Select>
|
||||
<small>Je možné vybrat jen jednu možnost. Výběr jiné odstraní předchozí.</small>
|
||||
{foodChoiceList && !closed && <>
|
||||
<p style={{ marginTop: "10px" }}>Na co dobrého? <small>(nepovinné)</small></p>
|
||||
<p className="mt-3">Na co dobrého? <small style={{ color: 'var(--luncher-text-muted)' }}>(nepovinné)</small></p>
|
||||
<Form.Select ref={foodChoiceRef} onChange={doAddFoodChoice}>
|
||||
<option></option>
|
||||
<option value="">Vyber jídlo...</option>
|
||||
{foodChoiceList.map((food, index) => <option key={food.name} value={index}>{food.name}</option>)}
|
||||
</Form.Select>
|
||||
</>}
|
||||
{foodChoiceList && !closed && <>
|
||||
<p style={{ marginTop: "10px" }}>V kolik hodin preferuješ odchod?</p>
|
||||
<p className="mt-3">V kolik hodin preferuješ odchod?</p>
|
||||
<Form.Select ref={departureChoiceRef} onChange={handleChangeDepartureTime}>
|
||||
<option></option>
|
||||
<option value="">Vyber čas...</option>
|
||||
{Object.values(DepartureTime)
|
||||
.filter(time => isInTheFuture(time))
|
||||
.map(time => <option key={time} value={time}>{time}</option>)}
|
||||
</Form.Select>
|
||||
</>}
|
||||
</>}
|
||||
</div>}
|
||||
{Object.keys(data.choices).length > 0 ?
|
||||
<Table bordered className='mt-5'>
|
||||
<Table className='choices-table mt-4 fade-in'>
|
||||
<tbody>
|
||||
{Object.keys(data.choices).map(key => {
|
||||
const locationKey = key as LunchChoice;
|
||||
const locationName = getLunchChoiceName(locationKey);
|
||||
const loginObject = data.choices[locationKey];
|
||||
if (!loginObject) {
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
const locationLoginList = Object.entries(loginObject);
|
||||
const locationPickCount = locationLoginList.length
|
||||
return (
|
||||
<tr key={key}>
|
||||
{(locationPickCount ?? 0) > 1 ? (
|
||||
<td>{locationName} ({locationPickCount})</td>
|
||||
) : (
|
||||
<td>{locationName}</td>)}
|
||||
<td>
|
||||
{locationName}
|
||||
{(locationPickCount ?? 0) > 1 && <span className="ms-1">({locationPickCount})</span>}
|
||||
</td>
|
||||
<td className='p-0'>
|
||||
<Table>
|
||||
<Table className="nested-table">
|
||||
<tbody>
|
||||
{locationLoginList.map((entry: [string, UserLunchChoice], index) => {
|
||||
{locationLoginList.map((entry: [string, UserLunchChoice]) => {
|
||||
const login = entry[0];
|
||||
const userPayload = entry[1];
|
||||
const userChoices = userPayload?.selectedFoods;
|
||||
const trusted = userPayload?.trusted || false;
|
||||
const isBuyer = userPayload?.isBuyer || false;
|
||||
return <tr key={entry[0]}>
|
||||
<td>
|
||||
<div className="user-row">
|
||||
<div className="user-info">
|
||||
{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>}
|
||||
<strong>{login}</strong>
|
||||
{userPayload.departureTime && <small className="ms-2" style={{ color: 'var(--luncher-text-muted)' }}>({userPayload.departureTime})</small>}
|
||||
{userPayload.note && <span className="ms-2" style={{ fontSize: 'small', color: 'var(--luncher-text-secondary)' }}>({userPayload.note})</span>}
|
||||
</div>
|
||||
<div className="user-actions">
|
||||
{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!);
|
||||
@@ -563,24 +579,26 @@ function App() {
|
||||
doRemoveChoices(key as LunchChoice);
|
||||
}} className='action-icon' icon={faTrashCan} />
|
||||
</span>}
|
||||
</td>
|
||||
{userChoices?.length && food ? <td>
|
||||
<ul>
|
||||
{userChoices?.map(foodIndex => {
|
||||
</div>
|
||||
</div>
|
||||
{userChoices && userChoices.length > 0 && food && (
|
||||
<div className="food-choices">
|
||||
{userChoices.map(foodIndex => {
|
||||
const restaurantKey = key as Restaurant;
|
||||
const foodName = food[restaurantKey]?.food?.[foodIndex].name;
|
||||
return <li key={foodIndex}>
|
||||
{foodName}
|
||||
return <div key={foodIndex} className="food-choice-item">
|
||||
<span className="food-choice-name">{foodName}</span>
|
||||
{login === auth.login && canChangeChoice &&
|
||||
<span title={`Odstranit ${foodName}`}>
|
||||
<FontAwesomeIcon onClick={() => {
|
||||
doRemoveFoodChoice(restaurantKey, foodIndex);
|
||||
}} className='action-icon' icon={faTrashCan} />
|
||||
</span>}
|
||||
</li>
|
||||
</div>
|
||||
})}
|
||||
</ul>
|
||||
</td> : null}
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
)}
|
||||
@@ -592,94 +610,94 @@ function App() {
|
||||
)}
|
||||
</tbody>
|
||||
</Table>
|
||||
: <div className='mt-5'><i>Zatím nikdo nehlasoval...</i></div>
|
||||
: <div className='no-votes mt-4'>Zatím nikdo nehlasoval...</div>
|
||||
}
|
||||
</div>
|
||||
{dayIndex === todayDayIndex &&
|
||||
<div className='mt-5'>
|
||||
{dayIndex === data.todayDayIndex &&
|
||||
<div className='pizza-section fade-in'>
|
||||
{!data.pizzaDay &&
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<>
|
||||
<h3>Pizza Day</h3>
|
||||
<p>Pro dnešní den není aktuálně založen Pizza day.</p>
|
||||
{loadingPizzaDay ?
|
||||
<span>
|
||||
<FontAwesomeIcon icon={faGear} className='fa-spin' /> Zjišťujeme dostupné pizzy
|
||||
<span style={{ color: 'var(--luncher-primary)' }}>
|
||||
<FontAwesomeIcon icon={faGear} className='fa-spin me-2' /> Zjišťujeme dostupné pizzy
|
||||
</span>
|
||||
:
|
||||
<>
|
||||
<div>
|
||||
<Button onClick={async () => {
|
||||
setLoadingPizzaDay(true);
|
||||
await createPizzaDay().then(() => setLoadingPizzaDay(false));
|
||||
}}>Založit Pizza day</Button>
|
||||
<Button onClick={doJdemeObed} style={{ marginLeft: "14px" }}>Jdeme na oběd !</Button>
|
||||
</>
|
||||
}
|
||||
<Button variant="outline-primary" onClick={doJdemeObed}>Jdeme na oběd!</Button>
|
||||
</div>
|
||||
}
|
||||
</>
|
||||
}
|
||||
{data.pizzaDay &&
|
||||
<div>
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<h3>Pizza day</h3>
|
||||
<>
|
||||
<h3>Pizza Day</h3>
|
||||
{
|
||||
data.pizzaDay.state === PizzaDayState.CREATED &&
|
||||
<div>
|
||||
<>
|
||||
<p>
|
||||
Pizza Day je založen a spravován uživatelem {data.pizzaDay.creator}.<br />
|
||||
Pizza Day je založen a spravován uživatelem <strong>{data.pizzaDay.creator}</strong>.<br />
|
||||
Můžete upravovat své objednávky.
|
||||
</p>
|
||||
{
|
||||
data.pizzaDay.creator === auth.login &&
|
||||
<>
|
||||
<Button className='danger mb-3' title="Smaže kompletně pizza day, včetně dosud zadaných objednávek." onClick={async () => {
|
||||
<div className="mb-4">
|
||||
<Button variant="danger" title="Smaže kompletně pizza day, včetně dosud zadaných objednávek." onClick={async () => {
|
||||
await deletePizzaDay();
|
||||
}}>Smazat Pizza day</Button>
|
||||
<Button className='mb-3' style={{ marginLeft: '20px' }} title={noOrders ? "Nelze uzamknout - neexistuje žádná objednávka" : "Zamezí přidávat/odebírat objednávky. Použij před samotným objednáním, aby již nemohlo docházet ke změnám."} disabled={noOrders} onClick={async () => {
|
||||
<Button title={noOrders ? "Nelze uzamknout - neexistuje žádná objednávka" : "Zamezí přidávat/odebírat objednávky. Použij před samotným objednáním, aby již nemohlo docházet ke změnám."} disabled={noOrders} onClick={async () => {
|
||||
await lockPizzaDay();
|
||||
}}>Uzamknout</Button>
|
||||
</>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</>
|
||||
}
|
||||
{
|
||||
data.pizzaDay.state === PizzaDayState.LOCKED &&
|
||||
<div>
|
||||
<p>Objednávky jsou uzamčeny uživatelem {data.pizzaDay.creator}</p>
|
||||
{data.pizzaDay.creator === auth.login &&
|
||||
<>
|
||||
<Button className='danger mb-3' title="Umožní znovu editovat objednávky." onClick={async () => {
|
||||
<p>Objednávky jsou uzamčeny uživatelem <strong>{data.pizzaDay.creator}</strong></p>
|
||||
{data.pizzaDay.creator === auth.login &&
|
||||
<div className="mb-4">
|
||||
<Button variant="secondary" title="Umožní znovu editovat objednávky." onClick={async () => {
|
||||
await unlockPizzaDay();
|
||||
}}>Odemknout</Button>
|
||||
<Button className='danger mb-3' style={{ marginLeft: '20px' }} title={noOrders ? "Nelze objednat - neexistuje žádná objednávka" : "Použij po objednání. Objednávky zůstanou zamčeny."} disabled={noOrders} onClick={async () => {
|
||||
<Button title={noOrders ? "Nelze objednat - neexistuje žádná objednávka" : "Použij po objednání. Objednávky zůstanou zamčeny."} disabled={noOrders} onClick={async () => {
|
||||
await finishOrder();
|
||||
}}>Objednáno</Button>
|
||||
</>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</>
|
||||
}
|
||||
{
|
||||
data.pizzaDay.state === PizzaDayState.ORDERED &&
|
||||
<div>
|
||||
<p>Pizzy byly objednány uživatelem {data.pizzaDay.creator}</p>
|
||||
<>
|
||||
<p>Pizzy byly objednány uživatelem <strong>{data.pizzaDay.creator}</strong></p>
|
||||
{data.pizzaDay.creator === auth.login &&
|
||||
<div>
|
||||
<Button className='danger mb-3' title="Vrátí stav do předchozího kroku (před objednáním)." onClick={async () => {
|
||||
<div className="mb-4">
|
||||
<Button variant="secondary" title="Vrátí stav do předchozího kroku (před objednáním)." onClick={async () => {
|
||||
await lockPizzaDay();
|
||||
}}>Vrátit do "uzamčeno"</Button>
|
||||
<Button className='danger mb-3' style={{ marginLeft: '20px' }} title="Nastaví stav na 'Doručeno' - koncový stav." onClick={async () => {
|
||||
<Button title="Nastaví stav na 'Doručeno' - koncový stav." onClick={async () => {
|
||||
await finishDelivery({ body: { bankAccount: settings?.bankAccount, bankAccountHolder: settings?.holderName } });
|
||||
}}>Doručeno</Button>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
{
|
||||
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>
|
||||
</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>
|
||||
}
|
||||
</div>
|
||||
{data.pizzaDay.state === PizzaDayState.CREATED &&
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<div className="pizza-order-form">
|
||||
<SelectSearch
|
||||
search={true}
|
||||
options={pizzaSuggestions}
|
||||
@@ -688,39 +706,67 @@ function App() {
|
||||
onBlur={_ => { }}
|
||||
onFocus={_ => { }}
|
||||
/>
|
||||
Poznámka: <input ref={pizzaPoznamkaRef} className='mt-3' type="text" onKeyDown={event => {
|
||||
<div className="d-flex align-items-center gap-2">
|
||||
<label style={{ color: 'var(--luncher-text-secondary)' }}>Poznámka:</label>
|
||||
<input ref={pizzaPoznamkaRef} type="text" placeholder="Např. bez cibule" onKeyDown={event => {
|
||||
if (event.key === 'Enter') {
|
||||
handlePizzaPoznamkaChange();
|
||||
}
|
||||
event.stopPropagation();
|
||||
}} />
|
||||
<Button
|
||||
style={{ marginLeft: '20px' }}
|
||||
disabled={!myOrder?.pizzaList?.length}
|
||||
onClick={handlePizzaPoznamkaChange}>
|
||||
Uložit
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
<PizzaOrderList state={data.pizzaDay.state!} orders={data.pizzaDay.orders!} onDelete={handlePizzaDelete} creator={data.pizzaDay.creator!} />
|
||||
{
|
||||
data.pizzaDay.state === PizzaDayState.DELIVERED && myOrder?.hasQr ?
|
||||
data.pizzaDay.state === PizzaDayState.DELIVERED && myOrder?.hasQr &&
|
||||
<div className='qr-code'>
|
||||
<h3>QR platba</h3>
|
||||
<img src={`/api/qr?login=${auth.login}`} alt='QR kód' />
|
||||
</div> : null
|
||||
</div>
|
||||
}
|
||||
</>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
{data.pendingQrs && data.pendingQrs.length > 0 &&
|
||||
<div className='pizza-section fade-in mt-4'>
|
||||
<h3>Nevyřízené platby</h3>
|
||||
<p>Máte neuhrazené QR kódy z předchozích Pizza day.</p>
|
||||
{data.pendingQrs.map(qr => (
|
||||
<div key={qr.date} className='qr-code mb-3'>
|
||||
<p>
|
||||
<strong>{qr.date}</strong> — {qr.creator} ({qr.totalPrice} Kč)
|
||||
</p>
|
||||
<img src={`/api/qr?login=${auth.login}`} alt='QR kód' />
|
||||
<div className='mt-2'>
|
||||
<Button variant="success" onClick={async () => {
|
||||
await dismissQr({ body: { date: qr.date } });
|
||||
// Přenačteme data pro aktualizaci
|
||||
const response = await getData({ query: { dayIndex } });
|
||||
if (response.data) {
|
||||
setData(response.data);
|
||||
}
|
||||
}}>
|
||||
Zaplatil jsem
|
||||
</Button>
|
||||
</div>
|
||||
</> || "Jejda, něco se nám nepovedlo :("}
|
||||
</div>
|
||||
<FallingLeaves
|
||||
))}
|
||||
</div>
|
||||
}
|
||||
</>
|
||||
</div>
|
||||
{/* <FallingLeaves
|
||||
numLeaves={LEAF_PRESETS.NORMAL}
|
||||
leafVariants={LEAF_COLOR_THEMES.AUTUMN}
|
||||
/>
|
||||
/> */}
|
||||
<Footer />
|
||||
<NoteModal isOpen={noteModalOpen} onClose={() => setNoteModalOpen(false)} onSave={saveNote} />
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
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";
|
||||
@@ -22,6 +23,7 @@ export default function AppRoutes() {
|
||||
width: '100vw',
|
||||
height: '100vh'
|
||||
}} /> */}
|
||||
<SnowOverlay color={'rgba(240, 240, 240, 0.9)'} disabledOnSingleCpuDevices={true} />
|
||||
<App />
|
||||
</>
|
||||
<ToastContainer />
|
||||
|
||||
@@ -1,13 +1,89 @@
|
||||
.login {
|
||||
height: 100%;
|
||||
.login-page {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
text-align: center;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: var(--luncher-bg);
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.login-inner {
|
||||
.login-card {
|
||||
background: var(--luncher-bg-card);
|
||||
border-radius: var(--luncher-radius-xl);
|
||||
box-shadow: var(--luncher-shadow-lg);
|
||||
padding: 48px;
|
||||
max-width: 420px;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
border: 1px solid var(--luncher-border-light);
|
||||
}
|
||||
|
||||
.login-logo {
|
||||
font-size: 2.5rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 8px;
|
||||
letter-spacing: -0.5px;
|
||||
}
|
||||
|
||||
.login-subtitle {
|
||||
color: var(--luncher-text-secondary);
|
||||
font-size: 1rem;
|
||||
margin-bottom: 40px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.login-form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
.login-form label {
|
||||
display: block;
|
||||
text-align: left;
|
||||
font-weight: 500;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.login-form .hint {
|
||||
font-size: 0.85rem;
|
||||
color: var(--luncher-text-muted);
|
||||
margin-top: 8px;
|
||||
text-align: left;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.login-form input[type="text"] {
|
||||
width: 100%;
|
||||
padding: 14px 18px;
|
||||
font-size: 1rem;
|
||||
border: 2px solid var(--luncher-border);
|
||||
border-radius: var(--luncher-radius-sm);
|
||||
background: var(--luncher-bg);
|
||||
color: var(--luncher-text);
|
||||
transition: var(--luncher-transition);
|
||||
}
|
||||
|
||||
.login-form input[type="text"]:hover {
|
||||
border-color: var(--luncher-text-muted);
|
||||
}
|
||||
|
||||
.login-form input[type="text"]:focus {
|
||||
border-color: var(--luncher-primary);
|
||||
box-shadow: 0 0 0 3px var(--luncher-primary-light);
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.login-form input[type="text"]::placeholder {
|
||||
color: var(--luncher-text-muted);
|
||||
}
|
||||
|
||||
.login-form .btn {
|
||||
width: 100%;
|
||||
padding: 14px 24px;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
margin-top: 8px;
|
||||
}
|
||||
@@ -26,7 +26,7 @@ export default function Login() {
|
||||
}, [auth]);
|
||||
|
||||
const doLogin = useCallback(async () => {
|
||||
const length = loginRef?.current?.value.length && loginRef.current.value.replace(/\s/g, '').length
|
||||
const length = loginRef?.current?.value.length && loginRef.current.value.replaceAll(/\s/g, '').length
|
||||
if (length) {
|
||||
const response = await login({ body: { login: loginRef.current?.value } });
|
||||
if (response.data) {
|
||||
@@ -36,21 +36,35 @@ export default function Login() {
|
||||
}, [auth]);
|
||||
|
||||
if (!auth?.login) {
|
||||
return <div className='login'>
|
||||
<h1>Luncher</h1>
|
||||
<h4 style={{ marginBottom: "50px" }}>Aplikace pro profesionální management obědů</h4>
|
||||
<div className='login-inner'>
|
||||
<p style={{ fontSize: "12px", marginTop: "10px" }}>
|
||||
Zobrazované jméno by mělo být vaše jméno nebo přezdívka, pod kterou vás kolegové dokáží snadno identifikovat. Jméno je možné kdykoli změnit.
|
||||
</p>
|
||||
Zobrazované jméno: <input style={{ marginTop: "10px" }} ref={loginRef} type='text' onKeyDown={event => {
|
||||
return (
|
||||
<div className='login-page'>
|
||||
<div className='login-card'>
|
||||
<h1 className='login-logo'>Luncher</h1>
|
||||
<p className='login-subtitle'>Aplikace pro profesionální management obědů</p>
|
||||
<div className='login-form'>
|
||||
<div>
|
||||
<label htmlFor="login-input">Zobrazované jméno</label>
|
||||
<input
|
||||
id="login-input"
|
||||
ref={loginRef}
|
||||
type='text'
|
||||
placeholder="Např. Jan Novák"
|
||||
onKeyDown={event => {
|
||||
if (event.key === 'Enter') {
|
||||
doLogin()
|
||||
}
|
||||
}} />
|
||||
<Button onClick={doLogin} style={{ marginTop: "20px" }}>Uložit</Button>
|
||||
}}
|
||||
/>
|
||||
<p className='hint'>
|
||||
Zadejte jméno nebo přezdívku, pod kterou vás kolegové snadno identifikují.
|
||||
Jméno je možné kdykoli změnit.
|
||||
</p>
|
||||
</div>
|
||||
<Button onClick={doLogin}>Pokračovat</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return <div>Neplatný stav</div>
|
||||
}
|
||||
|
||||
@@ -73,22 +73,16 @@ 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.getTime());
|
||||
const firstDay = new Date(date);
|
||||
firstDay.setDate(date.getDate() - getDayOfWeekIndex(date));
|
||||
return firstDay;
|
||||
}
|
||||
|
||||
/** Vrátí poslední pracovní den v týdnu předaného data. */
|
||||
export function getLastWorkDayOfWeek(date: Date) {
|
||||
const lastDay = new Date(date.getTime());
|
||||
const lastDay = new Date(date);
|
||||
lastDay.setDate(date.getDate() + (4 - getDayOfWeekIndex(date)));
|
||||
return lastDay;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { Navbar } from "react-bootstrap";
|
||||
|
||||
export default function Footer() {
|
||||
return <Navbar className="text-light" variant='dark' expand="lg" style={{
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
marginTop: "auto", // Pushne footer na spodek
|
||||
flexShrink: 0 // Zabrání zmenšování při malém obsahu
|
||||
}}>
|
||||
<span>🄯 Žádná práva nevyhrazena. TODO a zdrojové kódy dostupné <a href="https://gitea.melancholik.eu/mates/Luncher">zde</a>.</span>
|
||||
</Navbar >
|
||||
return (
|
||||
<footer className="footer">
|
||||
<span>
|
||||
Zdroj. kódy dostupné na{' '}
|
||||
<a href="https://gitea.melancholik.eu/mates/Luncher" target="_blank" rel="noopener noreferrer">
|
||||
Gitea
|
||||
</a>
|
||||
</span>
|
||||
</footer>
|
||||
);
|
||||
}
|
||||
@@ -1,21 +1,24 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Navbar, Nav, NavDropdown } from "react-bootstrap";
|
||||
import { Navbar, Nav, NavDropdown, Modal, Button } from "react-bootstrap";
|
||||
import { useAuth } from "../context/auth";
|
||||
import SettingsModal from "./modals/SettingsModal";
|
||||
import { useSettings } from "../context/settings";
|
||||
import { useSettings, ThemePreference } from "../context/settings";
|
||||
import FeaturesVotingModal from "./modals/FeaturesVotingModal";
|
||||
import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";
|
||||
import RefreshMenuModal from "./modals/RefreshMenuModal";
|
||||
import GenerateQRModal from "./modals/GenerateQRModal";
|
||||
import { useNavigate } from "react-router";
|
||||
import { STATS_URL } from "../AppRoutes";
|
||||
import { FeatureRequest, getVotes, updateVote } from "../../../types";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faSun, faMoon } from "@fortawesome/free-solid-svg-icons";
|
||||
|
||||
type Props = {
|
||||
dayIndex?: number;
|
||||
}
|
||||
const CHANGELOG = [
|
||||
"Nový moderní design aplikace",
|
||||
"Oprava parsování Sladovnické a TechTower",
|
||||
"Možnost označit se jako objednávající u volby \"budu objednávat\"",
|
||||
];
|
||||
|
||||
export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
export default function Header() {
|
||||
const auth = useAuth();
|
||||
const settings = useSettings();
|
||||
const navigate = useNavigate();
|
||||
@@ -23,9 +26,29 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
const [votingModalOpen, setVotingModalOpen] = useState<boolean>(false);
|
||||
const [pizzaModalOpen, setPizzaModalOpen] = useState<boolean>(false);
|
||||
const [refreshMenuModalOpen, setRefreshMenuModalOpen] = useState<boolean>(false);
|
||||
const [generateQRModalOpen, setGenerateQRModalOpen] = useState<boolean>(false);
|
||||
const [changelogModalOpen, setChangelogModalOpen] = useState<boolean>(false);
|
||||
const [featureVotes, setFeatureVotes] = useState<FeatureRequest[] | undefined>([]);
|
||||
|
||||
// Zjistíme aktuální efektivní téma (pro zobrazení správné ikony)
|
||||
const [effectiveTheme, setEffectiveTheme] = useState<'light' | 'dark'>('light');
|
||||
|
||||
useEffect(() => {
|
||||
const updateEffectiveTheme = () => {
|
||||
if (settings?.themePreference === 'system') {
|
||||
const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
|
||||
setEffectiveTheme(isDark ? 'dark' : 'light');
|
||||
} else {
|
||||
setEffectiveTheme(settings?.themePreference || 'light');
|
||||
}
|
||||
};
|
||||
|
||||
updateEffectiveTheme();
|
||||
|
||||
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
|
||||
mediaQuery.addEventListener('change', updateEffectiveTheme);
|
||||
return () => mediaQuery.removeEventListener('change', updateEffectiveTheme);
|
||||
}, [settings?.themePreference]);
|
||||
|
||||
useEffect(() => {
|
||||
if (auth?.login) {
|
||||
getVotes().then(response => {
|
||||
@@ -50,8 +73,10 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
setRefreshMenuModalOpen(false);
|
||||
}
|
||||
|
||||
const closeGenerateQRModal = () => {
|
||||
setGenerateQRModalOpen(false);
|
||||
const toggleTheme = () => {
|
||||
// Přepínáme mezi light a dark (ignorujeme system pro jednoduchost)
|
||||
const newTheme: ThemePreference = effectiveTheme === 'dark' ? 'light' : 'dark';
|
||||
settings?.setThemePreference(newTheme);
|
||||
}
|
||||
|
||||
const isValidInteger = (str: string) => {
|
||||
@@ -64,19 +89,19 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
return n !== Infinity && String(n) === str && n >= 0;
|
||||
}
|
||||
|
||||
const saveSettings = (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean) => {
|
||||
const saveSettings = (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean, themePreference?: ThemePreference) => {
|
||||
if (bankAccountNumber) {
|
||||
try {
|
||||
// Validace kódu banky
|
||||
if (bankAccountNumber.indexOf('/') < 0) {
|
||||
throw Error("Číslo účtu neobsahuje lomítko/kód banky")
|
||||
if (!bankAccountNumber.includes('/')) {
|
||||
throw new Error("Číslo účtu neobsahuje lomítko/kód banky")
|
||||
}
|
||||
const split = bankAccountNumber.split("/");
|
||||
if (split[1].length !== 4) {
|
||||
throw Error("Kód banky musí být 4 číslice")
|
||||
throw new Error("Kód banky musí být 4 číslice")
|
||||
}
|
||||
if (!isValidInteger(split[1])) {
|
||||
throw Error("Kód banky není číslo")
|
||||
throw new Error("Kód banky není číslo")
|
||||
}
|
||||
|
||||
// Validace čísla a předčíslí
|
||||
@@ -86,7 +111,7 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
cislo = cislo.replace('-', '');
|
||||
}
|
||||
if (!isValidInteger(cislo)) {
|
||||
throw Error("Předčíslí nebo číslo účtu neobsahuje pouze číslice")
|
||||
throw new Error("Předčíslí nebo číslo účtu neobsahuje pouze číslice")
|
||||
}
|
||||
if (cislo.length < 16) {
|
||||
cislo = cislo.padStart(16, '0');
|
||||
@@ -99,7 +124,7 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
sum += Number.parseInt(char) * weight
|
||||
}
|
||||
if (sum % 11 !== 0) {
|
||||
throw Error("Číslo účtu je neplatné")
|
||||
throw new Error("Číslo účtu je neplatné")
|
||||
}
|
||||
} catch (e: any) {
|
||||
alert(e.message)
|
||||
@@ -109,6 +134,9 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
settings?.setBankAccountNumber(bankAccountNumber);
|
||||
settings?.setBankAccountHolderName(bankAccountHolderName);
|
||||
settings?.setHideSoupsOption(hideSoupsOption);
|
||||
if (themePreference) {
|
||||
settings?.setThemePreference(themePreference);
|
||||
}
|
||||
closeSettingsModal();
|
||||
}
|
||||
|
||||
@@ -128,13 +156,21 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
<Navbar.Toggle aria-controls="basic-navbar-nav" />
|
||||
<Navbar.Collapse id="basic-navbar-nav">
|
||||
<Nav className="nav">
|
||||
<button
|
||||
className="theme-toggle"
|
||||
onClick={toggleTheme}
|
||||
title={effectiveTheme === 'dark' ? 'Přepnout na světlý režim' : 'Přepnout na tmavý režim'}
|
||||
aria-label="Přepnout barevný motiv"
|
||||
>
|
||||
<FontAwesomeIcon icon={effectiveTheme === 'dark' ? faSun : faMoon} />
|
||||
</button>
|
||||
<NavDropdown align="end" title={auth?.login} id="basic-nav-dropdown">
|
||||
<NavDropdown.Item onClick={() => setSettingsModalOpen(true)}>Nastavení</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setRefreshMenuModalOpen(true)}>Přenačtení menu</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setGenerateQRModalOpen(true)}>Generování QR</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setVotingModalOpen(true)}>Hlasovat o nových funkcích</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setPizzaModalOpen(true)}>Pizza kalkulačka</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => navigate(STATS_URL)}>Statistiky</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setChangelogModalOpen(true)}>Novinky</NavDropdown.Item>
|
||||
<NavDropdown.Divider />
|
||||
<NavDropdown.Item onClick={auth?.logout}>Odhlásit se</NavDropdown.Item>
|
||||
</NavDropdown>
|
||||
@@ -142,8 +178,24 @@ export default function Header({ dayIndex }: Readonly<Props>) {
|
||||
</Navbar.Collapse>
|
||||
<SettingsModal isOpen={settingsModalOpen} onClose={closeSettingsModal} onSave={saveSettings} />
|
||||
<RefreshMenuModal isOpen={refreshMenuModalOpen} onClose={closeRefreshMenuModal} />
|
||||
<GenerateQRModal isOpen={generateQRModalOpen} onClose={closeGenerateQRModal} dayIndex={dayIndex} bankAccount={settings?.bankAccount} bankAccountHolder={settings?.holderName} />
|
||||
<FeaturesVotingModal isOpen={votingModalOpen} onClose={closeVotingModal} onChange={saveFeatureVote} initialValues={featureVotes} />
|
||||
<PizzaCalculatorModal isOpen={pizzaModalOpen} onClose={closePizzaModal} />
|
||||
<Modal show={changelogModalOpen} onHide={() => setChangelogModalOpen(false)}>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>Novinky</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<ul>
|
||||
{CHANGELOG.map((item, index) => (
|
||||
<li key={index}>{item}</li>
|
||||
))}
|
||||
</ul>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={() => setChangelogModalOpen(false)}>
|
||||
Zavřít
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
</Navbar>
|
||||
}
|
||||
@@ -9,11 +9,13 @@ type Props = {
|
||||
}
|
||||
|
||||
function Loader(props: Readonly<Props>) {
|
||||
return <div className='loader'>
|
||||
<h1>{props.title ?? 'Prosím čekejte...'}</h1>
|
||||
<FontAwesomeIcon icon={props.icon} className={`loader-icon mb-3 ` + (props.animation ?? '')} />
|
||||
<p>{props.description}</p>
|
||||
return (
|
||||
<div className='loader'>
|
||||
<FontAwesomeIcon icon={props.icon} className={`loader-icon ${props.animation ?? ''}`} />
|
||||
<h2 className='loader-title'>{props.title ?? 'Prosím čekejte...'}</h2>
|
||||
<p className='loader-description'>{props.description}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default Loader;
|
||||
|
||||
@@ -15,29 +15,43 @@ export default function PizzaOrderList({ state, orders, onDelete, creator }: Rea
|
||||
}
|
||||
|
||||
if (!orders?.length) {
|
||||
return <p className="mt-3"><i>Zatím žádné objednávky...</i></p>
|
||||
return <p className="mt-4" style={{ color: 'var(--luncher-text-muted)', fontStyle: 'italic' }}>Zatím žádné objednávky...</p>
|
||||
}
|
||||
|
||||
const total = orders.reduce((total, order) => total + order.totalPrice, 0);
|
||||
|
||||
return <Table className="mt-3" striped bordered hover>
|
||||
<thead>
|
||||
return (
|
||||
<div className="mt-4" style={{
|
||||
background: 'var(--luncher-bg-card)',
|
||||
borderRadius: 'var(--luncher-radius-lg)',
|
||||
overflow: 'hidden',
|
||||
border: '1px solid var(--luncher-border-light)',
|
||||
boxShadow: 'var(--luncher-shadow)'
|
||||
}}>
|
||||
<Table className="mb-0" style={{ color: 'var(--luncher-text)' }}>
|
||||
<thead style={{ background: 'var(--luncher-primary-light)' }}>
|
||||
<tr>
|
||||
<th>Jméno</th>
|
||||
<th>Objednávka</th>
|
||||
<th>Poznámka</th>
|
||||
<th>Příplatek</th>
|
||||
<th>Cena</th>
|
||||
<th style={{ padding: '16px 20px', color: 'var(--luncher-primary)', fontWeight: 600, border: 'none' }}>Jméno</th>
|
||||
<th style={{ padding: '16px 20px', color: 'var(--luncher-primary)', fontWeight: 600, border: 'none' }}>Objednávka</th>
|
||||
<th style={{ padding: '16px 20px', color: 'var(--luncher-primary)', fontWeight: 600, border: 'none' }}>Poznámka</th>
|
||||
<th style={{ padding: '16px 20px', color: 'var(--luncher-primary)', fontWeight: 600, border: 'none' }}>Příplatek</th>
|
||||
<th style={{ padding: '16px 20px', color: 'var(--luncher-primary)', fontWeight: 600, border: 'none', textAlign: 'right' }}>Cena</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{orders.map(order => <tr key={order.customer}>
|
||||
{orders.map(order => <tr key={order.customer} style={{ borderColor: 'var(--luncher-border-light)' }}>
|
||||
<PizzaOrderRow creator={creator} state={state} order={order} onDelete={onDelete} onFeeModalSave={saveFees} />
|
||||
</tr>)}
|
||||
<tr style={{ fontWeight: 'bold' }}>
|
||||
<td colSpan={4}>Celkem</td>
|
||||
<td>{`${total} Kč`}</td>
|
||||
<tr style={{
|
||||
fontWeight: 700,
|
||||
background: 'var(--luncher-bg-hover)',
|
||||
borderTop: '2px solid var(--luncher-border)'
|
||||
}}>
|
||||
<td colSpan={4} style={{ padding: '16px 20px', border: 'none' }}>Celkem</td>
|
||||
<td style={{ padding: '16px 20px', border: 'none', textAlign: 'right', color: 'var(--luncher-primary)' }}>{`${total} Kč`}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</Table>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,176 +0,0 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Modal, Button, Table, Form, Alert } from "react-bootstrap";
|
||||
import { ClientData, generateQr, getData } from "../../../../types";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean,
|
||||
onClose: () => void,
|
||||
dayIndex?: number,
|
||||
bankAccount?: string,
|
||||
bankAccountHolder?: string,
|
||||
}
|
||||
|
||||
type UserQRData = {
|
||||
login: string;
|
||||
selected: boolean;
|
||||
note: string;
|
||||
amount: string;
|
||||
}
|
||||
|
||||
/** Modální dialog pro generování QR kódů. */
|
||||
export default function GenerateQRModal({ isOpen, onClose, dayIndex, bankAccount, bankAccountHolder }: Readonly<Props>) {
|
||||
const [users, setUsers] = useState<UserQRData[]>([]);
|
||||
const [loading, setLoading] = useState<boolean>(false);
|
||||
|
||||
const isBankDataValid = bankAccount && bankAccountHolder;
|
||||
|
||||
useEffect(() => {
|
||||
if (isOpen) {
|
||||
setLoading(true);
|
||||
getData({ query: { dayIndex } }).then(response => {
|
||||
const data: ClientData = response.data;
|
||||
const userList: UserQRData[] = [];
|
||||
|
||||
// Projdeme všechny volby stravování a získáme uživatele
|
||||
if (data.choices) {
|
||||
Object.entries(data.choices).forEach(([locationKey, locationUsers]) => {
|
||||
Object.keys(locationUsers).forEach(login => {
|
||||
// Přidáme uživatele pouze pokud tam ještě není
|
||||
if (!userList.find(u => u.login === login)) {
|
||||
userList.push({
|
||||
login,
|
||||
selected: false,
|
||||
note: '',
|
||||
amount: ''
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
setUsers(userList);
|
||||
setLoading(false);
|
||||
}).catch(() => {
|
||||
setLoading(false);
|
||||
});
|
||||
}
|
||||
}, [isOpen, dayIndex]);
|
||||
|
||||
const handleCheckboxChange = (login: string) => {
|
||||
setUsers(users.map(u =>
|
||||
u.login === login ? { ...u, selected: !u.selected } : u
|
||||
));
|
||||
};
|
||||
|
||||
const handleNoteChange = (login: string, note: string) => {
|
||||
setUsers(users.map(u =>
|
||||
u.login === login ? { ...u, note } : u
|
||||
));
|
||||
};
|
||||
|
||||
const handleAmountChange = (login: string, amount: string) => {
|
||||
setUsers(users.map(u =>
|
||||
u.login === login ? { ...u, amount } : u
|
||||
));
|
||||
};
|
||||
|
||||
const handleGenerate = async () => {
|
||||
const selectedUsers = users.filter(u => u.selected);
|
||||
// TODO: Implementovat generování QR kódů
|
||||
console.log('Generování QR pro:', selectedUsers);
|
||||
alert('Funkce generování QR bude implementována');
|
||||
await generateQr({
|
||||
body: {
|
||||
bankAccount: bankAccount!,
|
||||
bankAccountHolder: bankAccountHolder!,
|
||||
qrCodes: selectedUsers.map(u => ({
|
||||
login: u.login,
|
||||
des: u.note,
|
||||
amount: Number.parseFloat(u.amount)
|
||||
}))
|
||||
},
|
||||
})
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
setUsers([]);
|
||||
onClose();
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal show={isOpen} onHide={handleClose} size="lg">
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>Generování QR kódů</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
{!isBankDataValid && (
|
||||
<Alert variant="warning">
|
||||
<strong>Upozornění:</strong> Pro generování QR kódů je nutné mít v nastavení vyplněné číslo bankovního účtu a jméno majitele účtu.
|
||||
</Alert>
|
||||
)}
|
||||
{loading ? (
|
||||
<p>Načítání uživatelů...</p>
|
||||
) : users.length === 0 ? (
|
||||
<p>Pro aktuální den nemá žádný uživatel vybranou volbu stravování.</p>
|
||||
) : (
|
||||
<Table striped bordered hover>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style={{ width: '50px' }}></th>
|
||||
<th>Uživatel</th>
|
||||
<th>Poznámka</th>
|
||||
<th style={{ width: '120px' }}>Částka (Kč)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map(user => (
|
||||
<tr key={user.login}>
|
||||
<td className="text-center">
|
||||
<Form.Check
|
||||
type="checkbox"
|
||||
checked={user.selected}
|
||||
onChange={() => handleCheckboxChange(user.login)}
|
||||
/>
|
||||
</td>
|
||||
<td>{user.login}</td>
|
||||
<td>
|
||||
<Form.Control
|
||||
type="text"
|
||||
value={user.note}
|
||||
onChange={(e) => handleNoteChange(user.login, e.target.value)}
|
||||
placeholder="Poznámka"
|
||||
disabled={!user.selected}
|
||||
/>
|
||||
</td>
|
||||
<td>
|
||||
<Form.Control
|
||||
type="number"
|
||||
step="0.01"
|
||||
min="0"
|
||||
value={user.amount}
|
||||
onChange={(e) => handleAmountChange(user.login, e.target.value)}
|
||||
placeholder="0.00"
|
||||
disabled={!user.selected}
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</Table>
|
||||
)}
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={handleClose}>
|
||||
Zavřít
|
||||
</Button>
|
||||
<Button
|
||||
variant="primary"
|
||||
onClick={handleGenerate}
|
||||
disabled={users.filter(u => u.selected).length === 0 || !isBankDataValid}
|
||||
>
|
||||
Generovat
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -15,12 +15,12 @@ export default function PizzaAdditionalFeeModal({ customerName, isOpen, onClose,
|
||||
const priceRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
const doSubmit = () => {
|
||||
onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value ?? "0"));
|
||||
onSave(customerName, textRef.current?.value, Number.parseInt(priceRef.current?.value ?? "0"));
|
||||
}
|
||||
|
||||
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
|
||||
if (e.key === 'Enter') {
|
||||
onSave(customerName, textRef.current?.value, parseInt(priceRef.current?.value ?? "0"));
|
||||
onSave(customerName, textRef.current?.value, Number.parseInt(priceRef.current?.value ?? "0"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,13 +36,13 @@ export default function PizzaCalculatorModal({ isOpen, onClose }: Readonly<Props
|
||||
|
||||
// 1. pizza
|
||||
if (diameter1Ref.current?.value) {
|
||||
const diameter1 = parseInt(diameter1Ref.current?.value);
|
||||
const diameter1 = Number.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 = parseInt(price1Ref.current?.value);
|
||||
const price1 = Number.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 = parseInt(diameter2Ref.current?.value);
|
||||
const diameter2 = Number.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 = parseInt(price2Ref.current?.value);
|
||||
const price2 = Number.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 = 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;
|
||||
const bigger = Math.max(r.pizza1.pricePerM, r.pizza2.pricePerM);
|
||||
const smaller = Math.min(r.pizza1.pricePerM, r.pizza2.pricePerM);
|
||||
r.ratio = (bigger / smaller) - 1;
|
||||
r.diameterDiff = Math.abs(r.pizza1.diameter - r.pizza2.diameter);
|
||||
} else {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useRef, useState } from "react";
|
||||
import { Modal, Button, Alert } from "react-bootstrap";
|
||||
import { Modal, Button, Alert, Form } from "react-bootstrap";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
@@ -30,7 +30,6 @@ export default function RefreshMenuModal({ isOpen, onClose }: Readonly<Props>) {
|
||||
if (res.ok) {
|
||||
setRefreshMessage({ type: 'success', text: 'Uspesny fetch' });
|
||||
if (refreshPassRef.current) {
|
||||
// Clean hesla xd
|
||||
refreshPassRef.current.value = '';
|
||||
}
|
||||
} else {
|
||||
@@ -50,7 +49,7 @@ export default function RefreshMenuModal({ isOpen, onClose }: Readonly<Props>) {
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal show={isOpen} onHide={handleClose} size="lg">
|
||||
<Modal show={isOpen} onHide={handleClose}>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>Přenačtení menu</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
@@ -63,36 +62,29 @@ export default function RefreshMenuModal({ isOpen, onClose }: Readonly<Props>) {
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
<div className="mb-3">
|
||||
Heslo: <input
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Heslo</Form.Label>
|
||||
<Form.Control
|
||||
ref={refreshPassRef}
|
||||
type="password"
|
||||
placeholder="Zadejte heslo"
|
||||
className="form-control d-inline-block"
|
||||
style={{ width: 'auto', marginLeft: '10px' }}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
</div>
|
||||
</Form.Group>
|
||||
|
||||
<div className="mb-3">
|
||||
Typ refreshe: <select
|
||||
ref={refreshTypeRef}
|
||||
className="form-select d-inline-block"
|
||||
style={{ width: 'auto', marginLeft: '10px' }}
|
||||
defaultValue="week"
|
||||
>
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Typ refreshe</Form.Label>
|
||||
<Form.Select ref={refreshTypeRef} defaultValue="week">
|
||||
<option value="week">Týden</option>
|
||||
<option value="day">Den</option>
|
||||
</select>
|
||||
</div>
|
||||
</Form.Select>
|
||||
</Form.Group>
|
||||
|
||||
<Button
|
||||
variant="info"
|
||||
onClick={handleRefresh}
|
||||
disabled={refreshLoading}
|
||||
className="mb-3"
|
||||
>
|
||||
{refreshLoading ? 'Refreshing...' : 'Refresh'}
|
||||
{refreshLoading ? 'Načítám...' : 'Obnovit menu'}
|
||||
</Button>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
|
||||
@@ -1,42 +1,212 @@
|
||||
import { useRef } from "react";
|
||||
import { Modal, Button } from "react-bootstrap"
|
||||
import { useSettings } from "../../context/settings";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { Modal, Button, Form } from "react-bootstrap"
|
||||
import { useSettings, ThemePreference } from "../../context/settings";
|
||||
import { NotificationSettings, UdalostEnum, getNotificationSettings, updateNotificationSettings } from "../../../../types";
|
||||
import { useAuth } from "../../context/auth";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean,
|
||||
onClose: () => void,
|
||||
onSave: (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean) => void,
|
||||
onSave: (bankAccountNumber?: string, bankAccountHolderName?: string, hideSoupsOption?: boolean, themePreference?: ThemePreference) => void,
|
||||
}
|
||||
|
||||
/** Modální dialog pro uživatelská nastavení. */
|
||||
export default function SettingsModal({ isOpen, onClose, onSave }: Readonly<Props>) {
|
||||
const auth = useAuth();
|
||||
const settings = useSettings();
|
||||
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">
|
||||
const ntfyTopicRef = useRef<HTMLInputElement>(null);
|
||||
const discordWebhookRef = useRef<HTMLInputElement>(null);
|
||||
const teamsWebhookRef = useRef<HTMLInputElement>(null);
|
||||
const [notifSettings, setNotifSettings] = useState<NotificationSettings>({});
|
||||
const [enabledEvents, setEnabledEvents] = useState<UdalostEnum[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isOpen && auth?.login) {
|
||||
getNotificationSettings().then(response => {
|
||||
if (response.data) {
|
||||
setNotifSettings(response.data);
|
||||
setEnabledEvents(response.data.enabledEvents ?? []);
|
||||
}
|
||||
}).catch(() => {});
|
||||
}
|
||||
}, [isOpen, auth?.login]);
|
||||
|
||||
const toggleEvent = (event: UdalostEnum) => {
|
||||
setEnabledEvents(prev =>
|
||||
prev.includes(event) ? prev.filter(e => e !== event) : [...prev, event]
|
||||
);
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
// Uložení notifikačních nastavení na server
|
||||
await updateNotificationSettings({
|
||||
body: {
|
||||
ntfyTopic: ntfyTopicRef.current?.value || undefined,
|
||||
discordWebhookUrl: discordWebhookRef.current?.value || undefined,
|
||||
teamsWebhookUrl: teamsWebhookRef.current?.value || undefined,
|
||||
enabledEvents,
|
||||
}
|
||||
}).catch(() => {});
|
||||
|
||||
// Uložení ostatních nastavení (localStorage)
|
||||
onSave(
|
||||
bankAccountRef.current?.value,
|
||||
nameRef.current?.value,
|
||||
hideSoupsRef.current?.checked,
|
||||
themeRef.current?.value as ThemePreference,
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal show={isOpen} onHide={onClose} size="lg">
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>Nastavení</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<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
|
||||
</span>
|
||||
<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>
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Check
|
||||
id="hideSoupsCheckbox"
|
||||
ref={hideSoupsRef}
|
||||
type="checkbox"
|
||||
label="Skrýt polévky"
|
||||
defaultChecked={settings?.hideSoups}
|
||||
title="V nabídkách nebudou zobrazovány polévky. Tato funkce je experimentální."
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
Experimentální funkce - zejména u TechTower bývá problém polévky spolehlivě rozeznat.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<hr />
|
||||
|
||||
<h4>Notifikace</h4>
|
||||
<p>
|
||||
Nastavením notifikací budete dostávat upozornění o událostech (např. "Jdeme na oběd") přímo do vámi zvoleného komunikačního kanálu.
|
||||
</p>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>ntfy téma (topic)</Form.Label>
|
||||
<Form.Control
|
||||
ref={ntfyTopicRef}
|
||||
type="text"
|
||||
placeholder="moje-tema"
|
||||
defaultValue={notifSettings.ntfyTopic}
|
||||
key={notifSettings.ntfyTopic ?? 'ntfy-empty'}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
Téma pro ntfy push notifikace. Nechte prázdné pro vypnutí.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Discord webhook URL</Form.Label>
|
||||
<Form.Control
|
||||
ref={discordWebhookRef}
|
||||
type="text"
|
||||
placeholder="https://discord.com/api/webhooks/..."
|
||||
defaultValue={notifSettings.discordWebhookUrl}
|
||||
key={notifSettings.discordWebhookUrl ?? 'discord-empty'}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
URL webhooku Discord kanálu. Nechte prázdné pro vypnutí.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>MS Teams webhook URL</Form.Label>
|
||||
<Form.Control
|
||||
ref={teamsWebhookRef}
|
||||
type="text"
|
||||
placeholder="https://outlook.office.com/webhook/..."
|
||||
defaultValue={notifSettings.teamsWebhookUrl}
|
||||
key={notifSettings.teamsWebhookUrl ?? 'teams-empty'}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
URL webhooku MS Teams kanálu. Nechte prázdné pro vypnutí.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Události k odběru</Form.Label>
|
||||
{Object.values(UdalostEnum).map(event => (
|
||||
<Form.Check
|
||||
key={event}
|
||||
id={`notif-event-${event}`}
|
||||
type="checkbox"
|
||||
label={event}
|
||||
checked={enabledEvents.includes(event)}
|
||||
onChange={() => toggleEvent(event)}
|
||||
/>
|
||||
))}
|
||||
<Form.Text className="text-muted">
|
||||
Zvolte události, o kterých chcete být notifikováni. Notifikace jsou odesílány pouze uživatelům se stejnou zvolenou lokalitou.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<hr />
|
||||
|
||||
<h4>Bankovní účet</h4>
|
||||
<p>Nastavením čísla účtu umožníte automatické generování QR kódů pro úhradu za vámi provedené objednávky v rámci Pizza day.<br />Pokud vaše číslo účtu neobsahuje předčíslí, je možné ho zcela vynechat.<br /><br />Číslo účtu není ukládáno na serveru, posílá se na něj pouze za účelem vygenerování QR kódů.</p>
|
||||
Číslo účtu: <input className="mb-3" ref={bankAccountRef} type="text" placeholder="123456-1234567890/1234" defaultValue={settings?.bankAccount} onKeyDown={e => e.stopPropagation()} /> <br />
|
||||
Název příjemce (jméno majitele účtu): <input ref={nameRef} type="text" placeholder="Jan Novák" defaultValue={settings?.holderName} onKeyDown={e => e.stopPropagation()} />
|
||||
<p>
|
||||
Nastavením čísla účtu umožníte automatické generování QR kódů pro úhradu za vámi provedené objednávky v rámci Pizza day.
|
||||
</p>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Číslo účtu</Form.Label>
|
||||
<Form.Control
|
||||
ref={bankAccountRef}
|
||||
type="text"
|
||||
placeholder="123456-1234567890/1234"
|
||||
defaultValue={settings?.bankAccount}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
Pokud vaše číslo účtu neobsahuje předčíslí, je možné ho zcela vynechat.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Název příjemce</Form.Label>
|
||||
<Form.Control
|
||||
ref={nameRef}
|
||||
type="text"
|
||||
placeholder="Jan Novák"
|
||||
defaultValue={settings?.holderName}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
<Form.Text className="text-muted">
|
||||
Jméno majitele účtu pro QR platbu.
|
||||
</Form.Text>
|
||||
</Form.Group>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={onClose}>
|
||||
Storno
|
||||
</Button>
|
||||
<Button variant="primary" onClick={() => onSave(bankAccountRef.current?.value, nameRef.current?.value, hideSoupsRef.current?.checked)}>
|
||||
<Button onClick={handleSave}>
|
||||
Uložit
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -55,7 +55,7 @@ function useProvideAuth(): AuthContextProps {
|
||||
setLoginName(undefined);
|
||||
setTrusted(undefined);
|
||||
if (trusted && logoutUrl?.length) {
|
||||
window.location.replace(logoutUrl);
|
||||
globalThis.location.replace(logoutUrl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,14 +3,19 @@ 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 = {
|
||||
@@ -28,10 +33,23 @@ export const useSettings = () => {
|
||||
return useContext(settingsContext);
|
||||
}
|
||||
|
||||
function getInitialTheme(): ThemePreference {
|
||||
try {
|
||||
const saved = localStorage.getItem(THEME_KEY) as ThemePreference | null;
|
||||
if (saved && ['system', 'light', 'dark'].includes(saved)) {
|
||||
return saved;
|
||||
}
|
||||
} catch (e) {
|
||||
// localStorage nedostupný
|
||||
}
|
||||
return 'system';
|
||||
}
|
||||
|
||||
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>(getInitialTheme);
|
||||
|
||||
useEffect(() => {
|
||||
const accountNumber = localStorage.getItem(BANK_ACCOUNT_NUMBER_KEY);
|
||||
@@ -72,6 +90,29 @@ 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);
|
||||
}
|
||||
@@ -84,12 +125,18 @@ function useProvideSettings(): SettingsContextProps {
|
||||
setHideSoups(hideSoups);
|
||||
}
|
||||
|
||||
function setThemePreference(theme: ThemePreference) {
|
||||
setTheme(theme);
|
||||
}
|
||||
|
||||
return {
|
||||
bankAccount,
|
||||
holderName,
|
||||
hideSoups,
|
||||
themePreference,
|
||||
setBankAccountNumber,
|
||||
setBankAccountHolderName,
|
||||
setHideSoupsOption,
|
||||
setThemePreference,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@ if (process.env.NODE_ENV === 'development') {
|
||||
socketUrl = `http://localhost:3001`;
|
||||
socketPath = undefined;
|
||||
} else {
|
||||
socketUrl = `${window.location.host}`;
|
||||
socketPath = `${window.location.pathname}socket.io`;
|
||||
socketUrl = `${globalThis.location.host}`;
|
||||
socketPath = `${globalThis.location.pathname}socket.io`;
|
||||
}
|
||||
|
||||
export const socket = socketio.connect(socketUrl, { path: socketPath, transports: ["websocket"] });
|
||||
|
||||
@@ -7,14 +7,32 @@ body,
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
||||
monospace;
|
||||
}
|
||||
|
||||
/* Smooth scrolling */
|
||||
html {
|
||||
scroll-behavior: smooth;
|
||||
}
|
||||
|
||||
/* Better focus styles */
|
||||
:focus-visible {
|
||||
outline: 2px solid var(--luncher-primary);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
/* Selection color */
|
||||
::selection {
|
||||
background: var(--luncher-primary-light);
|
||||
color: var(--luncher-primary);
|
||||
}
|
||||
|
||||
@@ -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.indexOf("/login") == -1) {
|
||||
if (!response.ok && !response.url.includes("/login")) {
|
||||
const json = await response.json();
|
||||
toast.error(json.error, { theme: "colored" });
|
||||
}
|
||||
|
||||
@@ -2,15 +2,154 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 20px;
|
||||
padding: 32px 24px;
|
||||
min-height: calc(100vh - 140px);
|
||||
background: var(--luncher-bg);
|
||||
|
||||
h1 {
|
||||
font-size: 2rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.week-navigator {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: xx-large;
|
||||
gap: 24px;
|
||||
margin-bottom: 32px;
|
||||
|
||||
svg {
|
||||
font-size: 1.5rem;
|
||||
color: var(--luncher-text-secondary);
|
||||
cursor: pointer;
|
||||
padding: 12px;
|
||||
border-radius: 50%;
|
||||
background: var(--luncher-bg-card);
|
||||
box-shadow: var(--luncher-shadow-sm);
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&:hover {
|
||||
color: var(--luncher-primary);
|
||||
background: var(--luncher-primary-light);
|
||||
transform: scale(1.05);
|
||||
}
|
||||
}
|
||||
|
||||
.date-range {
|
||||
margin: 5px 20px;
|
||||
margin: 0;
|
||||
font-size: 1.25rem;
|
||||
font-weight: 600;
|
||||
color: var(--luncher-text);
|
||||
min-width: 280px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
// Chart container
|
||||
.recharts-wrapper {
|
||||
background: var(--luncher-bg-card);
|
||||
border-radius: var(--luncher-radius-lg);
|
||||
box-shadow: var(--luncher-shadow);
|
||||
padding: 24px;
|
||||
border: 1px solid var(--luncher-border-light);
|
||||
}
|
||||
|
||||
// Chart text styling
|
||||
.recharts-cartesian-axis-tick-value {
|
||||
fill: var(--luncher-text-secondary);
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.recharts-legend-item-text {
|
||||
color: var(--luncher-text) !important;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.recharts-tooltip-wrapper {
|
||||
.recharts-default-tooltip {
|
||||
background: var(--luncher-bg-card) !important;
|
||||
border: 1px solid var(--luncher-border) !important;
|
||||
border-radius: var(--luncher-radius-sm) !important;
|
||||
box-shadow: var(--luncher-shadow-lg) !important;
|
||||
|
||||
.recharts-tooltip-label {
|
||||
color: var(--luncher-text) !important;
|
||||
font-weight: 600;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.recharts-tooltip-item {
|
||||
color: var(--luncher-text-secondary) !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.recharts-cartesian-grid-horizontal line,
|
||||
.recharts-cartesian-grid-vertical line {
|
||||
stroke: var(--luncher-border);
|
||||
}
|
||||
|
||||
.voting-stats-section {
|
||||
margin-top: 48px;
|
||||
width: 100%;
|
||||
max-width: 800px;
|
||||
|
||||
h2 {
|
||||
font-size: 1.5rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 16px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.voting-stats-table {
|
||||
width: 100%;
|
||||
background: var(--luncher-bg-card);
|
||||
border-radius: var(--luncher-radius-lg);
|
||||
box-shadow: var(--luncher-shadow);
|
||||
border: 1px solid var(--luncher-border-light);
|
||||
overflow: hidden;
|
||||
border-collapse: collapse;
|
||||
|
||||
th {
|
||||
background: var(--luncher-primary);
|
||||
color: #ffffff;
|
||||
padding: 12px 20px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
font-size: 0.9rem;
|
||||
|
||||
&:last-child {
|
||||
text-align: center;
|
||||
width: 120px;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 12px 20px;
|
||||
border-bottom: 1px solid var(--luncher-border-light);
|
||||
color: var(--luncher-text);
|
||||
font-size: 0.9rem;
|
||||
|
||||
&:last-child {
|
||||
text-align: center;
|
||||
font-weight: 600;
|
||||
color: var(--luncher-primary);
|
||||
}
|
||||
}
|
||||
|
||||
tbody tr {
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&:hover {
|
||||
background: var(--luncher-bg-hover);
|
||||
}
|
||||
|
||||
&:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import Footer from "../components/Footer";
|
||||
import Header from "../components/Header";
|
||||
import { useAuth } from "../context/auth";
|
||||
import Login from "../Login";
|
||||
import { formatDate, getFirstWorkDayOfWeek, getHumanDate, getLastWorkDayOfWeek } from "../Utils";
|
||||
import { WeeklyStats, LunchChoice, getStats } from "../../../types";
|
||||
import { WeeklyStats, LunchChoice, VotingStats, FeatureRequest, getStats, getVotingStats } from "../../../types";
|
||||
import Loader from "../components/Loader";
|
||||
import { faChevronLeft, faChevronRight, faGear } from "@fortawesome/free-solid-svg-icons";
|
||||
import { Legend, Line, LineChart, Tooltip, XAxis, YAxis } from "recharts";
|
||||
@@ -17,22 +17,22 @@ const CHART_HEIGHT = 700;
|
||||
const STROKE_WIDTH = 2.5;
|
||||
|
||||
const COLORS = [
|
||||
// Komentáře jsou kvůli vizualizaci barev ve VS Code
|
||||
'#ff1493', // #ff1493
|
||||
'#1e90ff', // #1e90ff
|
||||
'#c5a700', // #c5a700
|
||||
'#006400', // #006400
|
||||
'#b300ff', // #b300ff
|
||||
'#ff4500', // #ff4500
|
||||
'#bc8f8f', // #bc8f8f
|
||||
'#00ff00', // #00ff00
|
||||
'#7c7c7c', // #7c7c7c
|
||||
'#ff1493',
|
||||
'#1e90ff',
|
||||
'#c5a700',
|
||||
'#006400',
|
||||
'#b300ff',
|
||||
'#ff4500',
|
||||
'#bc8f8f',
|
||||
'#00ff00',
|
||||
'#7c7c7c',
|
||||
]
|
||||
|
||||
export default function StatsPage() {
|
||||
const auth = useAuth();
|
||||
const [dateRange, setDateRange] = useState<Date[]>();
|
||||
const [data, setData] = useState<WeeklyStats>();
|
||||
const [votingStats, setVotingStats] = useState<VotingStats>();
|
||||
|
||||
// Prvotní nastavení aktuálního týdne
|
||||
useEffect(() => {
|
||||
@@ -49,6 +49,19 @@ export default function StatsPage() {
|
||||
}
|
||||
}, [dateRange]);
|
||||
|
||||
// Načtení statistik hlasování
|
||||
useEffect(() => {
|
||||
getVotingStats().then(response => {
|
||||
setVotingStats(response.data);
|
||||
});
|
||||
}, []);
|
||||
|
||||
const sortedVotingStats = useMemo(() => {
|
||||
if (!votingStats) return [];
|
||||
return Object.entries(votingStats)
|
||||
.sort((a, b) => (b[1] as number) - (a[1] as number));
|
||||
}, [votingStats]);
|
||||
|
||||
const renderLine = (location: LunchChoice) => {
|
||||
const index = Object.values(LunchChoice).indexOf(location);
|
||||
return <Line key={location} name={getLunchChoiceName(location)} type="monotone" dataKey={data => data.locations[location] ?? 0} stroke={COLORS[index]} strokeWidth={STROKE_WIDTH} />
|
||||
@@ -74,13 +87,20 @@ export default function StatsPage() {
|
||||
}
|
||||
}
|
||||
|
||||
const isCurrentOrFutureWeek = useMemo(() => {
|
||||
if (!dateRange) return true;
|
||||
const currentWeekEnd = getLastWorkDayOfWeek(new Date());
|
||||
currentWeekEnd.setHours(23, 59, 59, 999);
|
||||
return dateRange[1] >= currentWeekEnd;
|
||||
}, [dateRange]);
|
||||
|
||||
const handleKeyDown = useCallback((e: any) => {
|
||||
if (e.keyCode === 37) {
|
||||
handlePreviousWeek();
|
||||
} else if (e.keyCode === 39) {
|
||||
} else if (e.keyCode === 39 && !isCurrentOrFutureWeek) {
|
||||
handleNextWeek()
|
||||
}
|
||||
}, [dateRange]);
|
||||
}, [dateRange, isCurrentOrFutureWeek]);
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('keydown', handleKeyDown);
|
||||
@@ -103,7 +123,7 @@ export default function StatsPage() {
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header dayIndex={undefined} />
|
||||
<Header />
|
||||
<div className="stats-page">
|
||||
<h1>Statistiky</h1>
|
||||
<div className="week-navigator">
|
||||
@@ -112,7 +132,7 @@ export default function StatsPage() {
|
||||
</span>
|
||||
<h2 className="date-range">{getHumanDate(dateRange[0])} - {getHumanDate(dateRange[1])}</h2>
|
||||
<span title="Následující týden">
|
||||
<FontAwesomeIcon icon={faChevronRight} style={{ cursor: "pointer" }} onClick={handleNextWeek} />
|
||||
<FontAwesomeIcon icon={faChevronRight} style={{ cursor: "pointer", visibility: isCurrentOrFutureWeek ? "hidden" : "visible" }} onClick={handleNextWeek} />
|
||||
</span>
|
||||
</div>
|
||||
<LineChart width={CHART_WIDTH} height={CHART_HEIGHT} data={data}>
|
||||
@@ -122,6 +142,27 @@ export default function StatsPage() {
|
||||
<Tooltip />
|
||||
<Legend />
|
||||
</LineChart>
|
||||
{sortedVotingStats.length > 0 && (
|
||||
<div className="voting-stats-section">
|
||||
<h2>Hlasování o funkcích</h2>
|
||||
<table className="voting-stats-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Funkce</th>
|
||||
<th>Počet hlasů</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{sortedVotingStats.map(([feature, count]) => (
|
||||
<tr key={feature}>
|
||||
<td>{FeatureRequest[feature as keyof typeof FeatureRequest] ?? feature}</td>
|
||||
<td>{count as number}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<Footer />
|
||||
</>
|
||||
|
||||
1211
client/yarn.lock
1211
client/yarn.lock
File diff suppressed because it is too large
Load Diff
@@ -1,20 +1,20 @@
|
||||
import express from "express";
|
||||
import bodyParser from "body-parser";
|
||||
import cors from 'cors';
|
||||
import { getData, getDateForWeekIndex } from "./service";
|
||||
import { getData, getDateForWeekIndex, getToday } from "./service";
|
||||
import dotenv from 'dotenv';
|
||||
import path from 'path';
|
||||
import { getQr } from "./qr";
|
||||
import { generateToken, verify } from "./auth";
|
||||
import { InsufficientPermissions } from "./utils";
|
||||
import { generateToken, getLogin, verify } from "./auth";
|
||||
import { getIsWeekend, InsufficientPermissions, parseToken } from "./utils";
|
||||
import { getPendingQrs } from "./pizza";
|
||||
import { initWebsocket } from "./websocket";
|
||||
import pizzaDayRoutes from "./routes/pizzaDayRoutes";
|
||||
import foodRoutes, { refreshMetoda } from "./routes/foodRoutes";
|
||||
import votingRoutes from "./routes/votingRoutes";
|
||||
import easterEggRoutes from "./routes/easterEggRoutes";
|
||||
import statsRoutes from "./routes/statsRoutes";
|
||||
import debugRoutes from "./routes/debugRoutes";
|
||||
import qrRoutes from "./routes/qrRoutes";
|
||||
import notificationRoutes from "./routes/notificationRoutes";
|
||||
|
||||
const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
|
||||
dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
|
||||
@@ -101,8 +101,6 @@ app.get("/api/qr", (req, res) => {
|
||||
// Přeskočení auth pro refresh dat xd
|
||||
app.use("/api/food/refresh", refreshMetoda);
|
||||
|
||||
app.use("/api/debug", debugRoutes);
|
||||
|
||||
/** Middleware ověřující JWT token */
|
||||
app.use("/api/", (req, res, next) => {
|
||||
if (HTTP_REMOTE_USER_ENABLED) {
|
||||
@@ -137,8 +135,22 @@ app.get("/api/data", async (req, res) => {
|
||||
if (!isNaN(index)) {
|
||||
date = getDateForWeekIndex(parseInt(req.query.dayIndex));
|
||||
}
|
||||
} else if (getIsWeekend(getToday())) {
|
||||
// Na víkendu zobrazíme pátek místo hlášky "Užívejte víkend"
|
||||
date = getDateForWeekIndex(4);
|
||||
}
|
||||
res.status(200).json(await getData(date));
|
||||
const data = await getData(date);
|
||||
// Připojíme nevyřízené QR kódy pro přihlášeného uživatele
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
const pendingQrs = await getPendingQrs(login);
|
||||
if (pendingQrs.length > 0) {
|
||||
data.pendingQrs = pendingQrs;
|
||||
}
|
||||
} catch {
|
||||
// Token nemusí být validní, ignorujeme
|
||||
}
|
||||
res.status(200).json(data);
|
||||
});
|
||||
|
||||
// Ostatní routes
|
||||
@@ -147,7 +159,7 @@ app.use("/api/food", foodRoutes);
|
||||
app.use("/api/voting", votingRoutes);
|
||||
app.use("/api/easterEggs", easterEggRoutes);
|
||||
app.use("/api/stats", statsRoutes);
|
||||
app.use("/api/qr", qrRoutes);
|
||||
app.use("/api/notifications", notificationRoutes);
|
||||
|
||||
app.use('/stats', express.static('public'));
|
||||
app.use(express.static('public'));
|
||||
|
||||
@@ -517,24 +517,6 @@ const MOCK_DATA = {
|
||||
name: "Pečené vepřové koleno, křen, hořčice, chléb",
|
||||
price: "320\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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -549,24 +531,6 @@ const MOCK_DATA = {
|
||||
name: "Poutine (trhané vepřové, hranolky, sýr, čalamáda, pikantní omáčka)",
|
||||
price: "190\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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -581,24 +545,6 @@ const MOCK_DATA = {
|
||||
name: "Vepřový řízek z kotlety, domácí bramborový salát",
|
||||
price: "170\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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -613,24 +559,6 @@ const MOCK_DATA = {
|
||||
name: "Burger z Chuck rollu, hranolky, tatarská omáčka",
|
||||
price: "200\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,
|
||||
}
|
||||
],
|
||||
],
|
||||
@@ -673,18 +601,6 @@ const MOCK_DATA = {
|
||||
name: "Hovězí po Burgundsku, bramborová kaše",
|
||||
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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -699,18 +615,6 @@ const MOCK_DATA = {
|
||||
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: "Š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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -725,18 +629,6 @@ const MOCK_DATA = {
|
||||
name: "Rajská s plněnou paprikou, knedlík",
|
||||
price: "170\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,
|
||||
}
|
||||
],
|
||||
[
|
||||
@@ -751,18 +643,6 @@ const MOCK_DATA = {
|
||||
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,
|
||||
},
|
||||
{
|
||||
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,
|
||||
}
|
||||
],
|
||||
],
|
||||
@@ -1522,7 +1402,7 @@ const MOCK_PIZZA_LIST = [
|
||||
* Funkce vrací mock datu ve formátu YYYY-MM-DD
|
||||
*/
|
||||
export const getTodayMock = (): Date => {
|
||||
return new Date('2025-01-08'); // středa
|
||||
return new Date('2025-01-10'); // pátek
|
||||
}
|
||||
|
||||
export const getMenuSladovnickaMock = () => {
|
||||
|
||||
@@ -3,11 +3,56 @@ import dotenv from 'dotenv';
|
||||
import path from 'path';
|
||||
import { getClientData, getToday } from "./service";
|
||||
import { getUsersByLocation, getHumanTime } from "./utils";
|
||||
import { NotifikaceData, NotifikaceInput } from '../../types';
|
||||
import { NotifikaceData, NotifikaceInput, NotificationSettings } from '../../types';
|
||||
import getStorage from "./storage";
|
||||
|
||||
const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
|
||||
dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
|
||||
|
||||
const storage = getStorage();
|
||||
const NOTIFICATION_SETTINGS_PREFIX = 'notif';
|
||||
|
||||
/** Vrátí klíč pro uložení notifikačních nastavení uživatele. */
|
||||
function getNotificationSettingsKey(login: string): string {
|
||||
return `${NOTIFICATION_SETTINGS_PREFIX}_${login}`;
|
||||
}
|
||||
|
||||
/** Vrátí nastavení notifikací pro daného uživatele. */
|
||||
export async function getNotificationSettings(login: string): Promise<NotificationSettings> {
|
||||
return await storage.getData<NotificationSettings>(getNotificationSettingsKey(login)) ?? {};
|
||||
}
|
||||
|
||||
/** Uloží nastavení notifikací pro daného uživatele. */
|
||||
export async function saveNotificationSettings(login: string, settings: NotificationSettings): Promise<NotificationSettings> {
|
||||
await storage.setData(getNotificationSettingsKey(login), settings);
|
||||
return settings;
|
||||
}
|
||||
|
||||
/** Odešle ntfy notifikaci na dané téma. */
|
||||
async function ntfyCallToTopic(topic: string, message: string) {
|
||||
const url = process.env.NTFY_HOST;
|
||||
const username = process.env.NTFY_USERNAME;
|
||||
const password = process.env.NTFY_PASSWD;
|
||||
if (!url || !username || !password) {
|
||||
return;
|
||||
}
|
||||
const token = Buffer.from(`${username}:${password}`, 'utf8').toString('base64');
|
||||
try {
|
||||
const response = await axios({
|
||||
url: `${url}/${topic}`,
|
||||
method: 'POST',
|
||||
data: message,
|
||||
headers: {
|
||||
'Authorization': `Basic ${token}`,
|
||||
'Tag': 'meat_on_bone'
|
||||
}
|
||||
});
|
||||
console.log(response.data);
|
||||
} catch (error) {
|
||||
console.error(`Chyba při odesílání ntfy notifikace na topic ${topic}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
export const ntfyCall = async (data: NotifikaceInput) => {
|
||||
const url = process.env.NTFY_HOST
|
||||
const username = process.env.NTFY_USERNAME;
|
||||
@@ -87,10 +132,58 @@ export const teamsCall = async (data: NotifikaceInput) => {
|
||||
}
|
||||
}
|
||||
|
||||
/** Odešle Teams notifikaci na daný webhook URL. */
|
||||
async function teamsCallToUrl(webhookUrl: string, data: NotifikaceInput) {
|
||||
const title = data.udalost;
|
||||
let time = new Date();
|
||||
time.setTime(time.getTime() + 1000 * 60);
|
||||
const message = 'Odcházíme v ' + getHumanTime(time) + ', ' + data.user;
|
||||
const card = {
|
||||
'@type': 'MessageCard',
|
||||
'@context': 'http://schema.org/extensions',
|
||||
'themeColor': "0072C6",
|
||||
summary: 'Summary description',
|
||||
sections: [
|
||||
{
|
||||
activityTitle: title,
|
||||
text: message,
|
||||
},
|
||||
],
|
||||
};
|
||||
try {
|
||||
await axios.post(webhookUrl, card, {
|
||||
headers: {
|
||||
'content-type': 'application/vnd.microsoft.teams.card.o365connector'
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error(`Chyba při odesílání Teams notifikace:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/** Odešle Discord notifikaci na daný webhook URL. */
|
||||
async function discordCall(webhookUrl: string, data: NotifikaceInput) {
|
||||
let time = new Date();
|
||||
time.setTime(time.getTime() + 1000 * 60);
|
||||
const message = `🍖 **${data.udalost}** — ${data.user} (odchod v ${getHumanTime(time)})`;
|
||||
try {
|
||||
await axios.post(webhookUrl, {
|
||||
content: message,
|
||||
}, {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error(`Chyba při odesílání Discord notifikace:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/** Zavolá notifikace na všechny konfigurované způsoby notifikace, přetížení proměných na false pro jednotlivé způsoby je vypne*/
|
||||
export const callNotifikace = async ({ input, teams = true, gotify = false, ntfy = true }: NotifikaceData) => {
|
||||
const notifications = [];
|
||||
const notifications: Promise<any>[] = [];
|
||||
|
||||
// Globální notifikace (zpětně kompatibilní)
|
||||
if (ntfy) {
|
||||
const ntfyPromises = await ntfyCall(input);
|
||||
if (ntfyPromises) {
|
||||
@@ -100,20 +193,33 @@ export const callNotifikace = async ({ input, teams = true, gotify = false, ntfy
|
||||
if (teams) {
|
||||
const teamsPromises = await teamsCall(input);
|
||||
if (teamsPromises) {
|
||||
notifications.push(teamsPromises);
|
||||
notifications.push(Promise.resolve(teamsPromises));
|
||||
}
|
||||
}
|
||||
|
||||
// Per-user notifikace: najdeme uživatele se stejnou lokací a odešleme dle jejich nastavení
|
||||
const clientData = await getClientData(getToday());
|
||||
const usersToNotify = getUsersByLocation(clientData.choices, input.user);
|
||||
for (const user of usersToNotify) {
|
||||
if (user === input.user) continue; // Neposíláme notifikaci spouštějícímu uživateli
|
||||
const userSettings = await getNotificationSettings(user);
|
||||
if (!userSettings.enabledEvents?.includes(input.udalost)) continue;
|
||||
|
||||
if (userSettings.ntfyTopic) {
|
||||
notifications.push(ntfyCallToTopic(userSettings.ntfyTopic, `${input.udalost} - spustil: ${input.user}`));
|
||||
}
|
||||
if (userSettings.discordWebhookUrl) {
|
||||
notifications.push(discordCall(userSettings.discordWebhookUrl, input));
|
||||
}
|
||||
if (userSettings.teamsWebhookUrl) {
|
||||
notifications.push(teamsCallToUrl(userSettings.teamsWebhookUrl, input));
|
||||
}
|
||||
}
|
||||
// gotify bych řekl, že už je deprecated
|
||||
// if (gotify) {
|
||||
// const gotifyPromises = await gotifyCall(input, gotifyData);
|
||||
// notifications.push(...gotifyPromises);
|
||||
// }
|
||||
|
||||
try {
|
||||
const results = await Promise.all(notifications);
|
||||
return results;
|
||||
} catch (error) {
|
||||
console.error("Error in callNotifikace: ", error);
|
||||
// Handle the error as needed
|
||||
}
|
||||
};
|
||||
@@ -4,9 +4,10 @@ import { generateQr } from "./qr";
|
||||
import getStorage from "./storage";
|
||||
import { downloadPizzy } from "./chefie";
|
||||
import { getClientData, getToday, initIfNeeded } from "./service";
|
||||
import { Pizza, ClientData, PizzaDayState, PizzaSize, PizzaOrder, PizzaVariant, UdalostEnum } from "../../types/gen/types.gen";
|
||||
import { Pizza, ClientData, PizzaDayState, PizzaSize, PizzaOrder, PizzaVariant, UdalostEnum, PendingQr } from "../../types/gen/types.gen";
|
||||
|
||||
const storage = getStorage();
|
||||
const PENDING_QR_PREFIX = 'pending_qr';
|
||||
|
||||
/**
|
||||
* Vrátí seznam dostupných pizz pro dnešní den.
|
||||
@@ -241,6 +242,12 @@ export async function finishPizzaDelivery(login: string, bankAccount?: string, b
|
||||
let message = order.pizzaList!.map(pizza => `Pizza ${pizza.name} (${pizza.size})`).join(', ');
|
||||
await generateQr(order.customer, bankAccount, bankAccountHolder, order.totalPrice, message);
|
||||
order.hasQr = true;
|
||||
// Uložíme nevyřízený QR kód pro persistentní zobrazení
|
||||
await addPendingQr(order.customer, {
|
||||
date: today,
|
||||
creator: login,
|
||||
totalPrice: order.totalPrice,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -308,3 +315,40 @@ export async function updatePizzaFee(login: string, targetLogin: string, text?:
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí klíč pro uložení nevyřízených QR kódů uživatele.
|
||||
*/
|
||||
function getPendingQrKey(login: string): string {
|
||||
return `${PENDING_QR_PREFIX}_${login}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Přidá nevyřízený QR kód pro uživatele.
|
||||
*/
|
||||
async function addPendingQr(login: string, pendingQr: PendingQr): Promise<void> {
|
||||
const key = getPendingQrKey(login);
|
||||
const existing = await storage.getData<PendingQr[]>(key) ?? [];
|
||||
// Nepřidáváme duplicity pro stejný den
|
||||
if (!existing.some(qr => qr.date === pendingQr.date)) {
|
||||
existing.push(pendingQr);
|
||||
await storage.setData(key, existing);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí nevyřízené QR kódy pro uživatele.
|
||||
*/
|
||||
export async function getPendingQrs(login: string): Promise<PendingQr[]> {
|
||||
return await storage.getData<PendingQr[]>(getPendingQrKey(login)) ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Označí QR kód pro daný den jako uhrazený (odstraní ho ze seznamu nevyřízených).
|
||||
*/
|
||||
export async function dismissPendingQr(login: string, date: string): Promise<void> {
|
||||
const key = getPendingQrKey(login);
|
||||
const existing = await storage.getData<PendingQr[]>(key) ?? [];
|
||||
const filtered = existing.filter(qr => qr.date !== date);
|
||||
await storage.setData(key, filtered);
|
||||
}
|
||||
@@ -100,7 +100,7 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
|
||||
const html = await getHtml(SLADOVNICKA_URL);
|
||||
const $ = load(html);
|
||||
|
||||
// Nejdříve zjistíme, které dny jsou k dispozici z tab elementů
|
||||
// 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('[id^="daily-menu-content-"]');
|
||||
const menuContentElements = $('#daily-menu-content-list').children('.daily-menu-content__content').not('.daily-menu-content__content--static');
|
||||
|
||||
const result: Food[][] = [];
|
||||
|
||||
@@ -130,59 +130,32 @@ export const getMenuSladovnicka = async (firstDayOfWeek: Date, mock: boolean = f
|
||||
continue; // Přeskočíme, pokud content element neexistuje
|
||||
}
|
||||
|
||||
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 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 currentDayFood: Food[] = [];
|
||||
|
||||
// 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) => {
|
||||
// Projdeme všechny řádky - první je polévka, zbytek jsou hlavní jídla
|
||||
rows.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 (první řádek může být prázdný)
|
||||
// Přeskočíme prázdné řádky
|
||||
if (parsed.cleanName.trim().length > 0) {
|
||||
currentDayFood.push({
|
||||
amount,
|
||||
name: parsed.cleanName,
|
||||
price,
|
||||
isSoup: false,
|
||||
isSoup: i === 0, // První řádek je polévka
|
||||
allergens: parsed.allergens.length > 0 ? parsed.allergens : undefined,
|
||||
});
|
||||
}
|
||||
@@ -351,8 +324,13 @@ 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('–')) {
|
||||
if (nameRaw.endsWith('–')|| nameRaw.endsWith('—')) {
|
||||
nameRaw = nameRaw.slice(0, -1).trim();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import express, { Request } from "express";
|
||||
import { addChoice, getData, removeChoices } from "../service";
|
||||
import { ClientData, LunchChoice } from "../../../types";
|
||||
|
||||
const NAMES = ["alice", "bob", "carol", "dave", "eve", "frank", "grace", "heidi", "ivan", "judy"];
|
||||
const DATES = ["2025-01-06", "2025-01-07", "2025-01-08", "2025-01-09", "2025-01-10"];
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.get("/createUsers", async (req: Request<{}, any, any>, res) => {
|
||||
for (const element of NAMES) {
|
||||
for (const dateStr of DATES) {
|
||||
// Se šancí 50 % přidat pro tohoto uživatele tento den náhodnou volbu
|
||||
if (Math.random() > 0.5) {
|
||||
const foodIndex = Math.floor(Math.random() * 3); // Předpokládáme, že jsou 3 možnosti jídla
|
||||
const date = new Date(dateStr);
|
||||
// Náhodná volba z LunchChoice
|
||||
const lunchChoices = [
|
||||
"SLADOVNICKA",
|
||||
"TECHTOWER",
|
||||
"ZASTAVKAUMICHALA",
|
||||
"SENKSERIKOVA",
|
||||
];
|
||||
const randomLunchChoice = lunchChoices[Math.floor(Math.random() * lunchChoices.length)];
|
||||
await addChoice(element, true, randomLunchChoice as LunchChoice, foodIndex, date);
|
||||
}
|
||||
}
|
||||
}
|
||||
res.status(200).json({});
|
||||
});
|
||||
|
||||
router.get("/clearUsers", async (req: Request<{}, any, any>, res) => {
|
||||
for (const dateStr of DATES) {
|
||||
const date = new Date(dateStr);
|
||||
const data: ClientData = await getData(date);
|
||||
for (const user of NAMES) {
|
||||
for (const locationKey in data.choices) {
|
||||
await removeChoices(user, true, locationKey as keyof ClientData["choices"], date);
|
||||
}
|
||||
}
|
||||
}
|
||||
res.status(200).json({});
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -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 } from "../service";
|
||||
import { addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote, fetchRestaurantWeekMenuData, saveRestaurantWeekMenu, updateBuyer } from "../service";
|
||||
import { getDayOfWeekIndex, parseToken, getFirstWorkDayOfWeek } from "../utils";
|
||||
import { getWebsocket } from "../websocket";
|
||||
import { callNotifikace } from "../notifikace";
|
||||
@@ -182,6 +182,15 @@ 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 };
|
||||
|
||||
32
server/src/routes/notificationRoutes.ts
Normal file
32
server/src/routes/notificationRoutes.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { getNotificationSettings, saveNotificationSettings } from "../notifikace";
|
||||
import { UpdateNotificationSettingsData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
/** Vrátí nastavení notifikací pro přihlášeného uživatele. */
|
||||
router.get("/settings", async (req, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
try {
|
||||
const settings = await getNotificationSettings(login);
|
||||
res.status(200).json(settings);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
/** Uloží nastavení notifikací pro přihlášeného uživatele. */
|
||||
router.post("/settings", async (req: Request<{}, any, UpdateNotificationSettingsData["body"]>, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
try {
|
||||
const settings = await saveNotificationSettings(login, {
|
||||
ntfyTopic: req.body.ntfyTopic,
|
||||
discordWebhookUrl: req.body.discordWebhookUrl,
|
||||
teamsWebhookUrl: req.body.teamsWebhookUrl,
|
||||
enabledEvents: req.body.enabledEvents,
|
||||
});
|
||||
res.status(200).json(settings);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -1,9 +1,9 @@
|
||||
import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { createPizzaDay, deletePizzaDay, getPizzaList, addPizzaOrder, removePizzaOrder, lockPizzaDay, unlockPizzaDay, finishPizzaOrder, finishPizzaDelivery, updatePizzaDayNote, updatePizzaFee } from "../pizza";
|
||||
import { createPizzaDay, deletePizzaDay, getPizzaList, addPizzaOrder, removePizzaOrder, lockPizzaDay, unlockPizzaDay, finishPizzaOrder, finishPizzaDelivery, updatePizzaDayNote, updatePizzaFee, dismissPendingQr } from "../pizza";
|
||||
import { parseToken } from "../utils";
|
||||
import { getWebsocket } from "../websocket";
|
||||
import { AddPizzaData, FinishDeliveryData, RemovePizzaData, UpdatePizzaDayNoteData, UpdatePizzaFeeData } from "../../../types";
|
||||
import { AddPizzaData, DismissQrData, FinishDeliveryData, RemovePizzaData, UpdatePizzaDayNoteData, UpdatePizzaFeeData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
@@ -109,4 +109,16 @@ router.post("/updatePizzaFee", async (req: Request<{}, any, UpdatePizzaFeeData["
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
/** Označí QR kód jako uhrazený. */
|
||||
router.post("/dismissQr", async (req: Request<{}, any, DismissQrData["body"]>, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (!req.body.date) {
|
||||
return res.status(400).json({ error: "Nebyl předán datum" });
|
||||
}
|
||||
try {
|
||||
await dismissPendingQr(login, req.body.date);
|
||||
res.status(200).json({});
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -1,15 +0,0 @@
|
||||
import express, { Request, Response } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { GenerateQrData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.post("/generate", async (req: Request<{}, any, GenerateQrData["body"]>, res: Response<any>) => {
|
||||
getLogin(parseToken(req));
|
||||
console.log("Bank account for QR codes:", req.body.bankAccount);
|
||||
console.log("Bank account holder for QR codes:", req.body.bankAccountHolder);
|
||||
console.log("Requested QR codes for users:", req.body.qrCodes);
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -1,7 +1,7 @@
|
||||
import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { getUserVotes, updateFeatureVote } from "../voting";
|
||||
import { getUserVotes, updateFeatureVote, getVotingStats } from "../voting";
|
||||
import { GetVotesData, UpdateVoteData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
@@ -23,4 +23,11 @@ router.post("/updateVote", async (req: Request<{}, any, UpdateVoteData["body"]>,
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
router.get("/stats", async (req, res, next) => {
|
||||
try {
|
||||
const data = await getVotingStats();
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -1,4 +1,4 @@
|
||||
import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getIsWeekend, getWeekNumber } from "./utils";
|
||||
import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getIsWeekend, getWeekNumber } from "./utils";
|
||||
import getStorage from "./storage";
|
||||
import { getMenuSladovnicka, getMenuTechTower, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
|
||||
import { getTodayMock } from "./mock";
|
||||
@@ -31,7 +31,10 @@ export const getDateForWeekIndex = (index: number) => {
|
||||
function getEmptyData(date?: Date): ClientData {
|
||||
const usedDate = date || getToday();
|
||||
return {
|
||||
date: usedDate.toISOString().split('T')[0],
|
||||
todayDayIndex: getDayOfWeekIndex(getToday()),
|
||||
date: getHumanDate(usedDate),
|
||||
isWeekend: getIsWeekend(usedDate),
|
||||
dayIndex: getDayOfWeekIndex(usedDate),
|
||||
choices: {},
|
||||
};
|
||||
}
|
||||
@@ -195,7 +198,14 @@ export async function getRestaurantMenu(restaurant: Restaurant, date?: Date, for
|
||||
food: [],
|
||||
};
|
||||
}
|
||||
if (forceRefresh || (!weekMenu[dayOfWeekIndex][restaurant]?.food?.length && !weekMenu[dayOfWeekIndex][restaurant]?.closed)) {
|
||||
const MENU_REFETCH_TTL_MS = 60 * 60 * 1000; // 1 hour
|
||||
const existingMenu = weekMenu[dayOfWeekIndex][restaurant];
|
||||
const lastFetchExpired = !existingMenu?.lastUpdate ||
|
||||
existingMenu.lastUpdate === now || // freshly initialized, never fetched
|
||||
(now - existingMenu.lastUpdate) > MENU_REFETCH_TTL_MS;
|
||||
const shouldFetch = forceRefresh ||
|
||||
(!existingMenu?.food?.length && !existingMenu?.closed && lastFetchExpired);
|
||||
if (shouldFetch) {
|
||||
const firstDay = getFirstWorkDayOfWeek(usedDate);
|
||||
|
||||
try {
|
||||
@@ -237,7 +247,32 @@ export async function getRestaurantMenu(restaurant: Restaurant, date?: Date, for
|
||||
console.error(`Selhalo načtení jídel pro podnik ${restaurant}`, e);
|
||||
}
|
||||
}
|
||||
return weekMenu[dayOfWeekIndex][restaurant]!;
|
||||
const result = weekMenu[dayOfWeekIndex][restaurant]!;
|
||||
result.warnings = generateMenuWarnings(result, now);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generuje varování o kvalitě/úplnosti dat menu restaurace.
|
||||
*/
|
||||
function generateMenuWarnings(menu: RestaurantDayMenu, now: number): string[] {
|
||||
const warnings: string[] = [];
|
||||
if (!menu.food?.length || menu.closed) {
|
||||
return warnings;
|
||||
}
|
||||
const hasSoup = menu.food.some(f => f.isSoup);
|
||||
if (!hasSoup) {
|
||||
warnings.push('Chybí polévka');
|
||||
}
|
||||
const missingPrice = menu.food.some(f => !f.isSoup && (!f.price || f.price.trim() === ''));
|
||||
if (missingPrice) {
|
||||
warnings.push('U některých jídel chybí cena');
|
||||
}
|
||||
const STALE_THRESHOLD_MS = 24 * 60 * 60 * 1000;
|
||||
if (menu.lastUpdate && (now - menu.lastUpdate) > STALE_THRESHOLD_MS) {
|
||||
warnings.push('Data jsou starší než 24 hodin');
|
||||
}
|
||||
return warnings;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -375,7 +410,7 @@ export async function addChoice(login: string, trusted: boolean, locationKey: Lu
|
||||
data = await removeChoiceIfPresent(login, usedDate);
|
||||
} else {
|
||||
// Mažeme případné ostatní volby (měla by být maximálně jedna)
|
||||
removeChoiceIfPresent(login, usedDate, locationKey);
|
||||
data = await removeChoiceIfPresent(login, usedDate, locationKey);
|
||||
}
|
||||
// TODO vytáhnout inicializaci "prázdné struktury" do vlastní funkce
|
||||
data.choices[locationKey] ??= {};
|
||||
@@ -474,6 +509,24 @@ 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.
|
||||
*
|
||||
@@ -483,5 +536,9 @@ export async function updateDepartureTime(login: string, time?: string, date?: D
|
||||
export async function getClientData(date?: Date): Promise<ClientData> {
|
||||
const targetDate = date ?? getToday();
|
||||
const dateString = formatDate(targetDate);
|
||||
return await storage.getData<ClientData>(dateString) || getEmptyData(date);
|
||||
const clientData = await storage.getData<ClientData>(dateString) || getEmptyData(date);
|
||||
return {
|
||||
...clientData,
|
||||
todayDayIndex: getDayOfWeekIndex(getToday()),
|
||||
}
|
||||
}
|
||||
@@ -25,6 +25,12 @@ export async function getStats(startDate: string, endDate: string): Promise<Week
|
||||
throw Error('Neplatný rozsah');
|
||||
}
|
||||
|
||||
const today = new Date();
|
||||
today.setHours(23, 59, 59, 999);
|
||||
if (end > today) {
|
||||
throw Error('Nelze načíst statistiky pro budoucí datum');
|
||||
}
|
||||
|
||||
const result = [];
|
||||
for (const date = start; date <= end; date.setDate(date.getDate() + 1)) {
|
||||
const locationsStats: DailyStats = {
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
import { FeatureRequest } from "../../types/gen/types.gen";
|
||||
import { FeatureRequest, VotingStats } from "../../types/gen/types.gen";
|
||||
import getStorage from "./storage";
|
||||
|
||||
interface VotingData {
|
||||
[login: string]: FeatureRequest[],
|
||||
}
|
||||
|
||||
export interface VotingStatsResult {
|
||||
[feature: string]: number;
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
const STORAGE_KEY = 'voting';
|
||||
|
||||
@@ -52,3 +56,21 @@ export async function updateFeatureVote(login: string, option: FeatureRequest, a
|
||||
await storage.setData(STORAGE_KEY, data);
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí agregované statistiky hlasování - počet hlasů pro každou funkci.
|
||||
*
|
||||
* @returns objekt, kde klíčem je název funkce a hodnotou počet hlasů
|
||||
*/
|
||||
export async function getVotingStats(): Promise<VotingStatsResult> {
|
||||
const data = await storage.getData<VotingData>(STORAGE_KEY);
|
||||
const stats: VotingStatsResult = {};
|
||||
if (data) {
|
||||
for (const votes of Object.values(data)) {
|
||||
for (const feature of votes) {
|
||||
stats[feature] = (stats[feature] || 0) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return stats;
|
||||
}
|
||||
1402
server/yarn.lock
1402
server/yarn.lock
File diff suppressed because it is too large
Load Diff
@@ -26,6 +26,8 @@ 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:
|
||||
@@ -48,6 +50,12 @@ paths:
|
||||
$ref: "./paths/pizzaDay/updatePizzaDayNote.yml"
|
||||
/pizzaDay/updatePizzaFee:
|
||||
$ref: "./paths/pizzaDay/updatePizzaFee.yml"
|
||||
/pizzaDay/dismissQr:
|
||||
$ref: "./paths/pizzaDay/dismissQr.yml"
|
||||
|
||||
# Notifikace (/api/notifications)
|
||||
/notifications/settings:
|
||||
$ref: "./paths/notifications/settings.yml"
|
||||
|
||||
# Easter eggy (/api/easterEggs)
|
||||
/easterEggs:
|
||||
@@ -64,10 +72,8 @@ paths:
|
||||
$ref: "./paths/voting/getVotes.yml"
|
||||
/voting/updateVote:
|
||||
$ref: "./paths/voting/updateVote.yml"
|
||||
|
||||
# QR kódy (/api/qr)
|
||||
/qr/generate:
|
||||
$ref: "./paths/qr/generateQr.yml"
|
||||
/voting/stats:
|
||||
$ref: "./paths/voting/getVotingStats.yml"
|
||||
|
||||
components:
|
||||
schemas:
|
||||
|
||||
6
types/paths/food/updateBuyer.yml
Normal file
6
types/paths/food/updateBuyer.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
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.
|
||||
26
types/paths/notifications/settings.yml
Normal file
26
types/paths/notifications/settings.yml
Normal file
@@ -0,0 +1,26 @@
|
||||
get:
|
||||
operationId: getNotificationSettings
|
||||
summary: Vrátí nastavení notifikací pro přihlášeného uživatele.
|
||||
responses:
|
||||
"200":
|
||||
description: Nastavení notifikací
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "../../schemas/_index.yml#/NotificationSettings"
|
||||
post:
|
||||
operationId: updateNotificationSettings
|
||||
summary: Uloží nastavení notifikací pro přihlášeného uživatele.
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "../../schemas/_index.yml#/NotificationSettings"
|
||||
responses:
|
||||
"200":
|
||||
description: Nastavení notifikací bylo uloženo.
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "../../schemas/_index.yml#/NotificationSettings"
|
||||
17
types/paths/pizzaDay/dismissQr.yml
Normal file
17
types/paths/pizzaDay/dismissQr.yml
Normal file
@@ -0,0 +1,17 @@
|
||||
post:
|
||||
operationId: dismissQr
|
||||
summary: Označí QR kód pro daný den jako uhrazený (odstraní ho ze seznamu nevyřízených).
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
properties:
|
||||
date:
|
||||
description: Datum Pizza day, ke kterému se QR kód vztahuje
|
||||
type: string
|
||||
required:
|
||||
- date
|
||||
responses:
|
||||
"200":
|
||||
description: QR kód byl označen jako uhrazený.
|
||||
@@ -1,12 +0,0 @@
|
||||
post:
|
||||
operationId: generateQr
|
||||
summary: Generování QR kódů.
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "../../schemas/_index.yml#/GenerateQrCodesRequest"
|
||||
responses:
|
||||
"200":
|
||||
description: QR kódy byly úspěšně vygenerovány.
|
||||
9
types/paths/voting/getVotingStats.yml
Normal file
9
types/paths/voting/getVotingStats.yml
Normal file
@@ -0,0 +1,9 @@
|
||||
get:
|
||||
operationId: getVotingStats
|
||||
summary: Vrátí agregované statistiky hlasování o nových funkcích.
|
||||
responses:
|
||||
"200":
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "../../schemas/_index.yml#/VotingStats"
|
||||
@@ -21,13 +21,23 @@ 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: Datum konkrétního dne
|
||||
description: Human-readable datum dne
|
||||
type: string
|
||||
format: date
|
||||
isWeekend:
|
||||
description: Příznak, zda je tento den víkend
|
||||
type: boolean
|
||||
dayIndex:
|
||||
description: Index dne v týdnu, ke kterému se vztahují tato data
|
||||
$ref: "#/DayIndex"
|
||||
choices:
|
||||
$ref: "#/LunchChoices"
|
||||
menus:
|
||||
@@ -43,6 +53,11 @@ ClientData:
|
||||
description: Datum a čas poslední aktualizace pizz
|
||||
type: string
|
||||
format: date-time
|
||||
pendingQrs:
|
||||
description: Nevyřízené QR kódy pro platbu z předchozích pizza day
|
||||
type: array
|
||||
items:
|
||||
$ref: "#/PendingQr"
|
||||
|
||||
# --- OBĚDY ---
|
||||
UserLunchChoice:
|
||||
@@ -64,6 +79,9 @@ 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
|
||||
@@ -163,6 +181,11 @@ RestaurantDayMenu:
|
||||
type: array
|
||||
items:
|
||||
$ref: "#/Food"
|
||||
warnings:
|
||||
description: Seznam varování o kvalitě/úplnosti dat menu
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
RestaurantDayMenuMap:
|
||||
description: Objekt, kde klíčem je podnik ((#Restaurant)) a hodnotou denní menu daného podniku ((#RestaurantDayMenu))
|
||||
type: object
|
||||
@@ -245,6 +268,12 @@ FeatureRequest:
|
||||
- UI
|
||||
- DEVELOPMENT
|
||||
|
||||
VotingStats:
|
||||
description: Statistiky hlasování - klíčem je název funkce, hodnotou počet hlasů
|
||||
type: object
|
||||
additionalProperties:
|
||||
type: integer
|
||||
|
||||
# --- EASTER EGGS ---
|
||||
EasterEgg:
|
||||
description: Data pro zobrazení easter eggů ssss
|
||||
@@ -469,43 +498,6 @@ PizzaDay:
|
||||
items:
|
||||
$ref: "#/PizzaOrder"
|
||||
|
||||
# --- QR KÓDY ---
|
||||
QrCodeRequest:
|
||||
description: Data potřebná pro vygenerování jednoho QR kódu pro platbu
|
||||
type: object
|
||||
required:
|
||||
- login
|
||||
- note
|
||||
- amount
|
||||
properties:
|
||||
login:
|
||||
description: Přihlašovací jméno uživatele, pro kterého bude QR kód vygenerován
|
||||
type: string
|
||||
note:
|
||||
description: Popis platby
|
||||
type: string
|
||||
amount:
|
||||
description: Částka platby v Kč
|
||||
type: number
|
||||
GenerateQrCodesRequest:
|
||||
description: Data potřebná pro vygenerování QR kódů pro platbu
|
||||
type: object
|
||||
required:
|
||||
- bankAccount
|
||||
- bankAccountHolder
|
||||
properties:
|
||||
bankAccount:
|
||||
description: Číslo bankovního účtu objednávajícího
|
||||
type: string
|
||||
bankAccountHolder:
|
||||
description: Jméno majitele bankovního účtu
|
||||
type: string
|
||||
qrCodes:
|
||||
description: Pole požadavků na vygenerování QR kódů
|
||||
type: array
|
||||
items:
|
||||
$ref: "#/QrCodeRequest"
|
||||
|
||||
# --- NOTIFIKACE ---
|
||||
UdalostEnum:
|
||||
type: string
|
||||
@@ -540,6 +532,24 @@ NotifikaceData:
|
||||
type: boolean
|
||||
ntfy:
|
||||
type: boolean
|
||||
NotificationSettings:
|
||||
description: Nastavení notifikací pro konkrétního uživatele
|
||||
type: object
|
||||
properties:
|
||||
ntfyTopic:
|
||||
description: Téma pro ntfy push notifikace
|
||||
type: string
|
||||
discordWebhookUrl:
|
||||
description: URL webhooku Discord kanálu
|
||||
type: string
|
||||
teamsWebhookUrl:
|
||||
description: URL webhooku MS Teams kanálu
|
||||
type: string
|
||||
enabledEvents:
|
||||
description: Seznam událostí, o kterých chce být uživatel notifikován
|
||||
type: array
|
||||
items:
|
||||
$ref: "#/UdalostEnum"
|
||||
GotifyServer:
|
||||
type: object
|
||||
required:
|
||||
@@ -552,3 +562,23 @@ GotifyServer:
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
|
||||
# --- NEVYŘÍZENÉ QR KÓDY ---
|
||||
PendingQr:
|
||||
description: Nevyřízený QR kód pro platbu z předchozího Pizza day
|
||||
type: object
|
||||
additionalProperties: false
|
||||
required:
|
||||
- date
|
||||
- creator
|
||||
- totalPrice
|
||||
properties:
|
||||
date:
|
||||
description: Datum Pizza day, ke kterému se QR kód vztahuje
|
||||
type: string
|
||||
creator:
|
||||
description: Jméno zakladatele Pizza day (objednávajícího)
|
||||
type: string
|
||||
totalPrice:
|
||||
description: Celková cena objednávky v Kč
|
||||
type: number
|
||||
|
||||
Reference in New Issue
Block a user