From 8150653e31b48f02702e87d32098d1b0574e64c9 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro.alonso@kaleidos.net>
Date: Tue, 29 Jul 2014 15:09:51 +0200
Subject: [PATCH] Improving user settings

---
 app/coffee/app.coffee                         |  4 +
 app/coffee/modules/admin/nav.coffee           |  5 +-
 app/coffee/modules/auth.coffee                |  3 +
 app/coffee/modules/base.coffee                |  1 +
 app/coffee/modules/nav.coffee                 | 16 ++--
 app/coffee/modules/user-settings.coffee       | 22 +++++
 app/coffee/modules/user-settings/main.coffee  | 82 +++++++++++++++++++
 app/coffee/modules/user-settings/nav.coffee   | 34 ++++++++
 app/partials/mail-notifications.jade          | 10 +--
 app/partials/user-profile.jade                |  7 +-
 .../views/modules/user-settings-menu.jade     |  6 +-
 gulpfile.coffee                               |  3 +-
 12 files changed, 174 insertions(+), 19 deletions(-)
 create mode 100644 app/coffee/modules/user-settings.coffee
 create mode 100644 app/coffee/modules/user-settings/main.coffee
 create mode 100644 app/coffee/modules/user-settings/nav.coffee

diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 9ea580c1..b9e8b900 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -101,6 +101,9 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide) ->
     $routeProvider.when("/project/:pslug/user-settings/user-profile",
           {templateUrl: "/partials/user-profile.html"})
 
+    $routeProvider.when("/project/:pslug/user-settings/user-avatar",
+          {templateUrl: "/partials/user-avatar.html"})
+
     $routeProvider.when("/project/:pslug/user-settings/mail-notifications",
           {templateUrl: "/partials/mail-notifications.html"})
 
