Merge branch 'deni-dev(pc)' into 'master'

home ++

See merge request !155

src/container/Home.js

@@ -17,7 +17,7 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
 import Collapse from '@material-ui/core/Collapse';
 import DateFnsUtils from '@date-io/date-fns';
 import { MuiPickersUtilsProvider } from "@material-ui/pickers";
-import localeID from 'date-fns/locale/id';
+import localeID from 'date-fns/locale/en-US';
 
 import {
   BrowserRouter as Router,
@@ -483,7 +483,9 @@ export default function MiniDrawer() {
           <div style={{ width: '100%', textAlign: '-webkit-center', marginTop: -45, display: 'flex', justifyContent: 'center' }}>
             <div className={"sub-color"} style={{ width: 90, height: 90, borderRadius: 50, display: 'flex', justifyContent: 'center' }}>
               <div style={{ width: 72, height: 72, backgroundColor: '#838383', borderRadius: 50, alignSelf: 'center' }}>
-                {userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />}
+                <Link to={"profile"}>
+                  {userPhoto === "" ? null : <img src={userPhoto} style={{ width: 72, height: 72, borderRadius: 50 }} />}
+                </Link>
               </div>
 
             </div>
@@ -585,6 +587,20 @@ export default function MiniDrawer() {
             </div>
           ))}
         </List>
+        {open &&
+          <div style={{ marginLeft: 20, marginTop: 5 }}>
+            <button
+              style={{
+                outline: 'none',
+                backgroundColor: 'transparent',
+                cursor: 'pointer',
+                borderColor: 'transparent',
+              }}
+              onClick={() => logout()}>
+              <Typography style={{ color: '#525355', fontSize: 14, fontFamily: 'Nunito Sans, sans-serif' }}>Logout</Typography>
+            </button>
+          </div>
+        }
       </Drawer>
       <div className={classes.content} style={{ justifyContent: 'space-between', padding: 0, backgroundColor: '#f8f8f8' }}>
         <div>

src/container/MasterData/Parameter/CreateParameter.js

@@ -939,7 +939,7 @@ export default class CreateParameter extends Component {
                             <div className="margin-top-10px" style={{ backgroundColor: '#e8e8e8', padding: 10, borderRadius: 5 }}>
                                 <TextField
                                     style={{ width: '100%' }}
-                                    defaultValue={"Aktif"}
+                                    defaultValue={"Active"}
                                     id="status"
                                     label="Status"
                                     disabled

src/container/MasterData/Parameter/Parameter.js

@@ -681,7 +681,7 @@ export default class Parameter extends Component {
         return (
             <div style={{ height: this.props.height }}>
                 {/* <Row> */}
-                <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+                <div className={"main-color"} style={{ height: 195, width: '100%' }} />
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}
@@ -689,7 +689,7 @@ export default class Parameter extends Component {
                 </Snackbar>
                 {this.state.visibleParameter === true ?
                     <div>
-                        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
+                        <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%', }}>Parameter</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' }}>
                                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -465,7 +465,7 @@ export default class Perusahaan extends Component {
         return (
             <div style={{ height: this.props.height }}>
                 {/* <Row> */}
-                <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+                <div className={"main-color"} style={{ height: 195, width: '100%' }} />
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}
@@ -473,7 +473,7 @@ export default class Perusahaan extends Component {
                 </Snackbar>
                 {this.state.visiblePerusahaan === true ?
                     <div>
-                        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
+                        <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 - Company</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' }}>
                                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />

src/container/MasterData/UnitBisnis.js

@@ -395,7 +395,7 @@ export default class UnitBisnis extends Component {
         return (
             <div style={{ height: this.props.height }}>
                 {/* <Row> */}
-                <div style={{ height: 199, width: '100%' }} className={"main-color"} />
+                <div style={{ height: 195, width: '100%' }} className={"main-color"} />
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}
@@ -403,7 +403,7 @@ export default class UnitBisnis extends Component {
                 </Snackbar>
                 {this.state.visibleUnitBisnis === true ?
                     <div>
-                        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
+                        <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' }}>
                                 <img src={Images.searchBlack} style={{ marginRight: 10 }} />

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -396,7 +396,7 @@ export default class CreateUnitBisnis extends Component {
                             <div className="margin-top-10px" style={{ padding: 10, borderRadius: 5, backgroundColor: '#e8e8e8', }}>
                                 <TextField
                                     style={{ width: '100%' }}
-                                    defaultValue={"Aktif"}
+                                    defaultValue={"Active"}
                                     id="status"
                                     label="Status"
                                     disabled
@@ -425,7 +425,7 @@ export default class CreateUnitBisnis extends Component {
                                 <TextField
                                     style={{ width: '100%' }}
                                     id="unit"
-                                    label="Unit Bisnis"
+                                    label="Business Unit"
                                     value={this.state.name}
                                     inputProps={{
                                         style: {

src/container/Profile.js

@@ -340,7 +340,7 @@ export default class Profile extends Component {
                         {this.state.messageAlert}
                     </Alert>
                 </Snackbar>
-                <div className={"main-color"} style={{ height: 203, flex: 1, display: 'flex', alignItems: 'flex-end', padding: 20 }}>
+                <div className={"main-color"} style={{ height: 195, flex: 1, display: 'flex', alignItems: 'flex-end', padding: 20 }}>
                     <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', width: '100%' }}>
                         <div style={{ display: 'flex', alignItems: 'center' }}>
                             <div style={{ height: 72, width: 72, backgroundColor: 'white', borderRadius: 40, marginRight: 20 }}>