fixed theme not using theme.ts
This commit is contained in:
parent
ffa060cee8
commit
6727d9f132
4 changed files with 9 additions and 15 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "Brand X Technologies",
|
"name": "Adaptive Dashboard",
|
||||||
"short_name": "BXT",
|
"short_name": "Adaptive",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "favicon.ico",
|
"src": "favicon.ico",
|
||||||
|
|
|
||||||
|
|
@ -101,9 +101,6 @@ export default function UserWrapper() {
|
||||||
<NavigationContainer />
|
<NavigationContainer />
|
||||||
</main>
|
</main>
|
||||||
</AppThemeProvider>
|
</AppThemeProvider>
|
||||||
{/* <FirmwareLoader> */}
|
|
||||||
|
|
||||||
{/* </FirmwareLoader> */}
|
|
||||||
</StateProvider>
|
</StateProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { DeveloperBoard as ProvisionIcon, LibraryAdd as CreateGroupIcon } from "@mui/icons-material";
|
import { DeveloperBoard as ProvisionIcon, LibraryAdd as CreateGroupIcon } from "@mui/icons-material";
|
||||||
import { Box, Chip, Grid2, IconButton, Skeleton, Tab, Tabs, Theme, Tooltip, Typography } from "@mui/material";
|
import { Box, Chip, Grid2, IconButton, Skeleton, Tab, Tabs, Theme, Tooltip, Typography, useTheme } from "@mui/material";
|
||||||
import { blue, green, orange } from "@mui/material/colors";
|
import { blue, green, orange } from "@mui/material/colors";
|
||||||
import { makeStyles } from "@mui/styles";
|
import { makeStyles } from "@mui/styles";
|
||||||
import ResponsiveTable, { Column } from "common/ResponsiveTable";
|
import ResponsiveTable, { Column } from "common/ResponsiveTable";
|
||||||
|
|
@ -74,6 +74,7 @@ const useStyles = makeStyles((theme: Theme) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
export default function Devices() {
|
export default function Devices() {
|
||||||
|
const theme = useTheme();
|
||||||
const isMobile = useMobile();
|
const isMobile = useMobile();
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
@ -263,7 +264,7 @@ export default function Devices() {
|
||||||
const status = device.status ?? pond.DeviceStatus.create()
|
const status = device.status ?? pond.DeviceStatus.create()
|
||||||
const deviceStateHelper = getDeviceStateHelper(status.state);
|
const deviceStateHelper = getDeviceStateHelper(status.state);
|
||||||
return (
|
return (
|
||||||
<Box className={classes.cellContainer}>
|
<Box className={classes.cellContainer} style={{ width: theme.spacing(0.5)}}>
|
||||||
<Tooltip title={deviceStateHelper.description}>{deviceStateHelper.icon}</Tooltip>
|
<Tooltip title={deviceStateHelper.description}>{deviceStateHelper.icon}</Tooltip>
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
|
|
@ -283,6 +284,7 @@ export default function Devices() {
|
||||||
<Chip
|
<Chip
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
label={device.settings?.name ? device.settings.name : "Device " + device.settings?.deviceId}
|
label={device.settings?.name ? device.settings.name : "Device " + device.settings?.deviceId}
|
||||||
|
sx={{ maxWidth: 120}}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import React, { createContext, useContext, useMemo, useState } from "react";
|
import React, { createContext, useContext, useMemo, useState } from "react";
|
||||||
import { ThemeProvider, createTheme, PaletteMode } from "@mui/material/styles";
|
import { ThemeProvider, createTheme, PaletteMode } from "@mui/material/styles";
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
import useMediaQuery from "@mui/material/useMediaQuery";
|
||||||
|
import { getTheme } from "./theme";
|
||||||
|
|
||||||
// --- You can import your own makePaletteColor() here if needed ---
|
// --- You can import your own makePaletteColor() here if needed ---
|
||||||
|
|
||||||
|
|
@ -33,13 +34,7 @@ export const AppThemeProvider: React.FC<{ children: React.ReactNode }> = ({ chil
|
||||||
const prefersDark = useMediaQuery("(prefers-color-scheme: dark)");
|
const prefersDark = useMediaQuery("(prefers-color-scheme: dark)");
|
||||||
const resolvedMode: PaletteMode = mode === "system" ? (prefersDark ? "dark" : "light") : mode;
|
const resolvedMode: PaletteMode = mode === "system" ? (prefersDark ? "dark" : "light") : mode;
|
||||||
|
|
||||||
const theme = useMemo(() => createTheme({
|
const theme = useMemo(() => getTheme(resolvedMode), [resolvedMode]);
|
||||||
palette: {
|
|
||||||
mode: resolvedMode,
|
|
||||||
primary: { main: "#1976d2" }, // Or use makePaletteColor()
|
|
||||||
secondary: { main: "#e91e63" },
|
|
||||||
},
|
|
||||||
}), [resolvedMode]);
|
|
||||||
|
|
||||||
const toggleMode = () => {
|
const toggleMode = () => {
|
||||||
setMode(prev =>
|
setMode(prev =>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue