This commit is contained in:
Sean Edmunds
2024-08-20 16:28:46 -05:00
parent 8152d3fe73
commit 7990f164d6
39 changed files with 824 additions and 772 deletions

View File

@@ -1,36 +1,36 @@
import Homepage from "./pages/homepage/Homepage";
import {
MantineProvider,
DEFAULT_THEME,
MantineProvider,
createTheme,
mergeMantineTheme,
} from "@mantine/core";
} from '@mantine/core';
import { useLocalStorage } from '@mantine/hooks';
import { ModalsProvider } from '@mantine/modals';
import { useEffect } from 'react';
import {
Route,
RouterProvider,
createBrowserRouter,
createRoutesFromElements,
RouterProvider,
} from "react-router-dom";
import Settings from "./pages/settings/Settings";
import { ModalsProvider } from "@mantine/modals";
import { useLocalStorage } from "@mantine/hooks";
import { useEffect, useState } from "react";
import { useQueryAPI } from "./hooks/useAPI";
import ThemeProvider from "./components/ThemeProvider";
import "@mantine/core/styles.css"; //import Mantine V7 styles needed by MRT
import "@mantine/dates/styles.css"; //if using mantine date picker features
import "mantine-react-table/styles.css"; //import MRT styles
import { appTheme } from "./contexts/theme";
import { useAtom } from "jotai";
} from 'react-router-dom';
import ThemeProvider from './components/ThemeProvider';
import { useQueryAPI } from './hooks/useAPI';
import Homepage from './pages/homepage/Homepage';
import Settings from './pages/settings/Settings';
import '@mantine/core/styles.css'; //import Mantine V7 styles needed by MRT
import '@mantine/dates/styles.css'; //if using mantine date picker features
import 'mantine-react-table/styles.css'; //import MRT styles
import { useAtom } from 'jotai';
import { appTheme } from './contexts/theme';
function App() {
const { data, isFetched } = useQueryAPI({
endpoint: "api/themes",
endpoint: 'api/themes',
});
const [themeName, setThemeName] = useLocalStorage<any>({
key: "theme",
defaultValue: "blackboard",
key: 'theme',
defaultValue: 'blackboard',
});
const [theme, setTheme] = useAtom(appTheme);
@@ -45,38 +45,31 @@ function App() {
const router = createBrowserRouter(
createRoutesFromElements(
<Route>
<Route path="/trigger" element={<Homepage theme={theme} />} />
<Route
path="/trigger/settings"
element={<Settings theme={theme} />}
/>
<Route path='/trigger' element={<Homepage theme={theme} />} />
<Route path='/trigger/settings' element={<Settings theme={theme} />} />
</Route>,
),
);
const overrides = createTheme({
white: theme?.colorbackground,
fontFamily:
"-apple-system,Jost,BlinkMacSystemFont,Helvetica Neue,Roboto,sans-serif",
fontFamily: '-apple-system,Jost,BlinkMacSystemFont,Helvetica Neue,Roboto,sans-serif',
});
const mantineTheme = mergeMantineTheme(DEFAULT_THEME, overrides);
return (
<>
{theme && (
{theme && (
<MantineProvider theme={mantineTheme}>
<ThemeProvider theme={theme}>
<ModalsProvider >
<RouterProvider router={router} />
</ModalsProvider>
</ThemeProvider>
<ThemeProvider theme={theme}>
<ModalsProvider>
<RouterProvider router={router} />
</ModalsProvider>
</ThemeProvider>
</MantineProvider>
)}
</>
);
}
export default App;
export default App;