improved top menu dropdown content; updated years in license banners

DenysVuika · Jan 11, 2014 · 6483e85 · 6483e85
1 parent edc198d
commit 6483e85
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 32 deletions.
diff --git a/collabjs.web.api.js b/collabjs.web.api.js
@@ -16,11 +16,19 @@ module.exports = function (context) {
   context.once('app.init.routes', function (app) {
 
     app.post('/api/auth/login', passport.authenticate('local'), function (req, res) {
-        res.send({ name: req.user.name });
+        res.send({
+          account: req.user.account,
+          name: req.user.name,
+          pictureUrl: config.env.avatarServer + '/avatar/' + req.user.pictureId
+        });
       });
 
     app.get('/api/auth/check', function(req, res) {
-      res.send(req.isAuthenticated() ? { name: req.user.name } : '0');
+      res.send(req.isAuthenticated() ? {
+        account: req.user.account,
+        name: req.user.name,
+        pictureUrl: config.env.avatarServer + '/avatar/' + req.user.pictureId
+      } : '0');
     });
 
     app.post('/api/auth/logout', function (req, res) {

diff --git a/gruntfile.js b/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function (grunt) {
       options: {
         banner: '/*!\n' +
                 '* <%= pkg.name %> v<%= pkg.version %>\n' +
-                '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+                '* Copyright (c) 2013-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
                 '* License: MIT\n' +
                 '* http://www.opensource.org/licenses/mit-license.php\n' +
                 '*/\n'
@@ -21,7 +21,7 @@ module.exports = function (grunt) {
       options: {
         banner: '/*!\n' +
           '* <%= pkg.name %> v<%= pkg.version %>\n' +
-          '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+          '* Copyright (c) 2013-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
           '* License: MIT\n' +
           '* http://www.opensource.org/licenses/mit-license.php\n' +
           '*/\n'
@@ -48,7 +48,7 @@ module.exports = function (grunt) {
         mangle: false,
         banner: '/*!\n' +
           '* <%= pkg.name %> v<%= pkg.version %>\n' +
-          '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+          '* Copyright (c) 2013-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
           '* License: MIT\n' +
           '* http://www.opensource.org/licenses/mit-license.php\n' +
           '*/\n'

diff --git a/public/css/collabjs.css b/public/css/collabjs.css
@@ -800,6 +800,26 @@ a.comments-button {
 .menu-actions > li.active {
   border-bottom: 1px blue solid;
 }
+.settings-menu-item {
+  text-align: center;
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.settings-menu-item img.user-avatar {
+  display: inline-block;
+  border: 4px solid #fff;
+  max-width: 100px;
+  max-height: 100px;
+  border-radius: 50%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.3);
+}
+.settings-menu-item .user-account {
+  display: block;
+  color: #9EA1AA;
+  margin-top: 15px;
+  text-shadow: 0 1px white;
+  font-size: 16px;
+}
 /* Login */
 .login-box,
 .register-box {

diff --git a/public/css/collabjs.less b/public/css/collabjs.less
@@ -147,6 +147,29 @@ a.comments-button {
   border-bottom: 1px blue solid;
 }
 
+.settings-menu-item {
+  text-align: center;
+  margin-top: 15px;
+  margin-bottom: 15px;
+
+  img.user-avatar {
+    display: inline-block;
+    border: 4px solid #fff;
+    max-width: 100px;
+    max-height: 100px;
+    border-radius: 50%;
+    box-shadow: 0 1px 3px 0 rgba(0,0,0,0.3);
+  }
+
+  .user-account {
+    display: block;
+    color: #9EA1AA;
+    margin-top: 15px;
+    text-shadow: 0 1px white;
+    font-size: 16px;
+  }
+}
+
 /* Login */
 
 .login-box,

diff --git a/public/css/collabjs.min.css b/public/css/collabjs.min.css
diff --git a/public/js/app.min.js b/public/js/app.min.js
diff --git a/public/js/collabjs.min.js b/public/js/collabjs.min.js
diff --git a/public/js/controllers.js b/public/js/controllers.js
@@ -1,6 +1,6 @@
 /*!
 * collab.js v0.4.0
-* Copyright (c) 2013 Denis Vuyka
+* Copyright (c) 2013-2014 Denis Vuyka
 * License: MIT
 * http://www.opensource.org/licenses/mit-license.php
 */
@@ -253,8 +253,6 @@ angular.module('collabjs.controllers')
       'use strict';
 
       $scope.error = false;
-      $scope.dismissError = function () { $scope.error = false; };
-
       $scope.username = '';
       $scope.password = '';
 
@@ -335,6 +333,8 @@ angular.module('collabjs.controllers')
         if (user) {
           $scope.isAuthenticated = true;
           $scope.userName = user.name;
+          $scope.userPictureUrl = user.pictureUrl;
+          $scope.userAccount = user.account;
 
           // TODO: optimize (called on every route change)
           searchService.getLists().then(
@@ -528,8 +528,6 @@ angular.module('collabjs.controllers')
       'use strict';
 
       $scope.error = false;
-      $scope.dismissError = function () { $scope.error = false; };
-
       $scope.account = '';
       $scope.name = '';
       $scope.email = '';

diff --git a/public/js/controllers.min.js b/public/js/controllers.min.js
diff --git a/public/js/controllers/MenuController.js b/public/js/controllers/MenuController.js
@@ -12,6 +12,8 @@ angular.module('collabjs.controllers')
         if (user) {
           $scope.isAuthenticated = true;
           $scope.userName = user.name;
+          $scope.userPictureUrl = user.pictureUrl;
+          $scope.userAccount = user.account;
 
           // TODO: optimize (called on every route change)
           searchService.getLists().then(

diff --git a/public/js/directives.js b/public/js/directives.js
@@ -1,6 +1,6 @@
 /*!
 * collab.js v0.4.0
-* Copyright (c) 2013 Denis Vuyka
+* Copyright (c) 2013-2014 Denis Vuyka
 * License: MIT
 * http://www.opensource.org/licenses/mit-license.php
 */

diff --git a/public/js/directives.min.js b/public/js/directives.min.js
diff --git a/public/js/filters.js b/public/js/filters.js
@@ -1,6 +1,6 @@
 /*!
 * collab.js v0.4.0
-* Copyright (c) 2013 Denis Vuyka
+* Copyright (c) 2013-2014 Denis Vuyka
 * License: MIT
 * http://www.opensource.org/licenses/mit-license.php
 */

diff --git a/public/js/filters.min.js b/public/js/filters.min.js
@@ -1,6 +1,6 @@
 /*!
 * collab.js v0.4.0
-* Copyright (c) 2013 Denis Vuyka
+* Copyright (c) 2013-2014 Denis Vuyka
 * License: MIT
 * http://www.opensource.org/licenses/mit-license.php
 */

diff --git a/public/js/services.js b/public/js/services.js
@@ -1,6 +1,6 @@
 /*!
 * collab.js v0.4.0
-* Copyright (c) 2013 Denis Vuyka
+* Copyright (c) 2013-2014 Denis Vuyka
 * License: MIT
 * http://www.opensource.org/licenses/mit-license.php
 */
@@ -64,7 +64,6 @@ angular.module('collabjs.services')
               deferred.resolve(_user);
             })
             .error(function (data, status) {
-              // status === 401 (Unauthorized)
               _user = false;
               deferred.reject(null);
             });

diff --git a/public/js/services.min.js b/public/js/services.min.js
diff --git a/public/js/services/AuthService.js b/public/js/services/AuthService.js
@@ -23,7 +23,6 @@ angular.module('collabjs.services')
               deferred.resolve(_user);
             })
             .error(function (data, status) {
-              // status === 401 (Unauthorized)
               _user = false;
               deferred.reject(null);
             });

diff --git a/views/core/shared/menu.jade b/views/core/shared/menu.jade
@@ -12,23 +12,22 @@ div.navbar.navbar-default.navbar-fixed-top(role='navigation', ng-controller='Men
           span {{userName}}
           b.caret
         ul.dropdown-menu
+          li.settings-menu-item
+            div
+              img.user-avatar(ng-src='{{userPictureUrl}}')
+              span.user-account {{userAccount}}
+          li.divider
           li
             a(href='/#/account')
               i.fa.fa-user.fa-fw
-              | &nbsp;Edit profile
-          li.divider
+              | &nbsp;Profile
           li
             a(href='/#/help')
               i.fa.fa-flag.fa-fw
               | &nbsp;Help
-          li
-            a(href='/#/about')
-              i.fa.fa-question-circle.fa-fw
-              | &nbsp;About
-          li.divider
           li(ng-controller='LoginController')
             a(href='', ng-click='logout()')
-              i.fa.fa-sign-out.fa-fw
+              i.fa.fa-power-off.fa-fw
               | &nbsp;Logout
 
     ul.nav.navbar-nav.menu-actions.ng-cloak(menubar='active', data-subpaths='true')