From a061e1ee71ccb2936fff9c030dade91b7453205a Mon Sep 17 00:00:00 2001 From: Mohammed Tantawy <6102@ait.nsw.edu.au> Date: Sun, 10 Feb 2019 12:15:57 +1100 Subject: [PATCH] General fixes Added Avatar in Company details page Refreshed the graphs in the dashboard page Refresh Sidebar after loading --- .../ads-details/ads-details.controller.js | 21 +++++------ .../scripts/ads-details/ads-details.html | 2 +- src/assets/scripts/app/shared.service.js | 4 +- src/assets/scripts/charts/chartJS/index.js | 6 ++- .../scripts/charts/easyPieChart/index.js | 6 ++- .../scripts/companies/companies.controller.js | 16 ++++---- .../scripts/dashboard/dashboard.controller.js | 6 ++- src/assets/scripts/dashboard/dashboard.html | 14 +++---- src/assets/scripts/logout/controller.js | 4 +- src/assets/scripts/nwSidebar/nwSidebar.html | 12 +++--- .../scripts/nwSidebar/sidebar.controller.js | 5 ++- .../scripts/nwTopbar/topbar.controller.js | 15 +++----- src/assets/scripts/users/users.controller.js | 37 +++++++++---------- 13 files changed, 76 insertions(+), 72 deletions(-) diff --git a/src/assets/scripts/ads-details/ads-details.controller.js b/src/assets/scripts/ads-details/ads-details.controller.js index 79f4757..64a40bc 100644 --- a/src/assets/scripts/ads-details/ads-details.controller.js +++ b/src/assets/scripts/ads-details/ads-details.controller.js @@ -2,23 +2,22 @@ import moment from 'moment'; import Avatar from 'avatar-initials'; const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => { - $scope.$on('loadUserSuccess', function (event, user) { - $scope.user = user; - AdsDetailsService.fetchAdDetails($routeParams) + // $scope.$on('loadUserSuccess', function (event, user) { + // $scope.user = user; + // }); + // UserService.loadUser(); + AdsDetailsService.fetchAdDetails($routeParams) .then((result) => { $scope.ad = result; + console.log(result); - // $scope.avatar = new Avatar(document.getElementById('avatar_company_details'), { - // 'useGravatar': false, - // 'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}` - // 'initial_weight': 300, - // }); + $scope.avatar = new Avatar(document.getElementById('ad-details-avatar'), { + 'useGravatar': false, + 'initials': result.companyname[0].toUpperCase()+result.companyname[1].toUpperCase(), + }); }) .catch((error) => { console.log(error); }); $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); } - }); - UserService.loadUser(); - } diff --git a/src/assets/scripts/ads-details/ads-details.html b/src/assets/scripts/ads-details/ads-details.html index de3c3a1..65f14cd 100644 --- a/src/assets/scripts/ads-details/ads-details.html +++ b/src/assets/scripts/ads-details/ads-details.html @@ -16,7 +16,7 @@
- company + company

{{ ad.title }}

diff --git a/src/assets/scripts/app/shared.service.js b/src/assets/scripts/app/shared.service.js index 4dc5016..7317fed 100644 --- a/src/assets/scripts/app/shared.service.js +++ b/src/assets/scripts/app/shared.service.js @@ -15,11 +15,9 @@ const UserService = ($cookies, $rootScope, $location) => { if(typeof $cookies.get('access_token') !== 'undefined' ){ $rootScope.$broadcast('loadUserSuccess', parseJwt( $cookies.get('access_token') )); $('#modalLoginForm').modal('hide'); - } else { - if($location.path() === '/signup') { $('#modalLoginForm').modal('hide'); } + } else if($location.path() === '/signup') { $('#modalLoginForm').modal('hide'); } else { $('#modalLoginForm').modal({backdrop: 'static', keyboard: false}); } } - } return serv; diff --git a/src/assets/scripts/charts/chartJS/index.js b/src/assets/scripts/charts/chartJS/index.js index 1d02273..400bb56 100755 --- a/src/assets/scripts/charts/chartJS/index.js +++ b/src/assets/scripts/charts/chartJS/index.js @@ -1,7 +1,7 @@ import Chart from 'chart.js'; import { COLORS } from '../../constants/colors'; -export default (function () { +const chart = function () { // ------------------------------------------------------ // @Line Charts // ------------------------------------------------------ @@ -144,4 +144,6 @@ export default (function () { }, }); } -}()) +}; + +export default chart; diff --git a/src/assets/scripts/charts/easyPieChart/index.js b/src/assets/scripts/charts/easyPieChart/index.js index 4a76898..153d410 100755 --- a/src/assets/scripts/charts/easyPieChart/index.js +++ b/src/assets/scripts/charts/easyPieChart/index.js @@ -1,7 +1,7 @@ import * as $ from 'jquery'; import 'easy-pie-chart/dist/jquery.easypiechart.min.js'; -export default (function () { +const pieChart = function () { if ($('.easy-pie-chart').length > 0) { $('.easy-pie-chart').easyPieChart({ lineWidth:7, @@ -13,5 +13,7 @@ export default (function () { }, }); } -}()) +}; + +export default pieChart; diff --git a/src/assets/scripts/companies/companies.controller.js b/src/assets/scripts/companies/companies.controller.js index 72844a1..15d66bc 100644 --- a/src/assets/scripts/companies/companies.controller.js +++ b/src/assets/scripts/companies/companies.controller.js @@ -9,13 +9,15 @@ const CompaniesController = ($scope, CompaniesService, UserService) => { $scope.companies = result; $scope.avatar = function(index) { - new Avatar(document.getElementById('company'+index), { - 'useGravatar': false, - 'initials': result[index].name[0], - 'initial_weight': 300, - }); - } - masonry(); + new Avatar(document.getElementById('company'+index), { + 'useGravatar': false, + 'initials': result[index].name[0], + 'initial_weight': 300, + }); + } + masonry(); + + }) .catch( (error) => { console.log(error); }) }); diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 433dff8..4b5b97c 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -1,15 +1,17 @@ import masonry from "../masonry"; +import chart from "../charts/chartJS"; +import pieChart from "../charts/easyPieChart"; /** @ngInject */ const DashboardController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function(event, user) { $scope.user = user; - window.dispatchEvent(window.EVENT); }); // tutte le funzioni del controller masonry(); - UserService.loadUser(); + chart(); + pieChart(); } export default DashboardController; \ No newline at end of file diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index 98b9ac7..97974ee 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -9,7 +9,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -82,7 +82,7 @@
New Registered Users
- +
@@ -97,7 +97,7 @@
-
+
@@ -189,12 +189,12 @@
-
+
Your Ads
-
+
@@ -261,7 +261,7 @@ -
+
diff --git a/src/assets/scripts/logout/controller.js b/src/assets/scripts/logout/controller.js index 7a46d3d..519f559 100644 --- a/src/assets/scripts/logout/controller.js +++ b/src/assets/scripts/logout/controller.js @@ -2,13 +2,13 @@ import masonry from "../masonry"; const LogoutController = ($scope, $location, LogoutService, $cookies, UserService) => { $scope.userLogged = false; - + UserService.loadUser(); $scope.userLogout = async () => { await LogoutService.logoutUserService($scope.user) .then((result)=>{ $cookies.remove('access_token'); - UserService.loadUser(); $location.path('/'); + $scope.$emit('needReload'); masonry(); }) .catch((err)=>{ console.log(err); }) diff --git a/src/assets/scripts/nwSidebar/nwSidebar.html b/src/assets/scripts/nwSidebar/nwSidebar.html index 1bf4f50..aead209 100644 --- a/src/assets/scripts/nwSidebar/nwSidebar.html +++ b/src/assets/scripts/nwSidebar/nwSidebar.html @@ -211,7 +211,7 @@