Merge branch 'didam' into 'master'

update

See merge request !47

src/container/Otorisasi/User.js

@@ -6,112 +6,6 @@ import Images from "../../assets/Images";
 import MUIDataTable from "mui-datatables";
 import AddRole from './UserRole/AddRole';
 import EditRole from './UserRole/EditRole'
-
-var ct = require("../../library/CustomTable");
-const getMuiTheme = () => createMuiTheme(ct.customTable());
-const options = ct.customOptions();
-
-export default class User extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-      add: false,
-      edit: false
-    }
-  }
-  render() {
-    const columns = [{
-      name: "Action",
-      options: {
-        customBodyRender: (val, tableMeta) => {
-          return (
-            <div style={{ display: 'flex' }}>
-              <button
-                style={{
-                  backgroundColor: 'transparent',
-                  cursor: 'pointer',
-                  borderColor: 'transparent',
-                }}
-                onClick={() => this.setState({edit: true})}
-              >
-                <img src={Images.editCopy} />
-              </button>
-            </div >
-          );
-        }
-      }
-    }, {
-      name: "ID",
-      options: {
-        customBodyRender: (val, tableMeta) => {
-          return (
-            <div style={{ display: 'flex', width: 50 }}>
-              {val}
-            </div >
-          );
-        }
-      }
-    }, {
-      name: "User Role",
-      options: {
-        customBodyRender: (val, tableMeta) => {
-          return (
-            <div style={{ display: 'flex', width: 250 }}>
-              {val}
-            </div >
-          );
-        }
-      }
-    }, "Hak Akses", "Status"]
-    const data = [
-      ["1", "1", "Laporan Bulanan - September 2020", "1 (20 Oktober 2020)", "Belum Disetujui"],
-      ["2", "2", "Laporan Bulanan - September 2020", "1 (20 Oktober 2020)", "Belum Disetujui"],
-      ["3", "3", "Budget Tahunan 2021", "0 (20 Oktober 2020)", "Belum Disetujui"],
-      ["4", "4", "Laporan Bulanan - September 2020", "0 (20 Oktober 2020)", "Belum Disetujui"],
-      ["5", "5", "Budget Tahunan 2021", "0 (20 Oktober 2020)", "Belum Disetujui"],
-    ]
-    return (
-      <div style={{ height: this.props.height }}>
-        {/* <Row> */}
-        <div style={{ height: 199, backgroundColor: '#354960', width: '100%' }} />
-        <div>
-          <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
-            <label style={{ color: 'white', width: '20%', alignSelf: 'center'}}>Master Data - Role & Otorisasi</label>
-            <div style={{width: '60%', justifyContent: 'center', display: 'flex', borderWidth: 2, alignItems: 'center' }}>
-              <div style={{width: '50%', backgroundColor:'white', padding: 10, borderRadius: 7.5, flexDirection: 'row', display: 'flex'}}>
-                <SearchIcon/>
-                <input type="text" style={{flexGrow: 1, marginLeft: 10}}/>
-              </div>
-            </div>
-            {/* <label style={{ color: 'white', width: '60%', justifyContent: 'center', display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center' }}>Search</label> */}
-            <div style={{ width: '20%', justifyContent: 'flex-end', display: 'flex' }}>
-              <img src={Images.add} onClick={() => this.setState({add: true})}/>
-            </div>
-          </div>
-          <div style={{ padding: 25 }}>
-            <MuiThemeProvider theme={getMuiTheme()}>
-              <MUIDataTable
-                data={data}
-                columns={columns}
-                options={options}
-              />
-            </MuiThemeProvider>
-          </div>
-        </div>
-        {this.state.add && <AddRole/>}
-        {this.state.edit && <EditRole/>}
-      </div>
-    );
-  }
-}
-import React, { Component } from "react";
-import { Container, Row, Col } from "react-bootstrap";
-import { makeStyles, createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
-import SearchIcon from '@material-ui/icons/Search';
-import Images from "../../assets/Images";
-import MUIDataTable from "mui-datatables";
-import AddRole from './UserRole/AddRole';
-import EditRole from './UserRole/EditRole'
 import api from "../../api";
 import { titleCase } from "../../library/Utils";