From 300e22a5378841d65119941bfde5a0c3fe6be4dd Mon Sep 17 00:00:00 2001 From: Michael Albert Date: Thu, 14 May 2020 11:17:00 +0200 Subject: [PATCH] Show version of Synapse-Admin Change-Id: I354e3f3b3e4f45e5ca72318ce70b66bee433f3d6 --- package.json | 6 +++--- public/index.html | 9 ++++++++- src/components/LoginPage.js | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7d754fe..002f90d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "synapse-admin", - "version": "0.1.0", + "version": "0.2.1", "description": "Admin GUI for the Matrix.org server Synapse", "author": "Awesome Technologies Innovationslabor GmbH", "license": "Apache-2.0", @@ -29,8 +29,8 @@ "react-scripts": "^3.4.1" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", + "start": "REACT_APP_VERSION=$(git describe --tags) react-scripts start", + "build": "REACT_APP_VERSION=$(git describe --tags) react-scripts build", "fix:other": "yarn prettier --write", "fix:code": "yarn test:lint --fix", "fix": "yarn fix:code && yarn fix:other", diff --git a/public/index.html b/public/index.html index 4209361..2b90907 100644 --- a/public/index.html +++ b/public/index.html @@ -38,5 +38,12 @@ To begin the development, run `npm start` or `yarn start`. To create a production bundle, use `npm run build` or `yarn build`. --> + - + \ No newline at end of file diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js index 6834625..a5bcec8 100644 --- a/src/components/LoginPage.js +++ b/src/components/LoginPage.js @@ -29,7 +29,7 @@ const useStyles = makeStyles(theme => ({ main: { display: "flex", flexDirection: "column", - minHeight: "100vh", + minHeight: "calc(100vh - 1em)", alignItems: "center", justifyContent: "flex-start", background: "url(./images/floating-cogs.svg)", @@ -40,6 +40,7 @@ const useStyles = makeStyles(theme => ({ card: { minWidth: "30em", marginTop: "6em", + marginBottom: "6em", }, avatar: { margin: "1em",