Browse Source

fixed buttons on top, sidebar

pull/146/head
Francesca Sperati 7 years ago
parent
commit
e0f1e43a2d
9 changed files with 42 additions and 24 deletions
  1. +9
    -0
      src/assets/scripts/ads-details/ads-details.controller.js
  2. +1
    -1
      src/assets/scripts/ads-details/ads-details.html
  3. +1
    -1
      src/assets/scripts/companies/companies.html
  4. +1
    -1
      src/assets/scripts/company-detail/company-detail.html
  5. +0
    -1
      src/assets/scripts/index.js
  6. +9
    -2
      src/assets/scripts/nwSidebar/sidebar.controller.js
  7. +2
    -2
      src/assets/scripts/nwTopbar/nwTopbar.html
  8. +7
    -16
      src/assets/scripts/sidebar/index.js
  9. +12
    -0
      src/assets/styles/nomit.scss

+ 9
- 0
src/assets/scripts/ads-details/ads-details.controller.js View File

@ -1,4 +1,5 @@
import moment from 'moment'; import moment from 'moment';
import Avatar from 'avatar-initials';
const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => { const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => {
$scope.$on('loadUserSuccess', function (event, user) { $scope.$on('loadUserSuccess', function (event, user) {
@ -7,11 +8,19 @@ const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserServi
.then((result) => { .then((result) => {
$scope.ad = result; $scope.ad = result;
window.msnry.layout(); 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); }); .catch((error) => { console.log(error); });
$scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); } $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); }
}); });
UserService.loadUser(); UserService.loadUser();
} }
export default AdsDetailsController; export default AdsDetailsController;

+ 1
- 1
src/assets/scripts/ads-details/ads-details.html View File

@ -16,7 +16,7 @@
<div class="card"> <div class="card">
<div class="row"> <div class="row">
<div class="col-3 mt-4 "> <div class="col-3 mt-4 ">
<img class="img-fluid ml-4 mb-4 companies-update-img" src="assets/static/images/nomit-logo.png" alt="company"
<img class="img-fluid ml-4 mb-4 companies-update-img" ng-src="{{avatar_company_details.element.src}}" alt="company"
class="avatar"> class="avatar">
</div> </div>
<div class="col-9 card-body"> <div class="col-9 card-body">


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

@ -18,7 +18,7 @@
<div class="user-card-title">{{company.name}}</div> <div class="user-card-title">{{company.name}}</div>
<div class=" text-size-11">Victoria</div> <div class=" text-size-11">Victoria</div>
<div class=" text-size-11">{{companies.email}}</div> <div class=" text-size-11">{{companies.email}}</div>
<a href="#" id="user-action-fill">view company profile</a>
<a href="!#/company-detail" id="user-action-fill">view company profile</a>
<a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="Company will be unable to log in to WISP">ban <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="Company will be unable to log in to WISP">ban
company</a> company</a>
</div> </div>


+ 1
- 1
src/assets/scripts/company-detail/company-detail.html View File

@ -14,7 +14,7 @@
<div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-user" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee' || profile.role =='user' "> <div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-user" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee' || profile.role =='user' ">
<div class="card item-box"> <div class="card item-box">
<div class="user-data-title"> <div class="user-data-title">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<img class="user-update-img" ng-src="{{avatar.element.src}}" alt="">
<div class="testo"> <div class="testo">
<h5>{{ company.company.name }}</h5> {{ company.company.description }} <h5>{{ company.company.name }}</h5> {{ company.company.description }}
</div> </div>


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

@ -5,7 +5,6 @@ import './masonry';
import './charts'; import './charts';
import './popover'; import './popover';
import './scrollbar'; import './scrollbar';
import './sidebar';
import './skycons'; import './skycons';
import './vectorMaps'; import './vectorMaps';
import './chat'; import './chat';


+ 9
- 2
src/assets/scripts/nwSidebar/sidebar.controller.js View File

@ -1,8 +1,15 @@
import functionSearch from '../search';
import functionSidebar from '../sidebar';
/** @ngInject */ /** @ngInject */
const SidebarController = ($scope, UserService) => { const SidebarController = ($scope, UserService) => {
UserService.loadUser();
var executed = false;
$scope.$on('loadUserSuccess', function (event, user) { $scope.$on('loadUserSuccess', function (event, user) {
$scope.user = user;
if(!executed){
executed = true;
$scope.user = user;
functionSidebar();
}
}); });
UserService.loadUser(); UserService.loadUser();
} }


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

@ -18,14 +18,14 @@
<input class="form-control" type="text" placeholder="Search users, companies, or anything.."> <input class="form-control" type="text" placeholder="Search users, companies, or anything..">
</li> </li>
<li class="visible-nomit ml-2" ng-show="user.role=='nomit' || user.role=='admin'"> <li class="visible-nomit ml-2" ng-show="user.role=='nomit' || user.role=='admin'">
<a href="#!user_add" role="button" class="btn btn-gradient ">
<a href="#!user_add" role="button" class="btn btn-gradient classe-bottone">
<i class="fa fa-plus pdd-right-5 text-white"></i> <i class="fa fa-plus pdd-right-5 text-white"></i>
ADD NEW USER ADD NEW USER
</a> </a>
</li> </li>
<li class="visible-referee visible-nomit visible-company ml-2" ng-show="user.role=='nomit' || user.role == 'referee' || user.role == 'company' || user.role=='admin'"> <li class="visible-referee visible-nomit visible-company ml-2" ng-show="user.role=='nomit' || user.role == 'referee' || user.role == 'company' || user.role=='admin'">
<a href="#!ads_add" role="button" class="btn btn-gradient">
<a href="#!ads_add" role="button" class="btn btn-gradient classe-bottone">
<i class="fa fa-plus pdd-right-5 text-white"></i> <i class="fa fa-plus pdd-right-5 text-white"></i>
CREATE NEW AD CREATE NEW AD
</a> </a>


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

@ -1,6 +1,9 @@
import * as $ from 'jquery'; import * as $ from 'jquery';
export default (function () {
const functionSidebar = () => {
// Sidebar links // Sidebar links
$('.sidebar .sidebar-menu li a').on('click', function () { $('.sidebar .sidebar-menu li a').on('click', function () {
const $this = $(this); 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
$('.sidebar-toggle').on('click', e => { $('.sidebar-toggle').on('click', e => {
$('.app').toggleClass('is-collapsed'); $('.app').toggleClass('is-collapsed');
@ -73,4 +62,6 @@ export default (function () {
window.dispatchEvent(window.EVENT); window.dispatchEvent(window.EVENT);
}, 300); }, 300);
}); });
}());
};
export default functionSidebar;

+ 12
- 0
src/assets/styles/nomit.scss View File

@ -141,6 +141,18 @@ h1{
color: #fff; 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{ .btn-skills{
cursor: default !important; cursor: default !important;
color: #501db9; color: #501db9;


Loading…
Cancel
Save