From dc28f6be2a3c9056802e109e3ecbf1cf315eb316 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 22 Sep 2016 00:12:49 -0400
Subject: [PATCH] appsettings version applied to about page. removed ols
 settings. setup dist gulp task

---
 .gitignore                                    |  1 +
 gulpfile.js                                   | 26 +++++++++++++++++++
 src/popup/app/settings.js                     |  4 +--
 .../app/settings/settingsAboutController.js   |  3 ++-
 .../app/settings/views/settingsAbout.html     |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3012831a..1b41173c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 npm-debug.log
 lib/
 css/
+dist/
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index e662ba0d..ebf77094 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -123,3 +123,29 @@ gulp.task('less', function () {
 gulp.task('watch', function () {
     gulp.watch(paths.lessDir + '*.less', ['less']);
 });
+
+gulp.task('dist:clean', function (cb) {
+    return rimraf(paths.dist, cb);
+});
+
+gulp.task('dist:move', function () {
+    var moves = [
+        {
+            src: ['src/**/*', '!src/popup/less{,/**/*}'],
+            dest: paths.dist
+        }
+    ];
+
+    var tasks = moves.map(function (move) {
+        return gulp.src(move.src).pipe(gulp.dest(move.dest));
+    });
+
+    return merge(tasks);
+});
+
+gulp.task('dist', ['build'], function (cb) {
+    return runSequence(
+        'dist:clean',
+        'dist:move',
+        cb);
+});
diff --git a/src/popup/app/settings.js b/src/popup/app/settings.js
index c2fd3310..bb40a845 100644
--- a/src/popup/app/settings.js
+++ b/src/popup/app/settings.js
@@ -1,2 +1,2 @@
-angular.module("bit")
-.constant("appSettings", { "rememberdEmailCookieName": "bit.rememberedEmail", "version": "0.0.1", "environment": "Development", "apiUri": "https://api.bitwarden.com" });
+angular.module('bit')
+.constant('appSettings', { 'version': '0.0.1' });
diff --git a/src/popup/app/settings/settingsAboutController.js b/src/popup/app/settings/settingsAboutController.js
index d368a330..2d7e3670 100644
--- a/src/popup/app/settings/settingsAboutController.js
+++ b/src/popup/app/settings/settingsAboutController.js
@@ -1,6 +1,7 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsAboutController', function ($scope) {
+    .controller('settingsAboutController', function ($scope, appSettings) {
         $scope.year = (new Date()).getFullYear();
+        $scope.version = appSettings.version;
     });
diff --git a/src/popup/app/settings/views/settingsAbout.html b/src/popup/app/settings/views/settingsAbout.html
index 9d0456f1..77b423d0 100644
--- a/src/popup/app/settings/views/settingsAbout.html
+++ b/src/popup/app/settings/views/settingsAbout.html
@@ -7,7 +7,7 @@
 <div class="content">
     <div class="about-page">
         <img src="../../../../images/logo@3x.png" alt="bitwarden" />
-        Version 0.0.1<br />
+        Version {{version}}<br />
         &copy; 8bit Solutions LLC 2015-{{year}}
     </div>
 </div>