diff --git a/jams-react-client/package-lock.json b/jams-react-client/package-lock.json index 3171c3597a80f7ee5045f8660b7e28120ce8eb37..262efc26cac8cfdf77818676300360d9007c3364 100644 --- a/jams-react-client/package-lock.json +++ b/jams-react-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "jams-jami-client", - "version": "0.1.1", + "version": "2.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/jams-react-client/package.json b/jams-react-client/package.json index 6dc68de4f3416614588fa181e4532c2a8ecb1f8a..4678abdf3bd8d24d51dfe7e5d4b3e027be827e8b 100644 --- a/jams-react-client/package.json +++ b/jams-react-client/package.json @@ -1,6 +1,6 @@ { "name": "jams-jami-client", - "version": "0.1.1", + "version": "2.2.0", "description": "Jams client for managing user's devices", "private": false, "main": "dist/index.js", diff --git a/jams-react-client/src/components/Footer/Footer.js b/jams-react-client/src/components/Footer/Footer.js index 88ba9774c9dd1fe5ad05b5f80396c9a336ff52b9..1387e46b1e350455270384540e2bd0dde64119c4 100755 --- a/jams-react-client/src/components/Footer/Footer.js +++ b/jams-react-client/src/components/Footer/Footer.js @@ -8,6 +8,8 @@ import List from "@material-ui/core/List"; // core components import styles from "assets/jss/material-dashboard-react/components/footerStyle.js"; +const pjson = require('../../../package.json'); + const useStyles = makeStyles(styles); export default function Footer(props) { @@ -17,6 +19,7 @@ export default function Footer(props) { <div className={classes.container}> <p className={classes.right}> <span> + JAMS Version {pjson.version.slice(0, 3)} - © {1900 + new Date().getYear()}{" "} <a href="https://savoirfairelinux.com" diff --git a/jams-react-client/src/views/Settings/General.js b/jams-react-client/src/views/Settings/General.js index 0f71520105a5e5746f4555e20a7b62cf7225a9d2..c9fe060afffa4bc3be49a88ce33139779ea1fc42 100644 --- a/jams-react-client/src/views/Settings/General.js +++ b/jams-react-client/src/views/Settings/General.js @@ -30,6 +30,8 @@ import i18next from "i18next"; import LanguagePicker from "../../components/LanguagePicker/LanguagePicker"; +const pjson = require('../../../package.json'); + let generator = require("generate-password"); const useStyles = makeStyles((theme) => ({ @@ -159,7 +161,7 @@ export default function General(props) { <VpnKeyIcon /> </InputAdornment> } - endAdornment={ + endAdornment={ <IconButton aria-label="toggle password visibility" onMouseDown={handleMouseDownPassword} @@ -265,6 +267,9 @@ export default function General(props) { {i18next.t("change_admin_password", "Change administrator password")} </Button> </Grid> + <Grid item lg={6}> + Version {pjson.version.slice(0, 3)} + </Grid> </Grid> </form>