commit

components/Layout/SidebarUserBlock.js

@@ -14,7 +14,7 @@ class SidebarUserBlock extends Component {
 	async componentDidMount() {
 		// const user = await getUser();
 		const user = this.props.user;
-		this.setState({ user: user, role: user.peran[0].peran.nama });
+		this.setState({ user: user, role: user.peran[0].peran });
 	}
 
 	componentDidUpdate(oldProps) {
@@ -32,14 +32,14 @@ class SidebarUserBlock extends Component {
 						{/* User picture */}
 						<div className="user-block-picture">
 							<div className="user-block-status">
-								<img className="img-thumbnail rounded-circle" src="/static/img/logo-single.png" alt="Avatar" width="60" height="60" />
+								<img className="img-thumbnail rounded-circle" src={role.id === 2022 ? "/static/img/univ-avatar.png" : "/static/img/logo-single.png"} alt="Avatar" width="60" height="60" />
 								<div className="circle bg-success circle-lg"></div>
 							</div>
 						</div>
 						{/* Name and Job */}
 						<div className="user-block-info">
 							<span className="user-block-name">{user.nama}</span>
-							<span className="user-block-role">{role}</span>
+							<span className="user-block-role">{role.nama}</span>
 						</div>
 					</div>
 				</div>

components/Main/Timeline.js

@@ -23,7 +23,7 @@ function Timeline({ data }) {
 												<div className="d-flex align-items-center mb-3">
 													<img className="mr-3 rounded-circle thumb48" src="/static/img/user/admin.png" alt="Avatar" />
 													<p className="m-0">
-														<strong>{data.role}</strong>
+														<strong>{data.role_name}</strong>
 														<br />
 														{data.description}
 													</p>

components/PT/Timeline.js

@@ -24,7 +24,7 @@ function Timeline({ data, dataPelaporan }) {
 												<div className="d-flex align-items-center mb-3">
 													<img className="mr-3 rounded-circle thumb48" src="/static/img/user/admin.png" alt="Avatar" />
 													<p className="m-0">
-														<strong>{data.role}</strong>
+														<strong>{data.role_name}</strong>
 														<br />
 														{data.description}
 													</p>

pages/app/pemantauan/index.js

@@ -60,7 +60,8 @@ class Search extends Component {
 	fetchData = async () => {
 		const searchValue = document.getElementById("searchInput").value;
 		const jsonData = await getPT({ search: searchValue });
-		this.setState({ data: jsonData });
+		console.log(jsonData);
+		// this.setState({ data: jsonData });
 	};
 
 	handleApplyClick = () => {
@@ -73,9 +74,9 @@ class Search extends Component {
 
 	handleSearchClick = () => {
 		this.fetchData();
-		if (this.state.data && this.state.data.length) {
-			this.renderTableData();
-		}
+		// if (this.state.data && this.state.data.length) {
+		// 	this.renderTableData();
+		// }
 	};
 
 	renderTableData() {

pages/app/pt/keberatan/index.js

@@ -14,7 +14,7 @@ class Keberatan extends Component {
 
 	componentDidMount = async () => {
 		const { user } = this.props;
-		const org_id = user.data.peran[0].organisasi.id;
+		const org_id = user.peran[0].organisasi.id;
 		const sanksi = await getSanksi({ ptId: org_id });
 		this.setState({ sanksi });
 	};
@@ -25,7 +25,7 @@ class Keberatan extends Component {
 			<ContentWrapper>
 				<div className="content-heading">Permohonan Keberatan</div>
 				<Row>
-					<Col lg={12}>{sanksi.data && sanksi.data.length ? <TableSanksi listData={sanksi.data} to="/app/pt/keberatan/detail" linkName="Detail" /> : ""}</Col>
+					<Col lg={12}>{sanksi.data?.length ? <TableSanksi listData={sanksi.data} to="/app/pt/keberatan/detail" linkName="Detail" /> : ""}</Col>
 				</Row>
 			</ContentWrapper>
 		);

pages/login.js

@@ -16,7 +16,7 @@ class Login extends Component {
 	state = {
 		/* Group each form state in an object.
            Property name MUST match the form name */
-
+		error: null,
 		formLogin: {
 			username: "",
 			password: "",
@@ -69,16 +69,20 @@ class Login extends Component {
 			if (auth.success) {
 				axiosAPI.defaults.headers.Authorization = `Bearer ${auth.access_token}`;
 				const dataUser = await getUser();
-				console.log(dataUser);
-				this.props.setUser(dataUser);
-				if (dataUser.peran[0].peran.id === 2022) {
-					const org_id = dataUser.peran[0].organisasi.id;
+				// console.log(dataUser);
+				this.props.setUser(dataUser.data);
+				if (dataUser.data.peran[0].peran.id === 2022) {
+					const org_id = dataUser.data.peran[0].organisasi.id;
 					const pt = await getPT({ id: org_id });
-					this.props.setPT(pt);
+					if (pt?.success) {
+						this.props.setPT(pt.data);
+					}
 					Router.push({ pathname: "/app/pt/pemantauan" });
 				} else {
 					Router.push({ pathname: "/app/pemantauan" });
 				}
+			} else {
+				this.setState({ error: auth.message || auth.error });
 			}
 		}
 		// e.preventDefault();
@@ -97,6 +101,7 @@ class Login extends Component {
 					<CardBody className="card-body">
 						{" "}
 						<h5 className="card-title text-center py-2 bg-gray">Aplikasi Perguruan Tinggi Bermasalah </h5>
+						{this.state.error}
 						<form onSubmit={this.onSubmit} method="post" name="formLogin">
 							<div className="form-group">
 								<label className="col-form-label">Username *</label>