Browse Source

Added Logout

Accessible from the button 'Logout' in the menu
pull/146/head
Mohammed Tantawy 7 years ago
parent
commit
c2c0d60c6e
8 changed files with 64 additions and 11 deletions
  1. +2
    -1
      src/assets/scripts/app/index.js
  2. +1
    -1
      src/assets/scripts/dashboard/dashboard.html
  3. +16
    -7
      src/assets/scripts/dashboard/index.js
  4. +1
    -0
      src/assets/scripts/index.js
  5. +12
    -0
      src/assets/scripts/logout/controller.js
  6. +8
    -0
      src/assets/scripts/logout/index.js
  7. +22
    -0
      src/assets/scripts/logout/service.js
  8. +2
    -2
      src/assets/scripts/nwTopbar/nwTopbar.html

+ 2
- 1
src/assets/scripts/app/index.js View File

@ -8,6 +8,7 @@ angular.module('NomitWisp',
'NomitWisp-Sidebar',
'NomitWisp-Footer',
'nwDashboard',
'nwLogout',
ngRoute
])
@ -16,7 +17,7 @@ angular.module('NomitWisp',
.when('/', {
controller: 'DashboardController',
templateUrl: 'assets/scripts/dashboard/dashboard.html'
})
})
.otherwise({
redirectTo: '/'
});

+ 1
- 1
src/assets/scripts/dashboard/dashboard.html View File

@ -2,7 +2,7 @@
<div id='mainContent row'>
<div class="row content-title mT-60">
<div class="col-8 ml-1 mb-3">
Dashboard
Welcome {{ user.fullname }}
</div>
</div>
<div class=" gap-20 masonry pos-r">


+ 16
- 7
src/assets/scripts/dashboard/index.js View File

@ -1,14 +1,23 @@
import angular from 'angular';
import * as angular from 'angular';
import ngCookies from 'angular-cookies';
angular.module('nwDashboard', [])
angular.module('nwDashboard', [ngCookies])
.controller('DashboardController', DashboardController);
/** @ngInject */
function DashboardController($scope){
function DashboardController($scope, $cookies){
// service carica dashboard
// jquery per grafici
$scope.user = {
role : 'admin'
};
const token = $cookies.get('access_token');
console.log(token);
if(typeof(token) !== "undefined"){
$scope.user = parseJwt( token );
}
}
}
function parseJwt(token) {
var base64Url = token.split('.')[1];
var base64 = base64Url.replace('-', '+').replace('_', '/');
return JSON.parse(window.atob(base64));
};

+ 1
- 0
src/assets/scripts/index.js View File

@ -18,6 +18,7 @@ import './googleMaps';
import './utils';
import './user-form';
import './login';
import './logout';
import './nwFooter';
import './nwSidebar';
import './nwTopbar';


+ 12
- 0
src/assets/scripts/logout/controller.js View File

@ -0,0 +1,12 @@
const LogoutController = ($scope, LogoutService, $cookies) => {
$scope.userLogged = false;
$scope.userLogout = async () => {
console.log("Logout");
const result = await LogoutService.logoutUserService($scope.user);
$cookies.remove('access_token');
console.log(result);
}
};
export default LogoutController;

+ 8
- 0
src/assets/scripts/logout/index.js View File

@ -0,0 +1,8 @@
import angular from 'angular';
import ngCookies from 'angular-cookies';
import LogoutController from './controller';
import LogoutService from './service';
angular.module('nwLogout', [ngCookies])
.controller(LogoutController.name, LogoutController)
.factory(LogoutService.name, LogoutService);

+ 22
- 0
src/assets/scripts/logout/service.js View File

@ -0,0 +1,22 @@
const LogoutService = ($http) => {
let serv = {};
serv.logoutUserService = (user) =>{
return $http({
method: 'POST',
url: 'https://nomitwisp-restapi.herokuapp.com/logout',
data: user,
headers: { 'Content-Type': 'application/json' }
})
.then( (result) => {
console.log(result);
return result;
}, (err) => {
console.log(err.data);
return err.data;
});
}
return serv;
}
export default LogoutService;

+ 2
- 2
src/assets/scripts/nwTopbar/nwTopbar.html View File

@ -58,8 +58,8 @@
</a>
</li>
<li role="separator" class="divider"></li>
<li>
<a href="" class="d-b td-n pY-5 bgcH-grey-100 c-grey-700">
<li ng-controller="LogoutController">
<a href="#" ng-click="userLogout()" class="d-b td-n pY-5 bgcH-grey-100 c-grey-700">
<i class="ti-power-off mR-10"></i>
<span>Logout</span>
</a>


Loading…
Cancel
Save