fix NTP icons, add AP

This commit is contained in:
proddy
2024-03-23 17:16:45 +01:00
parent 2ab50bd0a2
commit 0deaafb9ce
14 changed files with 73 additions and 70 deletions

View File

@@ -8,6 +8,7 @@ import MemoryIcon from '@mui/icons-material/Memory';
import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
import SettingsEthernetIcon from '@mui/icons-material/SettingsEthernet';
import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
import TuneIcon from '@mui/icons-material/Tune';
import { List, Button, Dialog, DialogActions, DialogContent, DialogTitle, Box } from '@mui/material';
@@ -171,7 +172,7 @@ const Settings: FC = () => {
/>
<ListMenuItem
icon={AccessTimeIcon}
icon={SettingsInputAntennaIcon}
bgcolor="#5f9a5f"
label={LL.ACCESS_POINT(0)}
text={LL.CONFIGURE(LL.ACCESS_POINT(0))}

View File

@@ -4,7 +4,7 @@ import { Navigate, Routes, Route } from 'react-router-dom';
import APSettings from './APSettings';
import APStatus from './APStatus';
import type { FC } from 'react';
import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { useI18nContext } from 'i18n/i18n-react';
@@ -23,14 +23,7 @@ const AccessPoint: FC = () => {
</RouterTabs>
<Routes>
<Route path="status" element={<APStatus />} />
<Route
path="settings"
element={
<RequireAdmin>
<APSettings />
</RequireAdmin>
}
/>
<Route path="settings" element={<APSettings />} />
<Route path="*" element={<Navigate replace to="settings" />} />
</Routes>
</>

View File

@@ -4,7 +4,7 @@ import MqttSettings from './MqttSettings';
import MqttStatus from './MqttStatus';
import type { FC } from 'react';
import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { useI18nContext } from 'i18n/i18n-react';
@@ -23,14 +23,7 @@ const Mqtt: FC = () => {
</RouterTabs>
<Routes>
<Route path="status" element={<MqttStatus />} />
<Route
path="settings"
element={
<RequireAdmin>
<MqttSettings />
</RequireAdmin>
}
/>
<Route path="settings" element={<MqttSettings />} />
<Route path="*" element={<Navigate replace to="settings" />} />
</Routes>
</>

View File

@@ -8,7 +8,7 @@ import WiFiNetworkScanner from './WiFiNetworkScanner';
import type { FC } from 'react';
import type { WiFiNetwork } from 'types';
import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { useI18nContext } from 'i18n/i18n-react';
const Network: FC = () => {
@@ -48,22 +48,8 @@ const Network: FC = () => {
</RouterTabs>
<Routes>
<Route path="status" element={<NetworkStatus />} />
<Route
path="scan"
element={
<RequireAdmin>
<WiFiNetworkScanner />
</RequireAdmin>
}
/>
<Route
path="settings"
element={
<RequireAdmin>
<NetworkSettings />
</RequireAdmin>
}
/>
<Route path="scan" element={<WiFiNetworkScanner />} />
<Route path="settings" element={<NetworkSettings />} />
<Route path="*" element={<Navigate replace to="settings" />} />
</Routes>
</WiFiConnectionContext.Provider>

View File

@@ -4,7 +4,7 @@ import NTPSettings from './NTPSettings';
import NTPStatus from './NTPStatus';
import type { FC } from 'react';
import { RequireAdmin, RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { RouterTabs, useLayoutTitle, useRouterTab } from 'components';
import { useI18nContext } from 'i18n/i18n-react';
@@ -22,14 +22,7 @@ const NetworkTime: FC = () => {
</RouterTabs>
<Routes>
<Route path="status" element={<NTPStatus />} />
<Route
path="settings"
element={
<RequireAdmin>
<NTPSettings />
</RequireAdmin>
}
/>
<Route path="settings" element={<NTPSettings />} />
<Route path="*" element={<Navigate replace to="settings" />} />
</Routes>
</>

View File

@@ -1,11 +1,12 @@
import { Tab } from '@mui/material';
import { useContext, type FC } from 'react';
import { Navigate, Routes, Route } from 'react-router-dom';
import SystemLog from './SystemLog';
import SystemStatus from './SystemStatus';
import type { FC } from 'react';
import { useRouterTab, RouterTabs, useLayoutTitle } from 'components';
import { useRouterTab, RouterTabs, useLayoutTitle, RequireAdmin } from 'components';
import { AuthenticatedContext } from 'contexts/authentication';
import { useI18nContext } from 'i18n/i18n-react';
import SystemActivity from 'project/SystemActivity';
@@ -15,18 +16,26 @@ const System: FC = () => {
useLayoutTitle(LL.SYSTEM(0));
const { routerTab } = useRouterTab();
const { me } = useContext(AuthenticatedContext);
return (
<>
<RouterTabs value={routerTab}>
<Tab value="status" label={LL.STATUS_OF('')} />
<Tab value="activity" label={LL.ACTIVITY()} />
<Tab value="log" label={LL.LOG_OF('')} />
<Tab disabled={!me.admin} value="log" label={me.admin ? LL.LOG_OF('') : ''} />
</RouterTabs>
<Routes>
<Route path="status" element={<SystemStatus />} />
<Route path="activity" element={<SystemActivity />} />
<Route path="log" element={<SystemLog />} />
<Route
path="log"
element={
<RequireAdmin>
<SystemLog />
</RequireAdmin>
}
/>
<Route path="*" element={<Navigate replace to="status" />} />
</Routes>
</>

View File

@@ -1,3 +1,4 @@
import AccessTimeIcon from '@mui/icons-material/AccessTime';
import BuildIcon from '@mui/icons-material/Build';
import CancelIcon from '@mui/icons-material/Cancel';
import CastIcon from '@mui/icons-material/Cast';
@@ -6,6 +7,7 @@ import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
import MemoryIcon from '@mui/icons-material/Memory';
import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
import RefreshIcon from '@mui/icons-material/Refresh';
import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
import TimerIcon from '@mui/icons-material/Timer';
import {
@@ -249,7 +251,7 @@ const SystemStatus: FC = () => {
<ListMenuItem
disabled={!me.admin}
icon={DeviceHubIcon}
icon={AccessTimeIcon}
bgcolor={ntpStatusHighlight()}
label={LL.STATUS_OF('NTP')}
text={ntpStatus()}
@@ -266,6 +268,16 @@ const SystemStatus: FC = () => {
to="/settings/ota"
/>
<Divider variant="inset" component="li" />
<ListMenuItem
disabled={!me.admin}
icon={SettingsInputAntennaIcon}
bgcolor={activeHighlight(data.ota_status)}
label={LL.ACCESS_POINT(0)}
text={data.ap_status ? LL.ACTIVE() : LL.INACTIVE(0)}
to="/settings/ap/status"
/>
<Divider variant="inset" component="li" />
</List>
{renderScanDialog()}

View File

@@ -37,6 +37,7 @@ export interface SystemStatus {
ntp_status: number;
ota_status: boolean;
mqtt_status: boolean;
ap_status: boolean;
}
export interface OTASettingsType {