Skip to content

C
clone_excelso
Commit 18fa5817 authored by Trisno's avatar Trisno
Browse files
Options

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

parents 39aa0048 33c1adac
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 65 deletions
view/ChangeEmail.js
View file @ 18fa5817
...@@ -13,11 +13,15 @@ class ChangeEmail extends React.Component { ...@@ -13,11 +13,15 @@ class ChangeEmail extends React.Component {
super(props); super(props);
this.state = { this.state = {
email: "", email: "",
caretHidden:true caretHidden:true,
spinner: false,
} }
} }
changeEmail() { changeEmail() {
this.setState({
spinner: true,
})
let paramater = { let paramater = {
"email": this.state.email, "email": this.state.email,
...@@ -35,16 +39,34 @@ class ChangeEmail extends React.Component { ...@@ -35,16 +39,34 @@ class ChangeEmail extends React.Component {
} }
this.props.setChangeEmail(loginProps) this.props.setChangeEmail(loginProps)
this.props.setEmailConfirm(emailConfirmProps) this.props.setEmailConfirm(emailConfirmProps)
Alert.alert( Alert.alert(
'', '',
i18n.t('alertCheckEmail') i18n.t('alertCheckEmail'),
, [
) {
this.props.navigation.navigate("Email Confirmation"); text: 'OK', onPress: () => {
this.setState({
spinner: false,
})
this.props.navigation.navigate("Email Confirmation");
}
}
]
);
}).catch(error => { }).catch(error => {
let response = error.response.data; let response = error.response.data;
Alert.alert(response.msg); Alert.alert(
'',
response.msg,
[
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} }
......
view/EmailConfirmation.js
View file @ 18fa5817
...@@ -78,12 +78,18 @@ class EmailConfirmation extends React.Component { ...@@ -78,12 +78,18 @@ class EmailConfirmation extends React.Component {
}) })
}).catch(error => { }).catch(error => {
let response = error.response.data; let response = error.response.data;
Alert.alert('',response.msg); Alert.alert(
this.setState({ '',
spinner: false, response.msg,
}) [
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} else { } else {
let pageProps = { let pageProps = {
...@@ -114,11 +120,18 @@ class EmailConfirmation extends React.Component { ...@@ -114,11 +120,18 @@ class EmailConfirmation extends React.Component {
}) })
}).catch(error => { }).catch(error => {
this.setState({
spinner: false,
})
let response = error.response.data; let response = error.response.data;
Alert.alert(response.msg); Alert.alert(
'',
response.msg,
[
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} }
} }
...@@ -159,18 +172,22 @@ class EmailConfirmation extends React.Component { ...@@ -159,18 +172,22 @@ class EmailConfirmation extends React.Component {
} }
// console.log(params) // console.log(params)
Axios.post(this.props.BASE_URL+'crm/v2/auth/login', params).then(res => { Axios.post(this.props.BASE_URL+'crm/v2/auth/login', params).then(res => {
this.setState({ this.setState({
spinner: false, spinner: false,
}) })
}).catch(error => { }).catch(error => {
let response = error.response.data; let response = error.response.data;
Alert.alert('', i18n.t('alertCheckEmail')); Alert.alert(
this.setState({ '',
spinner: false, i18n.t('alertCheckEmail'),
}) [
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} else { } else {
...@@ -184,22 +201,30 @@ class EmailConfirmation extends React.Component { ...@@ -184,22 +201,30 @@ class EmailConfirmation extends React.Component {
this.props.setPage(pageProps) this.props.setPage(pageProps)
Axios.post(this.props.BASE_URL+'crm/v2/auth/register_resend_email', paramater).then(res => { Axios.post(this.props.BASE_URL+'crm/v2/auth/register_resend_email', paramater).then(res => {
this.setState({
spinner: false,
})
Alert.alert( Alert.alert(
i18n.t('alertSuccessTitle'), i18n.t('alertSuccessTitle'),
i18n.t('alertEmailSended') i18n.t('alertEmailSended'),
[
) {
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}).catch(error => { }).catch(error => {
let response = error.response.data; let response = error.response.data;
// console.log(response); Alert.alert(
this.setState({ '',
spinner: false, response.msg,
}) [
Alert.alert('', response.msg) {
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} }
......
view/Login.js
View file @ 18fa5817
...@@ -247,10 +247,17 @@ class Login extends React.Component { ...@@ -247,10 +247,17 @@ class Login extends React.Component {
} else { } else {
let response = error.response.data; let response = error.response.data;
Alert.alert(response.msg); Alert.alert(
this.setState({ '',
spinner: false, response.msg,
}) [
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
} }
}) })
} }
......
view/NewPassword.js
View file @ 18fa5817
...@@ -96,11 +96,18 @@ class NewPassword extends React.Component { ...@@ -96,11 +96,18 @@ class NewPassword extends React.Component {
}) })
this.props.navigation.navigate('Login') this.props.navigation.navigate('Login')
}).catch(error => { }).catch(error => {
this.setState({
spinner: false,
})
let response = error.response.data; let response = error.response.data;
Alert.alert('',response.msg); Alert.alert(
'',
response.msg,
[
{
text: 'OK', onPress: () => this.setState({
spinner: false,
})
}
]
);
}) })
} }
......
view/New_Register.js
View file @ 18fa5817
...@@ -237,15 +237,21 @@ class NewRegister extends React.Component { ...@@ -237,15 +237,21 @@ class NewRegister extends React.Component {
this.props.setRegistration(registerProps); this.props.setRegistration(registerProps);
Alert.alert( Alert.alert(
'', '',
i18n.t('alertCheckEmail') i18n.t('alertCheckEmail'),
, [
) {
this.setState({ text: 'OK', onPress: () => {
spinner: false, this.setState({
}) spinner: false,
})
this.props.navigation.navigate('Email Confirmation')
this.props.navigation.navigate('Email Confirmation')
}
}
],
{ cancelable: false }
);
}).catch(error => { }).catch(error => {
// console.log(JSON.stringify(error.response)); // console.log(JSON.stringify(error.response));
...@@ -260,7 +266,7 @@ class NewRegister extends React.Component { ...@@ -260,7 +266,7 @@ class NewRegister extends React.Component {
}) })
} }
] ]
) );
}) })
} }
......
view/ResetPassword.js
View file @ 18fa5817
...@@ -43,23 +43,25 @@ class ResetPassword extends React.Component { ...@@ -43,23 +43,25 @@ class ResetPassword extends React.Component {
} }
this.props.setChangeIsSubmit(isSubmit) this.props.setChangeIsSubmit(isSubmit)
this.setState({
spinner: false,
})
Alert.alert( Alert.alert(
'', '',
i18n.t('alertCheckEmail') i18n.t('alertCheckEmail'),
, [
) {
text: 'OK', onPress: () => {
this.props.navigation.navigate('New Password'); this.setState({
spinner: false,
})
this.props.navigation.navigate('New Password');
}
}
],
{ cancelable: false }
);
} }
}).catch(error => { }).catch(error => {
// this.setState({
// spinner: false,
// })
let response = error.response.data; let response = error.response.data;
// Alert.alert('',response.msg);
Alert.alert( Alert.alert(
'', '',
response.msg, response.msg,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment