Merge branch 'didam' into 'master'

update button close

See merge request !117

src/assets/Images.js

@@ -35,6 +35,7 @@ const Images = {
     berhasil: require('./berhasil.svg'),
     up: require('./up.svg'),
     down: require('./down.svg'),
+    close: require('./close.svg'),
 
     //Image
     triputra: require('./triputra.png'),

src/assets/close.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+    <defs>
+        <path id="gi74onwb9a" d="M.898.157l-.74.74c-.212.211-.209.546 0 .754l14.19 14.193c.21.209.546.208.754 0l.74-.74c.212-.212.209-.547 0-.755L1.653.156C1.547.052 1.412 0 1.275 0 1.14 0 1.002.052.898.157z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <path d="M0 0H24V24H0z" transform="translate(-4 -4)"/>
+        <g transform="translate(-4 -4) translate(4 4)">
+            <path stroke="#FFF" stroke-linecap="round" stroke-width="2" d="M1.143 1.143L14.857 14.857M14.857 1.143L1.143 14.857"/>
+        </g>
+    </g>
+</svg>

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -671,7 +671,7 @@ export default class ApprovalMatrix extends Component {
                                         className="btn btn-circle btn-white"
                                         onClick={() => this.setState({ visibleUpload: false })}
                                     >
-                                        <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                        <img src={Images.close}/>
                                     </button>
                                 </div>
                             </div>

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -6,6 +6,7 @@ import * as R from 'ramda'
 import format from "date-fns/format";
 import localeID from "date-fns/locale/id"
 import api from "../../api";
+import Images from '../../assets/Images';
 
 export default class CreateApprovalMatrix extends Component {
     constructor(props) {
@@ -170,7 +171,7 @@ export default class CreateApprovalMatrix extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/ApprovalMatrix/EditApprovalMatrix.js

@@ -5,6 +5,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import * as R from 'ramda'
 import format from "date-fns/format";
 import api from "../../api";
+import Images from '../../assets/Images';
 
 const operator = [
   {
@@ -189,7 +190,7 @@ export default class EditApprovalMatrix extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/Parameter/CreateParameter.js

@@ -5,6 +5,7 @@ import api from '../../../api';
 import { DatePicker } from '@material-ui/pickers';
 import { format } from 'date-fns';
 import * as R from 'ramda'
+import Images from '../../../assets/Images';
 
 export default class CreateParameter extends Component {
     constructor(props) {
@@ -377,7 +378,7 @@ export default class CreateParameter extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>
@@ -697,7 +698,7 @@ export default class CreateParameter extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/Parameter/Parameter.js

@@ -777,7 +777,7 @@ export default class Parameter extends Component {
                                         className="btn btn-circle btn-white"
                                         onClick={() => this.setState({ visibleUpload: false })}
                                     >
-                                        <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                        <img src={Images.close}/>
                                     </button>
                                 </div>
                             </div>

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -5,6 +5,7 @@ import { DateTimePicker, KeyboardDatePicker, DatePicker } from "@material-ui/pic
 import format from "date-fns/format";
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import api from '../../../api';
+import Images from '../../../assets/Images';
 
 export default class CreatePerusahaan extends Component {
     constructor(props) {
@@ -123,7 +124,7 @@ export default class CreatePerusahaan extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/Perusahaan/EditPerusahaan.js

@@ -5,6 +5,7 @@ import * as R from 'ramda'
 import api from '../../../api'
 import Autocomplete from '@material-ui/lab/Autocomplete'
 import { format } from 'date-fns'
+import Images from '../../../assets/Images'
 
 export default class EditPerusahaan extends Component {
     constructor(props) {
@@ -177,7 +178,7 @@ export default class EditPerusahaan extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -607,7 +607,7 @@ export default class Perusahaan extends Component {
                                         className="btn btn-circle btn-white"
                                         onClick={() => this.setState({ visibleUpload: false })}
                                     >
-                                        <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                        <img src={Images.close}/>
                                     </button>
                                 </div>
                             </div>

src/container/MasterData/ReportItems.js

@@ -877,7 +877,7 @@ export default class ReportItems extends Component {
                                         className="btn btn-circle btn-white"
                                         onClick={() => this.setState({ visibleUpload: false })}
                                     >
-                                        <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                        <img src={Images.close}/>
                                     </button>
                                 </div>
                             </div>

src/container/MasterData/UnitBisnis.js

@@ -504,7 +504,7 @@ export default class UnitBisnis extends Component {
                                         className="btn btn-circle btn-white"
                                         onClick={() => this.setState({ visibleUpload: false })}
                                     >
-                                        <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                        <img src={Images.close}/>
                                     </button>
                                 </div>
                             </div>

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -6,6 +6,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../../../library/Utils';
 import format from "date-fns/format";
 import { DatePicker } from '@material-ui/pickers';
+import Images from '../../../assets/Images';
 
 export default class CreateReportItems extends Component {
     constructor(props) {
@@ -284,7 +285,7 @@ export default class CreateReportItems extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/formReportItems/EditReportItems.js

@@ -6,6 +6,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import api from '../../../api';
 import * as R from 'ramda'
 import { titleCase } from '../../../library/Utils';
+import Images from '../../../assets/Images';
 
 export default class EditReportItems extends Component {
     constructor(props) {
@@ -305,7 +306,7 @@ export default class EditReportItems extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -3,6 +3,7 @@ import { TextField, Typography } from '@material-ui/core';
 import * as R from 'ramda'
 import { DateTimePicker, KeyboardDatePicker, DatePicker } from "@material-ui/pickers";
 import format from "date-fns/format";
+import Images from '../../../assets/Images';
 
 export default class CreateUnitBisnis extends Component {
     constructor(props) {
@@ -118,7 +119,7 @@ export default class CreateUnitBisnis extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>
@@ -306,7 +307,7 @@ export default class CreateUnitBisnis extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/Otorisasi/User.js

@@ -550,7 +550,7 @@ export default class UserRole extends Component {
                     className="btn btn-circle btn-white"
                     onClick={() => this.setState({ visibleUpload: false })}
                   >
-                    <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                    <img src={Images.close}/>
                   </button>
                 </div>
               </div>

src/container/Otorisasi/User/AddUser.js

@@ -9,6 +9,7 @@ import RemoveIcon from '@material-ui/icons/Remove';
 import AddIcon from '@material-ui/icons/Add';
 import { DatePicker } from '@material-ui/pickers';
 import * as R from 'ramda'
+import Images from '../../../assets/Images';
 
 const CustomCheckbox = withStyles({
     root: {
@@ -274,7 +275,7 @@ export default class AddUser extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/Otorisasi/User/EditUser.js

@@ -8,6 +8,7 @@ import format from "date-fns/format";
 import RemoveIcon from '@material-ui/icons/Remove';
 import AddIcon from '@material-ui/icons/Add';
 import * as R from 'ramda'
+import Images from '../../../assets/Images';
 
 const CustomCheckbox = withStyles({
     root: {
@@ -310,7 +311,7 @@ export default class EditUser extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/Otorisasi/UserRole/AddRole.js

@@ -7,6 +7,7 @@ import {DatePicker} from "@material-ui/pickers";
 import format from "date-fns/format";
 import localeID from "date-fns/locale/id"
 import * as R from 'ramda'
+import Images from '../../../assets/Images';
 
 const CustomCheckbox = withStyles({
     root: {
@@ -203,7 +204,7 @@ export default class AddRole extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>

src/container/Otorisasi/UserRole/EditRole.js

@@ -6,6 +6,7 @@ import RemoveIcon from '@material-ui/icons/Remove';
 import { DatePicker } from "@material-ui/pickers";
 import format from "date-fns/format";
 import * as R from 'ramda'
+import Images from '../../../assets/Images';
 const CustomCheckbox = withStyles({
     root: {
         color: '#51c6ea',
@@ -131,6 +132,7 @@ export default class EditRole extends Component {
     getMenu() {
         api.create().getMenu().then((response) => {
             if (response.data.status === 'success') {
+                console.log(response.data.data)
                 this.setState({ menuData: response.data.data })
             } else {
                 alert(response.data.message)
@@ -211,7 +213,7 @@ export default class EditRole extends Component {
                                 className="btn btn-circle btn-white"
                                 onClick={() => this.props.onClickClose()}
                             >
-                                <i className="fa fa-lg fa-times" style={{ color: 'white' }} />
+                                <img src={Images.close}/>
                             </button>
                         </div>
                     </div>