Added version display.

GovTechSG · Mar 29, 2018 · 1930948 · 1930948
1 parent 7d6600e
commit 1930948
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 24 deletions.
diff --git a/index.ejs b/index.ejs
@@ -9,28 +9,33 @@
 </head>
 
 <body ng-app="app">
-    <header>
-        <nav class="navbar navbar-default">
-            <div class="container-fluid" id="main-navbar" ng-controller="mainController as mainCtrl">
-                <div class="navbar-header">
-                    <img ng-src="{{ mainCtrl.apexLogo }}" alt="APEX Signature Validation Tool" />
+
+    <div ng-controller="mainController as mainCtrl">
+
+        <header>
+            <nav class="navbar navbar-default">
+                <div class="container-fluid" id="main-navbar">
+                    <div class="navbar-header">
+                        <img ng-src="{{ mainCtrl.apexLogo }}" alt="APEX Signature Validation Tool" />
+                    </div>
+                    <ul class="nav navbar-nav">
+                        <li ng-class="{active: mainCtrl.isStateActive('signatureValidator')}">
+                            <a ui-sref="signatureValidator">Signature Validator</a>
+                        </li>
+                        <li ng-class="{active: mainCtrl.isStateActive('joseValidator')}">
+                            <a ui-sref="joseValidator">JOSE Validator</a>
+                        </li>
+                    </ul>
                 </div>
-                <ul class="nav navbar-nav">
-                    <li ng-class="{active: mainCtrl.isStateActive('signatureValidator')}">
-                        <a ui-sref="signatureValidator">Signature Validator</a>
-                    </li>
-                    <li ng-class="{active: mainCtrl.isStateActive('joseValidator')}">
-                        <a ui-sref="joseValidator">JOSE Validator</a>
-                    </li>
-                </ul>
-            </div>
-        </nav>
-    </header>
-
-    <ui-view></ui-view>
-
-    <div class="footer">
-        <p style="text-align: center;">© Government Technology Agency of Singapore. All Rights Reserved.</p>
+            </nav>
+        </header>
+
+        <ui-view></ui-view>
+
+        <div class="footer">
+            <p style="text-align: center;">v{{ mainCtrl.version }} © Government Technology Agency of Singapore. All Rights Reserved.</p>
+        </div>
+
     </div>
 
 </body>

diff --git a/src/mainController.js b/src/mainController.js
@@ -4,6 +4,7 @@ function mainController(stateService) {
     let controller = this;
 
     controller.apexLogo = apexLogo; // path to logo file
+    controller.version = VERSION;
 
     controller.isStateActive = function (stateName) {
         return stateName === stateService.state;

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,10 +2,12 @@ const webpack = require('webpack');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin');
-
+const version = require('./package.json').version;
 const path = require('path');
 
 module.exports = (env = {}) => { // set env as empty object if unset from cli
+    console.log('Building version: ' + version);
+
     let config = {
         entry: {
             app: './src/app.js'
@@ -63,7 +65,8 @@ module.exports = (env = {}) => { // set env as empty object if unset from cli
         config.plugins.push(new webpack.optimize.UglifyJsPlugin()); // minify js
         config.plugins.push(new OptimizeCssAssetsPlugin()); // minify css
         config.plugins.push(new webpack.DefinePlugin({
-            'process.env.NODE_ENV': JSON.stringify('production')
+            'process.env.NODE_ENV': JSON.stringify('production'),
+            'VERSION': JSON.stringify(version)
         }));
         config.plugins.push(new HtmlWebpackPlugin({
             title: 'Apex Signature Validator',
@@ -73,7 +76,8 @@ module.exports = (env = {}) => { // set env as empty object if unset from cli
         config.plugins.push(new HtmlWebpackInlineSourcePlugin());
     } else {
         config.plugins.push(new webpack.DefinePlugin({
-            'process.env.NODE_ENV': JSON.stringify('development')
+            'process.env.NODE_ENV': JSON.stringify('development'),
+            'VERSION': JSON.stringify(version)
         }));
         config.plugins.push(new HtmlWebpackPlugin({
             title: 'Apex Signature Validator',