diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea88b2..1ee6008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,10 @@ before_script: build: stage: build - script: "platformio run -e esp12e" + script: + - "platformio run -e esp12e" + - vers=$(grep -Po '[0-9]*\.[0-9]*\.[0-9]*(?=\")' ./src/Pins.h) + - mv .pio/'build/esp12e/*.bin Pumpensteuerung-${vers}.bin artifacts: paths: - - .pio/build/esp12e/*.bin \ No newline at end of file + - ./*.bin \ No newline at end of file diff --git a/interface/src/project/GeneralInformation.tsx b/interface/src/project/GeneralInformation.tsx index ccd0735..91c976d 100644 --- a/interface/src/project/GeneralInformation.tsx +++ b/interface/src/project/GeneralInformation.tsx @@ -1,12 +1,6 @@ import React, {Component} from 'react'; import {Box, List, ListItem, ListItemText} from '@material-ui/core'; -import { - FormButton, - restController, - RestControllerProps, - RestFormLoader, - SectionContent -} from '../components'; +import {FormButton, restController, RestControllerProps, RestFormLoader, SectionContent} from '../components'; import {ENDPOINT_ROOT} from "../api"; import {GeneralInformaitonState} from "./types"; import RefreshIcon from "@material-ui/icons/Refresh"; @@ -21,12 +15,6 @@ class GeneralInformation extends Component { - // this.props.loadData(); - // console.log("refreshing data"); - // console.log(this.props.data) - // }, 10000); } componentWillUnmount() { @@ -39,58 +27,62 @@ class GeneralInformation extends Component ( - <> - - - - - - - - - - - - - - - - - - - - - - - } variant="contained" color="secondary" - onClick={this.props.loadData}> - Refresh - - - - Version: {props.data.version} - + <> + + + + + + + + + + + + + + + + + + + + + + + } variant="contained" color="secondary" + onClick={this.props.loadData}> + Refresh + - - )} + + Version: {props.data.version} + + + + )} /> ); @@ -100,7 +92,7 @@ class GeneralInformation extends Component= 86400) { // display days return (Math.trunc(sec / 86400) + "d " + Math.trunc((sec % 86400) / 3600) + "h " + Math.trunc((sec % 3600) / 60) + "min " + sec % 60 + "sec"); @@ -115,6 +107,20 @@ class GeneralInformation extends Component