diff --git a/app/coffee/modules/projects/main.coffee b/app/coffee/modules/projects/main.coffee index 5f2d5db9..2fe946bb 100644 --- a/app/coffee/modules/projects/main.coffee +++ b/app/coffee/modules/projects/main.coffee @@ -23,7 +23,6 @@ taiga = @.taiga module = angular.module("taigaProject") bindOnce = @.taiga.bindOnce - class ProjectsController extends taiga.Controller @.$inject = [ "$scope", @@ -37,12 +36,14 @@ class ProjectsController extends taiga.Controller "tgLoader" ] - constructor: (@scope, @rs, @rootscope, @navurls, @auth, @location, @appTitle, @projectUrl, @tgLoader) -> + constructor: (@scope, @rs, @rootscope, @navurls, @auth, @location, @appTitle, @projectUrl, @tgLoader, @navUrls) -> @appTitle.set("Projects") if !@auth.isAuthenticated() @location.path(@navurls.resolve("login")) + @.user = @auth.getUser() + @.projects = [] @.loadInitialData() .then () => @@ -59,6 +60,10 @@ class ProjectsController extends taiga.Controller newProject: -> @rootscope.$broadcast("projects:create") + logout: -> + @auth.logout() + @location.path(@navurls.resolve("login")) + module.controller("ProjectsController", ProjectsController) diff --git a/app/partials/projects.jade b/app/partials/projects.jade index 7c104054..fd0bc627 100644 --- a/app/partials/projects.jade +++ b/app/partials/projects.jade @@ -6,6 +6,16 @@ block head block content div.home-projects-list(ng-controller="ProjectsController as ctrl") .home-projects-wrapper + div.welcome-user + div.info + p + | Welcome + span(tg-bo-bind="ctrl.user.full_name_display") + a.logout(ng-click="ctrl.logout()" href="", title="Logout") logout + + .avatar(href="", title="User preferences") + img(ng-src="{{ctrl.user.photo}}", alt="username") + .home-projects-list-inner div.recent-projects ul diff --git a/app/styles/modules/home-projects-list.scss b/app/styles/modules/home-projects-list.scss index d91fedfd..1d6ae088 100644 --- a/app/styles/modules/home-projects-list.scss +++ b/app/styles/modules/home-projects-list.scss @@ -11,6 +11,35 @@ position: fixed; top: 0; width: 100%; + .welcome-user { + display: flex; + position: absolute; + right: 1rem; + top: 1rem; + p { + color: $whitish; + margin-bottom: 0; + span { + &:before { + content: ' '; + } + } + } + .logout { + @extend %small; + float: right; + &:hover { + color: $red-light; + } + } + .info { + padding: 10px 5px; + padding-right: 1rem; + } + img { + width: 60px; + } + } } .home-projects-wrapper { @include table-flex-child(0, 1200px, 0, 1200px);