Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/app.component.ts

@@ -9,6 +9,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
 const moment = _rollupMoment || _moment;
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { SqliteService } from 'src/app/services/sqlite.service';
+import { BackgroundService } from 'src/app/services/background.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
 
@@ -39,7 +40,8 @@ export class AppComponent {
     /* private splashScreen: SplashScreen, */
       private statusBar: StatusBar,
       private screenOrientation: ScreenOrientation,
-      private sqliteservice: SqliteService
+      private sqliteservice: SqliteService,
+      private backgroundservice: BackgroundService
   ) {
     this.initializeApp();
   }
@@ -65,6 +67,18 @@ export class AppComponent {
           console.log("Error creating local database: ", error)
         }
       }
+
+      window.addEventListener('online', () => {
+        console.log('Became online')
+        this.backgroundservice.online()
+        if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+        } else {
+        }
+      });
+      window.addEventListener('offline', () => {
+        console.log('Became offline')
+        this.backgroundservice.offline()
+      });
       
     });
   }

src/app/pages/chat/chat.page.ts

@@ -30,6 +30,7 @@ import { environment } from 'src/environments/environment';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';
+import { Crop } from '@ionic-native/crop/ngx';
 
 
 @Component({
@@ -119,6 +120,7 @@ export class ChatPage implements OnInit {
     public ThemeService: ThemeService,
     private dataService:DataService,
     private router: Router,
+    private crop: Crop,
     ){
       this.loggedUserChat = authService.ValidatedUserChat['data'];
       this.headers = new HttpHeaders();
@@ -549,4 +551,10 @@ hideRefreshButton(){
     modal.onDidDismiss();
   }
 
-}
+//   this.crop.crop('path/to/image.jpg', {quality: 75})
+//   .then(
+//     newImage => console.log('new image path is: ' + newImage),
+//     error => console.error('Error cropping image', error)
+//   );
+
+ }

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -414,7 +414,8 @@ export class NewPublicationPage implements OnInit {
       directory: Directory.Data
     });
 
-    this.loadFiles();
+    //this.loadFiles(fileName);
+    this.loadFileData(fileName);
   }
 
   private async readAsBase64(photo: Photo) {
@@ -434,7 +435,7 @@ export class NewPublicationPage implements OnInit {
     }
   }
 
-  async loadFiles() {
+  async loadFiles(fileName) {
     this.images = [];
 
     const loading = await this.loadingCtrl.create({
@@ -442,11 +443,11 @@ export class NewPublicationPage implements OnInit {
     });
     await loading.present();
 
-    Filesystem.readdir({
-      path: IMAGE_DIR,
+    /* Filesystem.readdir({
+      path: `${IMAGE_DIR}/${fileName}`,
       directory: Directory.Data,
     }).then(result => {
-      console.log('ALL RESULTS', result.files[0])
+      console.log('ALL RESULTS', result.files)
       let lastphoto = result.files[result.files.length - 1]
       this.loadFileData(lastphoto);
     },
@@ -461,12 +462,17 @@ export class NewPublicationPage implements OnInit {
       }
     ).then(_ => {
       loading.dismiss();
-    });
+    }); */
   }
 
   async loadFileData(fileName: string) {
     console.log('ALL PHOTOT FILE', fileName)
-    // for (let f of fileNames) {
+
+    const loading = await this.loadingCtrl.create({
+      message: 'Loading data...',
+    });
+    await loading.present();
+
     const filePath = `${IMAGE_DIR}/${fileName}`;
 
     const readFile = await Filesystem.readFile({
@@ -483,7 +489,9 @@ export class NewPublicationPage implements OnInit {
     console.log('ALL IMAGE', this.images)
 
     this.capturedImage = this.images[0].data
-    //}
+
+    loading.dismiss();
+
   }
 
   

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

@@ -16,6 +16,7 @@ import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-f
 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 { Crop } from '@ionic-native/crop/ngx';
 
 @Component({
   selector: 'app-publications',
@@ -68,7 +69,8 @@ export class PublicationsPage implements OnInit {
     private sqliteservice: SqliteService,
     private backgroundservice: BackgroundService,
     private platform: Platform,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private crop: Crop,
   ) {
     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"];
@@ -91,6 +93,8 @@ export class PublicationsPage implements OnInit {
 
   }
 
+
+
   hideRefreshButton() {
     window.onresize = (event) => {
       if (window.innerWidth < 801) {
@@ -452,4 +456,12 @@ export class PublicationsPage implements OnInit {
     });
   }
 
+  // this.crop.crop('path/to/image.jpg', {quality: 75})
+  // .then(
+  //   newImage => console.log('new image path is: ' + newImage),
+  //   error => console.error('Error cropping image', error)
+  // );
+
+ 
+  
 }

src/global.scss

@@ -1355,4 +1355,7 @@ ngx-mat-datetime-content{
         --background:transparent;
       
     }
+    .transparent-modal .modal-wrapper {
+        --background: rgba(44, 39, 45, 0.7);
+    }
  }