From 181c8f4a9d53f9dfec832a6b70f35f76f66d7210 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 27 Jul 2021 10:42:04 +0100
Subject: [PATCH 1/8] save

---
 src/app/pages/chat/group-messages/group-messages.page.html  | 2 +-
 src/app/pages/chat/messages/messages.page.html              | 2 +-
 src/app/shared/chat/group-messages/group-messages.page.html | 2 +-
 src/app/shared/chat/messages/messages.page.html             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 65b2582ff..6132a87a0 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -86,7 +86,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openChatOptions()">
+      <button class="btn-no-color" > <!-- (click)="openChatOptions()" -->
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 5f3dbf293..02ea4e6c9 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -75,7 +75,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openChatOptions()">
+      <button class="btn-no-color"> <!-- (click)="openChatOptions()" -->
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 1df0d7960..10edb115c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -63,7 +63,7 @@
   <ion-label>{{message}}</ion-label>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
+      <button class="btn-no-color" > <!-- (click)="openSendGroupMessageOptions()" -->
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 0e4ce007b..edd0c5a38 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -50,7 +50,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openSendMessageOptions()">
+      <button class="btn-no-color" > <!-- (click)="openSendMessageOptions()" -->
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>

From 498e279c73a074f5b905bb06bde25dfaa844eca5 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 27 Jul 2021 16:27:49 +0100
Subject: [PATCH 2/8] save

---
 src/app/shared/chat/group-messages/group-messages.page.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 10edb115c..ee1684a2f 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -60,7 +60,6 @@
 </ion-content>
 
 <ion-footer>
-  <ion-label>{{message}}</ion-label>
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" > <!-- (click)="openSendGroupMessageOptions()" -->

From 0d1591465742b7f0f58759d8ad0cfd8a392087d9 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 27 Jul 2021 16:58:38 +0100
Subject: [PATCH 3/8] save

---
 .../gabinete-digital.page.html                |  2 +-
 .../gabinete-digital.page.scss                | 37 ++++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 1a8821117..ca17c7c36 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -11,7 +11,7 @@
   <div class="main-content d-flex height-100 ">
 
       <!-- Aside left -->
