diff --git a/package-lock.json b/package-lock.json index 1fb79cf6f..5142b17d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16457,11 +16457,11 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, "ng-lazyload-image": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/ng-lazyload-image/-/ng-lazyload-image-9.1.0.tgz", - "integrity": "sha512-ZdfCXMTaehfzxcSRRThpz9YZbEA+8LPA086Od6JiylrGj0yNM7Aq830A1x6NE/M8o2VuVq93emH9m8T6SFBHlA==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/ng-lazyload-image/-/ng-lazyload-image-9.1.2.tgz", + "integrity": "sha512-E5oz5HdTRtYW/TH+jceT4VMcRXKdX9Ut82eEwt2K0/bFAXKU14HluCFa8cMidPBgSa08Mlf+gmoKCTvAfUPgag==", "requires": { - "tslib": "^2.0.0" + "tslib": "^2.3.0" } }, "ng2-pdf-viewer": { diff --git a/package.json b/package.json index 8debfbbb0..73300595b 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "jetifier": "^1.6.8", "lite-server": "^2.6.1", "moment": "^2.29.1", - "ng-lazyload-image": "^9.1.0", + "ng-lazyload-image": "^9.1.2", "ng2-pdf-viewer": "^7.0.1", "ngx-cookie-service": "^12.0.3", "ngx-image-compress": "^11.0.3", diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index c978800ce..a541aa08c 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -5,7 +5,7 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { HomePageRoutingModule } from './home-routing.module'; - +import { LazyLoadImageModule } from 'ng-lazyload-image'; import { HomePage } from './home.page'; /* import { IonicSelectableModule } from 'ionic-selectable'; */ @@ -15,6 +15,7 @@ import { HomePage } from './home.page'; FormsModule, IonicModule, HomePageRoutingModule, + LazyLoadImageModule ], declarations: [HomePage], }) 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 35b432670..c3bb97330 100644 --- a/src/app/pages/publications/view-publications/view-publications.module.ts +++ b/src/app/pages/publications/view-publications/view-publications.module.ts @@ -10,8 +10,16 @@ import { ViewPublicationsPage } from './view-publications.page'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; -import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it +import { Attributes, IntersectionObserverHooks, LazyLoadImageModule, LAZYLOAD_IMAGE_HOOKS } from 'ng-lazyload-image'; // <-- import it +export class LazyLoadImageHooks extends IntersectionObserverHooks { +setup(attributes: Attributes) { + attributes.offset = 10; + attributes.defaultImagePath = "/assets/icon/icon-no-image.svg"; + attributes.errorImagePath = "/assets/icon/icon-no-image.svg"; + return super.setup(attributes); +} +} @NgModule({ imports: [ @@ -24,6 +32,7 @@ import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it LazyLoadImageModule ], exports: [ViewPublicationsPage], - declarations: [ViewPublicationsPage] + declarations: [ViewPublicationsPage], + providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}] }) export class ViewPublicationsPageModule {} diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index db5984a90..847b460c5 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -26,25 +26,44 @@ - + + --> +
+ + + +
+ +
+
+
+
+ {{publication.Title}} +
+
{{publication.DatePublication | date: 'dd-MM-yy | HH:mm'}}
+
+
+

{{publication.Message}}

+
+
+
+
+
+
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index 58f696aa8..b8c63dfb3 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -11,6 +11,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { forkJoin } from 'rxjs'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-view-publications', @@ -23,7 +24,7 @@ export class ViewPublicationsPage implements OnInit { publicationList: Publication[] = new Array(); item: PublicationFolder; - defaultImage = "https://governo.gov.ao/ao/noticias/presidente-joao-lourenco-ouviu-a-voz-da-igreja/" + defaultImage = "/assets/icon/icon-no-image.svg"; folderId: string; id: string; error: any; @@ -40,7 +41,8 @@ export class ViewPublicationsPage implements OnInit { private router: Router, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, - public ThemeService: ThemeService) { + public ThemeService: ThemeService, + private toastService: ToastService,) { this.item = new PublicationFolder(); this.activatedRoute.paramMap.subscribe(params => { @@ -64,7 +66,7 @@ export class ViewPublicationsPage implements OnInit { this.getPublicationDetail(); this.getPublicationsIds(); /* setTimeout(() => { - this.getPublicationsIds(); + this.getPublications(); }, 1000); */ this.backgroundservice.registerBackService('Online', () => { @@ -86,7 +88,7 @@ export class ViewPublicationsPage implements OnInit { // } //this.testForkJoin() //this.getPublicationDetail(); - // this.getPublicationsIds(); + // this.getPublications(); } doRefresh = (event) => { @@ -258,7 +260,7 @@ export class ViewPublicationsPage implements OnInit { }); - this.getpublication = publicationArray; + this.publicationList = publicationArray; }) } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index f181a90a7..aa093b8ed 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -79,6 +79,10 @@ export class MessageService { } } + // if(typeof(this.file?.type)) { + // this.hasFile = true + // } + if(this.hasFile) { this.getFileFromDb() if(this.file.type != 'application/webtrix') { @@ -178,6 +182,7 @@ export class MessageService { } } + } redefinedMessage(ChatMessage) { diff --git a/src/app/shared/publication/view-publications/view-publications.module.ts b/src/app/shared/publication/view-publications/view-publications.module.ts index 27e09ec09..1b9114b60 100644 --- a/src/app/shared/publication/view-publications/view-publications.module.ts +++ b/src/app/shared/publication/view-publications/view-publications.module.ts @@ -6,15 +6,27 @@ import { IonicModule } from '@ionic/angular'; import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module'; import { ViewPublicationsPage } from './view-publications.page'; +import { Attributes, IntersectionObserverHooks, LazyLoadImageModule, LAZYLOAD_IMAGE_HOOKS } from 'ng-lazyload-image'; + +export class LazyLoadImageHooks extends IntersectionObserverHooks { +setup(attributes: Attributes) { + attributes.offset = 10; + attributes.defaultImagePath = "/assets/icon/icon-no-image.svg"; + attributes.errorImagePath = "/assets/icon/icon-no-image.svg"; + return super.setup(attributes); +} +} @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ViewPublicationsPageRoutingModule + ViewPublicationsPageRoutingModule, + LazyLoadImageModule ], exports: [ViewPublicationsPage], - declarations: [ViewPublicationsPage] + declarations: [ViewPublicationsPage], + providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}] }) export class ViewPublicationsPageModule {} diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 83acf49c6..81573e3ce 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -39,7 +39,27 @@
- + + + +
+ +
+
+
+
+ {{publication.Title}} +
+
{{publication.DatePublication | date: 'dd-MM-yy | HH:mm'}}
+
+
+

{{publication.Message}}

+
+
+
+
+
+
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index d92cc069f..8fa8d4e7c 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -137,7 +137,7 @@ export class ViewPublicationsPage implements OnInit { getFromDB() { this.storage.get('view_publications').then((viewPublications) => { - this.getpublication = viewPublications; + this.publicationList = viewPublications; }) } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 1918c97b0..ef4d21407 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -116,6 +116,7 @@ $app-theme: mat-light-theme( --ion-color-expediente: #dae3f3; } +// dark-mode @media (prefers-color-scheme: dark) { /* * Dark Colors