@@ -171,6 +174,7 @@ modules = [
     "taigaAdmin",
     "taigaNavMenu",
     "taigaProject",
+    "taigaUserSettings",
 
     # Vendor modules
     "ngRoute",
diff --git a/app/coffee/modules/admin/nav.coffee b/app/coffee/modules/admin/nav.coffee
index 69cb4536..8aeb9631 100644
--- a/app/coffee/modules/admin/nav.coffee
+++ b/app/coffee/modules/admin/nav.coffee
@@ -22,11 +22,12 @@
 AdminNavigationDirective = ->
     link = ($scope, $el, $attrs) ->
         section = $attrs.tgAdminNavigation
-
-        console.log "section:", section
         $el.find(".active").removeClass("active")
         $el.find("#adminmenu-#{section} a").addClass("active")
 
+        $scope.$on "$destroy", ->
+            $el.off()
+
     return {link:link}
 
 module = angular.module("taigaAdmin")
diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index a4f43363..96bbb9c0 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -91,6 +91,9 @@ class AuthService extends taiga.Service
             @.setUser(user)
             return user
 
+    logout: ->
+        @.removeToken()
+
     register: (data, type, existing) ->
         url = @urls.resolve("auth-register")
 
diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index 6608893c..2a070d9f 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -90,6 +90,7 @@ urls = {
 
     # User settings
     "user-settings-user-profile": "/project/:project/user-settings/user-profile"
+    "user-settings-user-avatar": "/project/:project/user-settings/user-avatar"
     "user-settings-mail-notifications": "/project/:project/user-settings/mail-notifications"
 
 }
diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee
index e93c5c2c..e2113073 100644
--- a/app/coffee/modules/nav.coffee
+++ b/app/coffee/modules/nav.coffee
@@ -67,7 +67,7 @@ module.directive("tgProjectsNav", ProjectsNavigationDirective)
 ## Project
 #############################################################################
 
-ProjectMenuDirective = ($log, $compile, $auth, $rootscope) ->
+ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location) ->
     menuEntriesTemplate = _.template("""
     <div class="menu-container">
         <ul class="main-nav">
@@ -115,9 +115,10 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope) ->
             <div class="user-settings">
                 <ul class="popover">
                     <li><a href="" title="Account settings", tg-nav="user-settings-user-profile:project=project.slug">Account settings</a></li>
-                    <li><a href="" title="Logout">Logout</a></li>
+                    <li><a href="" title="Change profile photo", tg-nav="user-settings-user-avatar:project=project.slug">Change profile photo</a></li>
+                    <li><a href="" title="Logout" class="logout">Logout</a></li>
                 </ul>
-                <a href="" title="User preferences" class="avatar">
+                <a href="" title="User preferences" class="avatar" id="nav-user-settings">
                     <img src="<%- user.photo %>" alt="<%- user.full_name_display %>" />
                 </a>
             </div>
@@ -151,7 +152,6 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope) ->
 
         container.replaceWith(dom)
 
-
     link = ($scope, $el, $attrs, $ctrl) ->
         renderMainMenu($el)
 
@@ -169,6 +169,12 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope) ->
                     $el.find(".popover").hide()
                     body.unbind("click")
 
+        $el.on "click", ".logout", (event) ->
+            event.preventDefault()
+            $auth.logout()
+            $scope.$apply ->
+                $location.path("/login")
+
         $scope.$on "$viewContentLoaded", (ctx) ->
             if ctx.targetScope.$$childHead is null || ctx.targetScope.$$childHead.hideMenu
                 $el.addClass("hidden")
@@ -183,4 +189,4 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope) ->
     return {link: link}
 
 
-module.directive("tgProjectMenu", ["$log", "$compile", "$tgAuth", "$rootScope", ProjectMenuDirective])
+module.directive("tgProjectMenu", ["$log", "$compile", "$tgAuth", "$rootScope", "$tgAuth", "$tgLocation", ProjectMenuDirective])
diff --git a/app/coffee/modules/user-settings.coffee b/app/coffee/modules/user-settings.coffee
new file mode 100644
index 00000000..d2c8f150
--- /dev/null
+++ b/app/coffee/modules/user-settings.coffee
@@ -0,0 +1,22 @@
+###
+# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2014 Jesús Espino Garcia <jespinog@gmail.com>
+# Copyright (C) 2014 David Barragán Merino <bameda@dbarragan.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: modules/user-settings.coffee
+###
+
+module = angular.module("taigaUserSettings", [])
diff --git a/app/coffee/modules/user-settings/main.coffee b/app/coffee/modules/user-settings/main.coffee
new file mode 100644
index 00000000..a40c5bc5
--- /dev/null
+++ b/app/coffee/modules/user-settings/main.coffee
@@ -0,0 +1,82 @@
+###
+# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2014 Jesús Espino Garcia <jespinog@gmail.com>
+# Copyright (C) 2014 David Barragán Merino <bameda@dbarragan.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: modules/user-settings/main.coffee
+###
+
+taiga = @.taiga
+
+mixOf = @.taiga.mixOf
+
+module = angular.module("taigaUserSettings")
+
+
+#############################################################################
+## User settings Controller
+#############################################################################
+
+class UserSettingsController extends mixOf(taiga.Controller, taiga.PageMixin)
+      @.$inject = [
+          "$scope",
+          "$rootScope",
+          "$tgRepo",
+          "$tgConfirm",
+          "$tgResources",
+          "$routeParams",
+          "$q",
+          "$location",
+          "$tgAuth"
+      ]
+
+      constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @auth) ->
+          @scope.sectionName = "User Settings" #i18n
+          @scope.project = {}
+          @scope.user = @auth.getUser()
+
+          promise = @.loadInitialData()
+          promise.then null, ->
+              console.log "FAIL" #TODO
+
+      loadProject: ->
+          return @rs.projects.get(@scope.projectId).then (project) =>
+              @scope.project = project
+              return project
+
+      loadInitialData: ->
+          promise = @repo.resolve({pslug: @params.pslug}).then (data) =>
+              @scope.projectId = data.project
+              return data
+
+          return promise.then(=> @.loadProject())
+
+
+module.controller("UserSettingsController", UserSettingsController)
+
+#############################################################################
+## User Profile Directive
+#############################################################################
+
+UserProfileDirective = () ->
+    link = ($scope, $el, $attrs) ->
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+    return {link:link}
+
+module.directive("tgUserProfile", UserProfileDirective)
diff --git a/app/coffee/modules/user-settings/nav.coffee b/app/coffee/modules/user-settings/nav.coffee
new file mode 100644
index 00000000..a1ad7cc0
--- /dev/null
+++ b/app/coffee/modules/user-settings/nav.coffee
@@ -0,0 +1,34 @@
+###
+# Copyright (C) 2014 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2014 Jesús Espino Garcia <jespinog@gmail.com>
+# Copyright (C) 2014 David Barragán Merino <bameda@dbarragan.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# File: modules/user-settings/nav.coffee
+###
+
+UserSettingsNavigationDirective = ->
+    link = ($scope, $el, $attrs) ->
+        section = $attrs.tgUserSettingsNavigation
+        $el.find(".active").removeClass("active")
+        $el.find("#usersettingsmenu-#{section} a").addClass("active")
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+    return {link:link}
+
+module = angular.module("taigaUserSettings")
+module.directive("tgUserSettingsNavigation", UserSettingsNavigationDirective)
diff --git a/app/partials/mail-notifications.jade b/app/partials/mail-notifications.jade
index b53ed1ba..a527c5bf 100644
--- a/app/partials/mail-notifications.jade
+++ b/app/partials/mail-notifications.jade
@@ -1,13 +1,13 @@
-extends layout
+extends dummy-layout
 
 block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
-    div.wrapper(tg-project-us-status, ng-controller="ProjectValuesController as ctrl",
-                ng-init="section='admin'")
-        sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values")
-            include views/modules/admin-menu
+    div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl",
+                    ng-init="section='mail-notifications'")
+        sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications")
+            include views/modules/user-settings-menu
 
         section.main.admin-roles
             header
diff --git a/app/partials/user-profile.jade b/app/partials/user-profile.jade
index 74b0e552..4ab47b54 100644
--- a/app/partials/user-profile.jade
+++ b/app/partials/user-profile.jade
@@ -4,8 +4,9 @@ block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
-    div.wrapper
-        sidebar.menu-secondary.sidebar
+    div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl",
+                ng-init="section='user-settings'")
+        sidebar.menu-secondary.sidebar(tg-user-settings-navigation="user-profile")
             include views/modules/user-settings-menu
 
         section.main.user-profile
@@ -15,7 +16,7 @@ block content
             form
                 fieldset
                     label(for="user-email") Email
-                    input(type="text", placeholder="Email", id="user-email")
+                    input(type="text", placeholder="Email", id="user-email", ng-value="user.email")
                 fieldset
                     label(for="current-password") Current Password
                     input(type="password", placeholder="Password", id="current-password")
diff --git a/app/partials/views/modules/user-settings-menu.jade b/app/partials/views/modules/user-settings-menu.jade
index 808b5ecc..75a6b5fa 100644
--- a/app/partials/views/modules/user-settings-menu.jade
+++ b/app/partials/views/modules/user-settings-menu.jade
@@ -5,14 +5,14 @@ section.admin-menu
     nav
         ul
             li#usersettingsmenu-user-profile
-                a(href="", tg-nav="project-admin-project-profile-details:project=project.slug")
+                a(href="", tg-nav="user-settings-user-profile:project=project.slug")
                     span.title User profile
                     span.icon.icon-arrow-right
             li#usersettingsmenu-avatar
-                a(href="" tg-nav="project-admin-memberships:project=project.slug")
+                a(href="" tg-nav="user-settings-user-avatar:project=project.slug")
                     span.title User avatar
                     span.icon.icon-arrow-right
             li#usersettingsmenu-mail-notifications
-                a(href="", tg-nav="project-admin-project-values-us-status:project=project.slug")
+                a(href="", tg-nav="user-settings-mail-notifications:project=project.slug")
                     span.title Email notificiations
                     span.icon.icon-arrow-right
diff --git a/gulpfile.coffee b/gulpfile.coffee
index 89924bdf..d7c92fa9 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -50,7 +50,8 @@ paths = {
              "app/coffee/modules/admin/*.coffee",
              "app/coffee/modules/locales/*.coffee",
              "app/coffee/modules/base/*.coffee",
-             "app/coffee/modules/resources/*.coffee"]
+             "app/coffee/modules/resources/*.coffee",
+             "app/coffee/modules/user-settings/*.coffee"]
     vendorJsLibs: [
         "app/vendor/jquery/dist/jquery.js",
         "app/vendor/lodash/dist/lodash.js",