Merge pull request #78 from ChannelFinder/display-package-json-version

Update version in package.json and display on services page
ChannelFinder · Oct 10, 2023 · a5a9198 · a5a9198
2 parents c155535 + 6023f1e
commit a5a9198
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.env b/.env
@@ -11,6 +11,7 @@
 
 REACT_APP_WEBSITE_NAME=PV Info
 REACT_APP_WEBSITE_DESC=EPICS Controls PV Info
+REACT_APP_VERSION=$npm_package_version
 
 REACT_APP_ENDPOINT=/pvinfo
 REACT_APP_DOMAIN=localhost

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pvinfo",
   "homepage": "https://yourdomainhere/pvinfo",
-  "version": "1.0.0",
+  "version": "1.3.0",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.0",

diff --git a/src/components/services/Services.js b/src/components/services/Services.js
@@ -106,10 +106,11 @@ function Services() {
     return (
         <Fragment>
             <Box sx={{ display: "flex", flexDirection: "column" }}>
-                <Box sx={{ mb: 3, display: "flex", flexDirection: { xs: "column", sm: "row" }, alignItems: { xs: "start", sm: "end" }, justifyContent: "space-between" }}>
-                    <Typography variant="h4" sx={{ fontWeight: "medium" }}>Services</Typography>
+                <Box sx={{ mb: 2, display: "flex", flexDirection: { xs: "column", sm: "row" }, alignItems: { xs: "start", sm: "start" }, justifyContent: "space-between" }}>
+                    <Typography variant="h4" sx={{ fontWeight: "medium", mb: { xs: 1, sm: 0 } }}>Services</Typography>
                     <Box>
-                        <Typography variant="body1"><Box component="span" sx={{ fontWeight: "medium" }}>PV Info Version:</Box> {gitInfo.commit.shortHash}</Typography>
+                        <Typography variant="body1"><Box component="span" sx={{ fontWeight: "medium" }}>PV Info Version:</Box> {process.env.REACT_APP_VERSION}</Typography>
+                        <Typography variant="body1"><Box component="span" sx={{ fontWeight: "medium" }}>Commit Hash:</Box> {gitInfo.commit.shortHash}</Typography>
                         <Typography variant="body1"><Box component="span" sx={{ fontWeight: "medium" }}>Commit Date:</Box> {new Date(gitInfo.commit.date).toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric' })}</Typography>
                     </Box>
                 </Box>