Merge pull request #137 from secretin/introduce_app_commitish

add secretin-app comittish
secretin · Mar 21, 2022 · e7958d7 · e7958d7
2 parents be51bb7 + cc2125d
commit e7958d7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/public/app-version.js b/public/app-version.js
@@ -0,0 +1 @@
+const SECRETIN_APP_COMMIT = 'master';
diff --git a/public/index.html b/public/index.html
@@ -10,6 +10,7 @@
     <!-- <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"> -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>Secret-in</title>
+    <script src="%PUBLIC_URL%/app-version.js"></script>
   </head>
   <body style="background-color: #fafafa">
     <%= require('fs').readFileSync('src/icons.svg') %>

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -12,5 +12,7 @@ SKIP_PREFLIGHT_CHECK=true REACT_APP_API_SECRETIN=https://api.secret-in.me yarn r
 echo "Pre-deploy tasks..."
 cp build/index.html build/404.html
 
+echo "const SECRETIN_APP_COMMIT = '$(git rev-parse HEAD)';" > build/app-version.js
+
 echo "Deploying..."
 ./node_modules/.bin/gh-pages -d build
diff --git a/src/components/App.js b/src/components/App.js
@@ -73,6 +73,27 @@ class App extends Component {
   }
 
   render() {
+    // eslint-disable-next-line no-undef
+    const shortCommit = SECRETIN_APP_COMMIT
+      ? // eslint-disable-next-line no-undef
+        SECRETIN_APP_COMMIT.substr(0, 7)
+      : '';
+    // eslint-disable-next-line no-undef
+    const secretinAppVersion = SECRETIN_APP_COMMIT ? (
+      <span className="secretin-version">
+        secretin-app{' '}
+        <a
+          // eslint-disable-next-line no-undef
+          href={`https://github.com/secretin/secretin-app/commit/${SECRETIN_APP_COMMIT}`}
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          {shortCommit}
+        </a>
+      </span>
+    ) : (
+      <span className="secretin-version">secretin-app dev</span>
+    );
     return (
       <Router basename={process.env.PUBLIC_URL}>
         <div className="App">
@@ -89,6 +110,7 @@ class App extends Component {
           <span className="secretin-version">
             secretin-lib v{Secretin.version}
           </span>
+          {secretinAppVersion}
         </div>
       </Router>
     );