Merge branch 'didam' into 'master'

update didim

See merge request !71

package-lock.json

@@ -12135,6 +12135,22 @@
         "prop-types": "^15.7.2"
       }
     },
+    "react-tooltip": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.8.tgz",
+      "integrity": "sha512-pDWa0/khTAgIfldp95tHgyuYyBhWNlfaU2LF9ubAKxpoqNe15uyf+uLlnhK/Lstb6FU8E8/SL28Wp6oEO9xw3g==",
+      "requires": {
+        "prop-types": "^15.7.2",
+        "uuid": "^7.0.3"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+        }
+      }
+    },
     "react-transition-group": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",

src/container/Login.js

@@ -75,7 +75,9 @@ class Login extends Component {
   }
     api.create().login(payload).then((response) => {
       if (response.data.status === 'success') {
+        console.log(response.data.data)
         localStorage.setItem(Constant.TOKEN, response.data.data.token)
+        localStorage.setItem(Constant.USER, response.data.data.user_id)
         if (this.state.rememberMe) {
           localStorage.setItem(Constant.EMAIL, this.state.email)
           localStorage.setItem(Constant.PASSWORD, this.state.password)

src/container/Otorisasi/User/AddUser.js

@@ -3,6 +3,8 @@ import { TextField, Divider, Typography, Checkbox, withStyles } from '@material-
 import api from '../../../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../../../library/Utils';
+import localeID from "date-fns/locale/id"
+import format from "date-fns/format";
 
 const CustomCheckbox = withStyles({
     root: {
@@ -29,7 +31,8 @@ export default class AddUser extends Component {
             startDate: null,
             endDate: null,
             company: [],
-            listRole: null
+            listRole: null,
+            date: new Date(),
         }
     }
 
@@ -247,7 +250,7 @@ export default class AddUser extends Component {
                         </div>
                     </div>
                     <div style={{flexDirection:'column', display: 'flex', paddingLeft: 20, paddingRight: 20 }}>
-                        <Typography style={{fontSize: 12}}>{`Dibuat  : ${this.state.tempData == null? '' : this.state.tempData.created}`}</Typography>
+                        <Typography style={{fontSize: 12}}>{`Dibuat  : ${format(this.state.date, 'dd MMMM yyyy', {locale: localeID})}`}</Typography>
                         {/* <Typography style={{fontSize: 12}}>{`Diubah: ${this.state.tempData == null? '' : this.state.tempData.updated}`}</Typography> */}
                     </div>
                     <Divider style={{margin: 20}}/>

src/library/Constant.js

 const Constant = {
     TOKEN: null,
-    USER: null,
+    USER: 0,
     EMAIL: 'TOKEN',
     PASSWORD: 'PASSWORD'