From d2478bf311a985605138bfe510f5d2c64a7950a9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 17 Jan 2023 10:45:20 +0100
Subject: [PATCH] return icons

---
 .../profile/edit-profile/edit-profile.page.html      |  8 ++++----
 src/app/modals/profile/profile.page.html             |  4 ++--
 src/app/modals/profile/profile.page.ts               | 12 +++++++-----
 src/app/pages/inactivity/inactivity.page.html        |  4 ++--
 src/app/pages/login/login.page.html                  |  4 ++--
 src/app/shared/header/header.page.html               |  8 ++++----
 src/environments/environment.ts                      |  2 +-
 src/index.html                                       |  2 +-
 src/main.ts                                          |  7 -------
 version/git-version.ts                               | 12 ++++++------
 10 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index 26565e73d..91d29a539 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -3,9 +3,9 @@
     <div class="profile-header width-100">
       <div class="div-logo  width-40">
         <div class="logo-icon">
-          <!-- <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
+          <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
           <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
-          <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'> -->
+          <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'>
         </div>
         <div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
           <div class="logo-description-content">
@@ -98,10 +98,10 @@
               <img style="width: 40px;" src="assets/images/logo-removebg-preview.png"/>
             </div>
 
-            <!-- <div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('doneIt')" >
+            <div class="btn-close d-flex cursor-pointer pr-10" (click)="changeTheme('doneIt')" >
               <img *ngIf="ThemeService.currentTheme == 'gov'" style="width: 40px;" src="assets/images/theme/doneIt/governoangola_A.png"/>
               <img *ngIf="ThemeService.currentTheme != 'gov'" style="width: 40px;" src="assets/images/theme/doneIt/governoangola_A1.png"/>
-            </div> -->
+            </div>
 
           </div>
         </div>
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index b8c07fc59..18f0967c8 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -2,9 +2,9 @@
   <div class="profile-header width-100">
     <div class="div-logo d-md-none width-40">
       <div class="logo-icon" *ngIf="hideImage">
-        <!-- <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
+        <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
         <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
-        <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'> -->
+        <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'>
       </div>
       <div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
         <div class="logo-description-content">
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index 9611bef28..9f69812c7 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -9,6 +9,7 @@ import { NotificationsService } from '../../services/notifications.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from 'src/app/services/theme.service'
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-profile',
@@ -218,11 +219,12 @@ export class ProfilePage implements OnInit {
     SessionStore.setUrlBeforeInactivity(this.router.url);
     this.logoutOut == false
 
-    setTimeout(() => {
-
+    if(environment.production) {
+      window.location.pathname = '/auth'
+    } else {
       const pathBeforeGoOut = window.location.pathname
       this.router.navigateByUrl('/auth', { replaceUrl: true });
-      
+        
       setTimeout(() => {
         if(this.logoutOut == false || pathBeforeGoOut == window.location.pathname) {
           window.location.pathname = '/auth'
@@ -230,8 +232,8 @@ export class ProfilePage implements OnInit {
           console.log('refresh')
         }
       }, 500)
-      
-    }, 100)
+    }
+
   }
 
   async editProfile() {
diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html
index 9357d666e..88a12aaf3 100644
--- a/src/app/pages/inactivity/inactivity.page.html
+++ b/src/app/pages/inactivity/inactivity.page.html
@@ -7,8 +7,8 @@
       <div class="div-top-header">
 
         <div class="div-logo">
-          <!-- <img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
-          <img style="max-width: 80px;" *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'> -->
+          <img style="max-width: 90px;" *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-bg-removebg-preview.png' alt='logo'>
+          <img style="max-width: 80px;" *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
         </div>
 
       </div>
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 60acee88b..0513e99e6 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -7,9 +7,9 @@
             <div class="bg-4 d-flex justify-center align-center">
               <div class="div-logo">
 
-                <!-- <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/fullLogo-no-g.png' alt='logo'>
+                <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/fullLogo-no-g.png' alt='logo'>
                 <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
-                <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'> -->
+                <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A.png' alt='logo'>
 
               </div>
             </div>
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 5f20920ed..8e7cd9824 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -13,9 +13,9 @@
 
       <div class="div-logo align-center justify-center">
         <div class="logo-icon">
-          <!-- <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
+          <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
           <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
-          <img *ngIf="ThemeService.currentTheme == 'doneIt'"  src="assets/images/theme/doneIt/governoangola_A1.png" alt='logo'/> -->
+          <img *ngIf="ThemeService.currentTheme == 'doneIt'"  src="assets/images/theme/doneIt/governoangola_A1.png" alt='logo'/>
         </div>
         <div *ngIf="ThemeService.currentTheme == 'gov'" class="logo-description d-flex align-center justify-content-center">
           <div class="logo-description-content">
@@ -45,9 +45,9 @@
       <div class="d-flex justify-space-between align-center">
         <div tab="events" class="div-logo height-fit-content">
           <div class="logo-icon">
-            <!-- <img *ngIf="ThemeService.currentTheme == 'default'" src='assets/images/logo-no-bg.png' alt='logo'>
+            <img *ngIf="ThemeService.currentTheme == 'default'" src='assets/images/logo-no-bg.png' alt='logo'>
             <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
-            <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'> -->
+            <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'>
           </div>
           <div class="logo-description d-flex align-center justify-content-center">
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 98e195ae6..979fe1b09 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,7 +11,7 @@ export const environment = {
   //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/',
   apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
-  production: true,
+  production: false,
   domain: 'evandre.dasilva@equilibrium.co.ao',
   defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local
   defaultuserpwd: 'Luand@1219', //tabteste@006,
diff --git a/src/index.html b/src/index.html
index 65d649aba..dcc59a249 100644
--- a/src/index.html
+++ b/src/index.html
@@ -56,7 +56,7 @@
 
   <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
 
-  <!-- <link rel="icon" type="image/x-icon" href="assets/icon/governoangola_A.png" /> -->
+  <link rel="icon" type="image/x-icon" href="assets/icon/governoangola_A.png" />
   <!-- <link rel="manifest" href="assets/json/manifest.json"> -->
 
   <!-- add to homescreen for ios -->
diff --git a/src/main.ts b/src/main.ts
index c65fee587..65a9052ea 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,13 +8,6 @@ import { defineCustomElements } from '@ionic/pwa-elements/loader';
 
 import "hammerjs"; // HAMMER TIME
 
-/* import * as Sentry from '@sentry/capacitor';
-// The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular.
-import * as SentrySibling from '@sentry/angular';
-// For automatic instrumentation (highly recommended)
- import { Integration } from '@sentry/types';
- import { BrowserTracing } from '@sentry/tracing'; */
-
 if (environment.production) {
   enableProdMode();
 }
diff --git a/version/git-version.ts b/version/git-version.ts
index 657f07974..54f3a2669 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "12612a360",
-  "SHA": "12612a360050a996f4b8067694513685280caeac",
+  "shortSHA": "3262b6a3a",
+  "SHA": "3262b6a3a7f3d37ee463dbc825193de1ab46cabd",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jan 16 15:45:08 2023 +0100'",
-  "lastCommitMessage": "fix ui",
-  "lastCommitNumber": "4627",
+  "lastCommitTime": "'Mon Jan 16 15:47:18 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4630",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   .gitignore\n\tnew file:   android/app/google-services.json\n\tmodified:   package.json\n\tmodified:   src/app/models/notifications.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/inactivity/inactivity.page.html\n\tmodified:   src/app/pages/login/login.page.html\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/environments/environment.ts\n\tmodified:   src/index.html\n\tmodified:   src/main.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file