andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

tidy up formatting, add a re-install option

Browse Source
This commit is contained in:
proddy
2025-01-05 18:26:18 +01:00
parent b13c608ff3
commit 472f922369
1 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
interface/src/app/settings/Version.tsx
View File

@@ -183,10 +183,6 @@ const Version = () => {
}; };
const showButtons = () => { const showButtons = () => {
if (!upgradeAvailable) {
return;
}
if (downloadOnly) { if (downloadOnly) {
return ( return (
<Button <Button
@@ -212,7 +208,7 @@ const Version = () => {
size="small" size="small"
onClick={() => showFirmwareDialog()} onClick={() => showFirmwareDialog()}
> >
{LL.UPGRADE()}&hellip; {upgradeAvailable ? LL.UPGRADE() : 'Re-install'}&hellip;
</Button> </Button>
); );
}; };
@@ -225,24 +221,24 @@ const Version = () => {
return ( return (
<> <>
<Box p={2} border="1px solid grey" borderRadius={2}> <Box p={2} border="1px solid grey" borderRadius={2}>
<Typography sx={{ pb: 2 }} variant="h6" color="primary"> <Typography mb={2} variant="h6" color="primary">
Firmware Version Firmware Version
</Typography> </Typography>
<Grid container spacing={4}> <Grid
<Grid mb={1}> container
<Typography mb={1} color="secondary"> direction="row"
{LL.VERSION()} rowSpacing={1}
</Typography> sx={{
<Typography mb={1} color="secondary"> justifyContent: 'flex-start',
Platform alignItems: 'baseline'
</Typography> }}
<Typography mb={1} color="secondary"> >
Release Type <Grid size={4}>
</Typography> <Typography color="secondary">{LL.VERSION()}</Typography>
</Grid> </Grid>
<Grid mb={1}> <Grid size={8}>
<Typography mb={1}> <Typography>
{data.emsesp_version} {data.emsesp_version}
{data.build_flags && ( {data.build_flags && (
<Typography variant="caption"> <Typography variant="caption">
@@ -250,8 +246,20 @@ const Version = () => {
</Typography> </Typography>
)} )}
</Typography> </Typography>
<Typography mb={1}>{getPlatform()}</Typography> </Grid>
<Typography mb={1}>
<Grid size={4}>
<Typography color="secondary">Platform</Typography>
</Grid>
<Grid size={8}>
<Typography>{getPlatform()}</Typography>
</Grid>
<Grid size={4}>
<Typography color="secondary">Release Type</Typography>
</Grid>
<Grid size={8}>
<Typography>
{data.emsesp_version.includes('dev') {data.emsesp_version.includes('dev')
? LL.DEVELOPMENT() ? LL.DEVELOPMENT()
: LL.STABLE()} : LL.STABLE()}
@@ -259,40 +267,48 @@ const Version = () => {
</Grid> </Grid>
</Grid> </Grid>
<Typography sx={{ pb: 2 }} variant="h6" color="primary"> <Typography mt={2} mb={2} variant="h6" color="primary">
{LL.AVAILABLE_VERSION()} {LL.AVAILABLE_VERSION()}
</Typography> </Typography>
<Grid
container
direction="row"
rowSpacing={1}
sx={{
justifyContent: 'flex-start',
alignItems: 'baseline'
}}
>
<Grid size={4}>
<Typography color="secondary">{LL.STABLE()}</Typography>
</Grid>
<Grid size={4}>
<Typography>
<Link target="_blank" href={STABLE_RELNOTES_URL} color="primary">
{latestVersion}
</Link>
</Typography>
</Grid>
<Grid size={4}>{!usingDevVersion && showButtons()}</Grid>
<Grid size={4}>
<Typography color="secondary">{LL.DEVELOPMENT()}</Typography>
</Grid>
<Grid size={4}>
<Typography>
<Link target="_blank" href={DEV_RELNOTES_URL} color="primary">
{latestDevVersion}
</Link>
</Typography>
</Grid>
<Grid size={4}>{usingDevVersion && showButtons()}</Grid>
</Grid>
{internetLive ? ( {internetLive ? (
<> <>
<Grid container spacing={4}>
<Grid mb={1}>
<Typography mb={1} color="secondary">
{LL.STABLE()}
</Typography>
<Typography mb={1} color="secondary">
{LL.DEVELOPMENT()}
</Typography>
</Grid>
<Grid mb={1}>
<Typography mb={1}>
{latestVersion}&nbsp;&nbsp;
<Link target="_blank" href={STABLE_RELNOTES_URL} color="primary">
(changelog)
</Link>
{!usingDevVersion && showButtons()}
</Typography>
<Typography mb={1}>
{latestDevVersion}&nbsp;&nbsp;
<Link target="_blank" href={DEV_RELNOTES_URL} color="primary">
(changelog)
</Link>
{usingDevVersion && showButtons()}
</Typography>
</Grid>
</Grid>
{upgradeAvailable ? ( {upgradeAvailable ? (
<Typography color="warning"> <Typography mt={2} color="warning">
<InfoOutlinedIcon <InfoOutlinedIcon
color="warning" color="warning"
sx={{ verticalAlign: 'middle', mr: 2 }} sx={{ verticalAlign: 'middle', mr: 2 }}
@@ -300,7 +316,7 @@ const Version = () => {
{LL.UPGRADE_AVAILABLE()} {LL.UPGRADE_AVAILABLE()}
</Typography> </Typography>
) : ( ) : (
<Typography color="success"> <Typography mt={2} color="success">
<CheckIcon <CheckIcon
color="success" color="success"
sx={{ verticalAlign: 'middle', mr: 2 }} sx={{ verticalAlign: 'middle', mr: 2 }}
@@ -326,7 +342,7 @@ const Version = () => {
) : ( ) : (
<Typography mb={1} color="warning"> <Typography mb={1} color="warning">
<WarningIcon color="warning" sx={{ verticalAlign: 'middle', mr: 2 }} /> <WarningIcon color="warning" sx={{ verticalAlign: 'middle', mr: 2 }} />
device cannot access internet no access to download site
</Typography> </Typography>
)} )}