-      <div class="aside-wrapper d-flex flex-column justify-center width-md-40 flex-grow-1 ">
+      <div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1 ">
         <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
         <div class="title-container">
           <ion-label class="title">Gabinete Digital</ion-label>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 63a27d761..deb1ddb80 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -12,8 +12,8 @@ ion-content{
     text-align: center;
   }
   .title-container{
-    padding: 30px 20px 0 20px !important;
-    margin-bottom: 15px;
+    padding: 30px 20px 15px 20px !important;
+    //margin-bottom: 15px;
     .btn-no-color{
       display: flex;
       float: right;
@@ -81,7 +81,7 @@ ion-content{
 
 
 /* NEW CSS */
-.main-content { 
+.main-content {
   width: 100%; /* 400px */
   height: 100%;
   font-family: Roboto;
@@ -93,8 +93,11 @@ ion-content{
   border-top-left-radius: 25px;
   border-top-right-radius: 25px;
 
+  .aside-wrapper{
+    //border: 1px solid red;
+  }
+
   .aside{
-    //display: flex;
     align-items: center;
     justify-content: center;
 
@@ -164,7 +167,7 @@ ion-content{
     }
     .exp-card-title p{
       text-align: center;
-    
+
     }
     .exp-card-content{
       font-size: 13px;
@@ -207,14 +210,14 @@ ion-content{
     width: 547px !important;
   }
 }
-@media only screen and (min-width: 749px) {
+/* @media only screen and (min-width: 749px) {
   .exp-card-long{
     width: 734px !important;
   }
-}
+} */
 
 
-@media only screen and (min-width: 801px) {
+@media only screen and (min-width: 701px) {
 
   .main-content{
     .aside-wrapper{
@@ -232,7 +235,7 @@ ion-content{
       }
       .aside-title{
         font-family: Roboto;
-        font-size: 25px;
+        font-size: 16px;
         text-align: left;
       }
       .exp-card{
@@ -243,7 +246,7 @@ ion-content{
         .exp-card-title{
           text-align: left !important;
         }
-      
+
       }
       .exp-card-long{
         //display: none;
@@ -321,6 +324,20 @@ ion-content{
     }
   }
 }
+@media only screen and (min-width: 801px) {
+  .content{
+    width: 65%;
+  }
+
+  .aside-right{
+    width: 35%;
+  }
+  .aside-title{
+    font-family: Roboto;
+    font-size: 25px;
+    text-align: left;
+  }
+}
 @media only screen and (min-width: 1024px){
   .content{
     width: 70%;

From 0f97e31d7f6e4eec1625d23b66e0b27c32293355 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 27 Jul 2021 17:01:19 +0100
Subject: [PATCH 4/8] save

---
 src/app/pages/gabinete-digital/gabinete-digital.page.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index deb1ddb80..27ea59141 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -235,7 +235,7 @@ ion-content{
       }
       .aside-title{
         font-family: Roboto;
-        font-size: 16px;
+        font-size: 16px !important;
         text-align: left;
       }
       .exp-card{

From b11307fdb157651709375f0fae3af687c95bde19 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 28 Jul 2021 08:35:56 +0100
Subject: [PATCH 5/8] save

---
 src/app/pages/gabinete-digital/gabinete-digital.page.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 27ea59141..6ee1f0446 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -218,6 +218,9 @@ ion-content{
 
 
 @media only screen and (min-width: 701px) {
+  .title{
+    font-size: 15px !important;
+  }
 
   .main-content{
     .aside-wrapper{
@@ -325,6 +328,9 @@ ion-content{
   }
 }
 @media only screen and (min-width: 801px) {
+  .title{
+    font-size: 25px;
+  }
   .content{
     width: 65%;
   }

From e76c41a6bbb5886d70ef42e6de8f1f732260619f Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 28 Jul 2021 09:29:14 +0100
Subject: [PATCH 6/8] remove components folder, as not being used.

---
 src/app/app-routing.module.ts                 |  4 +++
 src/app/app.module.ts                         | 15 +++++-----
 src/app/components/components.module.ts       | 12 --------
 src/app/home/home-routing.module.ts           |  1 -
 src/app/home/home.module.ts                   |  2 --
 src/app/home/home.page.ts                     |  8 +++---
 .../document-detail/document-detail.module.ts |  4 +--
 .../modals/profile/profile-routing.module.ts  | 17 +++++++++++
 src/app/modals/profile/profile.module.ts      | 20 +++++++++++++
 src/app/modals/profile/profile.page.html      |  9 ++++++
 src/app/modals/profile/profile.page.scss      |  0
 src/app/modals/profile/profile.page.spec.ts   | 24 ++++++++++++++++
 src/app/modals/profile/profile.page.ts        | 15 ++++++++++
 src/app/pages/agenda/agenda.module.ts         |  6 ++--
 .../agenda/view-event/view-event.module.ts    |  4 +--
 src/app/pages/chat/chat.module.ts             |  4 +--
 .../chat/edit-group/edit-group.module.ts      |  4 +--
 .../group-contacts/group-contacts.module.ts   |  4 +--
 .../group-messages/group-messages.module.ts   |  4 +--
 .../chat/messages/contacts/contacts.module.ts |  4 +--
 .../pages/chat/messages/messages.module.ts    |  4 +--
 .../new-group/contacts/contacts.module.ts     |  4 +--
 .../new-group/group-chat/group-chat.module.ts |  4 +--
 .../pages/chat/new-group/new-group.module.ts  |  4 +--
 src/app/pages/events/events.module.ts         |  4 +--
 .../despacho-pr/despacho-pr.module.ts         |  4 +--
 .../despachos-pr/despachos-pr.module.ts       |  4 +--
 .../despachos/despacho/despacho.module.ts     |  4 +--
 .../despachos/despachos.module.ts             |  4 +--
 .../diploma-assinar/diploma-assinar.module.ts |  4 +--
 .../diplomas-assinar.module.ts                |  4 +--
 .../diplomas/diploma/diploma.module.ts        |  4 +--
 .../diplomas/diplomas.module.ts               |  4 +--
 .../approve-event/approve-event.module.ts     |  4 +--
 .../event-list/event-list.module.ts           |  4 +--
 .../expediente-detail.module.ts               |  4 +--
 .../expediente/expediente.module.ts           |  4 +--
 .../expediente-pr/expediente-pr.module.ts     |  4 +--
 .../expedientes-pr/expedientes-pr.module.ts   |  4 +--
 .../gabinete-digital.module.ts                |  4 +--
 .../pedidos/pedido/pedido.module.ts           |  4 +--
 .../pedidos/pedidos.module.ts                 |  4 +--
 .../pendentes/pendentes.module.ts             |  4 +--
 .../pages/publications/publications.module.ts |  4 +--
 .../view-publications.module.ts               |  4 +--
 src/app/pages/search/search.module.ts         |  4 +--
 .../pendentes-resolver.service.spec.ts        | 16 -----------
 .../resolvers/pendentes-resolver.service.ts   | 28 -------------------
 .../processes-resolver.service.spec.ts        | 16 -----------
 .../resolvers/processes-resolver.service.ts   | 21 --------------
 .../agenda/view-event/view-event.module.ts    |  2 +-
 .../chat/edit-group/edit-group.module.ts      |  4 +--
 .../group-contacts/group-contacts.module.ts   |  4 +--
 .../group-messages/group-messages.module.ts   |  4 +--
 .../chat/messages/contacts/contacts.module.ts |  2 --
 .../shared/chat/messages/messages.module.ts   |  2 --
 .../new-group/contacts/contacts.module.ts     |  2 --
 .../new-group/group-chat/group-chat.module.ts |  2 --
 .../shared/chat/new-group/new-group.module.ts |  2 --
 .../edit-event.module.ts                      |  2 --
 .../chat-popover/chat-popover.module.ts       |  2 --
 .../opts-expediente/opts-expediente.module.ts |  2 --
 ...igital-gabinete-digital-module.js.download |  6 ++--
 63 files changed, 179 insertions(+), 203 deletions(-)
 delete mode 100644 src/app/components/components.module.ts
 create mode 100644 src/app/modals/profile/profile-routing.module.ts
 create mode 100644 src/app/modals/profile/profile.module.ts
 create mode 100644 src/app/modals/profile/profile.page.html
 create mode 100644 src/app/modals/profile/profile.page.scss
 create mode 100644 src/app/modals/profile/profile.page.spec.ts
 create mode 100644 src/app/modals/profile/profile.page.ts
 delete mode 100644 src/app/resolvers/pendentes-resolver.service.spec.ts
 delete mode 100644 src/app/resolvers/pendentes-resolver.service.ts
 delete mode 100644 src/app/resolvers/processes-resolver.service.spec.ts
 delete mode 100644 src/app/resolvers/processes-resolver.service.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index eaeb56b01..95fbf960e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -155,6 +155,10 @@ const routes = [
     path: 'inactivity',
     loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule)
   },
+  {
+    path: 'profile',
+    loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule)
+  },
 
 
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d3cfce314..30d2fd1be 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -37,21 +37,20 @@ import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-compo
 
 
 import {
-  NgxMatDatetimePickerModule, 
-  NgxMatNativeDateModule, 
-  NgxMatTimepickerModule 
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
 } from '@angular-material-components/datetime-picker';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSelectModule } from '@angular/material/select';
 import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
 import { MatButtonModule } from '@angular/material/button';
-import { ProcessesResolverService } from './resolvers/processes-resolver.service';
 import { HttpClient } from '@angular/common/http';
 
 @NgModule({
   declarations: [AppComponent],
   entryComponents: [],
-  imports: [BrowserModule, 
+  imports: [BrowserModule,
     CommonModule,
     FormsModule,
     CalendarModule.forRoot({
@@ -60,9 +59,9 @@ import { HttpClient } from '@angular/common/http';
     }),
     IonicModule.forRoot({animated: false}),
     IonicStorageModule.forRoot(),
-    AppRoutingModule, 
-    HttpClientModule, 
-    // NgbModule, 
+    AppRoutingModule,
+    HttpClientModule,
+    // NgbModule,
     NoopAnimationsModule,
     MatDatepickerModule,
 
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
deleted file mode 100644
index 3cdff95ee..000000000
--- a/src/app/components/components.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-@NgModule({
-
-  declarations: [],
-  exports: [],
-  imports: [
-    CommonModule,
-  ]
-})
-export class ComponentsModule { }
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 12ce18448..7281dfea6 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -223,7 +223,6 @@ const routes: Routes = [
               {
                 path: '',
                 loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then(m => m.DiplomasAssinarPageModule),
-               /*  resolve { diplomas: ProcessesResolverService}, */
               },
               {
                 path:':SerialNumber/:caller',
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 5cdd67938..c978800ce 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -8,7 +8,6 @@ import { HomePageRoutingModule } from './home-routing.module';
 
 import { HomePage } from './home.page';
 /* import { IonicSelectableModule } from 'ionic-selectable'; */
-import { ComponentsModule } from '../components/components.module';
 
 @NgModule({
   imports: [
@@ -16,7 +15,6 @@ import { ComponentsModule } from '../components/components.module';
     FormsModule,
     IonicModule,
     HomePageRoutingModule,
-    ComponentsModule
   ],
   declarations: [HomePage],
 })
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index dd2c0a172..b0b25c3e9 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -85,8 +85,8 @@ export class HomePage implements OnInit {
     if(this.platform.is('desktop') || this.platform.is('mobileweb')) {
       console.log('Notifications not supported')
     } else {
-      this.mobilefirstConnect();
-      this.notificatinsservice.onReceviNotification();
+      /* this.mobilefirstConnect();
+      this.notificatinsservice.onReceviNotification(); */
     }
 
   }
@@ -97,11 +97,11 @@ export class HomePage implements OnInit {
       window['WLAuthorizationManager'].obtainAccessToken("").then( (token) => {
 
         console.log('MobileFirst Server connect: Success ' + token);
-    
+
         var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
           WLResourceRequest.GET
         );
-  
+
         resourceRequest.setQueryParameter("name", "world");
         resourceRequest.send().then(
           (response) => {
diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts
index 809d618a0..d76773d26 100644
--- a/src/app/modals/document-detail/document-detail.module.ts
+++ b/src/app/modals/document-detail/document-detail.module.ts
@@ -8,7 +8,7 @@ import { DocumentDetailPageRoutingModule } from './document-detail-routing.modul
 
 import { DocumentDetailPage } from './document-detail.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DocumentDetailPageRoutingModule,
     BtnModalDismissPageModule,
   ],
diff --git a/src/app/modals/profile/profile-routing.module.ts b/src/app/modals/profile/profile-routing.module.ts
new file mode 100644
index 000000000..a7052f82c
--- /dev/null
+++ b/src/app/modals/profile/profile-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ProfilePage } from './profile.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ProfilePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ProfilePageRoutingModule {}
diff --git a/src/app/modals/profile/profile.module.ts b/src/app/modals/profile/profile.module.ts
new file mode 100644
index 000000000..f87f01cb6
--- /dev/null
+++ b/src/app/modals/profile/profile.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ProfilePageRoutingModule } from './profile-routing.module';
+
+import { ProfilePage } from './profile.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ProfilePageRoutingModule
+  ],
+  declarations: [ProfilePage]
+})
+export class ProfilePageModule {}
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
new file mode 100644
index 000000000..428d7d1f5
--- /dev/null
+++ b/src/app/modals/profile/profile.page.html
@@ -0,0 +1,9 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>profile</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+
+</ion-content>
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modals/profile/profile.page.spec.ts b/src/app/modals/profile/profile.page.spec.ts
new file mode 100644
index 000000000..8027310d0
--- /dev/null
+++ b/src/app/modals/profile/profile.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ProfilePage } from './profile.page';
+
+describe('ProfilePage', () => {
+  let component: ProfilePage;
+  let fixture: ComponentFixture<ProfilePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProfilePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ProfilePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
new file mode 100644
index 000000000..e24f8f60a
--- /dev/null
+++ b/src/app/modals/profile/profile.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-profile',
+  templateUrl: './profile.page.html',
+  styleUrls: ['./profile.page.scss'],
+})
+export class ProfilePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts
index 6e85614ce..7fd6a22b8 100644
--- a/src/app/pages/agenda/agenda.module.ts
+++ b/src/app/pages/agenda/agenda.module.ts
@@ -17,7 +17,7 @@ registerLocaleData(localeDe);
 import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 
 
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@@ -37,12 +37,12 @@ import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-t
     CommonModule,
     FormsModule,
     IonicModule,
-    /* ComponentsModule, */
+    /*  */
     CalendarModule.forRoot({
       provide: DateAdapter,
       useFactory: adapterFactory
     }),
-    ComponentsModule,
+
     AgendaPageRoutingModule,
     NgCalendarModule,
     // entryComponents
diff --git a/src/app/pages/agenda/view-event/view-event.module.ts b/src/app/pages/agenda/view-event/view-event.module.ts
index bc0bf102f..29247adab 100644
--- a/src/app/pages/agenda/view-event/view-event.module.ts
+++ b/src/app/pages/agenda/view-event/view-event.module.ts
@@ -8,7 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
 
 import { ViewEventPage } from './view-event.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ViewEventPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts
index 85c8c34bb..c8480955d 100644
--- a/src/app/pages/chat/chat.module.ts
+++ b/src/app/pages/chat/chat.module.ts
@@ -17,7 +17,7 @@ import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
 import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page';
 import { PipesModule } from 'src/app/pipes/pipes.module';
 import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { ContactsPageModule } from 'src/app/shared/chat/messages/contacts/contacts.module';
 import { GroupMessagesPageModule } from 'src/app/shared/chat/group-messages/group-messages.module';
 import { NewGroupPageModule } from 'src/app/shared/chat/new-group/new-group.module';
@@ -32,7 +32,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PipesModule,
     ChatPageRoutingModule,
     RouterModule,
diff --git a/src/app/pages/chat/edit-group/edit-group.module.ts b/src/app/pages/chat/edit-group/edit-group.module.ts
index 76bd8d362..34c8f0802 100644
--- a/src/app/pages/chat/edit-group/edit-group.module.ts
+++ b/src/app/pages/chat/edit-group/edit-group.module.ts
@@ -8,7 +8,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
 
 import { EditGroupPage } from './edit-group.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     EditGroupPageRoutingModule,
     BtnSeguintePageModule,
   ],
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
index e993e9da3..9878353f5 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
@@ -9,7 +9,7 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
 import { GroupContactsPage } from './group-contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { PipesModule } from 'src/app/pipes/pipes.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -17,7 +17,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PipesModule,
     GroupContactsPageRoutingModule,
     BtnSeguintePageModule,
diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts
index 4157e85c1..1dfcecefa 100644
--- a/src/app/pages/chat/group-messages/group-messages.module.ts
+++ b/src/app/pages/chat/group-messages/group-messages.module.ts
@@ -8,7 +8,7 @@ import { IonicModule } from '@ionic/angular';
 import { GroupMessagesPageRoutingModule } from './group-messages-routing.module';
 
 import { GroupMessagesPage } from './group-messages.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -18,7 +18,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     BrowserModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     GroupMessagesPageRoutingModule,
     ChatPopoverPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/pages/chat/messages/contacts/contacts.module.ts
index ca2f6bc11..7078e0cb5 100644
--- a/src/app/pages/chat/messages/contacts/contacts.module.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.module.ts
@@ -9,7 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
 import { ContactsPage } from './contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { PipesModule } from 'src/app/pipes/pipes.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { FilterPipe } from 'src/app/pipes/filter.pipe';
 
 @NgModule({
@@ -17,7 +17,7 @@ import { FilterPipe } from 'src/app/pipes/filter.pipe';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ContactsPageRoutingModule,
     PipesModule,
   ],
diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/pages/chat/messages/messages.module.ts
index 94397377a..bfcf1d45d 100644
--- a/src/app/pages/chat/messages/messages.module.ts
+++ b/src/app/pages/chat/messages/messages.module.ts
@@ -9,14 +9,14 @@ import { MessagesPageRoutingModule } from './messages-routing.module';
 import { MessagesPage } from './messages.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     MessagesPageRoutingModule
   ],
   declarations: [MessagesPage]
diff --git a/src/app/pages/chat/new-group/contacts/contacts.module.ts b/src/app/pages/chat/new-group/contacts/contacts.module.ts
index 942581b58..4c4ec76ec 100644
--- a/src/app/pages/chat/new-group/contacts/contacts.module.ts
+++ b/src/app/pages/chat/new-group/contacts/contacts.module.ts
@@ -8,7 +8,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
 
 import { ContactsPage } from './contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ContactsPageRoutingModule,
     BtnSeguintePageModule,
   ],
diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
index 2db5ec117..ebd13e04a 100644
--- a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
+++ b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts
@@ -8,7 +8,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
 
 import { GroupChatPage } from './group-chat.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     GroupChatPageRoutingModule,
     BtnSeguintePageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/chat/new-group/new-group.module.ts b/src/app/pages/chat/new-group/new-group.module.ts
index f96c28444..13d095ef6 100644
--- a/src/app/pages/chat/new-group/new-group.module.ts
+++ b/src/app/pages/chat/new-group/new-group.module.ts
@@ -8,7 +8,7 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module';
 
 import { NewGroupPage } from './new-group.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     NewGroupPageRoutingModule,
     BtnSeguintePageModule,
   ],
diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts
index ffcaef135..3f6e79aaf 100644
--- a/src/app/pages/events/events.module.ts
+++ b/src/app/pages/events/events.module.ts
@@ -8,7 +8,7 @@ import { EventsPageRoutingModule } from './events-routing.module';
 
 import { EventsPage } from './events.page';
 // import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-search/header-no-search.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-searc
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     EventsPageRoutingModule,
     HeaderNoSearchPageModule,
   ],
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts
index 5f7334e9a..5246c81ef 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts
@@ -8,7 +8,7 @@ import { DespachoPrPageRoutingModule } from './despacho-pr-routing.module';
 
 import { DespachoPrPage } from './despacho-pr.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DespachoPrPageRoutingModule,
     HeaderPageModule,
   ],
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts
index d72c2557b..276e09b20 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts
@@ -8,7 +8,7 @@ import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
 
 import { DespachosPrPage } from './despachos-pr.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DespachosPrPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
index 0579462ea..6b4de5340 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
@@ -8,7 +8,7 @@ import { DespachoPageRoutingModule } from './despacho-routing.module';
 
 import { DespachoPage } from './despacho.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DespachoPageRoutingModule,
     HeaderPageModule,
   ],
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
index 202bb6d84..e130dc791 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts
@@ -8,7 +8,7 @@ import { DespachosPageRoutingModule } from './despachos-routing.module';
 
 import { DespachosPage } from './despachos.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DespachosPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
index a9790731b..b5063c3de 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
@@ -8,7 +8,7 @@ import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.modul
 
 import { DiplomaAssinarPage } from './diploma-assinar.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DiplomaAssinarPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
index 1edfe392b..a1ccfc2a2 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
@@ -8,7 +8,7 @@ import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.mod
 
 import { DiplomasAssinarPage } from './diplomas-assinar.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -19,7 +19,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     IonicModule,
     DiplomasAssinarPageRoutingModule,
     HeaderPageModule,
-    ComponentsModule,
+
     BtnModalDismissPageModule,
   ],
   declarations: [DiplomasAssinarPage]
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
index 1a2611227..c10678733 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
@@ -8,7 +8,7 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module';
 
 import { DiplomaPage } from './diploma.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     DiplomaPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts
index fd3b5cef5..6ff7c8144 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
 import { DiplomasPageRoutingModule } from './diplomas-routing.module';
 
 import { DiplomasPage } from './diplomas.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -18,7 +18,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     IonicModule,
     DiplomasPageRoutingModule,
     HeaderPageModule,
-    ComponentsModule,
+
     BtnModalDismissPageModule,
   ],
   declarations: [DiplomasPage]
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts
index b5ebe2d40..b44da5b51 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts
@@ -8,7 +8,7 @@ import { ApproveEventPageRoutingModule } from './approve-event-routing.module';
 
 import { ApproveEventPage } from './approve-event.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ApproveEventPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.module.ts b/src/app/pages/gabinete-digital/event-list/event-list.module.ts
index c3419a8fb..7f7765bb3 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.module.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.module.ts
@@ -8,7 +8,7 @@ import { EventListPageRoutingModule } from './event-list-routing.module';
 
 import { EventListPage } from './event-list.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     EventListPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
index 62f2040d8..0fe73f6b1 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
@@ -8,7 +8,7 @@ import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.m
 
 import { ExpedienteDetailPage } from './expediente-detail.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ExpedienteDetailPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts
index 7d0427077..b25bc6c30 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts
@@ -8,7 +8,7 @@ import { ExpedientePageRoutingModule } from './expediente-routing.module';
 
 import { ExpedientePage } from './expediente.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ExpedientePageRoutingModule,
     HeaderPageModule,
   ],
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
index 2902a511a..bd71cffc0 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
@@ -8,7 +8,7 @@ import { ExpedientePrPageRoutingModule } from './expediente-pr-routing.module';
 
 import { ExpedientePrPage } from './expediente-pr.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ExpedientePrPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts
index b5a5deeea..b93e898cc 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts
@@ -8,7 +8,7 @@ import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module'
 
 import { ExpedientesPrPage } from './expedientes-pr.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -19,7 +19,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     IonicModule,
     ExpedientesPrPageRoutingModule,
     HeaderPageModule,
-    ComponentsModule,
+
     BtnModalDismissPageModule,
   ],
   declarations: [ExpedientesPrPage]
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
index 6cb489df0..cba285667 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts
@@ -20,7 +20,7 @@ import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/de
 import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
 import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page';
 import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
 import { ExpedientsPageModule } from 'src/app/shared/gabinete-digital/expedients/expedients.module';
@@ -39,7 +39,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     GabineteDigitalPageRoutingModule,
     //
     HeaderPageModule,
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
index c6b78fdf1..aa8656d3d 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
@@ -8,7 +8,7 @@ import { PedidoPageRoutingModule } from './pedido-routing.module';
 
 import { PedidoPage } from './pedido.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PedidoPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts
index 2d25777e3..d8bcece1e 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts
@@ -8,7 +8,7 @@ import { PedidosPageRoutingModule } from './pedidos-routing.module';
 
 import { PedidosPage } from './pedidos.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PedidosPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts
index 483c1523d..22787ed6b 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts
@@ -8,7 +8,7 @@ import { PendentesPageRoutingModule } from './pendentes-routing.module';
 
 import { PendentesPage } from './pendentes.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PendentesPageRoutingModule,
     HeaderPageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts
index a5dc16845..0a65732bf 100644
--- a/src/app/pages/publications/publications.module.ts
+++ b/src/app/pages/publications/publications.module.ts
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
 import { PublicationsPageRoutingModule } from './publications-routing.module';
 
 import { PublicationsPage } from './publications.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publications/view-publications.module';
 import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module';
 import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module';
@@ -20,7 +20,7 @@ import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edi
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     PublicationsPageRoutingModule,
     HeaderPageModule,
     ViewPublicationsPageModule,
diff --git a/src/app/pages/publications/view-publications/view-publications.module.ts b/src/app/pages/publications/view-publications/view-publications.module.ts
index 795264add..d05bd8b49 100644
--- a/src/app/pages/publications/view-publications/view-publications.module.ts
+++ b/src/app/pages/publications/view-publications/view-publications.module.ts
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
 import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module';
 
 import { ViewPublicationsPage } from './view-publications.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { HeaderPageModule } from 'src/app/shared/header/header.module';
 
 @NgModule({
@@ -15,7 +15,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ViewPublicationsPageRoutingModule,
     HeaderPageModule,
   ],
diff --git a/src/app/pages/search/search.module.ts b/src/app/pages/search/search.module.ts
index e6dcb0981..9191a7ca8 100644
--- a/src/app/pages/search/search.module.ts
+++ b/src/app/pages/search/search.module.ts
@@ -8,7 +8,7 @@ import { SearchPageRoutingModule } from './search-routing.module';
 
 import { SearchPage } from './search.page';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
-/* import { ComponentsModule } from 'src/app/components/components.module'; */
+/*  */
 /* import { TagCloudModule } from 'angular-tag-cloud-module'; */
 
 @NgModule({
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     FormsModule,
     IonicModule,
     /* TagCloudModule, */
-    /* ComponentsModule, */
+    /*  */
     SearchPageRoutingModule,
     BtnModalDismissPageModule,
   ],
diff --git a/src/app/resolvers/pendentes-resolver.service.spec.ts b/src/app/resolvers/pendentes-resolver.service.spec.ts
deleted file mode 100644
index 3a816d759..000000000
--- a/src/app/resolvers/pendentes-resolver.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { PendentesResolverService } from './pendentes-resolver.service';
-
-describe('PendentesResolverService', () => {
-  let service: PendentesResolverService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(PendentesResolverService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/resolvers/pendentes-resolver.service.ts b/src/app/resolvers/pendentes-resolver.service.ts
deleted file mode 100644
index d7adabe52..000000000
--- a/src/app/resolvers/pendentes-resolver.service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { ProcessesService } from '../services/processes.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class PendentesResolverService implements Resolve<any> {
-
-  constructor(
-    private processesService: ProcessesService,
-  ) { }
-
-  async resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
-  Promise<any> {
-
-    let despachos = await this.processesService.GetTasksList("Despacho", false).toPromise();
-    let pareceres = await this.processesService.GetTasksList("Pedido de Parecer", false).toPromise();
-    let deferimentos = await this.processesService.GetTasksList("Pedido de Deferimento", false).toPromise();
-    let expedientes = await this.processesService.GetTasksList("Expediente", false).toPromise();
-    let expedientes_pr = await this.processesService.GetTasksList("Expediente do Presidente", false).toPromise();
-
-    let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).filter(data => data.workflowInstanceDataFields.Status == "Pending");
-    
-    return pendentes;
-  }
-}
diff --git a/src/app/resolvers/processes-resolver.service.spec.ts b/src/app/resolvers/processes-resolver.service.spec.ts
deleted file mode 100644
index 300778951..000000000
--- a/src/app/resolvers/processes-resolver.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ProcessesResolverService } from './processes-resolver.service';
-
-describe('ProcessesResolverService', () => {
-  let service: ProcessesResolverService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ProcessesResolverService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/resolvers/processes-resolver.service.ts b/src/app/resolvers/processes-resolver.service.ts
deleted file mode 100644
index 63de8879d..000000000
--- a/src/app/resolvers/processes-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { ProcessesService } from '../services/processes.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ProcessesResolverService implements Resolve<any> {
-
-  constructor(
-    private processesService: ProcessesService,
-  ) { }
-
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
-  Observable<any> | Promise<any> | any {
-    /* const n: any = [{numero: '1', n2:'3e'}]
-    return n; */
-    return this.processesService.GetTasksList("Despacho do Presidente da República", false);
-  }
-}
diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts
index ec2133b67..c4cc69858 100644
--- a/src/app/shared/agenda/view-event/view-event.module.ts
+++ b/src/app/shared/agenda/view-event/view-event.module.ts
@@ -9,7 +9,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
 import { ViewEventPage } from './view-event.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 
 @NgModule({
   imports: [
diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts
index 62da945f7..7326f844f 100644
--- a/src/app/shared/chat/edit-group/edit-group.module.ts
+++ b/src/app/shared/chat/edit-group/edit-group.module.ts
@@ -8,7 +8,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
 
 import { EditGroupPage } from './edit-group.page';
 import { SharedModule } from '../../shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     EditGroupPageRoutingModule,
     BtnSeguintePageModule,
   ],
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts
index 98a13031c..1433b2c25 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts
@@ -9,14 +9,14 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
 import { GroupContactsPage } from './group-contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { PipesModule } from 'src/app/pipes/pipes.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     GroupContactsPageRoutingModule,
     PipesModule,
   ],
diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts
index 73a6eda80..3e2105b62 100644
--- a/src/app/shared/chat/group-messages/group-messages.module.ts
+++ b/src/app/shared/chat/group-messages/group-messages.module.ts
@@ -8,7 +8,7 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module'
 
 import { GroupMessagesPage } from './group-messages.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
+
 import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module';
 
 @NgModule({
@@ -16,7 +16,7 @@ import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.m
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
+
     ChatPopoverPageModule,
     GroupMessagesPageRoutingModule
   ],
diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts
index 56e3bca48..2fbc17124 100644
--- a/src/app/shared/chat/messages/contacts/contacts.module.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.module.ts
@@ -9,7 +9,6 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
 import { ContactsPage } from './contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { FilterPipe } from 'src/app/pipes/filter.pipe';
-import { ComponentsModule } from 'src/app/components/components.module';
 import { PipesModule } from 'src/app/pipes/pipes.module';
 
 @NgModule({
@@ -17,7 +16,6 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     ContactsPageRoutingModule,
     PipesModule,
   ],
diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/shared/chat/messages/messages.module.ts
index 455729837..209edd0a0 100644
--- a/src/app/shared/chat/messages/messages.module.ts
+++ b/src/app/shared/chat/messages/messages.module.ts
@@ -8,14 +8,12 @@ import { MessagesPageRoutingModule } from './messages-routing.module';
 
 import { MessagesPage } from './messages.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     MessagesPageRoutingModule
   ],
   exports: [MessagesPage],
diff --git a/src/app/shared/chat/new-group/contacts/contacts.module.ts b/src/app/shared/chat/new-group/contacts/contacts.module.ts
index 942581b58..f84088ee3 100644
--- a/src/app/shared/chat/new-group/contacts/contacts.module.ts
+++ b/src/app/shared/chat/new-group/contacts/contacts.module.ts
@@ -8,7 +8,6 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
 
 import { ContactsPage } from './contacts.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 
 @NgModule({
@@ -16,7 +15,6 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     ContactsPageRoutingModule,
     BtnSeguintePageModule,
   ],
diff --git a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
index 2db5ec117..0947edd4a 100644
--- a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
+++ b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts
@@ -8,7 +8,6 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
 
 import { GroupChatPage } from './group-chat.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
 import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
@@ -17,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     GroupChatPageRoutingModule,
     BtnSeguintePageModule,
     BtnModalDismissPageModule,
diff --git a/src/app/shared/chat/new-group/new-group.module.ts b/src/app/shared/chat/new-group/new-group.module.ts
index b9ea20a58..5add6b58f 100644
--- a/src/app/shared/chat/new-group/new-group.module.ts
+++ b/src/app/shared/chat/new-group/new-group.module.ts
@@ -8,14 +8,12 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module';
 
 import { NewGroupPage } from './new-group.page';
 import { SharedModule } from 'src/app/shared/shared.module';
-import { ComponentsModule } from 'src/app/components/components.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     NewGroupPageRoutingModule
   ],
   exports: [NewGroupPage],
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts
index 9d58d9292..eb34ada4f 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts
@@ -6,7 +6,6 @@ import { IonicModule } from '@ionic/angular';
 import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.module';
 
 import { EditEventToApproveComponent } from './edit-event.page';
-import { ComponentsModule } from 'src/app/components/components.module';
 
 
 import { MatNativeDateModule } from '@angular/material/core';
@@ -29,7 +28,6 @@ import { MatDialogModule } from '@angular/material/dialog';
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     EditEventToApproveComponentRoutingModule,
     // Angular material
     MatDatepickerModule,
diff --git a/src/app/shared/popover/chat-popover/chat-popover.module.ts b/src/app/shared/popover/chat-popover/chat-popover.module.ts
index 4c2489a0e..22cf03c30 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.module.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.module.ts
@@ -7,14 +7,12 @@ import { IonicModule } from '@ionic/angular';
 import { ChatPopoverPageRoutingModule } from './chat-popover-routing.module';
 
 import { ChatPopoverPage } from './chat-popover.page';
-import { ComponentsModule } from 'src/app/components/components.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     ChatPopoverPageRoutingModule
   ],
   exports: [ChatPopoverPage],
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.module.ts b/src/app/shared/popover/opts-expediente/opts-expediente.module.ts
index 755345c1d..f2d9a571d 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.module.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.module.ts
@@ -7,14 +7,12 @@ import { IonicModule } from '@ionic/angular';
 import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module';
 
 import { OptsExpedientePage } from './opts-expediente.page';
-import { ComponentsModule } from 'src/app/components/components.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    ComponentsModule,
     OptsExpedientePageRoutingModule
   ],
   declarations: [OptsExpedientePage]
diff --git a/src/assets/images/Gabinete Digital_files/pages-gabinete-digital-gabinete-digital-module.js.download b/src/assets/images/Gabinete Digital_files/pages-gabinete-digital-gabinete-digital-module.js.download
index 4891cc4ca..5662f5b86 100644
--- a/src/assets/images/Gabinete Digital_files/pages-gabinete-digital-gabinete-digital-module.js.download	
+++ b/src/assets/images/Gabinete Digital_files/pages-gabinete-digital-gabinete-digital-module.js.download	
@@ -86,7 +86,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/* import { ComponentsModule } from 'src/app/components/components.module'; */
+/*  */
 let GabineteDigitalPageModule = class GabineteDigitalPageModule {
 };
 GabineteDigitalPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
@@ -95,7 +95,7 @@ GabineteDigitalPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorat
             _angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"],
             _angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"],
             _ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"],
-            /* ComponentsModule, */
+            /*  */
             _gabinete_digital_routing_module__WEBPACK_IMPORTED_MODULE_5__["GabineteDigitalPageRoutingModule"]
         ],
         declarations: [_gabinete_digital_page__WEBPACK_IMPORTED_MODULE_6__["GabineteDigitalPage"]],
@@ -193,4 +193,4 @@ GabineteDigitalPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
 /***/ })
 
 }]);
-//# sourceMappingURL=pages-gabinete-digital-gabinete-digital-module.js.map
\ No newline at end of file
+//# sourceMappingURL=pages-gabinete-digital-gabinete-digital-module.js.map

From ba82497d8e24d5a971a93f731546dc9559263496 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 28 Jul 2021 09:34:11 +0100
Subject: [PATCH 7/8] save

---
 src/app/modals/profile/profile.page.html |  85 ++++++++++++-
 src/app/modals/profile/profile.page.scss |  64 ++++++++++
 src/app/modals/profile/profile.page.ts   | 149 ++++++++++++++++++++++-
 3 files changed, 290 insertions(+), 8 deletions(-)

diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 428d7d1f5..df059333e 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -1,9 +1,82 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>profile</ion-title>
-  </ion-toolbar>
-</ion-header>
+<ion-content class=" bg-blue">
 
-<ion-content>
+  <div class="profile-content">
+
+    <div class="d-flex justify-space-between align-center">
+      <div class="go-back d-flex align-center"  (click)="close()">
+        <ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
+      </div>
+
+      <!-- <div class="d-flex " (click)="close()">
+        <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+      </div> -->
+    </div>
+
+    <div >
+      <div class="d-flex align-center">
+        <ion-icon  class="profile-pic"  name="add-circle-outline"></ion-icon>
+      </div>
+    </div>
+
+    <div class="profile-info">
+      <div class="label-text">Dados Perfil</div>
+      <div class="user-role">{{loggeduser.RoleDescription}}</div>
+      <div class="email">{{loggeduser.Email}}</div>
+    </div>
+
+    <div class="login-preference" (mouseover)="checkState()" (click)="checkState()">
+      <div class="preference">Preferência Login</div>
+
+      <ion-row>
+        <ion-col class="align-center d-flex">
+          <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
+            <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
+            PIN
+          </div>
+
+        </ion-col>
+        <ion-col class="align-center d-flex">
+          <div (click)="addFingerprint()" class="d-flex align-center">
+            <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
+            Impressão Digital
+          </div>
+        </ion-col>
+
+      </ion-row>
+
+    </div>
+
+    <div class="d-flex justify-center mt-10">
+      <ion-buttons slot="start" class="buttonSize" (click)="logout()" >
+        <ion-button class="btn-cancel buttonSize" fill="clear" style="background:#ffe0e0;" >
+          <ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
+        </ion-button>
+      </ion-buttons>
+    </div>
+
+    <div class="d-flex justify-center mt-10">
+      <ion-button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
+        <ion-label>Alterar PIN</ion-label>
+      </ion-button>
+    </div>
+  </div>
 
 </ion-content>
+
+<!-- <ion-footer class=" footer-container ion-no-border bg-blue">
+
+  <div class="d-flex justify-space-between">
+
+    <ion-buttons slot="start" (click)="close()">
+      <ion-button class="btn-cancel" fill="clear" color="#061b52" >
+        <ion-label>Cancelar</ion-label>
+      </ion-button>
+      </ion-buttons>
+      <ion-buttons slot="end" (click)="close()">
+        <ion-button class="btn-ok" fill="clear" color="#fff" >
+          <ion-label>Gravar</ion-label>
+        </ion-button>
+      </ion-buttons>
+  </div>
+
+</ion-footer> -->
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index e69de29bb..65d3675e1 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -0,0 +1,64 @@
+.profile-content{
+  padding: 20px 20px;
+}
+
+.icon{
+  font-size: 35px;
+}
+
+.go-back{
+  font-family: Roboto;
+  font-size: 25px;
+  .icon{
+      margin-right: 7px;
+  }
+}
+
+.profile-pic{
+  width: 200px;
+  height: 200px;
+  border-radius: 20px;
+  margin: 0px auto;
+}
+
+.profile-info{
+  .label-text{
+      font-size: 15px;
+      font-weight: bold;
+      color: white;
+      margin-bottom: 10px;
+  }
+
+  .user-role{
+      background-color: white;
+      border-radius: 5px;
+      padding: 12px;
+      font-family: Roboto;
+      font-size: 13px;
+      color: black;
+      text-align: center;
+  }
+
+  .email {
+      margin-top: 15px;
+  }
+
+}
+
+.login-preference{
+  margin-top: 44px;
+
+  .preference{
+      font-family: Roboto;
+      font-size: 15px;
+      margin-bottom: 20px;
+      font-weight: bold;
+  }
+  .checkBox{
+      margin-right: 10px;
+  }
+}
+
+.buttonSize {
+  width: 100% !important;
+}
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index e24f8f60a..d77d04348 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -1,4 +1,11 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { AnimationController, ModalController } from '@ionic/angular';
+import { User } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
+import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
+import { PinPage } from 'src/app/shared/pin/pin.page';
+import { LocalstoreService } from 'src/app/store/localstore.service';
 
 @Component({
   selector: 'app-profile',
@@ -7,9 +14,147 @@ import { Component, OnInit } from '@angular/core';
 })
 export class ProfilePage implements OnInit {
 
-  constructor() { }
+  loggeduser: User;
+  userLoginPreference = ''
+
+  constructor(private modalController:ModalController,
+    private authService: AuthService,
+    private animationController: AnimationController,
+    private router: Router,
+    private localstoreService: LocalstoreService
+    ) {
+
+    this.loggeduser = authService.ValidatedUser;
+
+    console.log(this.loggeduser.RoleDescription)
+
+    this.checkState()
+  }
+
+  ngOnInit() {}
+
+  close() {
+    this.modalController.dismiss();
+  }
+
+  async addPin() {
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: PinPage,
+      cssClass: 'model profile-modal',
+      componentProps: {
+      }
+    });
+
+    modal.present();
+  }
+
+
+  async addFingerprint() {
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: FingerprintPage,
+      cssClass: 'model profile-modal',
+      componentProps: {
+      }
+    });
+
+    modal.present();
+  }
+
+  logout() {
+    // clear local storage
+    window.localStorage.clear();
+
+    setTimeout(()=>{
+      window.location.pathname = '/'
+      location.reload();
+    }, 1000)
+
+
+  }
+
+  LoginPreferenceMethod(type: string) {
+
+    let userData = this.localstoreService.get('UserData', {})
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      if (userData.loginPreference != type) {
+        if (type) {
+          userData.loginPreference = type
+        }
+      } else {
+        userData.loginPreference = 'none'
+      }
+
+    } else {
+      userData.loginPreference = 'none'
+    }
+
+
+    this.localstoreService.set('UserData', userData)
+  }
+
+  checkState() {
+
+    let userData = this.localstoreService.get('UserData', {})
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      this.userLoginPreference = userData.loginPreference
+    } else {
+      this.userLoginPreference =  ''
+    }
 
-  ngOnInit() {
   }
 
 }

From 8b3d195403dd7c60edf8238bbff9831221b18574 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 28 Jul 2021 16:27:10 +0100
Subject: [PATCH 8/8] changes in profile

---
 .../edit-profile-routing.module.ts            |  17 ++
 .../edit-profile/edit-profile.module.ts       |  20 +++
 .../edit-profile/edit-profile.page.html       |  76 +++++++++
 .../edit-profile/edit-profile.page.scss       |  73 ++++++++
 .../edit-profile/edit-profile.page.spec.ts    |  24 +++
 .../profile/edit-profile/edit-profile.page.ts | 161 ++++++++++++++++++
 .../modals/profile/profile-routing.module.ts  |   4 +
 src/app/modals/profile/profile.page.html      | 127 +++++++-------
 src/app/modals/profile/profile.page.scss      | 146 ++++++++++------
 src/app/modals/profile/profile.page.ts        | 135 +++++----------
 src/app/pages/events/events.page.html         |  19 +--
 .../header-no-search/header-no-search.page.ts |   9 +-
 src/assets/images/icons-default-profile.svg   |  34 ++++
 src/theme/variables.scss                      |   2 +-
 14 files changed, 619 insertions(+), 228 deletions(-)
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile-routing.module.ts
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile.module.ts
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile.page.html
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile.page.scss
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile.page.spec.ts
 create mode 100644 src/app/modals/profile/edit-profile/edit-profile.page.ts
 create mode 100644 src/assets/images/icons-default-profile.svg

diff --git a/src/app/modals/profile/edit-profile/edit-profile-routing.module.ts b/src/app/modals/profile/edit-profile/edit-profile-routing.module.ts
new file mode 100644
index 000000000..1055e551e
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EditProfilePage } from './edit-profile.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EditProfilePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EditProfilePageRoutingModule {}
diff --git a/src/app/modals/profile/edit-profile/edit-profile.module.ts b/src/app/modals/profile/edit-profile/edit-profile.module.ts
new file mode 100644
index 000000000..622248725
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditProfilePageRoutingModule } from './edit-profile-routing.module';
+
+import { EditProfilePage } from './edit-profile.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EditProfilePageRoutingModule
+  ],
+  declarations: [EditProfilePage]
+})
+export class EditProfilePageModule {}
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
new file mode 100644
index 000000000..a80695759
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -0,0 +1,76 @@
+<ion-content class=" bg-blue">
+  <div class="btn-close d-flex" (click)="close()">
+      <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+  </div>
+
+  <div class="profile-content width-100">
+
+    <div class="d-flex justify-space-between align-center">
+      <div class="go-back d-flex align-center"  (click)="close()">
+        <ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
+      </div>
+
+      <!-- <div class="d-flex " (click)="close()">
+        <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+      </div> -->
+    </div>
+
+    <div >
+      <div class="d-flex align-center">
+        <ion-icon  class="profile-pic"  src="assets/images/icons-default-profile.svg"></ion-icon>
+      </div>
+    </div>
+
+    <div class="profile-info">
+      <div class="label-text">Dados Perfil</div>
+      <div class="user-role">{{loggeduser.RoleDescription}}</div>
+      <div class="email">{{loggeduser.Email}}</div>
+    </div>
+
+    <div class="login-preference" (mouseover)="checkState()" (click)="checkState()">
+      <div class="preference">Preferência Login</div>
+
+      <ion-row>
+        <ion-col class="align-center d-flex">
+          <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
+            <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
+            PIN
+          </div>
+
+        </ion-col>
+        <ion-col class="align-center d-flex">
+          <div (click)="addFingerprint()" class="d-flex align-center">
+            <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
+            Impressão Digital
+          </div>
+        </ion-col>
+
+      </ion-row>
+    </div>
+
+    <div class="d-flex justify-center mt-10">
+      <button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
+        <ion-label>Alterar PIN</ion-label>
+      </button>
+    </div>
+  </div>
+
+</ion-content>
+
+<ion-footer class=" footer-container ion-no-border bg-blue">
+
+  <div class="d-flex justify-space-between">
+
+    <ion-buttons slot="start" (click)="close()">
+      <button class="btn-cancel" fill="clear" color="#061b52" >
+        <ion-label>Cancelar</ion-label>
+      </button>
+      </ion-buttons>
+      <ion-buttons slot="end" (click)="close()">
+        <button class="btn-ok" fill="clear" color="#fff" >
+          <ion-label>Gravar</ion-label>
+        </button>
+      </ion-buttons>
+  </div>
+
+</ion-footer>
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
new file mode 100644
index 000000000..fd1c49f37
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -0,0 +1,73 @@
+.btn-close{
+    padding: 20px 20px;
+    justify-content: center;
+    align-items: center;
+    float: right;
+}
+
+.profile-content{
+  width: 100% !important;
+  padding: 0px 20px;
+  float: left;
+}
+
+.icon{
+  font-size: 35px;
+}
+
+.go-back{
+  font-family: Roboto;
+  font-size: 25px;
+  .icon{
+      margin-right: 7px;
+  }
+}
+
+.profile-pic{
+  width: 200px;
+  height: 200px;
+  border-radius: 20px;
+  margin: 0px auto;
+}
+
+.profile-info{
+  .label-text{
+      font-size: 15px;
+      font-weight: bold;
+      color: white;
+      margin-bottom: 10px;
+  }
+
+  .user-role{
+      background-color: white;
+      border-radius: 5px;
+      padding: 12px;
+      font-family: Roboto;
+      font-size: 13px;
+      color: black;
+      text-align: center;
+  }
+
+  .email {
+      margin-top: 15px;
+  }
+
+}
+
+.login-preference{
+  margin-top: 44px;
+
+  .preference{
+      font-family: Roboto;
+      font-size: 15px;
+      margin-bottom: 20px;
+      font-weight: bold;
+  }
+  .checkBox{
+      margin-right: 10px;
+  }
+}
+
+.buttonSize {
+  width: 100% !important;
+}
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.spec.ts b/src/app/modals/profile/edit-profile/edit-profile.page.spec.ts
new file mode 100644
index 000000000..2f52dba55
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EditProfilePage } from './edit-profile.page';
+
+describe('EditProfilePage', () => {
+  let component: EditProfilePage;
+  let fixture: ComponentFixture<EditProfilePage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditProfilePage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EditProfilePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.ts b/src/app/modals/profile/edit-profile/edit-profile.page.ts
new file mode 100644
index 000000000..35c1f7690
--- /dev/null
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { AnimationController, ModalController } from '@ionic/angular';
+import { User } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
+import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
+import { PinPage } from 'src/app/shared/pin/pin.page';
+import { LocalstoreService } from 'src/app/store/localstore.service';
+
+@Component({
+  selector: 'app-edit-profile',
+  templateUrl: './edit-profile.page.html',
+  styleUrls: ['./edit-profile.page.scss'],
+})
+export class EditProfilePage implements OnInit {
+
+  loggeduser: User;
+  userLoginPreference = ''
+
+  constructor(private modalController:ModalController,
+    private authService: AuthService,
+    private animationController: AnimationController,
+    private router: Router,
+    private localstoreService: LocalstoreService
+    ) {
+
+    this.loggeduser = authService.ValidatedUser;
+
+    console.log(this.loggeduser.RoleDescription)
+
+    this.checkState()
+  }
+
+  ngOnInit() {}
+
+  close() {
+    this.modalController.dismiss();
+  }
+
+  async addPin() {
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: PinPage,
+      cssClass: 'model profile-modal',
+      componentProps: {
+      }
+    });
+
+    modal.present();
+  }
+
+
+  async addFingerprint() {
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: FingerprintPage,
+      cssClass: 'model profile-modal',
+      componentProps: {
+      }
+    });
+
+    modal.present();
+  }
+
+  logout() {
+    // clear local storage
+    window.localStorage.clear();
+
+    setTimeout(()=>{
+      window.location.pathname = '/'
+      location.reload();
+    }, 1000)
+
+
+  }
+
+  LoginPreferenceMethod(type: string) {
+
+    let userData = this.localstoreService.get('UserData', {})
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      if (userData.loginPreference != type) {
+        if (type) {
+          userData.loginPreference = type
+        }
+      } else {
+        userData.loginPreference = 'none'
+      }
+
+    } else {
+      userData.loginPreference = 'none'
+    }
+
+
+    this.localstoreService.set('UserData', userData)
+  }
+
+  checkState() {
+
+    let userData = this.localstoreService.get('UserData', {})
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      this.userLoginPreference = userData.loginPreference
+    } else {
+      this.userLoginPreference =  ''
+    }
+
+  }
+
+}
+
diff --git a/src/app/modals/profile/profile-routing.module.ts b/src/app/modals/profile/profile-routing.module.ts
index a7052f82c..b45610c01 100644
--- a/src/app/modals/profile/profile-routing.module.ts
+++ b/src/app/modals/profile/profile-routing.module.ts
@@ -7,6 +7,10 @@ const routes: Routes = [
   {
     path: '',
     component: ProfilePage
+  },
+  {
+    path: 'edit-profile',
+    loadChildren: () => import('./edit-profile/edit-profile.module').then( m => m.EditProfilePageModule)
   }
 ];
 
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index df059333e..fbb6f01b3 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -1,82 +1,71 @@
 <ion-content class=" bg-blue">
 
