Merge with developer-c

This commit is contained in:
Eudes Inácio
2021-02-24 11:04:11 +01:00
374 changed files with 5470 additions and 204982 deletions
+9 -13
View File
@@ -12,10 +12,10 @@ import { NotificationsService } from 'src/app/services/notifications.service';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Token } from '../../models/token.model';
import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
const { PushNotifications } = Plugins;
*/
@Component({
@@ -70,7 +70,7 @@ export class LoginPage implements OnInit {
}
this.authService.loginChat(postData).subscribe((res: any) => {
console.log(res.data);
this.storageService.store(AuthConnstants.AUTH, res.data);
//this.storageService.store(AuthConnstants.AUTH, res.data);
console.log('Login to Rocket chat OK');
}, (error: any) => {
console.log('Network error');
@@ -78,9 +78,9 @@ export class LoginPage implements OnInit {
});
}
storeUserIdANdToken() {
/* storeUserIdANdToken() {
(PushNotifications as any).requestPermission().then(result => {
(PushNotifications as any).requestPermission().then(result => {
PushNotifications.register();
});
@@ -104,18 +104,14 @@ export class LoginPage implements OnInit {
this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body, { headers }).subscribe(data => {
console.log('TOKEN USER MIDLE', data);
})
/*this.http.get<Token>('http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/notifications/user/'+res).subscribe(data => {
console.log('TOKEN USER MIDLE',data);
})*/
});
});
});
},
);
);
};
}; */
async Login() {
@@ -131,7 +127,7 @@ export class LoginPage implements OnInit {
}
if (await this.authService.login(this.userattempt)) {
this.loginRocketChat();
this.storeUserIdANdToken();
//this.storeUserIdANdToken();
this.router.navigate(['/home/events']);
}