diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 049292745..860ddbca9 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -38,7 +38,7 @@ -
+
@@ -57,9 +57,6 @@

{{viagem.Description}}

{{viagem.Detail}}

- @@ -93,9 +90,6 @@

{{evento.Description}}

- @@ -113,6 +107,94 @@ + +
+ + +
+ +
+
+ +

+

+
+
+ +
+ +
+
+ +

+

+
+
+ +
+ +
+
+ +

+

+
+
+ +
+ +
+
+ +

+

+
+
+
+ + +
+ +
+
+ + +

+
+
+
+ +
+ +
+
+ + +

+
+
+
+ +
+ +
+
+ + +

+
+
+
+
+
+ diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index fb589b982..4ff0d213c 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -59,6 +59,7 @@ export class PublicationsPage implements OnInit { hideRefreshBtn = true; showSlidingOptions = true; idSelected: string; + skeletonLoader:boolean; constructor( private router: Router, @@ -74,6 +75,7 @@ export class PublicationsPage implements OnInit { ) { this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + this.skeletonLoader = true; } ngOnInit() { @@ -140,6 +142,7 @@ export class PublicationsPage implements OnInit { getActions() { this.showLoader = true; + this.skeletonLoader = true; this.publications.GetPublicationFolderList().subscribe(res => { console.log('accoes', res) @@ -168,15 +171,13 @@ export class PublicationsPage implements OnInit { this.publicationsTravelFolderList.push(folder); } this.showLoader = false; - - /* this.publicationEventFolderStorage.reset(this.publicationsEventFolderList) - this.publicationTravelFolderService.reset(this.publicationsTravelFolderList) */ }); }, (error) => { this.getFromDB(); }); + this.skeletonLoader = false; } addActionToDB(folder) { diff --git a/src/assets/icon/icons-actions-grey.svg b/src/assets/icon/icons-actions-grey.svg new file mode 100644 index 000000000..3daded799 --- /dev/null +++ b/src/assets/icon/icons-actions-grey.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 76b20ba47..a8ccf00ce 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiURL: 'https://tabularium.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f6b819510..98e1871b5 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */