improve

src/app/modals/profile/edit-profile/edit-profile.page.html

@@ -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>

src/app/pages/publications/publications.page.html

@@ -15,7 +15,7 @@
     <!-- Left -->
     <div class="aside-left app-default-padding d-flex flex-grow-1 flex-column width-30 ">
       <!-- Header -->
-      <ion-progress-bar type="indeterminate" *ngIf="showLoader || skeletonLoader"></ion-progress-bar>
+      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-toolbar >
 
         <div class="main-header">

src/app/pages/publications/publications.page.ts

@@ -24,7 +24,7 @@ import { PermissionService } from 'src/app/services/permission.service';
   styleUrls: ['./publications.page.scss'],
 })
 export class PublicationsPage implements OnInit {
-  showLoader: boolean;
+  showLoader: boolean = false
   publicationFolder: PublicationFolder;
   publication: Publication;
 
@@ -57,7 +57,6 @@ export class PublicationsPage implements OnInit {
   hideRefreshBtn = true;
   showSlidingOptions = true;
   idSelected: string;
-  skeletonLoader: boolean;
 
   constructor(
     private router: Router,
@@ -138,13 +137,10 @@ export class PublicationsPage implements OnInit {
     return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear()
   }
 
-  loadList = false
 
   getActions() {
-    if(this.loadList == false) {
-      this.loadList = true
+    if(this.showLoader == false) {
       this.showLoader = true;
-      this.skeletonLoader = true;
       this.publications.GetPublicationFolderList().subscribe(async res => {
 
         const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
@@ -162,13 +158,9 @@ export class PublicationsPage implements OnInit {
         }
   
         this.showLoader = false;
-        this.skeletonLoader = false;
-        this.loadList = false
   
       }, (error) => {
         this.showLoader = false;
-        this.skeletonLoader = false;
-        this.loadList = false
       });
     }
 

src/environments/environment.ts

@@ -15,8 +15,8 @@ export const environment = {
   apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */
   production: false,
   domain: 'equilibrium.co.ao',
-  defaultuser: '',//evandre.dasilva@equilibrium.co.ao
-  defaultuserpwd: '', //Luand@1219,
+  defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao
+  defaultuserpwd: 'Luand@1219', //Luand@1219,
   chatOffline: true,
   presidencia: false,
   version: versionData,

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "f83ef8201",
-  "SHA": "f83ef8201fffa4d964d7293d17004c90e6429d7d",
+  "shortSHA": "1800b5b4a",
+  "SHA": "1800b5b4a96b7cbc94fd7aa9a624c140d2f78135",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Jan 19 12:47:00 2023 +0100'",
-  "lastCommitMessage": "fix chat",
-  "lastCommitNumber": "4662",
+  "lastCommitTime": "'Thu Jan 19 12:48:51 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4668",
   "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:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/shared/chat/messages/messages.page.ts\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.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/pages/publications/publications.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/environments/environment.ts",
   "changeAuthor": "peter.maquiran"
 }