From 29c702c6b5b6455e663f21ccbaaa6ca9a514028a Mon Sep 17 00:00:00 2001 From: Mohammed Tantawy <6102@ait.nsw.edu.au> Date: Sun, 3 Feb 2019 20:02:05 +1100 Subject: [PATCH] Added Profile Route Profile displays forms depending on user Topbar now filters users After logout the it prompts the login modal --- src/assets/scripts/app/index.js | 9 +- .../scripts/dashboard/dashboard.controller.js | 2 +- src/assets/scripts/dashboard/dashboard.html | 2 +- src/assets/scripts/index.js | 1 + src/assets/scripts/logout/controller.js | 5 +- src/assets/scripts/nwLogin/nwLogin.html | 10 +- src/assets/scripts/nwSidebar/index.js | 3 + .../scripts/nwSidebar/sidebar.controller.js | 10 + src/assets/scripts/nwTopbar/index.js | 3 + src/assets/scripts/nwTopbar/nwTopbar.html | 18 +- .../scripts/nwTopbar/topbar.controller.js | 10 + src/assets/scripts/profile/index.js | 10 + .../scripts/profile/profile.controller.js | 21 + src/assets/scripts/profile/profile.html | 543 ++++++++++++++++++ src/assets/scripts/profile/profile.service.js | 18 + 15 files changed, 643 insertions(+), 22 deletions(-) create mode 100644 src/assets/scripts/nwSidebar/sidebar.controller.js create mode 100644 src/assets/scripts/nwTopbar/topbar.controller.js create mode 100644 src/assets/scripts/profile/index.js create mode 100644 src/assets/scripts/profile/profile.controller.js create mode 100644 src/assets/scripts/profile/profile.html create mode 100644 src/assets/scripts/profile/profile.service.js diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index cce1554..0384799 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -12,6 +12,7 @@ angular.module('NomitWisp', 'nwLogout', 'nwAds', 'nwAdsDetails', + 'nwProfile', ngRoute ]) @@ -31,10 +32,10 @@ angular.module('NomitWisp', controller: 'AdsDetailsController', templateUrl: 'assets/scripts/ads-details/ads-details.html' }) - // .when('/profile', { - // controller: 'ProfileController', - // templateUrl: '' - // }) + .when('/profile', { + controller: 'ProfileController', + templateUrl: 'assets/scripts/profile/profile.html' + }) // .when('/users', { // controller: 'UsersController', // templateUrl: '' diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 2925ace..a9e483c 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -2,7 +2,7 @@ const DashboardController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function(event, user) { $scope.user = user; - console.log($scope.user); + // tutte le funzioni del controller }); diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index bdc149e..7072d84 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -82,7 +82,7 @@
This text is only visible to Users
-This text is only visible to Companies
-This text is visible to both Nomit and Admin
-This text is only visible to Nomit
-This text is only visible to Admin
+This text is only visible to Users
+This text is only visible to Companies
+This text is visible to both Nomit and Admin
+This text is only visible to Nomit
+This text is only visible to Admin