Conflit solved after pull

src/app/pages/agenda/agenda.page.ts

@@ -302,7 +302,6 @@ export class AgendaPage implements OnInit {
   eventClicked(event: CalendarEvent): void {
     //clear
 
-
     this.setIntervenient([]);
     this.setIntervenientCC([]);
     this.clearPostEvent();

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -35,7 +35,8 @@
           <!-- This is the list view -->
 
           <div *ngSwitchCase="'listview'">
-            <ion-item-sliding>
+
+            <ion-item-sliding *ngIf="loadCount">
               <div class="listview" >
                 <ion-list *ngIf="allProcessesList">
                   <div
@@ -87,6 +88,46 @@
                 </ion-list>
               </div>
             </ion-item-sliding>
+
+
+            <ion-item-sliding  *ngIf="!loadCount" class="width-100">
+                <ion-item lines="none"
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                    <div class="item-content flex-grow-1 cursor-pointer">
+                      <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
+                      <p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
+                      <p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
+                    </div>
+                  </ion-item>
+                  <ion-item lines="none"
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                    <div class="item-content flex-grow-1 cursor-pointer">
+                      <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
+                      <p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
+                      <p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
+                    </div>
+                  </ion-item>
+                  <ion-item lines="none"
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                    <div class="item-content flex-grow-1 cursor-pointer">
+                      <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
+                      <p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
+                      <p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
+                    </div>
+                  </ion-item>
+                  <ion-item lines="none"
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+
+                    <div class="item-content flex-grow-1 cursor-pointer">
+                      <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
+                      <p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
+                      <p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
+                    </div>
+                  </ion-item>
+              </ion-item-sliding>
           </div>
 
           <!-- This is the box view -->
@@ -251,7 +292,7 @@
               
               <ion-item-sliding  class="width-100">
                 <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -260,7 +301,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -269,7 +310,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -278,7 +319,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -289,7 +330,7 @@
               </ion-item-sliding>
               <ion-item-sliding  class="width-100">
                 <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -298,7 +339,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -307,7 +348,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -316,7 +357,7 @@
                     </div>
                   </ion-item>
                   <ion-item lines="none"
-                  class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
+                  class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
 
                     <div class="item-content flex-grow-1 cursor-pointer">
                       <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>

src/app/pages/gabinete-digital/gabinete-digital.page.scss

@@ -62,6 +62,7 @@ ion-segment-button{
      border-radius: 20px;
    }
    ion-item{
+     --ion-background-color:#ffffff;
      margin-bottom: 10px;
      border-radius: 5px;
    }
@@ -154,8 +155,8 @@ ion-segment-button{
        user-select: none;
        background:  white;
        box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
-      width: 90%;
+       width: 360px;
-      margin: 0px 7px;
+       margin: 7px;
        border-radius: 15px;
        padding: 7px;
        border:1px solid white;
@@ -600,14 +601,11 @@ ion-list{
    fill: red !important;
  }
  
-ion-item.item {
-  background-color: white !important;
-}
 
-.item{
+.item-skeleton{
   width: 100% !important;
   padding: 0px 20px 0 20px !important;
-  border-bottom: 1px solid #ebebeb !important;
+  border-bottom: 1px solid #ebebeb;
   align-items: center;
   justify-content: space-between;
   flex-direction: row;

src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 export const environment = {
 
   //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  apiURL: 'https://gd-fo-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
   //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   //apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',

src/setupProxy.js

@@ -6,7 +6,6 @@ module.exports = function (app) {
       target: "http://gpr-dev-10.gabinetedigital.local:9080",
       changeOrigin: true,
       pathRewrite: function (path, req) {
-        console.log("Rewrite in /mfp/api/imfpush/: ", path);
         return path.replace("/mfp/api", "");
       },
     })