+  <div class="profile-header width-100">
+    <div class="div-logo">
+      <div class="logo height-fit-content">
+        <img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
+      </div>
+    </div>
+    <div class="btn-close d-flex" (click)="close()">
+      <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
+    </div>
+  </div>
+
   <div class="profile-content">
 
-    <div class="d-flex justify-space-between align-center">
-      <div class="go-back d-flex align-center"  (click)="close()">
-        <ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
-      </div>
-
-      <!-- <div class="d-flex " (click)="close()">
-        <ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
-      </div> -->
+    <div class="profile-title d-flex justify-content-center width-100">
+      <ion-label >{{loggeduser.RoleDescription}}</ion-label>
     </div>
 
-    <div >
-      <div class="d-flex align-center">
-        <ion-icon  class="profile-pic"  name="add-circle-outline"></ion-icon>
-      </div>
-    </div>
-
-    <div class="profile-info">
-      <div class="label-text">Dados Perfil</div>
-      <div class="user-role">{{loggeduser.RoleDescription}}</div>
-      <div class="email">{{loggeduser.Email}}</div>
-    </div>
-
-    <div class="login-preference" (mouseover)="checkState()" (click)="checkState()">
-      <div class="preference">Preferência Login</div>
-
-      <ion-row>
-        <ion-col class="align-center d-flex">
-          <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
-            <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
-            PIN
-          </div>
-
-        </ion-col>
-        <ion-col class="align-center d-flex">
-          <div (click)="addFingerprint()" class="d-flex align-center">
-            <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
-            Impressão Digital
-          </div>
-        </ion-col>
-
-      </ion-row>
-
-    </div>
-
-    <div class="d-flex justify-center mt-10">
-      <ion-buttons slot="start" class="buttonSize" (click)="logout()" >
-        <ion-button class="btn-cancel buttonSize" fill="clear" style="background:#ffe0e0;" >
+    <div class="d-flex mt-10 width-100">
+      <ion-buttons slot="start" class="buttonSize" >
+        <button (click)="logout()" class="btn-delete" fill="clear" style="background:#ffe0e0;" >
           <ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
