Merge branch 'hotfix/3.3.1'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haniot-dashboard",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "license": "Apache 2.0",
   "autor": "NUTES/UEPB",
   "scripts": {
@@ -50,7 +50,6 @@
     "jwt-decode": "^2.2.0",
     "moment": "^2.24.0",
     "mustache": "^3.2.1",
-    "muuri": "^0.8.0",
     "ng-recaptcha": "^5.0.0",
     "ngx-echarts": "^4.2.2",
     "ngx-gauge": "^1.1.0",

src/app/core/template/navbar/navbar.component.ts

@@ -1,18 +1,16 @@
 import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Router } from '@angular/router';
+import { Title } from '@angular/platform-browser';
 
 import { ISubscription } from 'rxjs-compat/Subscription';
 import { TranslateService } from '@ngx-translate/core';
 
 import { PilotStudy } from '../../../modules/pilot.study/models/pilot.study';
-import { SelectPilotStudyService } from '../../../shared/shared.components/select.pilotstudy/service/select.pilot.study.service';
-import { PilotStudyService } from '../../../modules/pilot.study/services/pilot.study.service';
 import { LocalStorageService } from '../../../shared/shared.services/local.storage.service';
-import { AuthService } from '../../../security/auth/services/auth.service'
-import { UserService } from '../../../modules/admin/services/users.service'
-import { Title } from '@angular/platform-browser'
-import { LoadingService } from '../../../shared/shared.components/loading.component/service/loading.service'
+import { AuthService } from '../../../security/auth/services/auth.service';
+import { UserService } from '../../../modules/admin/services/users.service';
+import { LoadingService } from '../../../shared/shared.components/loading.component/service/loading.service';
 
 
 export declare interface RouteInfo {
@@ -82,8 +80,6 @@ export class NavbarComponent implements OnInit, OnDestroy {
         private router: Router,
         private authService: AuthService,
         private userService: UserService,
-        private pilotStudyService: PilotStudyService,
-        private selectPilotService: SelectPilotStudyService,
         private localStorageService: LocalStorageService,
         private loadingService: LoadingService,
         private translateService: TranslateService,
@@ -226,15 +222,14 @@ export class NavbarComponent implements OnInit, OnDestroy {
 
     getUserName() {
         this.loadUserTime = setInterval(() => {
-            const localUserLogged = JSON.parse(this.localStorageService.getItem('userLogged'));
-            const language = this.localStorageService.getItem('language');
             try {
+                const localUserLogged = JSON.parse(this.localStorageService.getItem('userLogged'));
+                const language = localUserLogged ? localUserLogged.language : '';
                 this.userLogged = localUserLogged;
                 this.userName = this.userLogged.name ? this.userLogged.name : this.userLogged.email;
                 this.configLanguage(language);
                 clearInterval(this.loadUserTime);
             } catch (e) {
-
             }
         }, 1000)
     }

src/app/modules/activity/activity.dashboard/activity.dashboard.component.scss

@@ -115,6 +115,12 @@ i:hover {
     border-radius: 20px;
     background: rgb(212, 207, 207);
   }
+
+  .disabled:hover{
+    border-radius: unset;
+    background: none;
+    cursor: default;
+  }
 }
 
 .disabled {
@@ -219,3 +225,32 @@ i:hover {
     }
   }
 }
+
+.separator {
+  overflow: visible; /* For IE */
+  padding: 0;
+  border: none;
+  border-top: medium double #333;
+  color: #333;
+  text-align: center;
+
+  &:after {
+    content: attr(data-label);
+    display: inline-block;
+    position: relative;
+    top: -0.7em;
+    font-size: 1em;
+    padding: 0 0.25em;
+    background: white;
+  }
+}
+
+.disabled {
+  i {
+    color: rgb(212, 207, 207);
+  }
+}
+
+.nav-link{
+  padding: 0px 10px 10px 0px;
+}