mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2026-05-02 12:07:02 +00:00
move Version from status to settings
This commit is contained in:
@@ -16,6 +16,7 @@ import DownloadUpload from 'app/settings/DownloadUpload';
|
|||||||
import MqttSettings from 'app/settings/MqttSettings';
|
import MqttSettings from 'app/settings/MqttSettings';
|
||||||
import NTPSettings from 'app/settings/NTPSettings';
|
import NTPSettings from 'app/settings/NTPSettings';
|
||||||
import Settings from 'app/settings/Settings';
|
import Settings from 'app/settings/Settings';
|
||||||
|
import Version from 'app/settings/Version';
|
||||||
import Network from 'app/settings/network/Network';
|
import Network from 'app/settings/network/Network';
|
||||||
import Security from 'app/settings/security/Security';
|
import Security from 'app/settings/security/Security';
|
||||||
import APStatus from 'app/status/APStatus';
|
import APStatus from 'app/status/APStatus';
|
||||||
@@ -26,7 +27,6 @@ import NTPStatus from 'app/status/NTPStatus';
|
|||||||
import NetworkStatus from 'app/status/NetworkStatus';
|
import NetworkStatus from 'app/status/NetworkStatus';
|
||||||
import Status from 'app/status/Status';
|
import Status from 'app/status/Status';
|
||||||
import SystemLog from 'app/status/SystemLog';
|
import SystemLog from 'app/status/SystemLog';
|
||||||
import Version from 'app/status/Version';
|
|
||||||
import { Layout } from 'components';
|
import { Layout } from 'components';
|
||||||
import { AuthenticatedContext } from 'contexts/authentication';
|
import { AuthenticatedContext } from 'contexts/authentication';
|
||||||
|
|
||||||
@@ -49,11 +49,11 @@ const AuthenticatedRouting = memo(() => {
|
|||||||
<Route path="/status/ntp" element={<NTPStatus />} />
|
<Route path="/status/ntp" element={<NTPStatus />} />
|
||||||
<Route path="/status/ap" element={<APStatus />} />
|
<Route path="/status/ap" element={<APStatus />} />
|
||||||
<Route path="/status/network" element={<NetworkStatus />} />
|
<Route path="/status/network" element={<NetworkStatus />} />
|
||||||
<Route path="/status/version" element={<Version />} />
|
|
||||||
|
|
||||||
{me.admin && (
|
{me.admin && (
|
||||||
<>
|
<>
|
||||||
<Route path="/settings" element={<Settings />} />
|
<Route path="/settings" element={<Settings />} />
|
||||||
|
<Route path="/settings/version" element={<Version />} />
|
||||||
<Route path="/settings/application" element={<ApplicationSettings />} />
|
<Route path="/settings/application" element={<ApplicationSettings />} />
|
||||||
<Route path="/settings/mqtt" element={<MqttSettings />} />
|
<Route path="/settings/mqtt" element={<MqttSettings />} />
|
||||||
<Route path="/settings/ntp" element={<NTPSettings />} />
|
<Route path="/settings/ntp" element={<NTPSettings />} />
|
||||||
|
|||||||
@@ -41,10 +41,10 @@ const Settings = () => {
|
|||||||
const { versions } = useContext(AuthenticatedContext);
|
const { versions } = useContext(AuthenticatedContext);
|
||||||
useLayoutTitle(LL.SETTINGS(0));
|
useLayoutTitle(LL.SETTINGS(0));
|
||||||
|
|
||||||
const firmwareText = versions?.current?.version
|
|
||||||
? `v${versions.current.version}`
|
|
||||||
: '';
|
|
||||||
const upgradeAvailable = versions?.current?.upgradeable ?? false;
|
const upgradeAvailable = versions?.current?.upgradeable ?? false;
|
||||||
|
const firmwareText = versions?.current?.version
|
||||||
|
? `v${versions.current.version}${upgradeAvailable ? ` (${LL.UPDATE_AVAILABLE()})` : ''}`
|
||||||
|
: '';
|
||||||
|
|
||||||
const [confirmFactoryReset, setConfirmFactoryReset] = useState(false);
|
const [confirmFactoryReset, setConfirmFactoryReset] = useState(false);
|
||||||
const [confirmRestart, setConfirmRestart] = useState(false);
|
const [confirmRestart, setConfirmRestart] = useState(false);
|
||||||
@@ -99,7 +99,7 @@ const Settings = () => {
|
|||||||
bgcolor="#72caf9"
|
bgcolor="#72caf9"
|
||||||
label="EMS-ESP Firmware"
|
label="EMS-ESP Firmware"
|
||||||
text={firmwareText}
|
text={firmwareText}
|
||||||
to="/status/version"
|
to="/settings/version"
|
||||||
badge={upgradeAvailable}
|
badge={upgradeAvailable}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user