Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/assets/sass/app.css

 .main-color{
-  background-color: #1a2d3e !important;
+  background-color: #273b80 !important;
 }
 
 .sub-color{
@@ -7,7 +7,7 @@
 }
 
 .blue-color{
-  color: #1a2d3e !important;
+  color: #273b80 !important;
 }
 
 .btn-save{

src/container/Home.js

@@ -76,7 +76,7 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.enteringScreen,
     }),
-    backgroundColor: '#1a2d3e'
+    backgroundColor: '#273b80'
   },
   topleftClose: {
     borderRight: 0,
@@ -91,7 +91,7 @@ const useStyles = makeStyles((theme) => ({
       width: theme.spacing(7) + 1,
     },
     paddingLeft: 15,
-    backgroundColor: '#1a2d3e'
+    backgroundColor: '#273b80'
   },
   drawerOpen: {
     width: drawerWidth,

src/container/MasterData/UnitBisnis.js

@@ -430,8 +430,8 @@ export default class UnitBisnis extends Component {
                     </Alert>
                 </Snackbar>
                 {this.state.visibleUnitBisnis === true ?
+                    this.state.load && (
                         <div>
-                        {this.state.load && (
                             <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
                                 <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Business Unit</label>
                                 <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
@@ -508,7 +508,6 @@ export default class UnitBisnis extends Component {
                                     <ReactTooltip border={true} id="create" place="bottom" type="light" effect="solid" />
                                 </div>
                             </div>
-                        )}
                             <div style={{ padding: 25 }}>
                                 <MuiThemeProvider theme={getMuiTheme()}>
                                     <MUIDataTable
@@ -518,9 +517,9 @@ export default class UnitBisnis extends Component {
                                         options={options}
                                     />
                                 </MuiThemeProvider>
-
                             </div>
                         </div>
+                    )
                     :
                     <div>
                         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>

src/container/ResetPassword.js

@@ -32,7 +32,7 @@ class ResetPassword extends Component {
   componentDidMount() {
     console.log(this.props.match.params.id)
     let userId = this.props.match.params.id
-      this.setState({userId})
+    this.setState({ userId })
     this.checkExpiredLink(userId)
     // console.log(this.props)
   }
@@ -96,9 +96,12 @@ class ResetPassword extends Component {
     api.create().resetPassword(payload).then((response) => {
       if (response.data) {
         if (response.ok) {
-                    if(response.data.status === 'success') {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' }) 
+          if (response.data.status === 'success') {
+            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' }, () => {
+              setTimeout(() => {
                 this.props.history.push('/login')
+              }, 1000);
+            })
           } else {
             this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
           }
@@ -117,7 +120,7 @@ class ResetPassword extends Component {
 
   handleChange(e) {
     let data = this.state
-      this.setState({...data, [e.target.name] : e.target.value})
+    this.setState({ ...data, [e.target.name]: e.target.value })
     if (e.target.name == "password") {
       this.setState({ errorPassword: false, msgPassword: 'Password consists of 8 characters with a combination of numbers.' })
     } else if (e.target.name == "confirmPassword") {
@@ -133,11 +136,11 @@ class ResetPassword extends Component {
             {this.state.messageAlert}
           </Alert>
         </Snackbar>
-              <div style={{padding: 56, display: 'flex', flexDirection: 'column', width: 378, height: 415, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
-                <img src={Images.tia}/>
+        <div style={{ padding: 56, display: 'flex', flexDirection: 'column', width: 378, height: 415, borderRadius: 12, boxShadow: '0 2 4 0 rgba(0, 0, 0, 0.2)', backgroundColor: '#ffffff', justifyContent: 'center', alignItems: 'center' }}>
+          <img src={Images.tia} />
 
           <TextField
-                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>New password *</Typography>}
+            label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>New password *</Typography>}
             id="password"
             type={this.state.showPass ? 'text' : 'password'}
             name={"password"}
@@ -148,23 +151,23 @@ class ResetPassword extends Component {
             variant="outlined"
             error={this.state.errorPassword}
             style={{ width: 250, height: 51, marginTop: 32 }}
-                  helperText={<Typography style={{fontSize: 9, marginTop: 4, fontFamily: 'Nunito Sans, sans-serif'}}>{this.state.msgPassword}</Typography>}
+            helperText={<Typography style={{ fontSize: 9, marginTop: 4, fontFamily: 'Nunito Sans, sans-serif' }}>{this.state.msgPassword}</Typography>}
             InputProps={{
               endAdornment: <InputAdornment position="end">
                 <IconButton
                   aria-label="toggle password visibility"
-                      style={{color: '#4b4b4b', opacity: 0.5}}
-                      onClick={() => this.setState({showPass: !this.state.showPass})}
+                  style={{ color: '#4b4b4b', opacity: 0.5 }}
+                  onClick={() => this.setState({ showPass: !this.state.showPass })}
                   edge="end"
                 >
-                      {this.state.showPass ? <Visibility style={{fontSize: 18}} /> : <VisibilityOff style={{fontSize: 18}} />}
+                  {this.state.showPass ? <Visibility style={{ fontSize: 18 }} /> : <VisibilityOff style={{ fontSize: 18 }} />}
                 </IconButton>
               </InputAdornment>,
             }}
           />
 
           <TextField
-                  label={<Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Repeat New Password *</Typography>}
+            label={<Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Repeat New Password *</Typography>}
             id="confirmPassword"
             type={this.state.showPass2 ? 'text' : 'password'}
             name={"confirmPassword"}
@@ -175,23 +178,23 @@ class ResetPassword extends Component {
             variant="outlined"
             error={this.state.errorConfirmPassword}
             style={{ width: 250, height: 51, marginTop: 45 }}
-                  helperText={<Typography style={{fontSize: 9, marginTop: 4, fontFamily: 'Nunito Sans, sans-serif'}}>{this.state.msgConfirmPassword}</Typography>}
+            helperText={<Typography style={{ fontSize: 9, marginTop: 4, fontFamily: 'Nunito Sans, sans-serif' }}>{this.state.msgConfirmPassword}</Typography>}
             InputProps={{
               endAdornment: <InputAdornment position="end">
                 <IconButton
                   aria-label="toggle password visibility"
-                      style={{color: '#4b4b4b', opacity: 0.5}}
-                      onClick={() => this.setState({showPass2: !this.state.showPass2})}
+                  style={{ color: '#4b4b4b', opacity: 0.5 }}
+                  onClick={() => this.setState({ showPass2: !this.state.showPass2 })}
                   edge="end"
                 >
-                      {this.state.showPass2 ? <Visibility style={{fontSize: 18}} /> : <VisibilityOff style={{fontSize: 18}} />}
+                  {this.state.showPass2 ? <Visibility style={{ fontSize: 18 }} /> : <VisibilityOff style={{ fontSize: 18 }} />}
                 </IconButton>
               </InputAdornment>,
             }}
           />
 
           <Button name="submit" variant="contained" disabled={this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? true : false} onClick={() => this.validateReset()} style={{ marginTop: 50, width: '100%', height: 35, borderRadius: 4, color: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#4b4b4b' : '#fff', backgroundColor: this.state.password.trim() == '' && this.state.confirmPassword.trim() == '' ? '#d8d8d8' : '#51c6ea' }}>
-                  <Typography style={{fontSize: 12, fontFamily: 'Nunito Sans, sans-serif'}}>Reset Password</Typography>
+            <Typography style={{ fontSize: 12, fontFamily: 'Nunito Sans, sans-serif' }}>Reset Password</Typography>
           </Button>
         </div>
       </div>