Skip to content

Commit e899654

Browse files
silverbuxsilverbux
committed
Added user current context
1 parent 4401c53 commit e899654

File tree

13 files changed

+83
-59
lines changed

13 files changed

+83
-59
lines changed

‎angular/app/components/login-form/login-form.component.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
class LoginFormController {
2-
constructor ($auth, $state, $stateParams, API, AclService) {
2+
constructor ($rootScope, $auth, $state, $stateParams, API, AclService) {
33
'ngInject'
44

5+
delete $rootScope.me
6+
57
this.$auth = $auth
68
this.$state = $state
79
this.$stateParams = $stateParams

‎angular/app/components/nav-header/nav-header.component.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,16 @@ <h3>
212212
<!-- User Account: style can be found in dropdown.less -->
213213
<li class="dropdown user user-menu" uib-dropdown>
214214
<a href="" class="dropdown-toggle" data-toggle="dropdown" uib-dropdown-toggle>
215-
<img src="/img/user2-160x160.jpg" class="user-image" alt="User Image">
216-
<span class="hidden-xs">Alexander Pierce</span>
215+
<img src="{{vm.userData.avatar}}" class="user-image" alt="User Image" onError="this.src='http://placeholdit.imgix.net/~text?txtfont=monospace,bold&bg=DD4B39&txtclr=ffffff&txt=A&w=45&h=45&txtsize=16'">
216+
<span class="hidden-xs">{{vm.userData.name | capitalize}}</span>
217217
</a>
218218
<ul class="dropdown-menu" uib-dropdown-menu>
219219
<!-- User image -->
220220
<li class="user-header">
221-
<img src="/img/user2-160x160.jpg" class="img-circle" alt="User Image">
222-
221+
<img src="{{vm.userData.avatar}}" class="img-circle" alt="User Image" onError="this.src='//placeholdit.imgix.net/~text?txtfont=monospace,bold&bg=DD4B39&txtclr=ffffff&txt=A&w=90&h=90&txtsize=36'">
223222
<p>
224-
Alexander Pierce - Web Developer
225-
<small>Member since Nov. 2012</small>
223+
{{vm.userData.name | capitalize}}
224+
<small>Member since {{vm.userData.created_at | datemillis |date:'MMMM yyyy' }}</small>
226225
</p>
227226
</li>
228227
<!-- Menu Body -->

‎angular/app/components/nav-header/nav-header.component.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
class NavHeaderController {
2-
constructor (ContextService) {
2+
constructor ($rootScope, ContextService) {
33
'ngInject'
44

5-
ContextService.me()
6-
.then((response) => {
7-
response = response.plain()
8-
this.userData = response.data
9-
})
10-
//
5+
let navHeader = this
6+
7+
ContextService.me(function (data) {
8+
navHeader.userData = data
9+
})
1110
}
11+
12+
$onInit () {}
1213
}
1314

1415
export const NavHeaderComponent = {

‎angular/app/components/nav-sidebar/nav-sidebar.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- Sidebar user panel -->
55
<div class="user-panel">
66
<div class="pull-left image">
7-
<img src="/img/user2-160x160.jpg" class="img-circle" alt="User Image">
7+
<img src="{{vm.userData.avatar}}" class="img-circle" alt="User Image" onError="this.src='http://placeholdit.imgix.net/~text?txtfont=monospace,bold&bg=DD4B39&txtclr=ffffff&txt=A&w=45&h=45&txtsize=16'">
88
</div>
99
<div class="pull-left info">
10-
<p>Alexander Pierce</p>
10+
<p>{{vm.userData.name | capitalize}}</p>
1111
<a href="javascript:void(0)"><i class="fa fa-circle text-success"></i> Online</a>
1212
</div>
1313
</div>

‎angular/app/components/nav-sidebar/nav-sidebar.component.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
class NavSidebarController {
2-
constructor (AclService) {
2+
constructor (AclService, ContextService) {
33
'ngInject'
44

5+
let navSideBar = this
56
this.can = AclService.can
7+
8+
ContextService.me(function (data) {
9+
navSideBar.userData = data
10+
})
611
}
712

813
$onInit () {}

‎angular/config/routes.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,9 @@ export function RoutesConfig ($stateProvider, $urlRouterProvider) {
270270
url: '/logout',
271271
views: {
272272
'main@app': {
273-
controller: function ($scope, $auth, $state, AclService) {
273+
controller: function ($rootScope, $scope, $auth, $state, AclService) {
274274
$auth.logout().then(function () {
275+
delete $rootScope.me
275276
AclService.flushRoles()
276277
AclService.setAbilities({})
277278
$state.go('login')

‎angular/filters/date_millis.filter.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export function DateMillisFilter () {
2+
'ngInject'
3+
4+
return function (input) {
5+
return Date.parse(input)
6+
}
7+
}

‎angular/index.filters.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { DateMillisFilter } from './filters/date_millis.filter'
12
import { CapitalizeFilter } from './filters/capitalize.filter'
23
import { HumanReadableFilter } from './filters/human_readable.filter'
34
import { TruncatCharactersFilter } from './filters/truncate_characters.filter'
@@ -6,8 +7,9 @@ import { TrustHtmlFilter } from './filters/trust_html.filter'
67
import { UcFirstFilter } from './filters/ucfirst.filter'
78

89
angular.module('app.filters')
10+
.filter('datemillis', DateMillisFilter)
911
.filter('capitalize', CapitalizeFilter)
10-
.filter('humanReadable', HumanReadableFilter)
12+
.filter('humanreadable', HumanReadableFilter)
1113
.filter('truncateCharacters', TruncatCharactersFilter)
1214
.filter('truncateWords', TruncateWordsFilter)
1315
.filter('trustHtml', TrustHtmlFilter)

‎angular/index.services.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ContextService } from './services/context.service';
1+
import { ContextService } from './services/context.service'
22
import { APIService } from './services/API.service'
33
import { DialogService } from './services/dialog.service'
44
import { ToastService } from './services/toast.service'

‎angular/run/routes.run.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API) {
1+
export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API, ContextService) {
22
'ngInject'
33

44
AclService.resume()
55

6-
if ($auth.isAuthenticated()) {
7-
let UserData = API.service('me', API.all('users'))
8-
UserData.one().get()
9-
.then((response) => {
10-
$rootScope.me = API.copy(response)
11-
})
12-
}
13-
146
/*eslint-disable */
157
let deregisterationCallback = $rootScope.$on('$stateChangeStart', function (event, toState) {
168
if (toState.data && toState.data.auth) {
@@ -23,8 +15,9 @@ export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API)
2315
$rootScope.bodyClass = 'hold-transition login-page'
2416
})
2517

26-
function fixSideBar () {
18+
function stateChange () {
2719
$timeout(function () {
20+
// fix sidebar
2821
var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight()
2922
var window_height = $(window).height()
3023
var sidebar_height = $('.sidebar').height()
@@ -38,10 +31,19 @@ export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API)
3831
$('.content-wrapper, .right-side').css('min-height', sidebar_height)
3932
}
4033
}
34+
35+
// get user current context
36+
if ($auth.isAuthenticated() && !$rootScope.me) {
37+
ContextService.getContext()
38+
.then((response) => {
39+
response = response.plain()
40+
$rootScope.me = response.data
41+
})
42+
}
4143
})
4244
}
4345

4446
$rootScope.$on('$destroy', deregisterationCallback)
45-
$rootScope.$on('$stateChangeSuccess', fixSideBar)
47+
$rootScope.$on('$stateChangeSuccess', stateChange)
4648
/*eslint-enable */
4749
}

‎angular/services/context.service.js

+22-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1-
export class ContextService{
2-
constructor($auth, API){
3-
'ngInject';
4-
this.$auth = $auth
5-
this.API = API
6-
}
1+
export class ContextService {
2+
constructor ($auth, $rootScope, API) {
3+
'ngInject'
4+
this.$auth = $auth
5+
this.API = API
6+
this.$rootScope = $rootScope
7+
}
78

8-
me() {
9-
let $auth = this.$auth
9+
getContext () {
10+
let $auth = this.$auth
1011

11-
if ($auth.isAuthenticated()) {
12-
let API = this.API
13-
let UserData = API.service('me', API.all('users'))
12+
if ($auth.isAuthenticated()) {
13+
let API = this.API
14+
let UserData = API.service('me', API.all('users'))
1415

15-
return UserData.one().get()
16-
} else {
17-
return null
18-
}
16+
return UserData.one().get()
17+
} else {
18+
return null
1919
}
20-
}
20+
}
2121

22+
me (cb) {
23+
this.$rootScope.$watch('me', function (nv) {
24+
cb(nv)
25+
})
26+
}
27+
}

‎app/Http/Controllers/UserController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class UserController extends Controller
1616
{
1717
/**
18-
* Get user current context
18+
* Get user current context.
1919
*
2020
* @return JSON
2121
*/
@@ -27,7 +27,7 @@ public function getMe()
2727
}
2828

2929
/**
30-
* Update user current context
30+
* Update user current context.
3131
*
3232
* @return JSON success message
3333
*/

‎tests/angular/services/context.service.spec.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
ngDescribe({
2-
name: 'Test ContextService',
3-
modules: 'app',
4-
inject: 'ContextService',
5-
tests: function (deps) {
6-
7-
it('basic test', () => {
8-
//
9-
});
10-
}
11-
});
2+
name: 'Test ContextService',
3+
modules: 'app',
4+
inject: 'ContextService',
5+
tests: function (deps) {
6+
it('basic test', () => {
7+
//
8+
})
9+
}
10+
})

0 commit comments

Comments
 (0)