Marbes/Luncher
5
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Marbes:d6d6ebb682933d1643866750a95d2e144ce06569
Branches Tags
Marbes:master
Marbes:feat/refreshMenu
Marbes:feat/openapi
Marbes:feat/jdemeNaObed
Marbes:feat/DayOfWeekIndex
Marbes:feat/enumFixes
..
compare: Marbes:739c7707e1218ecf50b815dea976230567b5b123
Branches Tags
Marbes:feat/refreshMenu
Marbes:master
Marbes:feat/openapi
Marbes:feat/jdemeNaObed
Marbes:feat/DayOfWeekIndex
Marbes:feat/enumFixes

No commits in common. "d6d6ebb682933d1643866750a95d2e144ce06569" and "739c7707e1218ecf50b815dea976230567b5b123" have entirely different histories.
d6d6ebb682 ... 739c7707e1

2 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

8
client/src/App.tsx
View File

@ -410,12 +410,12 @@ function App() {
<div className='wrapper'> <div className='wrapper'>
{data.isWeekend ? <h4>Užívejte víkend :)</h4> : <> {data.isWeekend ? <h4>Užívejte víkend :)</h4> : <>
<Alert variant={'primary'}> <Alert variant={'primary'}>
{/* <img alt="" src='hat.png' style={{ position: "absolute", width: "70px", rotate: "-45deg", left: -40, top: -58 }} /> <img alt="" src='hat.png' style={{ position: "absolute", width: "70px", rotate: "-45deg", left: -40, top: -58 }} />
<img alt="" src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} /> */} <img alt="" src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} />
Poslední změny: Poslední změny:
<ul> <ul>
<li>Migrace na generované <Link target='_blank' to="https://www.openapis.org">OpenAPI</Link></li> <li>Možnost výběru restaurace a jídel kliknutím v tabulce</li>
<li>Odebrání zimní atmosféry</li> <li><Link to={STATS_URL}>Statistiky</Link></li>
</ul> </ul>
</Alert> </Alert>
{dayIndex != null && {dayIndex != null &&

6
client/src/AppRoutes.tsx
View File

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