Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/header/header.page.html

@@ -55,7 +55,7 @@
 
       </div>
 
-      <div class="d-flex">
+      <div class="header-btns d-flex">
         <div class="mr-10 d-flex align-center cursor-pointer">
           <button (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="btn-no-color">
             <ion-icon class="font-45"   src='assets/images/icons-search.svg'></ion-icon>
@@ -79,9 +79,9 @@
           </div>
         </div>
 
-        <div class="div-profile justify-end d-flex cursor-pointer" (click)="openProfile()">
-          <ion-icon class="font-45" *ngIf="loggeduser.Profile == 'MDGPR'" src='assets/images/icons-profile.svg'></ion-icon>
-          <ion-icon class="font-45" *ngIf="loggeduser.Profile == 'PR' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
+        <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
+          <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
+          <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
         </div>
       </div>
     </div>

src/app/shared/header/header.page.scss

@@ -18,6 +18,35 @@
   margin: 0px auto;
 }
 
+.header-btns{
+  justify-content: center;
+  align-items: center;
+}
+
+.div-profile{
+  width: 90px;
+  height: fit-content;
+  font-size: 45px;
+  justify-content: flex-end;
+  display: flex;
+  background-color: transparent;
+  justify-content: center;
+  align-items: center;
+  overflow: auto;
+
+  .icon{
+    position: relative;
+    border: none !important;
+  }
+
+  .profile-text{
+    font-size: 20px;
+    font-weight: 300;
+    width: fit-content;
+    position: absolute;
+  }
+}
+
 
 .desktop{
   display: none;
@@ -64,4 +93,4 @@
   .icon-z{
     width: 20px;
   }
-}
+}

src/app/shared/header/header.page.ts

@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
 import { ProfileComponent } from '../headers/header-no-search/profile/profile.page';
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
+import { ProfilePage } from 'src/app/modals/profile/profile.page';
 
 @Component({
   selector: 'app-header',
@@ -16,7 +17,7 @@ export class HeaderPage implements OnInit {
   searchSubject: string = '';
   showSearch=false;
   loggeduser: User;
-  
+
   constructor(
     private router: Router,
     private modalController: ModalController,
@@ -100,12 +101,12 @@ export class HeaderPage implements OnInit {
     const leaveAnimation = (baseEl: any) => {
       return enterAnimation(baseEl).direction('reverse');
     }
- 
+
 
     const modal = await this.modalController.create({
       enterAnimation,
       leaveAnimation,
-      component: ProfileComponent,
+      component: ProfilePage,
       cssClass: 'model profile-modal search-submodal',
       componentProps: {
       }
@@ -133,4 +134,4 @@ export class HeaderPage implements OnInit {
    async basicSearch(){
     window['searchTriger']()
    }
-}
+}

src/app/shared/headers/header-no-search/header-no-search.page.html

@@ -57,7 +57,7 @@
         </div> -->
 
         <div class="div-profile d-flex cursor-pointer" (click)="openProfile()">
-          <ion-icon class="icon" src='assets/images/icons-default-profile.svg'></ion-icon>
+          <ion-icon class="icon" src='assets/images/icons-profile.svg'></ion-icon>
           <ion-label class="profile-text">{{loggeduser.Profile}}</ion-label>
         </div>
       </div>