From e0f1e43a2d669033cd70be6490b51742e3c19d8f Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Sun, 10 Feb 2019 00:29:30 +1100 Subject: [PATCH] fixed buttons on top, sidebar --- .../ads-details/ads-details.controller.js | 9 ++++++++ .../scripts/ads-details/ads-details.html | 2 +- src/assets/scripts/companies/companies.html | 2 +- .../company-detail/company-detail.html | 2 +- src/assets/scripts/index.js | 1 - .../scripts/nwSidebar/sidebar.controller.js | 11 +++++++-- src/assets/scripts/nwTopbar/nwTopbar.html | 4 ++-- src/assets/scripts/sidebar/index.js | 23 ++++++------------- src/assets/styles/nomit.scss | 12 ++++++++++ 9 files changed, 42 insertions(+), 24 deletions(-) diff --git a/src/assets/scripts/ads-details/ads-details.controller.js b/src/assets/scripts/ads-details/ads-details.controller.js index 33fb76e..1d52194 100644 --- a/src/assets/scripts/ads-details/ads-details.controller.js +++ b/src/assets/scripts/ads-details/ads-details.controller.js @@ -1,4 +1,5 @@ import moment from 'moment'; +import Avatar from 'avatar-initials'; const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { @@ -7,11 +8,19 @@ const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserServi .then((result) => { $scope.ad = result; window.msnry.layout(); + + $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, + }); }) .catch((error) => { console.log(error); }); $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); } }); UserService.loadUser(); + + } export default AdsDetailsController; \ No newline at end of file diff --git a/src/assets/scripts/ads-details/ads-details.html b/src/assets/scripts/ads-details/ads-details.html index 4a440d7..8bad245 100644 --- a/src/assets/scripts/ads-details/ads-details.html +++ b/src/assets/scripts/ads-details/ads-details.html @@ -16,7 +16,7 @@
- company
diff --git a/src/assets/scripts/companies/companies.html b/src/assets/scripts/companies/companies.html index 475ab92..4302ea5 100644 --- a/src/assets/scripts/companies/companies.html +++ b/src/assets/scripts/companies/companies.html @@ -18,7 +18,7 @@
{{company.name}}
Victoria
{{companies.email}}
- view company profile + view company profile ban company
diff --git a/src/assets/scripts/company-detail/company-detail.html b/src/assets/scripts/company-detail/company-detail.html index 6d42702..98e77a7 100644 --- a/src/assets/scripts/company-detail/company-detail.html +++ b/src/assets/scripts/company-detail/company-detail.html @@ -14,7 +14,7 @@
- +
{{ company.company.name }}
{{ company.company.description }}
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 31c9a1f..6d8cdd8 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -5,7 +5,6 @@ import './masonry'; import './charts'; import './popover'; import './scrollbar'; -import './sidebar'; import './skycons'; import './vectorMaps'; import './chat'; diff --git a/src/assets/scripts/nwSidebar/sidebar.controller.js b/src/assets/scripts/nwSidebar/sidebar.controller.js index 613f2ed..834725d 100644 --- a/src/assets/scripts/nwSidebar/sidebar.controller.js +++ b/src/assets/scripts/nwSidebar/sidebar.controller.js @@ -1,8 +1,15 @@ +import functionSearch from '../search'; +import functionSidebar from '../sidebar'; + /** @ngInject */ const SidebarController = ($scope, UserService) => { - UserService.loadUser(); + var executed = false; $scope.$on('loadUserSuccess', function (event, user) { - $scope.user = user; + if(!executed){ + executed = true; + $scope.user = user; + functionSidebar(); + } }); UserService.loadUser(); } diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html index 630cd76..1244c83 100644 --- a/src/assets/scripts/nwTopbar/nwTopbar.html +++ b/src/assets/scripts/nwTopbar/nwTopbar.html @@ -18,14 +18,14 @@
  • - + ADD NEW USER
  • - + CREATE NEW AD diff --git a/src/assets/scripts/sidebar/index.js b/src/assets/scripts/sidebar/index.js index ab26f99..6e6ec7c 100755 --- a/src/assets/scripts/sidebar/index.js +++ b/src/assets/scripts/sidebar/index.js @@ -1,6 +1,9 @@ import * as $ from 'jquery'; -export default (function () { +const functionSidebar = () => { + + + // Sidebar links $('.sidebar .sidebar-menu li a').on('click', function () { const $this = $(this); @@ -42,20 +45,6 @@ export default (function () { } }); - // Sidebar Activity Class - const sidebarLinks = $('.sidebar').find('.sidebar-link'); - - sidebarLinks - .each((index, el) => { - $(el).removeClass('active'); - }) - .filter(function () { - const href = $(this).attr('href'); - const pattern = href[0] === '/' ? href.substr(1) : href; - return pattern === (window.location.pathname).substr(1); - }) - .addClass('active'); - // ٍSidebar Toggle $('.sidebar-toggle').on('click', e => { $('.app').toggleClass('is-collapsed'); @@ -73,4 +62,6 @@ export default (function () { window.dispatchEvent(window.EVENT); }, 300); }); -}()); +}; + +export default functionSidebar; \ No newline at end of file diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index 38cafde..7d39c8a 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -141,6 +141,18 @@ h1{ color: #fff; } +.btn-gradient.classe-bottone{ + height: auto !important; + line-height: 1 !important; + min-height: 0 !important; + padding: 15px !important; + + i{ + float: left; + margin: -3px 0 0 14px; + } + +} .btn-skills{ cursor: default !important; color: #501db9;