-        </ion-button>
+        </button>
+        <button (click)="editProfile()" class="btn-cancel" fill="clear" color="#fff" >
+          <ion-label>Editar Perfil</ion-label>
+        </button>
       </ion-buttons>
     </div>
+    <div class="line"></div>
+  </div>
+  <div class="notifications-content">
+    <ion-label>2 novas notificações</ion-label>
+    <ion-list>
+      <div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none">
+          <div class="item-content width-100">
+            <div class="notification-item">
+              <img class="notification-icon" slot="end" src="assets/images/icons-default-agenda.svg" >
+            </div>
+            <div class="approve-event-time">
+              <p>08:00</p>
+              <p>09:00</p>
+            </div>
+            <div class="approve-event-detail">
+              <p>Luanda | Palácio Presidencial</p>
+              <h3>Almoço de Família</h3>
+            </div>
+            <div class="notification-label"></div>
+          </div>
+        </div>
+        <div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none">
+          <div class="item-content width-100">
+            <div class="notification-item">
+              <img class="notification-icon" slot="end" src="assets/images/icons-correspondencias.svg" >
+            </div>
+            <div class="approve-event-time">
+              <p>28-07-21</p>
+              <p>09:00</p>
+            </div>
+            <div class="approve-event-detail">
+              <h3>Relatório FMI</h3>
+              <p>Luanda | Palácio Presidencial</p>
+            </div>
+          </div>
+        </div>
+
+    </ion-list>
 
