fix: oprava chování Hell Girl theme
CI / Generate TypeScript types (push) Successful in 11s
CI / Server unit tests (push) Successful in 27s
CI / Build server (push) Successful in 31s
CI / Build client (push) Successful in 49s
CI / Playwright E2E tests (push) Successful in 1m58s
CI / Build and push Docker image (push) Successful in 49s
CI / Notify (push) Successful in 3s
CI / Generate TypeScript types (push) Successful in 11s
CI / Server unit tests (push) Successful in 27s
CI / Build server (push) Successful in 31s
CI / Build client (push) Successful in 49s
CI / Playwright E2E tests (push) Successful in 1m58s
CI / Build and push Docker image (push) Successful in 49s
CI / Notify (push) Successful in 3s
This commit is contained in:
2 files changed
+20
-20
No files matched your search
@@ -16,7 +16,6 @@ import './themes/hellgirl.scss';
|
|||||||
import { faCircleCheck, faNoteSticky, faTrashCan, faComment } from '@fortawesome/free-regular-svg-icons';
|
import { faCircleCheck, faNoteSticky, faTrashCan, faComment } from '@fortawesome/free-regular-svg-icons';
|
||||||
import { useSettings } from './context/settings';
|
import { useSettings } from './context/settings';
|
||||||
import Footer from './components/Footer';
|
import Footer from './components/Footer';
|
||||||
import HellGirlFlames from './components/HellGirlFlames';
|
|
||||||
import { faArrowUpRightFromSquare, faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faDharmachakra, faGear, faMoneyBillTransfer, faSatelliteDish, faSearch, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
|
import { faArrowUpRightFromSquare, faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faDharmachakra, faGear, faMoneyBillTransfer, faSatelliteDish, faSearch, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import Loader from './components/Loader';
|
import Loader from './components/Loader';
|
||||||
@@ -669,7 +668,6 @@ function App() {
|
|||||||
<div className="app-container">
|
<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` }} />}
|
{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 choices={data?.choices} dayIndex={dayIndex} />
|
<Header choices={data?.choices} dayIndex={dayIndex} />
|
||||||
{settings?.styleTheme === 'hellgirl' && <HellGirlFlames />}
|
|
||||||
<div className='wrapper'>
|
<div className='wrapper'>
|
||||||
{data.todayDayIndex != null && data.todayDayIndex > 4 &&
|
{data.todayDayIndex != null && data.todayDayIndex > 4 &&
|
||||||
<Alert variant="info" className="mb-3">
|
<Alert variant="info" className="mb-3">
|
||||||
|
|||||||
+20
-18
@@ -8,6 +8,7 @@ import StatsPage from "./pages/StatsPage";
|
|||||||
import OrderGroupsPage from "./pages/OrderGroupsPage";
|
import OrderGroupsPage from "./pages/OrderGroupsPage";
|
||||||
import SuggestionsPage from "./pages/SuggestionsPage";
|
import SuggestionsPage from "./pages/SuggestionsPage";
|
||||||
import App from "./App";
|
import App from "./App";
|
||||||
|
import HellGirlFlames from "./components/HellGirlFlames";
|
||||||
|
|
||||||
export const STATS_URL = '/stats';
|
export const STATS_URL = '/stats';
|
||||||
export const OBJEDNANI_URL = '/objednani';
|
export const OBJEDNANI_URL = '/objednani';
|
||||||
@@ -22,34 +23,35 @@ function Butterflies() {
|
|||||||
return <FlyingButterflies numButterflies={BUTTERFLY_PRESETS.NORMAL} />;
|
return <FlyingButterflies numButterflies={BUTTERFLY_PRESETS.NORMAL} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Doplňkové efekty vizuálních stylů — společné pro všechny stránky (např. plamen při otevření dialogu). */
|
||||||
|
function StyleThemeEffects() {
|
||||||
|
const settings = useSettings();
|
||||||
|
return settings?.styleTheme === 'hellgirl' ? <HellGirlFlames /> : null;
|
||||||
|
}
|
||||||
|
|
||||||
export default function AppRoutes() {
|
export default function AppRoutes() {
|
||||||
return (
|
return (
|
||||||
<Routes>
|
<ProvideSettings>
|
||||||
<Route path={STATS_URL} element={<StatsPage />} />
|
<StyleThemeEffects />
|
||||||
<Route path={NAVRHY_URL} element={
|
<Routes>
|
||||||
<ProvideSettings>
|
<Route path={STATS_URL} element={<StatsPage />} />
|
||||||
<SuggestionsPage />
|
<Route path={NAVRHY_URL} element={<SuggestionsPage />} />
|
||||||
</ProvideSettings>
|
<Route path={OBJEDNANI_URL} element={
|
||||||
} />
|
|
||||||
<Route path={OBJEDNANI_URL} element={
|
|
||||||
<ProvideSettings>
|
|
||||||
<SocketContext.Provider value={socket}>
|
<SocketContext.Provider value={socket}>
|
||||||
<OrderGroupsPage />
|
<OrderGroupsPage />
|
||||||
<ToastContainer />
|
<ToastContainer />
|
||||||
</SocketContext.Provider>
|
</SocketContext.Provider>
|
||||||
</ProvideSettings>
|
} />
|
||||||
} />
|
<Route path="/" element={
|
||||||
<Route path="/" element={
|
|
||||||
<ProvideSettings>
|
|
||||||
<SocketContext.Provider value={socket}>
|
<SocketContext.Provider value={socket}>
|
||||||
<>
|
<>
|
||||||
<Butterflies />
|
<FlyingButterflies numButterflies={BUTTERFLY_PRESETS.NORMAL} />
|
||||||
<App />
|
<App />
|
||||||
</>
|
</>
|
||||||
<ToastContainer />
|
<ToastContainer />
|
||||||
</SocketContext.Provider>
|
</SocketContext.Provider>
|
||||||
</ProvideSettings>
|
} />
|
||||||
} />
|
</Routes>
|
||||||
</Routes>
|
</ProvideSettings>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user