From 4401c53df9d491e66d6fa55d4c8bf8c591feae70 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Wed, 25 May 2016 16:57:06 +0800 Subject: [PATCH 1/2] Initial Commit --- .../nav-header/nav-header.component.js | 7 ++++++- angular/index.services.js | 2 ++ angular/run/routes.run.js | 10 ++++++++- angular/services/context.service.js | 21 +++++++++++++++++++ app/Http/Controllers/UserController.php | 10 +++++++++ .../angular/services/context.service.spec.js | 11 ++++++++++ 6 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 angular/services/context.service.js create mode 100644 tests/angular/services/context.service.spec.js diff --git a/angular/app/components/nav-header/nav-header.component.js b/angular/app/components/nav-header/nav-header.component.js index e528496..de05ae2 100644 --- a/angular/app/components/nav-header/nav-header.component.js +++ b/angular/app/components/nav-header/nav-header.component.js @@ -1,7 +1,12 @@ class NavHeaderController { - constructor () { + constructor (ContextService) { 'ngInject' + ContextService.me() + .then((response) => { + response = response.plain() + this.userData = response.data + }) // } } diff --git a/angular/index.services.js b/angular/index.services.js index fc70918..9133501 100644 --- a/angular/index.services.js +++ b/angular/index.services.js @@ -1,8 +1,10 @@ +import { ContextService } from './services/context.service'; import { APIService } from './services/API.service' import { DialogService } from './services/dialog.service' import { ToastService } from './services/toast.service' angular.module('app.services') + .service('ContextService', ContextService) .service('API', APIService) .service('DialogService', DialogService) .service('ToastService', ToastService) diff --git a/angular/run/routes.run.js b/angular/run/routes.run.js index 12d32c4..4b05818 100644 --- a/angular/run/routes.run.js +++ b/angular/run/routes.run.js @@ -1,8 +1,16 @@ -export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout) { +export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API) { 'ngInject' AclService.resume() + if ($auth.isAuthenticated()) { + let UserData = API.service('me', API.all('users')) + UserData.one().get() + .then((response) => { + $rootScope.me = API.copy(response) + }) + } + /*eslint-disable */ let deregisterationCallback = $rootScope.$on('$stateChangeStart', function (event, toState) { if (toState.data && toState.data.auth) { diff --git a/angular/services/context.service.js b/angular/services/context.service.js new file mode 100644 index 0000000..85461bc --- /dev/null +++ b/angular/services/context.service.js @@ -0,0 +1,21 @@ +export class ContextService{ + constructor($auth, API){ + 'ngInject'; + this.$auth = $auth + this.API = API + } + + me() { + let $auth = this.$auth + + if ($auth.isAuthenticated()) { + let API = this.API + let UserData = API.service('me', API.all('users')) + + return UserData.one().get() + } else { + return null + } + } +} + diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index c3a4df1..2af3bd1 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -14,6 +14,11 @@ class UserController extends Controller { + /** + * Get user current context + * + * @return JSON + */ public function getMe() { $user = Auth::user(); @@ -21,6 +26,11 @@ public function getMe() return response()->success($user); } + /** + * Update user current context + * + * @return JSON success message + */ public function putMe(Request $request) { $user = Auth::user(); diff --git a/tests/angular/services/context.service.spec.js b/tests/angular/services/context.service.spec.js new file mode 100644 index 0000000..3d53950 --- /dev/null +++ b/tests/angular/services/context.service.spec.js @@ -0,0 +1,11 @@ +ngDescribe({ + name: 'Test ContextService', + modules: 'app', + inject: 'ContextService', + tests: function (deps) { + + it('basic test', () => { + // + }); + } +}); From e8996548ef9e1c60109f03aed56698b59fdca0d8 Mon Sep 17 00:00:00 2001 From: alex quiambao Date: Thu, 26 May 2016 13:44:45 +0800 Subject: [PATCH 2/2] Added user current context --- .../login-form/login-form.component.js | 4 +- .../nav-header/nav-header.component.html | 11 +++--- .../nav-header/nav-header.component.js | 15 ++++---- .../nav-sidebar/nav-sidebar.component.html | 4 +- .../nav-sidebar/nav-sidebar.component.js | 7 +++- angular/config/routes.config.js | 3 +- angular/filters/date_millis.filter.js | 7 ++++ angular/index.filters.js | 4 +- angular/index.services.js | 2 +- angular/run/routes.run.js | 24 ++++++------ angular/services/context.service.js | 38 +++++++++++-------- app/Http/Controllers/UserController.php | 4 +- .../angular/services/context.service.spec.js | 19 +++++----- 13 files changed, 83 insertions(+), 59 deletions(-) create mode 100644 angular/filters/date_millis.filter.js diff --git a/angular/app/components/login-form/login-form.component.js b/angular/app/components/login-form/login-form.component.js index 3b410bb..e5ed517 100644 --- a/angular/app/components/login-form/login-form.component.js +++ b/angular/app/components/login-form/login-form.component.js @@ -1,7 +1,9 @@ class LoginFormController { - constructor ($auth, $state, $stateParams, API, AclService) { + constructor ($rootScope, $auth, $state, $stateParams, API, AclService) { 'ngInject' + delete $rootScope.me + this.$auth = $auth this.$state = $state this.$stateParams = $stateParams diff --git a/angular/app/components/nav-header/nav-header.component.html b/angular/app/components/nav-header/nav-header.component.html index 5d8183b..2becde0 100644 --- a/angular/app/components/nav-header/nav-header.component.html +++ b/angular/app/components/nav-header/nav-header.component.html @@ -212,17 +212,16 @@

  • - User Image - + User Image +
    • - User Image - + User Image

      - Alexander Pierce - Web Developer - Member since Nov. 2012 + {{vm.userData.name | capitalize}} + Member since {{vm.userData.created_at | datemillis |date:'MMMM yyyy' }}

      • diff --git a/angular/app/components/nav-header/nav-header.component.js b/angular/app/components/nav-header/nav-header.component.js index de05ae2..f383e23 100644 --- a/angular/app/components/nav-header/nav-header.component.js +++ b/angular/app/components/nav-header/nav-header.component.js @@ -1,14 +1,15 @@ class NavHeaderController { - constructor (ContextService) { + constructor ($rootScope, ContextService) { 'ngInject' - ContextService.me() - .then((response) => { - response = response.plain() - this.userData = response.data - }) - // + let navHeader = this + + ContextService.me(function (data) { + navHeader.userData = data + }) } + + $onInit () {} } export const NavHeaderComponent = { diff --git a/angular/app/components/nav-sidebar/nav-sidebar.component.html b/angular/app/components/nav-sidebar/nav-sidebar.component.html index 7514ed2..0c3be2c 100644 --- a/angular/app/components/nav-sidebar/nav-sidebar.component.html +++ b/angular/app/components/nav-sidebar/nav-sidebar.component.html @@ -4,10 +4,10 @@
      - User Image + User Image
      -

      Alexander Pierce

      +

      {{vm.userData.name | capitalize}}

      Online
      diff --git a/angular/app/components/nav-sidebar/nav-sidebar.component.js b/angular/app/components/nav-sidebar/nav-sidebar.component.js index c984a93..c7fc466 100644 --- a/angular/app/components/nav-sidebar/nav-sidebar.component.js +++ b/angular/app/components/nav-sidebar/nav-sidebar.component.js @@ -1,8 +1,13 @@ class NavSidebarController { - constructor (AclService) { + constructor (AclService, ContextService) { 'ngInject' + let navSideBar = this this.can = AclService.can + + ContextService.me(function (data) { + navSideBar.userData = data + }) } $onInit () {} diff --git a/angular/config/routes.config.js b/angular/config/routes.config.js index 08e1ec8..b952b4a 100644 --- a/angular/config/routes.config.js +++ b/angular/config/routes.config.js @@ -270,8 +270,9 @@ export function RoutesConfig ($stateProvider, $urlRouterProvider) { url: '/logout', views: { 'main@app': { - controller: function ($scope, $auth, $state, AclService) { + controller: function ($rootScope, $scope, $auth, $state, AclService) { $auth.logout().then(function () { + delete $rootScope.me AclService.flushRoles() AclService.setAbilities({}) $state.go('login') diff --git a/angular/filters/date_millis.filter.js b/angular/filters/date_millis.filter.js new file mode 100644 index 0000000..8c2a380 --- /dev/null +++ b/angular/filters/date_millis.filter.js @@ -0,0 +1,7 @@ +export function DateMillisFilter () { + 'ngInject' + + return function (input) { + return Date.parse(input) + } +} diff --git a/angular/index.filters.js b/angular/index.filters.js index 42f1e6f..3a65430 100644 --- a/angular/index.filters.js +++ b/angular/index.filters.js @@ -1,3 +1,4 @@ +import { DateMillisFilter } from './filters/date_millis.filter' import { CapitalizeFilter } from './filters/capitalize.filter' import { HumanReadableFilter } from './filters/human_readable.filter' import { TruncatCharactersFilter } from './filters/truncate_characters.filter' @@ -6,8 +7,9 @@ import { TrustHtmlFilter } from './filters/trust_html.filter' import { UcFirstFilter } from './filters/ucfirst.filter' angular.module('app.filters') + .filter('datemillis', DateMillisFilter) .filter('capitalize', CapitalizeFilter) - .filter('humanReadable', HumanReadableFilter) + .filter('humanreadable', HumanReadableFilter) .filter('truncateCharacters', TruncatCharactersFilter) .filter('truncateWords', TruncateWordsFilter) .filter('trustHtml', TrustHtmlFilter) diff --git a/angular/index.services.js b/angular/index.services.js index 9133501..2e2a157 100644 --- a/angular/index.services.js +++ b/angular/index.services.js @@ -1,4 +1,4 @@ -import { ContextService } from './services/context.service'; +import { ContextService } from './services/context.service' import { APIService } from './services/API.service' import { DialogService } from './services/dialog.service' import { ToastService } from './services/toast.service' diff --git a/angular/run/routes.run.js b/angular/run/routes.run.js index 4b05818..c8542fb 100644 --- a/angular/run/routes.run.js +++ b/angular/run/routes.run.js @@ -1,16 +1,8 @@ -export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API) { +export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API, ContextService) { 'ngInject' AclService.resume() - if ($auth.isAuthenticated()) { - let UserData = API.service('me', API.all('users')) - UserData.one().get() - .then((response) => { - $rootScope.me = API.copy(response) - }) - } - /*eslint-disable */ let deregisterationCallback = $rootScope.$on('$stateChangeStart', function (event, toState) { if (toState.data && toState.data.auth) { @@ -23,8 +15,9 @@ export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API) $rootScope.bodyClass = 'hold-transition login-page' }) - function fixSideBar () { + function stateChange () { $timeout(function () { + // fix sidebar var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight() var window_height = $(window).height() var sidebar_height = $('.sidebar').height() @@ -38,10 +31,19 @@ export function RoutesRun ($rootScope, $state, $auth, AclService, $timeout, API) $('.content-wrapper, .right-side').css('min-height', sidebar_height) } } + + // get user current context + if ($auth.isAuthenticated() && !$rootScope.me) { + ContextService.getContext() + .then((response) => { + response = response.plain() + $rootScope.me = response.data + }) + } }) } $rootScope.$on('$destroy', deregisterationCallback) - $rootScope.$on('$stateChangeSuccess', fixSideBar) + $rootScope.$on('$stateChangeSuccess', stateChange) /*eslint-enable */ } diff --git a/angular/services/context.service.js b/angular/services/context.service.js index 85461bc..aa3a86e 100644 --- a/angular/services/context.service.js +++ b/angular/services/context.service.js @@ -1,21 +1,27 @@ -export class ContextService{ - constructor($auth, API){ - 'ngInject'; - this.$auth = $auth - this.API = API - } +export class ContextService { + constructor ($auth, $rootScope, API) { + 'ngInject' + this.$auth = $auth + this.API = API + this.$rootScope = $rootScope + } - me() { - let $auth = this.$auth + getContext () { + let $auth = this.$auth - if ($auth.isAuthenticated()) { - let API = this.API - let UserData = API.service('me', API.all('users')) + if ($auth.isAuthenticated()) { + let API = this.API + let UserData = API.service('me', API.all('users')) - return UserData.one().get() - } else { - return null - } + return UserData.one().get() + } else { + return null } -} + } + me (cb) { + this.$rootScope.$watch('me', function (nv) { + cb(nv) + }) + } +} diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 2af3bd1..dd49370 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -15,7 +15,7 @@ class UserController extends Controller { /** - * Get user current context + * Get user current context. * * @return JSON */ @@ -27,7 +27,7 @@ public function getMe() } /** - * Update user current context + * Update user current context. * * @return JSON success message */ diff --git a/tests/angular/services/context.service.spec.js b/tests/angular/services/context.service.spec.js index 3d53950..08744f2 100644 --- a/tests/angular/services/context.service.spec.js +++ b/tests/angular/services/context.service.spec.js @@ -1,11 +1,10 @@ ngDescribe({ - name: 'Test ContextService', - modules: 'app', - inject: 'ContextService', - tests: function (deps) { - - it('basic test', () => { - // - }); - } -}); + name: 'Test ContextService', + modules: 'app', + inject: 'ContextService', + tests: function (deps) { + it('basic test', () => { + // + }) + } +})