diff --git a/src/views/Master/MasterRoles/DialogForm.js b/src/views/Master/MasterRoles/DialogForm.js
index a511605..a33f686 100644
--- a/src/views/Master/MasterRoles/DialogForm.js
+++ b/src/views/Master/MasterRoles/DialogForm.js
@@ -3,6 +3,19 @@ import { Modal, ModalHeader, ModalBody, ModalFooter, Row, Col } from 'reactstrap
import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
import 'antd/dist/antd.css';
import { withTranslation } from 'react-i18next';
+import axios from 'axios';
+import { Select } from 'antd';
+import { MENU_SEARCH } from '../../../const/ApiConst.js';
+
+const { Option } = Select
+const token = window.localStorage.getItem('token');
+const config = {
+ headers:
+ {
+ Authorization: `Bearer ${token}`,
+ "Content-type": `application/json`
+ }
+};
class DialogForm extends Component {
constructor(props) {
@@ -13,11 +26,14 @@ class DialogForm extends Component {
description: "",
openDialog: false,
isParentClick: false,
+ menu: [],
+ selectedMenu: null
}
}
async componentDidMount() {
this.props.showDialog(this.showDialog);
+ this.getAllMenu();
}
async componentDidUpdate() {
@@ -27,19 +43,38 @@ class DialogForm extends Component {
this.setState({
id: dataEdit.id,
name: dataEdit.name,
- description: dataEdit.description
+ description: dataEdit.description,
+ selectedMenu: dataEdit.default_page
})
} else {
this.setState({
id: 0,
name: "",
- description: ""
+ description: "",
+ selectedMenu: null
})
}
this.setState({ isParentClick: false });
}
}
+ getAllMenu = async () => {
+ const payload = {
+ "paging": { "start": 0, "length": -1 },
+ "columns": [
+ { "name": "name", "logic_operator": "ilike", "value": "", "operator": "AND" }
+ ],
+ "joins": [],
+ "orders": { "columns": ["id"], "ascending": false }
+ }
+ const result = await axios
+ .post(MENU_SEARCH, payload, config)
+ .then(res => res)
+ .catch((error) => error.response);
+ if (result && result.data && result.data.code == 200) {
+ this.setState({ menu: result.data.data });
+ }
+ }
showDialog = () => {
this.setState({ isParentClick: true });
@@ -60,7 +95,8 @@ class DialogForm extends Component {
const {
id,
name,
- description
+ description,
+ selectedMenu
} = this.state
let data = '';
@@ -70,14 +106,16 @@ class DialogForm extends Component {
data = {
id,
name,
- description
+ description,
+ selectedMenu
}
this.props.closeDialog('save', data);
} else {
data = {
id,
name,
- description
+ description,
+ selectedMenu
}
this.props.closeDialog('edit', data);
}
@@ -113,6 +151,21 @@ class DialogForm extends Component {
this.setState({ description: e.target.value })} placeholder={this.props.t('inputDescription')} />
+
+
+
+ {
+ this.setState({ selectedMenu: e.target.value });
+ }}>
+ {this.state.menu.map((item) => (
+
+ ))}
+
+
+
)
diff --git a/src/views/Master/MasterRoles/DialogMenuRoles.js b/src/views/Master/MasterRoles/DialogMenuRoles.js
index 2ab0523..cec1b42 100644
--- a/src/views/Master/MasterRoles/DialogMenuRoles.js
+++ b/src/views/Master/MasterRoles/DialogMenuRoles.js
@@ -1,234 +1,234 @@
-import React, { Component } from 'react'
-import { Modal, ModalHeader, ModalBody, ModalFooter, Row, Col, Table } from 'reactstrap';
-import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
-import 'antd/dist/antd.css';
-import axios from 'axios';
-import { MENU_SEARCH } from '../../../const/ApiConst.js';
-import { withTranslation, WithTranslation } from 'react-i18next';
-const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
-
-const token = window.localStorage.getItem('token');
-
-
-const config = {
- headers:
- {
- Authorization: `Bearer ${token}`,
- "Content-type": `application/json`
- }
-};
-
-class DialogMenuRoles extends Component {
- constructor(props) {
- super(props)
- this.state = {
- id: 0,
- name: "",
- description: "",
- openDialog: false,
- isParentClick: false,
- menu: [],
- stateMenu: [],
- allChecked: true,
- }
- }
-
- async componentDidMount() {
- this.props.showDialog(this.showDialog);
- this.getAllMenu();
- }
-
- async componentDidUpdate() {
- if (this.state.isParentClick === true) {
- const { idRoles } = this.props
- this.setStateMenu(true);
- this.setState({ isParentClick: false, id: idRoles });
- }
- }
-
-
- showDialog = () => {
- this.setState({ isParentClick: true });
- }
-
- getAllMenu = async () => {
- const payload = {
- "paging": { "start": 0, "length": -1 },
- "columns": [
- { "name": "name", "logic_operator": "ilike", "value": "", "operator": "AND" }
- ],
- "joins": [],
- "orders": { "columns": ["id"], "ascending": false }
- }
-
-
-
- const result = await axios
- .post(MENU_SEARCH, payload, config)
- .then(res => res)
- .catch((error) => error.response);
-
-
- if (result && result.data && result.data.code == 200) {
- this.setState({ menu: result.data.data }, () => {
- this.setStateMenu(false);
- });
- } else {
- }
-
- }
-
- setStateMenu = edit => {
- const stateMenu = [];
- this.state.menu.map((val) => {
- stateMenu.push(false);
- })
- this.setState({ stateMenu: [] }, () => {
- this.setState({ stateMenu: stateMenu }, () => {
- if (edit) {
- this.checkMenuRoles();
- }
- })
- })
- }
-
- checkMenuRoles = () => {
- let copyStateMenu = [...this.state.stateMenu];
- this.props.menuRoles.map((val, indexMenu) => {
- let index = this.getIndexDataMenu(val.menu_id);
- console.log("index true", val.menu_id);
- if (index >= 0) {
- copyStateMenu[index] = true;
- }
- })
- this.setState({ stateMenu: [] }, () => {
- let check = copyStateMenu.some(this.checkArray);
- if (check === false) {
- this.setState({ allChecked: true, stateMenu: copyStateMenu })
- } else {
- this.setState({ allChecked: false, stateMenu: copyStateMenu })
- }
- })
- }
-
-
- getIndexDataMenu = (id) => {
- let index = this.state.menu.findIndex(obj => obj.id === id);
- return index
- }
-
- handleSave = () => {
- const {
- stateMenu,
- menu,
- id
- } = this.state
-
- const arrayData = [];
-
- menu.map((val, index) => {
- let data = {
- roles_id: id,
- menu_id: val.id,
- checked: stateMenu[index]
- }
- arrayData.push(data);
- })
- this.props.closeDialog('save', arrayData);
- this.setState({ id: 0 });
- }
-
- handleCancel = () => {
- this.props.closeDialog('cancel', 'none')
- }
-
- handleChangeCheckbox = (checked, index) => {
- let copyStateMenu = [...this.state.stateMenu];
- copyStateMenu[index] = checked;
- console.log("cek uncek", copyStateMenu);
- this.setState({ stateMenu: copyStateMenu })
- }
-
- renderForm = () => {
- const { menu, stateMenu } = this.state
- return (
- menu.map((val, index) => {
- return (
-
- | {val.name} |
- this.handleChangeCheckbox(e.target.checked, index)} defaultChecked={stateMenu[index]} /> |
-
- )
- })
- )
- }
-
- checkArray = (val) => {
- return val === false;
- }
-
- handleAllChecked = (checked) => {
- this.setState({ allChecked: !this.state.allChecked });
- if (checked === true) {
- console.log("test 1")
- let check = this.state.stateMenu.some(this.checkArray);
-
- if (check) {
- const stateMenu = [];
- this.state.menu.map((val) => {
- stateMenu.push(true);
- })
-
- this.setState({ stateMenu: [] }, () => {
- this.setState({ stateMenu: stateMenu });
- })
- }
-
-
- } else {
- console.log("test 1 2 3 ")
- const stateMenu = [];
- this.state.menu.map((val) => {
- stateMenu.push(false);
- })
-
- this.setState({ stateMenu: [] }, () => {
- this.setState({ stateMenu: stateMenu });
- })
- }
- }
-
- render() {
- return (
-
- {this.props.t('menuRoles')}
-
-
-
-
- {' '}
-
-
-
- )
- }
-}
-export default withTranslation()(DialogMenuRoles);
\ No newline at end of file
+import React, { Component } from 'react'
+import { Modal, ModalHeader, ModalBody, ModalFooter, Row, Col, Table } from 'reactstrap';
+import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
+import 'antd/dist/antd.css';
+import axios from 'axios';
+import { MENU_SEARCH } from '../../../const/ApiConst.js';
+import { withTranslation, WithTranslation } from 'react-i18next';
+const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
+
+const token = window.localStorage.getItem('token');
+
+
+const config = {
+ headers:
+ {
+ Authorization: `Bearer ${token}`,
+ "Content-type": `application/json`
+ }
+};
+
+class DialogMenuRoles extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ id: 0,
+ name: "",
+ description: "",
+ openDialog: false,
+ isParentClick: false,
+ menu: [],
+ stateMenu: [],
+ allChecked: true,
+ }
+ }
+
+ async componentDidMount() {
+ this.props.showDialog(this.showDialog);
+ this.getAllMenu();
+ }
+
+ async componentDidUpdate() {
+ if (this.state.isParentClick === true) {
+ const { idRoles } = this.props
+ this.setStateMenu(true);
+ this.setState({ isParentClick: false, id: idRoles });
+ }
+ }
+
+
+ showDialog = () => {
+ this.setState({ isParentClick: true });
+ }
+
+ getAllMenu = async () => {
+ const payload = {
+ "paging": { "start": 0, "length": -1 },
+ "columns": [
+ { "name": "name", "logic_operator": "ilike", "value": "", "operator": "AND" }
+ ],
+ "joins": [],
+ "orders": { "columns": ["id"], "ascending": false }
+ }
+
+
+
+ const result = await axios
+ .post(MENU_SEARCH, payload, config)
+ .then(res => res)
+ .catch((error) => error.response);
+
+
+ if (result && result.data && result.data.code == 200) {
+ this.setState({ menu: result.data.data }, () => {
+ this.setStateMenu(false);
+ });
+ } else {
+ }
+
+ }
+
+ setStateMenu = edit => {
+ const stateMenu = [];
+ this.state.menu.map((val) => {
+ stateMenu.push(false);
+ })
+ this.setState({ stateMenu: [] }, () => {
+ this.setState({ stateMenu: stateMenu }, () => {
+ if (edit) {
+ this.checkMenuRoles();
+ }
+ })
+ })
+ }
+
+ checkMenuRoles = () => {
+ let copyStateMenu = [...this.state.stateMenu];
+ this.props.menuRoles.map((val, indexMenu) => {
+ let index = this.getIndexDataMenu(val.menu_id);
+ console.log("index true", val.menu_id);
+ if (index >= 0) {
+ copyStateMenu[index] = true;
+ }
+ })
+ this.setState({ stateMenu: [] }, () => {
+ let check = copyStateMenu.some(this.checkArray);
+ if (check === false) {
+ this.setState({ allChecked: true, stateMenu: copyStateMenu })
+ } else {
+ this.setState({ allChecked: false, stateMenu: copyStateMenu })
+ }
+ })
+ }
+
+
+ getIndexDataMenu = (id) => {
+ let index = this.state.menu.findIndex(obj => obj.id === id);
+ return index
+ }
+
+ handleSave = () => {
+ const {
+ stateMenu,
+ menu,
+ id
+ } = this.state
+
+ const arrayData = [];
+
+ menu.map((val, index) => {
+ let data = {
+ roles_id: id,
+ menu_id: val.id,
+ checked: stateMenu[index]
+ }
+ arrayData.push(data);
+ })
+ this.props.closeDialog('save', arrayData);
+ this.setState({ id: 0 });
+ }
+
+ handleCancel = () => {
+ this.props.closeDialog('cancel', 'none')
+ }
+
+ handleChangeCheckbox = (checked, index) => {
+ let copyStateMenu = [...this.state.stateMenu];
+ copyStateMenu[index] = checked;
+ console.log("cek uncek", copyStateMenu);
+ this.setState({ stateMenu: copyStateMenu })
+ }
+
+ renderForm = () => {
+ const { menu, stateMenu } = this.state
+ return (
+ menu.map((val, index) => {
+ return (
+
+ | {val.name} |
+ this.handleChangeCheckbox(e.target.checked, index)} defaultChecked={stateMenu[index]} /> |
+
+ )
+ })
+ )
+ }
+
+ checkArray = (val) => {
+ return val === false;
+ }
+
+ handleAllChecked = (checked) => {
+ this.setState({ allChecked: !this.state.allChecked });
+ if (checked === true) {
+ console.log("test 1")
+ let check = this.state.stateMenu.some(this.checkArray);
+
+ if (check) {
+ const stateMenu = [];
+ this.state.menu.map((val) => {
+ stateMenu.push(true);
+ })
+
+ this.setState({ stateMenu: [] }, () => {
+ this.setState({ stateMenu: stateMenu });
+ })
+ }
+
+
+ } else {
+ console.log("test 1 2 3 ")
+ const stateMenu = [];
+ this.state.menu.map((val) => {
+ stateMenu.push(false);
+ })
+
+ this.setState({ stateMenu: [] }, () => {
+ this.setState({ stateMenu: stateMenu });
+ })
+ }
+ }
+
+ render() {
+ return (
+
+ {this.props.t('menuRoles')}
+
+
+
+
+ {' '}
+
+
+
+ )
+ }
+}
+export default withTranslation()(DialogMenuRoles);
diff --git a/src/views/Master/MasterRoles/index.js b/src/views/Master/MasterRoles/index.js
index e1b6546..332f3c8 100644
--- a/src/views/Master/MasterRoles/index.js
+++ b/src/views/Master/MasterRoles/index.js
@@ -179,7 +179,8 @@ class index extends Component {
const formData = {
name: data.name,
- description: data.description
+ description: data.description,
+ default_page : data.selectedMenu
}
const result = await axios.post(ROLE_ADD, formData, config)
@@ -198,7 +199,8 @@ class index extends Component {
editRole = async (data) => {
const formData = {
name: data.name,
- description: data.description
+ description: data.description,
+ default_page: data.selectedMenu
}
const url = ROLE_EDIT(data.id)
const result = await axios.put(url, formData, config)
diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js
index cb1034c..7bda490 100644
--- a/src/views/Pages/Login/Login.js
+++ b/src/views/Pages/Login/Login.js
@@ -1,347 +1,392 @@
-import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
-import Slider from "react-slick";
-import { Spin } from 'antd';
-import { Checkbox } from 'antd';
-import { LoadingOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons';
-import {
- Button,
- Card,
- CardBody,
- CardGroup,
- Col,
- Container,
- Form,
- Input,
- InputGroup,
- InputGroupAddon,
- InputGroupText,
- Row,
- UncontrolledAlert,
- Alert,
- Carousel,
- CarouselIndicators,
- CarouselCaption,
- CarouselItem,
- CarouselControl
-} from 'reactstrap';
-import { USER_LOGIN, USER_LOGIN_V2, CALERTUSER_SEARCH, MENU_MANAGEMENT, APP_MODE } from '../../../const/ApiConst.js';
-import { appConfig, reloadConstants } from '../../../const/MapConst.js';
-import { APP_NAME } from '../../../const/AppConst.js'
-import moment from "moment"
-import axios from 'axios';
-import { NotificationContainer, NotificationManager } from 'react-notifications';
-import logo_login_adw from '../../../assets/img/logo_adyawinsa.jpg'
-import logo_login_kit from '../../../assets/img/logo_kit.png'
-import logo_login_nawakara from '../../../assets/img/logo_nawakara.png'
-import logo_login_si from '../../../assets/img/logo-surveyor-indonesia.png'
-
-
-const antIcon = ;
-
-const settings = {
- dots: true,
- infinite: true,
- speed: 500,
- arrows: false,
- autoplay: true,
- slidesToShow: 1,
- slidesToScroll: 1
-};
-
-class Login extends Component {
- constructor(props) {
- super(props);
- this.state = {
- name: '',
- password: '',
- remember: '',
- alertVisible: false,
- alertMessage: '',
- alertColor: 'success',
- validate: {
- emailState: '',
- },
- loader: false,
- type: 'password'
- }
- this.handleChange = this.handleChange.bind(this);
- this.showHide = this.showHide.bind(this);
- }
- showHide(e) {
- e.preventDefault();
- e.stopPropagation();
- this.setState({
- type: this.state.type === 'input' ? 'password' : 'input'
- })
- }
- validateEmail(e) {
- const emailRex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
- const { validate } = this.state
- if (emailRex.test(e.target.value)) {
- validate.emailState = 'has-success'
- } else {
- validate.emailState = 'has-danger'
- }
- this.setState({ validate })
- }
-
- handleChange = async (event) => {
- const { target } = event;
- const value = target.type === 'checkbox' ? target.checked : target.value;
- const { name } = target;
- await this.setState({
- [name]: value,
- });
- }
-
- getDataMenu = async (token, role_id) => {
- const config = {
- headers:
- {
- Authorization: `Bearer ${token}`,
- "Content-type": `application/json`
- }
- };
-
- let url = MENU_MANAGEMENT(role_id)
- const result = await axios
- .get(url, config)
- .then(res => res)
- .catch((error) => error.response);
-
- if (result && result.data && result.data.code == 200) {
- let resData = result.data.data
- window.localStorage.setItem('menu_login', JSON.stringify(resData));
- this.setState({ loader: false })
- // custom redirect home after login
- if (role_id == 28) {
- this.props.history.push("/dashboard-customer/58/63");
- }
- else {
- this.props.history.push("/dashboard");
- }
- } else {
- NotificationManager.error('Login Failed', 'Failed');
- this.setState({ loader: false })
- }
- }
-
- submitForm = (event) => {
- event.preventDefault();
- this.submitFormLogin();
- }
-
- submitFormLogin = async () => {
- this.setState({ loader: true })
- const { name, password, remember } = this.state
-
- if (name === '') {
- NotificationManager.error('Please fill username', 'Login Failed!');
- this.setState({ loader: false })
- return false;
- }
-
- if (password === '') {
- NotificationManager.error('Please fill password', 'Login Failed!');
- this.setState({ loader: false })
- return false;
- }
-
- let formData = {
- username: name,
- password,
- remember,
- }
-
- const doLogin = await axios.post(USER_LOGIN_V2, formData)
- .then(response => response)
- .catch(error => {
- this.setState({ loader: false });
- });
-
- if (doLogin && doLogin.data && doLogin.data.code === 200) {
- const { access_token, data_user } = doLogin.data.data
- this.getDataMenu(access_token, data_user.role_id)
- window.localStorage.setItem('isLogin', true);
- window.localStorage.setItem('token', access_token);
- window.localStorage.setItem('user_id', data_user.id);
- window.localStorage.setItem('user_name', data_user.name);
- window.localStorage.setItem('role_id', data_user.role_id);
- } else {
- console.log("kode : ", doLogin.data.code);
- // NotificationManager.error('Cek username atau password anda!', 'Gagal Login!');
- NotificationManager.error(doLogin.data.message, 'Login Failed!');
- this.setState({ loader: false });
- }
-
- }
-
- getConfigAlert = async (token, user_id) => {
- const config = {
- headers:
- {
- Authorization: `Bearer ${token}`,
- "Content-type": `application/json`
- }
- };
-
- const payload = {
- "paging": { "start": 0, "length": -1 },
- "columns": [
- { "name": "user_id", "logic_operator": "=", "value": `${user_id}`, "operator": "AND" }
- ],
- "joins": [],
- "orders": { "columns": ["id"], "ascending": false }
- }
-
- const result = await axios
- .post(CALERTUSER_SEARCH, payload, config)
- .then(res => res)
- .catch((error) => error.response);
-
- if (result && result.data && result.data.code == 200) {
- let resData = result.data.data
- let configAlert = []
- resData.map((val, index) => {
- configAlert.push(val.config_alert_id);
- });
- window.localStorage.setItem('userConfigAlert', configAlert.join());
- }
- }
-
- onShowAlert = (alertColor, alertMessage) => {
- this.setState({ alertVisible: true, alertColor: alertColor, alertMessage: alertMessage }, () => {
- window.setTimeout(() => {
- this.setState({ alertVisible: false })
- }, 3000)
- });
- }
-
- getLoginLogo = () => {
- return
- }
-
- getLoginSlider = () => {
- return
-
-
})
-
-
})
-
-
})
-
-
})
-
-
-
-
-
- {this.state.alertMessage}
-
-
-
- {this.getLoginSlider()}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {this.state.alertMessage}
+
+
+
+ {this.getLoginSlider()}
+
+
+
+
+
+
+