diff --git a/scripts/build-parcel.js b/scripts/build-parcel.js index 7602ec6..8d1eb67 100644 --- a/scripts/build-parcel.js +++ b/scripts/build-parcel.js @@ -7,5 +7,5 @@ fs.removeSync(path.normalize(`${__dirname}/../dist`)); require("./link-assets")(); // Spawn NPM synchronously -const result = spawn.sync('parcel', 'build public/index.parcel.html --log-level 4 --out-file index.html --detailed-report --no-source-maps'.split(" "), { stdio: 'inherit' }); +const result = spawn.sync('parcel', 'build public/index.parcel.html --out-file index.html --detailed-report --no-source-maps'.split(" "), { stdio: 'inherit' }); diff --git a/src/common/pages/ConfirmationCompleted/index.js b/src/common/pages/ConfirmationCompleted/index.js index c6317c1..d04a6a9 100644 --- a/src/common/pages/ConfirmationCompleted/index.js +++ b/src/common/pages/ConfirmationCompleted/index.js @@ -88,7 +88,7 @@ export default class ConfirmationCompletedComponent extends React.Component{ Konfirmasi Berhasil - Kami telah mengirim sebuah OTP nomor ponsel anda, jika tidak terkirim tekan link ini Resend + Terima Kasih, mohon cek email anda untuk langkah selanjutnya {/*We have sent an email with a confirmation link to your email address. Please allow 5-10 minutes for this message to arrive.*/} diff --git a/src/common/pages/Otp/index.js b/src/common/pages/Otp/index.js index f29a073..48f1e32 100644 --- a/src/common/pages/Otp/index.js +++ b/src/common/pages/Otp/index.js @@ -71,11 +71,7 @@ class OtpPage extends React.Component{ checkIsExpired(){ console.log(Date.parse(Date().toISOString()),this.state.otpData.expired_at); - if(Date.parse(Date().toISOString()) < Date.parse(this.state.otpData.expired_at)){ - return false; - }else{ - return true - } + return Date.parse(Date().toISOString()) >= Date.parse(this.state.otpData.expired_at); } handleChange = name => event => { @@ -89,7 +85,7 @@ class OtpPage extends React.Component{ setTimeout(()=>{ this.setState({isResending:false}); },3000); - } + }; login = () => { let data = { @@ -105,19 +101,19 @@ class OtpPage extends React.Component{ // },2000); // } // else{ - // this.authStore.validateOtp(data).then(res=>{ - // setTimeout(()=>{ - // this.props.history.push(LINKS.DASHBOARD); - // this.setState({isLoading:false}); - // },1000); - // }).catch(err=>{ - // setTimeout(()=>{ - // this.setState({isLoading:false,isOtpWrong:true}); - // },2000); - // setTimeout(()=>{ - // this.setState({isOtpWrong:false}); - // },4000) - // }); + this.authStore.validateOtp(data).then(res=>{ + setTimeout(()=>{ + this.props.history.push(LINKS.CONFIRMATION_COMPLETED); + this.setState({isLoading:false}); + },1000); + }).catch(err=>{ + setTimeout(()=>{ + this.setState({isLoading:false,isOtpWrong:true}); + },2000); + setTimeout(()=>{ + this.setState({isOtpWrong:false}); + },4000) + }); // } }; diff --git a/src/common/pages/RegisterNew/index.js b/src/common/pages/RegisterNew/index.js index 8607c8a..3ea0062 100644 --- a/src/common/pages/RegisterNew/index.js +++ b/src/common/pages/RegisterNew/index.js @@ -132,9 +132,9 @@ class RegisterPage extends React.Component { // return this.props.history.push(LINKS.LOGIN); - if (this.state.password.length < 8) { - return message.warning("password need atleast 8 characters"); - } + // if (this.state.password.length < 8) { + // return message.warning("password need atleast 8 characters"); + // } // if (this.state.upload_photo === '') { // return message.warning("please upload photo"); diff --git a/src/common/routes.js b/src/common/routes.js index 1cf0923..5bdb793 100644 --- a/src/common/routes.js +++ b/src/common/routes.js @@ -160,7 +160,7 @@ export default class Routes extends React.Component { ()}/>