fix
This commit is contained in:
@@ -6,8 +6,8 @@ android {
|
||||
applicationId "com.mermsemr.providers"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 1027
|
||||
versionName "1.0.27"
|
||||
versionCode 1028
|
||||
versionName "1.0.28"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildTypes {
|
||||
|
||||
@@ -37,27 +37,27 @@ export class MermsLoginPage implements OnInit {
|
||||
public platform_is_ios: boolean = false
|
||||
|
||||
constructor(
|
||||
public navCtrl: NavController,
|
||||
private alertCtrl: AlertController,
|
||||
private loadingCtrl: LoadingController,
|
||||
/* private mermsServiceProviderService :MermsServiceProviderService,*/
|
||||
private mermsSessionService :MermsSessionService ,
|
||||
private router: Router
|
||||
) { }
|
||||
public navCtrl: NavController,
|
||||
private alertCtrl: AlertController,
|
||||
private loadingCtrl: LoadingController,
|
||||
/* private mermsServiceProviderService :MermsServiceProviderService,*/
|
||||
private mermsSessionService: MermsSessionService,
|
||||
private router: Router
|
||||
) { }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
async loginAccount() {
|
||||
|
||||
console.log('MERMSLoginPage::loginAccount()')
|
||||
this.mermsSessionService.account_token = ''
|
||||
const loader = await this.loadingCtrl.create({
|
||||
message: 'Please wait...',
|
||||
duration: 3000,
|
||||
})
|
||||
|
||||
|
||||
console.log('MERMSLoginPage::loginAccount()')
|
||||
this.mermsSessionService.account_token = ''
|
||||
const loader = await this.loadingCtrl.create({
|
||||
message: 'Please wait...',
|
||||
duration: 3000,
|
||||
})
|
||||
|
||||
|
||||
/*
|
||||
220 spinner: null,
|
||||
@@ -76,8 +76,8 @@ export class MermsLoginPage implements OnInit {
|
||||
this.password === ''
|
||||
) {
|
||||
this.showAlert(
|
||||
'Invalid Login',
|
||||
'Enter username(email) and password to login'
|
||||
'Error Login',
|
||||
'Enter valid username(email) and password to login'
|
||||
)
|
||||
} else {
|
||||
loader.present()
|
||||
@@ -93,9 +93,9 @@ export class MermsLoginPage implements OnInit {
|
||||
|
||||
|
||||
|
||||
|
||||
this.completeLogin();
|
||||
}
|
||||
this.completeLogin();
|
||||
|
||||
}
|
||||
|
||||
completeLogin() {
|
||||
@@ -140,7 +140,7 @@ export class MermsLoginPage implements OnInit {
|
||||
appleSignup() {
|
||||
console.log('MERMSStartPage:appleSignup()')
|
||||
|
||||
|
||||
|
||||
}
|
||||
googleSignup() {
|
||||
console.log('MERMSLoginPage::googleSignup()')
|
||||
|
||||
Reference in New Issue
Block a user