Merge pull request #389 from havfo/feat-version

Add version to about
2020-05-19 07:51:08 +02:00 · 2020-05-19 07:51:08 +02:00 · aaa227e957
parent 6576516091 2bd7218379
commit aaa227e957
21 changed files with 35 additions and 5 deletions
--- a/app/.env
+++ b/app/.env
@ -0,0 +1,2 @@
+REACT_APP_VERSION=$npm_package_version
+REACT_APP_NAME=$npm_package_name
--- a/app/src/components/Controls/About.js
+++ b/app/src/components/Controls/About.js
@ -43,7 +43,8 @@ const styles = (theme) =>
 		link :
 		{
 			display      : 'block',
-			textAlign : 'center'
+			textAlign    : 'center',
+			marginBottom : theme.spacing(1)
 		}
 	});

@ -68,15 +69,16 @@ const About = ({
 				/>
 			</DialogTitle>
 			<DialogContent dividers='true'>
-				<DialogContentText>
+				<DialogContentText paragraph> 
 					Contributions to this work were made on behalf of the GÉANT
 					project, a project that has received funding from the
 					European Union’s Horizon 2020 research and innovation 
 					programme under Grant Agreement No. 731122 (GN4-2). 
 					On behalf of GÉANT project, GÉANT Association is the sole
 					owner of the copyright in all material which was developed 
-					by a member of the GÉANT project.<br />
-					<br />
+					by a member of the GÉANT project.
+				</DialogContentText>
+				<DialogContentText paragraph> 
 					GÉANT Vereniging (Association) is registered with the
 					Chamber of Commerce in Amsterdam with registration number
 					40535155 and operates in the UK as a branch of GÉANT
@ -87,6 +89,13 @@ const About = ({
 				<Link href='https://edumeet.org' target='_blank' rel='noreferrer' color='secondary' variant='h6' className={classes.link}>
 					https://edumeet.org
 				</Link>
+				<DialogContentText align='center' variant='h7'>
+					<FormattedMessage
+						id='label.version'
+						defaultMessage='Version'
+					/>
+					:{` ${process.env.REACT_APP_VERSION}`}
+				</DialogContentText>
 			</DialogContent>
 			<DialogActions>
 				{ window.config.logo && <img alt='Logo' className={classes.logo} src={window.config.logo} /> }
--- a/app/src/translations/cn.json
+++ b/app/src/translations/cn.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "设置",
 	"settings.camera": "视频设备",
--- a/app/src/translations/cs.json
+++ b/app/src/translations/cs.json
@ -118,6 +118,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Nastavení",
 	"settings.camera": "Kamera",
--- a/app/src/translations/de.json
+++ b/app/src/translations/de.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Video hinzufügen",
 	"label.promoteAllPeers": "Alle Teilnehmer reinlassen",
 	"label.moreActions": "Weitere Aktionen",
+	"label.version": null,

 	"settings.settings": "Einstellungen",
 	"settings.camera": "Kamera",
--- a/app/src/translations/dk.json
+++ b/app/src/translations/dk.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Indstillinger",
 	"settings.camera": "Kamera",
--- a/app/src/translations/el.json
+++ b/app/src/translations/el.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Ρυθμίσεις",
 	"settings.camera": "Κάμερα",
--- a/app/src/translations/en.json
+++ b/app/src/translations/en.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Add video",
 	"label.promoteAllPeers": "Promote all",
 	"label.moreActions": "More actions",
+	"label.version": "Version",

 	"settings.settings": "Settings",
 	"settings.camera": "Camera",
--- a/app/src/translations/es.json
+++ b/app/src/translations/es.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Ajustes",
 	"settings.camera": "Cámara",
--- a/app/src/translations/fr.json
+++ b/app/src/translations/fr.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Paramètres",
 	"settings.camera": "Caméra",
--- a/app/src/translations/hr.json
+++ b/app/src/translations/hr.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj video",
 	"label.promoteAllPeers": "Promoviraj sve",
 	"label.moreActions": "Više akcija",
+	"label.version": null,

 	"settings.settings":  "Postavke",
 	"settings.camera": "Kamera",
--- a/app/src/translations/hu.json
+++ b/app/src/translations/hu.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Videó hozzáadása",
 	"label.promoteAllPeers": "Mindenkit beengedek",
 	"label.moreActions": "További műveletek",
+	"label.version": "Verzió",

 	"settings.settings": "Beállítások",
 	"settings.camera": "Kamera",
--- a/app/src/translations/it.json
+++ b/app/src/translations/it.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Aggiungi video",
 	"label.promoteAllPeers": "Promuovi tutti",
 	"label.moreActions": "Altre azioni",
+	"label.version": null,

 	"settings.settings": "Impostazioni",
 	"settings.camera": "Videocamera",
--- a/app/src/translations/lv.json
+++ b/app/src/translations/lv.json
@ -116,6 +116,7 @@
 	"label.advanced": "Advancēts",
 	"label.addVideo": "Pievienot video",
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Iestatījumi",
 	"settings.camera": "Kamera",
--- a/app/src/translations/nb.json
+++ b/app/src/translations/nb.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Legg til video",
 	"label.promoteAllPeers": "Slipp inn alle",
 	"label.moreActions": "Flere handlinger",
+	"label.version": null,

 	"settings.settings": "Innstillinger",
 	"settings.camera": "Kamera",
--- a/app/src/translations/pl.json
+++ b/app/src/translations/pl.json
@ -119,6 +119,7 @@
 	"label.addVideo": "Dodaj wideo",
 	"label.promoteAllPeers": "Wpuść wszystkich",
 	"label.moreActions": "Więcej akcji",
+	"label.version": null,

 	"settings.settings": "Ustawienia",
 	"settings.camera": "Kamera",
--- a/app/src/translations/pt.json
+++ b/app/src/translations/pt.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Definições",
 	"settings.camera": "Camera",
--- a/app/src/translations/ro.json
+++ b/app/src/translations/ro.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Setări",
 	"settings.camera": "Cameră video",
--- a/app/src/translations/tr.json
+++ b/app/src/translations/tr.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Ayarlar",
 	"settings.camera": "Kamera",
--- a/app/src/translations/tw.json
+++ b/app/src/translations/tw.json
@ -118,6 +118,7 @@
 	"label.addVideo": "新增視訊",
 	"label.promoteAllPeers": "提升全部",
 	"label.moreActions": "更多",
+	"label.version": null,

 	"settings.settings": "設置",
 	"settings.camera": "視訊來源",
--- a/app/src/translations/uk.json
+++ b/app/src/translations/uk.json
@ -119,6 +119,7 @@
 	"label.addVideo": null,
 	"label.promoteAllPeers": null,
 	"label.moreActions": null,
+	"label.version": null,

 	"settings.settings": "Налаштування",
 	"settings.camera": "Камера",