feat(core): new module app.core

Now there is a new module called app.core. It contains core information about the app like version.
sensebox · Dec 7, 2017 · 9012f7a · 9012f7a
1 parent d9a9ed1
commit 9012f7a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,6 +19,7 @@ module.exports = function (grunt) {
 
   // Define the configuration for all the tasks
   grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
     replace: {
       control: {
         options: {
@@ -44,6 +45,10 @@ module.exports = function (grunt) {
             {
               match: 'OPENSENSEMAP_MAPTILES_URL',
               replacement: process.env.OPENSENSEMAP_MAPTILES_URL
+            },
+            {
+              match: 'VERSION',
+              replacement: '<%= pkg.version %>'
             }
           ]
         },
@@ -75,7 +80,20 @@ module.exports = function (grunt) {
           ]
         },
         files: [
-          {expand: true, flatten: true, src: ['.tmp/components/leaflet.directive.js',], dest: '.tmp/components'}
+          {expand: true, flatten: true, src: ['.tmp/components/leaflet.directive.js'], dest: '.tmp/components'}
+        ]
+      },
+      version: {
+        options: {
+          patterns: [
+            {
+              match: 'VERSION',
+              replacement: '<%= pkg.version %>'
+            }
+          ]
+        },
+        files: [
+          {expand: true, flatten: true, src: ['.tmp/scripts/constants.js'], dest: '.tmp/scripts'}
         ]
       }
     },
@@ -484,7 +502,7 @@ module.exports = function (grunt) {
         expand: true,
         cwd: '<%= yeoman.app %>/scripts',
         dest: '.tmp/scripts',
-        src: ['app.js']
+        src: ['app.js', 'constants.js']
       },
       components: {
         expand: true,
@@ -599,6 +617,7 @@ module.exports = function (grunt) {
       'autoprefixer',
       'replace:devapi',
       'replace:devmaps',
+      'replace:version',
       'languages',
       'connect:livereload',
       'watch'

diff --git a/app/index.html b/app/index.html
@@ -206,13 +206,15 @@
 
     <!-- build:js({.tmp,app}) scripts/scripts.js -->
     <script src="scripts/app.js"></script>
+    <script src="scripts/constants.js"></script>
     <script src="scripts/models/box.js"></script>
     <script src="scripts/models/sensor.js"></script>
     <script src="components/calendar.directive.js"></script>
     <script src="components/leaflet.directive.js"></script>
     <script src="components/leaflet.service.js"></script>
     <script src="components/charts.directive.js"></script>
     <script src="components/badge.directive.js"></script>
+    <script src="scripts/controllers/info.js"></script>
     <script src="scripts/controllers/register.js"></script>
     <script src="scripts/controllers/map.js"></script>
     <script src="scripts/controllers/sidebar.js"></script>

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -2,6 +2,7 @@
 
 angular
   .module('openSenseMapApp', [
+    'app.core',
     'app.models',
     'app.services',
     'ngResource',
@@ -369,7 +370,9 @@ angular
       })
       .state('info', {
         url: '/info',
-        templateUrl: 'views/info.html'
+        templateUrl: 'views/info.html',
+        controller: 'InfoController',
+        controllerAs: 'info'
       });
   }])
   .config(['$translateProvider', function ($translateProvider){

diff --git a/app/scripts/constants.js b/app/scripts/constants.js
@@ -0,0 +1,11 @@
+(function() {
+  'use strict';
+
+  angular.module('app.core', [
+
+  ])
+  .constant('app', {
+    VERSION: '@@VERSION',
+    NAME: 'Zahngold Bernd'
+  });
+})();
diff --git a/app/scripts/controllers/info.js b/app/scripts/controllers/info.js
@@ -0,0 +1,19 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('openSenseMapApp')
+    .controller('InfoController', InfoController);
+
+  InfoController.$inject = ['app'];
+  function InfoController(app) {
+    var vm = this;
+    vm.app = app;
+
+    activate();
+
+    ////////////////
+
+    function activate() {}
+  }
+})();
diff --git a/app/views/info.html b/app/views/info.html
@@ -1,7 +1,8 @@
 <div class="row register">
   <div class="col-lg-7 col-lg-offset-2">
 	<h3>Über openSenseMap</h3>
-	<p ng-bind-html="'INFO_ABOUT'|translate"></p>
+  <p ng-bind-html="'INFO_ABOUT'|translate"></p>
+  Version: <code style="color: #4EAF47;">{{info.app.VERSION}}-{{info.app.NAME}}</code>
 	<h4 ng-bind-html="'INFO_COPYRIGHT_NOTICES'|translate"></h4>
 	<p ng-bind-html="'INFO_MADE_BY'|translate"></p>
     © <a href="http://sensebox.de" target="_blank">senseBox</a> 2014 - 2016<br/><br/>