-    <div class="d-flex justify-center mt-10">
-      <ion-button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
-        <ion-label>Alterar PIN</ion-label>
-      </ion-button>
-    </div>
   </div>
 
 </ion-content>
-
-<!-- <ion-footer class=" footer-container ion-no-border bg-blue">
-
-  <div class="d-flex justify-space-between">
-
-    <ion-buttons slot="start" (click)="close()">
-      <ion-button class="btn-cancel" fill="clear" color="#061b52" >
-        <ion-label>Cancelar</ion-label>
-      </ion-button>
-      </ion-buttons>
-      <ion-buttons slot="end" (click)="close()">
-        <ion-button class="btn-ok" fill="clear" color="#fff" >
-          <ion-label>Gravar</ion-label>
-        </ion-button>
-      </ion-buttons>
-  </div>
-
-</ion-footer> -->
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 65d3675e1..081d3b5ff 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -1,64 +1,114 @@
-.profile-content{
+.profile-header{
+  margin: 0 em(20px);
+  // background-color: #0782c9;
   padding: 20px 20px;
+  border: 0!important;
+  overflow: auto;
+
+  .div-logo{
+    background: transparent;
+    width: calc(100% - 40px) !important;
+    justify-content: center;
+    display: flex;
+    float: left;
+
+    .logo{
+      width: 140px;
+      .img{
+        width: 100%;
+        margin: 0px auto;
+      }
+    }
+  }
+}
+.btn-close{
+  justify-content: center;
+  align-items: center;
+  float: left;
+}
+.profile-content{
+    padding: 20px 20px;
 }
 
 .icon{
-  font-size: 35px;
+    font-size: 40px;
 }
 
-.go-back{
-  font-family: Roboto;
-  font-size: 25px;
-  .icon{
-      margin-right: 7px;
-  }
+.profile-title{
+  font-weight: 300;
+  font-size: 20px !important;
+  margin-bottom: 40px !important;
 }
 
-.profile-pic{
-  width: 200px;
-  height: 200px;
-  border-radius: 20px;
-  margin: 0px auto;
+.line{
+  width: 100% !important;
+  margin-top: 15px;
+  border-top: 1px solid #d8d8d8;
 }
 
-.profile-info{
-  .label-text{
-      font-size: 15px;
-      font-weight: bold;
-      color: white;
-      margin-bottom: 10px;
-  }
-
-  .user-role{
-      background-color: white;
-      border-radius: 5px;
-      padding: 12px;
-      font-family: Roboto;
-      font-size: 13px;
-      color: black;
-      text-align: center;
-  }
-
-  .email {
-      margin-top: 15px;
-  }
-
+.btn-delete{
+  width: 40% !important;
+  margin-left: 0 !important;
 }
-
-.login-preference{
-  margin-top: 44px;
-
-  .preference{
-      font-family: Roboto;
-      font-size: 15px;
-      margin-bottom: 20px;
-      font-weight: bold;
-  }
-  .checkBox{
-      margin-right: 10px;
-  }
+.btn-cancel{
+  width: 40% !important;
+  margin-right: 0 !important;
 }
 
 .buttonSize {
   width: 100% !important;
 }
+
+ion-list{
+  background-color: transparent !important;
+}
+
+.notifications-content{
+  padding: 0px 20px;
+  .item{
+    display: flex;
+    border-radius: 15px;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    border: solid 1px #e9e9e9;
+    background-color: var(--white);
+    margin: 0 auto;
+    padding: 10px;
+    margin-bottom: 10px;
+    color: #000;
+    overflow: hidden;
+
+    border: 1px solid blue;
+
+    .notification-item{
+      width: fit-content;
+      float: left;
+      margin-right: 10px;
+      padding: 0 !important;
+      overflow: auto;
+
+
+    }
+    .notification-icon{
+      font-size: 35px !important;
+    }
+    .approve-event-time{
+      width: fit-content !important;
+      float: left;
+    }
+    .approve-event-detail{
+      width: calc(100% - 115px) !important;
+      float: left;
+    }
+    .notification-label{
+      float: right;
+      width: 5px;
+      height: 100%;
+      border-radius: 0% 100% 100% 0%;
+      background-color: #ffb703;
+    }
+  }
+
+}
+.item-inner{
+  padding: 0 !important;
+}
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index d77d04348..60b1cc2f2 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -6,6 +6,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
 import { PinPage } from 'src/app/shared/pin/pin.page';
 import { LocalstoreService } from 'src/app/store/localstore.service';
+import { EditProfilePage } from './edit-profile/edit-profile.page';
 
 @Component({
   selector: 'app-profile',
@@ -37,80 +38,7 @@ export class ProfilePage implements OnInit {
     this.modalController.dismiss();
   }
 
-  async addPin() {
-    const enterAnimation = (baseEl: any) => {
-      const backdropAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('ion-backdrop')!)
-        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
-
-      const wrapperAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('.modal-wrapper')!)
-        .keyframes([
-          { offset: 0, opacity: '1', right: '-100%' },
-          { offset: 1, opacity: '1', right: '0px' }
-        ]);
-
-      return this.animationController.create()
-        .addElement(baseEl)
-        .easing('ease-out')
-        .duration(500)
-        .addAnimation([backdropAnimation, wrapperAnimation]);
-    }
-
-    const leaveAnimation = (baseEl: any) => {
-      return enterAnimation(baseEl).direction('reverse');
-    }
-
-
-    const modal = await this.modalController.create({
-      enterAnimation,
-      leaveAnimation,
-      component: PinPage,
-      cssClass: 'model profile-modal',
-      componentProps: {
-      }
-    });
-
-    modal.present();
-  }
-
-
-  async addFingerprint() {
-    const enterAnimation = (baseEl: any) => {
-      const backdropAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('ion-backdrop')!)
-        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
-
-      const wrapperAnimation = this.animationController.create()
-        .addElement(baseEl.querySelector('.modal-wrapper')!)
-        .keyframes([
-          { offset: 0, opacity: '1', right: '-100%' },
-          { offset: 1, opacity: '1', right: '0px' }
-        ]);
-
-      return this.animationController.create()
-        .addElement(baseEl)
-        .easing('ease-out')
-        .duration(500)
-        .addAnimation([backdropAnimation, wrapperAnimation]);
-    }
-
-    const leaveAnimation = (baseEl: any) => {
-      return enterAnimation(baseEl).direction('reverse');
-    }
-
-
-    const modal = await this.modalController.create({
-      enterAnimation,
-      leaveAnimation,
-      component: FingerprintPage,
-      cssClass: 'model profile-modal',
-      componentProps: {
-      }
-    });
-
-    modal.present();
-  }
+  notImplemented(){}
 
   logout() {
     // clear local storage
@@ -121,28 +49,6 @@ export class ProfilePage implements OnInit {
       location.reload();
     }, 1000)
 
-
-  }
-
-  LoginPreferenceMethod(type: string) {
-
-    let userData = this.localstoreService.get('UserData', {})
-
-    if (userData.hasOwnProperty('loginPreference')) {
-      if (userData.loginPreference != type) {
-        if (type) {
-          userData.loginPreference = type
-        }
-      } else {
-        userData.loginPreference = 'none'
-      }
-
-    } else {
-      userData.loginPreference = 'none'
-    }
-
-
-    this.localstoreService.set('UserData', userData)
   }
 
   checkState() {
@@ -157,4 +63,41 @@ export class ProfilePage implements OnInit {
 
   }
 
+  async editProfile() {
+
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(500)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: EditProfilePage,
+      cssClass: 'model profile-modal',
+      componentProps: {
+      }
+    });
+    return await modal.present();
+  }
+
 }
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 9b3866f23..a5179fa11 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -25,7 +25,7 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  
+
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 
     <div class="conteiner-box px-20 height-100 overflow-y-auto" ng-swipe-up="swipe($event)">
@@ -36,9 +36,9 @@
             <div class="text">A sua Agenda</div>
           </div>
           <button class="btn-no-color" [routerLink]="['/home/agenda']">
-            <ion-icon 
-            class="icon-next" 
-            slot="end" 
+            <ion-icon
+            class="icon-next"
+            slot="end"
             src="assets/images/icons-arrow-circle-arrow-right.svg"
             ></ion-icon>
           </button>
@@ -46,8 +46,7 @@
         <div class="content">
           <ion-list>
             <ion-item class="cursor-pointer" lines="none" *ngFor="let event of toDayEventStorage.eventsList"
-            (click)="goToEvent(event.EventId)"
-            >
+            (click)="goToEvent(event.EventId)">
             <div class="d-flex  content-{{loggeduser.Profile}}-{{event.CalendarName}}">
 
               <div class="schedule-time">
@@ -64,7 +63,7 @@
             </ion-item>
 
           </ion-list>
-          <!-- 
+          <!--
           <div class="resume">
             <div class="title">
               Resumo para Amnahã
@@ -75,7 +74,7 @@
           -->
         </div>
       </div>
-    
+
       <div class="schedule">
         <div class="schedule-header">
           <div class="title">
@@ -100,10 +99,10 @@
                 <div class="location">{{ task.workflowInstanceDataFields.Sender }}</div>
               </div>
             </div>
-            </ion-item >
+            </ion-item>
 
           </ion-list>
         </div>
       </div>
     </div>
-</ion-content>
\ No newline at end of file
+</ion-content>
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.ts b/src/app/shared/headers/header-no-search/header-no-search.page.ts
index cc42609fe..13c72f775 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.ts
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.ts
@@ -6,6 +6,7 @@ import { ProfileComponent } from './profile/profile.page';
 import { Router } from '@angular/router';
 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-no-search',
   templateUrl: './header-no-search.page.html',
@@ -14,12 +15,12 @@ import { User } from 'src/app/models/user.model';
 export class HeaderNoSearchPage implements OnInit {
 
   loggeduser: User;
-  
+
   constructor(private modalController: ModalController,
     private menu: MenuController,
     private animationController: AnimationController,
     private router: Router,
-    authService: AuthService) { 
+    authService: AuthService) {
 
       this.loggeduser = authService.ValidatedUser;
     }
@@ -51,12 +52,12 @@ export class HeaderNoSearchPage 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',
       componentProps: {
       }
diff --git a/src/assets/images/icons-default-profile.svg b/src/assets/images/icons-default-profile.svg
new file mode 100644
index 000000000..dd82c44a7
--- /dev/null
+++ b/src/assets/images/icons-default-profile.svg
@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
+    <defs>
+        <filter id="b8vhf9zcla" width="111.2%" height="106.5%" x="-5.6%" y="-3.3%" filterUnits="objectBoundingBox">
+            <feOffset in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="7.5"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.490302666 0"/>
+        </filter>
+        <circle id="u6jbltuc9c" cx="60" cy="60" r="60"/>
+        <path id="ggtp3ri2hb" d="M25 0h350c13.807 0 25 11.193 25 25v664H0V25C0 11.193 11.193 0 25 0z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <path fill="#0782C9" d="M0 75H1024V708H0z" transform="translate(-764 -120)"/>
+            <g fill="#0782C9">
+                <path d="M0 0H1024V150H0z" transform="translate(-764 -120)"/>
+            </g>
+            <g>
+                <g transform="translate(-764 -120) translate(624) matrix(1 0 0 -1 0 689)">
+                    <use fill="#000" filter="url(#b8vhf9zcla)" xlink:href="#ggtp3ri2hb"/>
+                    <use fill="#0782C9" xlink:href="#ggtp3ri2hb"/>
+                </g>
+                <g transform="translate(-764 -120) translate(624) translate(140 120)">
+                    <rect width="120" height="120" fill="#FFF" fill-opacity=".6" rx="60"/>
+                    <g>
+                        <mask id="e5tuzk8b4d" fill="#fff">
+                            <use xlink:href="#u6jbltuc9c"/>
+                        </mask>
+                        <path fill="#42B9FE" fill-opacity=".7" d="M60 28c15.464 0 28 13.431 28 30 0 10.406-4.945 19.574-12.454 24.955C92.175 89.521 104 106.317 104 126c0 25.405-19.7 46-44 46s-44-20.595-44-46c0-19.683 11.825-36.48 28.454-43.046C36.944 77.574 32 68.406 32 58c0-16.569 12.536-30 28-30z" mask="url(#e5tuzk8b4d)"/>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index c09c7af4e..5651bbcf2 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -408,10 +408,10 @@ $app-theme: mat-light-theme((
 }
 
 .approve-event-time{
+  width: 33px;
   float: left;
 }
 .approve-event-time p{
-  width: 33px;
   font-family: Roboto;
   font-size: 13px;
   font-weight: normal;