andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

updates to #168

Browse Source
This commit is contained in:
proddy
2021-10-25 13:01:56 +02:00
parent be27033d41
commit 47cb296cc4
2 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pre_release.yml vendored
View File

@@ -48,7 +48,7 @@ jobs:
uses: "marvinpinto/action-automatic-releases@latest" uses: "marvinpinto/action-automatic-releases@latest"
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" repo_token: "${{ secrets.GITHUB_TOKEN }}"
title: ESP32 Development Build v${{steps.build_info.outputs.version}} title: Development Build v${{steps.build_info.outputs.version}}
automatic_release_tag: "latest" automatic_release_tag: "latest"
prerelease: true prerelease: true
files: | files: |

61
interface/src/system/VersionCheck.tsx
View File

@@ -19,6 +19,8 @@ export const VERSIONCHECK_ENDPOINT =
export const VERSIONCHECK_DEV_ENDPOINT = export const VERSIONCHECK_DEV_ENDPOINT =
'https://api.github.com/repos/emsesp/EMS-ESP32/releases/tags/latest'; 'https://api.github.com/repos/emsesp/EMS-ESP32/releases/tags/latest';
export const uploadURL = window.location.origin + '/system/upload';
interface VersionCheckProps extends WithSnackbarProps { interface VersionCheckProps extends WithSnackbarProps {
currentVersion: string; currentVersion: string;
onClose: () => void; onClose: () => void;
@@ -27,8 +29,10 @@ interface VersionCheckProps extends WithSnackbarProps {
interface VersionCheckState { interface VersionCheckState {
latestVersion?: string; latestVersion?: string;
latestVersionUrl?: string; latestVersionUrl?: string;
latestVersionChangelog?: string;
latestDevVersion?: string; latestDevVersion?: string;
latestDevVersionUrl?: string; latestDevVersionUrl?: string;
latestDevVersionChangelog?: string;
} }
class VersionCheck extends React.Component< class VersionCheck extends React.Component<
@@ -51,9 +55,10 @@ class VersionCheck extends React.Component<
} }
}) })
.then((data) => { .then((data) => {
this.setState({ latestVersion: data.name });
this.setState({ this.setState({
latestVersionUrl: data.assets[1].browser_download_url latestVersion: data.name,
latestVersionUrl: data.assets[1].browser_download_url,
latestVersionChangelog: data.html_url
}); });
}) })
.catch((error) => { .catch((error) => {
@@ -78,9 +83,10 @@ class VersionCheck extends React.Component<
} }
}) })
.then((data) => { .then((data) => {
this.setState({ latestDevVersion: data.name.split(/\s+/).splice(-1) });
this.setState({ this.setState({
latestDevVersionUrl: data.assets[1].browser_download_url latestDevVersion: data.name.split(/\s+/).splice(-1),
latestDevVersionUrl: data.assets[1].browser_download_url,
latestDevVersionChangelog: data.assets[0].browser_download_url
}); });
}) })
.catch((error) => { .catch((error) => {
@@ -99,7 +105,9 @@ class VersionCheck extends React.Component<
latestVersion, latestVersion,
latestVersionUrl, latestVersionUrl,
latestDevVersion, latestDevVersion,
latestDevVersionUrl latestDevVersionUrl,
latestVersionChangelog,
latestDevVersionChangelog
} = this.state; } = this.state;
return ( return (
<Dialog <Dialog
@@ -123,32 +131,55 @@ class VersionCheck extends React.Component<
mb={2} mb={2}
> >
<Typography variant="body1"> <Typography variant="body1">
You are currently on version <b>v{currentVersion}</b> You are currently running EMS-ESP version{' '}
<b>v{currentVersion}</b>
</Typography> </Typography>
</Box> </Box>
<Box mt={2} mb={2}> <Box mt={2} mb={2}>
The latest stable version is <b>{latestVersion}</b>. The latest <u>stable</u> version is <b>{latestVersion}</b>
Download&nbsp; &nbsp;(
<Link target="_blank" href={latestVersionUrl} color="primary"> <Link
{'here'}. target="_blank"
href={latestVersionChangelog}
color="primary"
>
{'release notes'}
</Link> </Link>
)&nbsp;(
<Link target="_blank" href={latestVersionUrl} color="primary">
{'download'}
</Link>
)
</Box> </Box>
<Box mt={2} mb={2}> <Box mt={2} mb={2}>
The latest development (beta) version is{' '} The latest <u>development</u> version is&nbsp;
<b>{latestDevVersion}</b>. Download&nbsp; <b>{latestDevVersion}</b>
&nbsp;(
<Link
target="_blank"
href={latestDevVersionChangelog}
color="primary"
>
{'release notes'}
</Link>
)&nbsp;(
<Link <Link
target="_blank" target="_blank"
href={latestDevVersionUrl} href={latestDevVersionUrl}
color="primary" color="primary"
> >
{'here'}. {'download'}
</Link> </Link>
)
</Box> </Box>
<Box color="warning.main" p={0} pl={0} pr={0} mt={4} mb={0}> <Box color="warning.main" p={0} pl={0} pr={0} mt={4} mb={0}>
<Typography variant="body2"> <Typography variant="body2">
<i> <i>
After downloading the firmware, go to UPLOAD FIRMWARE to Use&nbsp;
install the new version <Link target="_blank" href={uploadURL} color="primary">
{'UPLOAD FIRMWARE'}
</Link>
&nbsp;to install any new firmware versions.
</i> </i>
</Typography> </Typography>
</Box> </Box>