commit 491319864d92f96ad7f632a6aff0227aff506db2
author Matteo Scandolo <teo@opennetworking.org> Mon Nov 13 09:46:52 2017 -0800
committer Gerrit Code Review <gerrit@opencord.org> Mon Nov 13 09:46:52 2017 -0800
tree fc87762900ef8db0be780774a2d9102dcda64ad3
parent 86ce5a0f07684f6398d5a0e07d4e611ea24d433c
parent c2b3249d94ad92c0560167d67ce74077e9554706

Merge "updating generator and documentation"

package.json

diff --git a/package.json b/package.json
index cb93442..d9bd9b9 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,8 @@
   "dependencies": {
     "angular": "1.6.3",
     "angular-animate": "1.6.3",
+    "angular-base64": "^2.0.5",
+    "angular-chart.js": "^1.1.1",
     "angular-cookies": "1.6.3",
     "angular-resource": "1.6.3",
     "angular-toastr": "2.1.1",
@@ -15,6 +17,7 @@
     "lodash": "4.17.4",
     "ngprogress": "1.1.1",
     "oclazyload": "1.1.0",
+    "moment": "^2.19.0",
     "pluralize": "3.1.0",
     "rxjs": "5.2.0",
     "socket.io-client": "1.7.3"

src/app/core/header/header.html

diff --git a/src/app/core/header/header.html b/src/app/core/header/header.html
index 5249a3f..56cf7f1 100644
--- a/src/app/core/header/header.html
+++ b/src/app/core/header/header.html
@@ -52,20 +52,7 @@
           typeahead-template-url="customTemplate.html"
           typeahead-on-select="vm.routeSelected($item, $model, $label)">
       </form>
-      <ul class="nav navbar-nav navbar-right">
-        <!--<li class="dropdown">-->
-          <!--<a ui-sref="main.versions">-->
-            <!--<i class="fa fa-bell"></i>-->
-            <!--<span ng-if="vm.newNotifications.length > 0" class="label label-warning pull-right">{{vm.newNotifications.length}}</span>-->
-          <!--</a>-->
-        <!--</li>-->
-        <li class=" profil-link">
-          <a ui-sref="commonviews.login">
-            <span class="profile-address">{{vm.userEmail}}</span>
-            <img src="../../images/profile.jpg" class="img-circle" alt="">
-          </a>
-        </li>
-      </ul>
     </div>
   </div>
-</nav>
\ No newline at end of file
+</nav>
+

src/app/core/header/header.spec.ts

diff --git a/src/app/core/header/header.spec.ts b/src/app/core/header/header.spec.ts
index a4a7d90..3437b99 100644
--- a/src/app/core/header/header.spec.ts
+++ b/src/app/core/header/header.spec.ts
@@ -143,10 +143,6 @@
     // }, 'global');
   });
 
-  it('should print user email', () => {
-    expect($('.profile-address', element).text()).toBe('test@xos.us');
-  });
-
   it('should configure toastr', () => {
     delete MockToastrConfig['onTap'];
 

src/app/core/nav/nav.scss

diff --git a/src/app/core/nav/nav.scss b/src/app/core/nav/nav.scss
index 4897dec..55725b8 100644
--- a/src/app/core/nav/nav.scss
+++ b/src/app/core/nav/nav.scss
@@ -51,4 +51,4 @@
       margin-top: 20px;
     }
   }
-}
\ No newline at end of file
+}