diff --git a/composer.json b/composer.json index d2c083d0b53eb441e775826f1f646f3f3b10d95e..7eae2ae7d7b2143550ed2f082e46d9713651b706 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "project", "description": "Management of stocks, member, accounting, sales, ...", "license": "AGPL-3.0-or-later", - "version": "1.9.0", + "version": "1.9.1", "require": { "php": "^7.3|^8.0", "doctrine/dbal": "^3.1", diff --git a/package.json b/package.json index 1ddc4995b9ad0f460c90d7b9dd952c0e02668424..5c4143172a4d05d0eadc92625de506ff90ec5d30 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "name": "seb", "description": "Management of stocks, member, accounting, sales, ...", - "version": "1.9.0", + "version": "1.9.1", "main": "webpack.mix.js", "directories": { "test": "tests" diff --git a/resources/js/src/layout/Login.js b/resources/js/src/layout/Login.js index 7f02b1708b8ed79674b6cfeaf70d6e274a410753..51ef7338973ba68dca11c012edc75122eb3e0adf 100644 --- a/resources/js/src/layout/Login.js +++ b/resources/js/src/layout/Login.js @@ -5,6 +5,7 @@ import React from 'react'; import { Login } from 'react-admin'; import { Field, Form } from 'react-final-form'; import { Link as RouterLink } from 'react-router-dom'; +import pkg from '../../../../package.json'; const useStyles = makeStyles( (theme) => ({ @@ -171,6 +172,7 @@ const MyLoginPage = (props) => { </Login> <div className={classes.copying}> <Typography> + Seb {pkg.version ?? "DEV"}<br/> {translate('copying.bottommessage')} <Link to="/copying" component={RouterLink} className={classes.link}>GNU AGPLv3</Link><br/> <a className={classes.link} href="/doc/privacy-policy.pdf">Politique de Confidentialité</a> </Typography> diff --git a/resources/js/src/layout/forms/Copying.js b/resources/js/src/layout/forms/Copying.js index 6732bd1e2fba155be13cbdaa12e420f5a21e8c38..6b44796ed4930fca7a9bb12ca02d284cb459d265 100644 --- a/resources/js/src/layout/forms/Copying.js +++ b/resources/js/src/layout/forms/Copying.js @@ -4,6 +4,7 @@ import { ThemeProvider } from '@material-ui/styles'; import React, { useMemo } from 'react'; import { createMuiTheme, TopToolbar, useTranslate } from 'react-admin'; import { withRouter } from 'react-router-dom'; +import pkg from '../../../../../package.json'; import theme from '../Theme'; const useStyles = makeStyles( @@ -32,7 +33,7 @@ const Copying = withRouter(({ history: { goBack }, ...props }) => { <ThemeProvider theme={muiTheme}> <Container maxWidth="md" style={{ backgroundColor: "#424242", color: "#ffffff" }}> <div className={classes.form}> - <Typography variant="h4" component="h1" gutterBottom>{translate('copying.title')}</Typography> + <Typography variant="h4" component="h1" gutterBottom>{translate('copying.title')} - Seb {pkg.version ?? "DEV"}</Typography> <Typography variant="h5" component="h2" gutterBottom>{translate('copying.notice')}</Typography> <Typography gutterBottom> {translate('copying.agpl.line1')}<br />