commit

components/Main/Login.js

@@ -12,7 +12,7 @@ class Login extends Component {
 		super(props);
 		this.state = {
 			/* Group each form state in an object.
-           Property name MUST match the form name */
+		   Property name MUST match the form name */
 			error: null,
 			formLogin: {
 				username: "",
@@ -88,7 +88,7 @@ class Login extends Component {
 	render() {
 		return (
 			<Card className="card card-flat">
-				<img className="img-login-1" src="/static/img/Logo-login.png" alt="Logo" />
+				<img className="img-login-1" src="/static/img/logo-login.png" alt="Logo" />
 				<CardBody className="card-body">
 					{" "}
 					<h5 className="card-title text-left py-2 bg-gray border-radius-login"><img className="icon-triangle" src="/static/img/icon-caution.png"></img><b>Login Menggunakan Akun PDDIKTI </b></h5>

components/Pelaporan/InputData.js

@@ -52,9 +52,9 @@ const checkIfFilesAreCorrectType = (files) => {
 const selectInstanceId = 1;
 const laporanSchema = Yup.object().shape({
 	no_laporan: Yup.string().required("Harap Diisi"),
-	keterangan: Yup.string().min(3).max(200).required("Harap Diisi"),
-	pelanggaran: Yup.array().min(1).required("Harap Diisi"),
-	dokumen: Yup.array().notRequired().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
+	keterangan: Yup.string().min(3).max(200).required("Wajib Di Isi"),
+	pelanggaran: Yup.array().min(1).required("Wajib Di Isi"),
+	dokumen: Yup.array().required().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig,),
 });
 export class InputData extends Component {
 	constructor(props) {
@@ -136,7 +136,7 @@ export class InputData extends Component {
 		formdata.append("no_laporan", data.no_laporan);
 		formdata.append("pt_id", query.ptId);
 		formdata.append("keterangan", data.keterangan);
-		formdata.append("pelanggaran_id", data.pelanggaran.join());
+		formdata.append("pelanggaran", data.pelanggaran.join());
 		if (data.dokumen.length > 0) {
 			data.dokumen.forEach((e) => {
 				formdata.append("dokumen", e);

pages/app/index.js

@@ -41,7 +41,7 @@ class App extends Component {
 			<div>
 				<Navbar className="navbar-color" expand="md" dark>
 					<NavbarBrand href="/">
-						<img className="img-fluid logo-nav" src="/static/img/Logo-vputih.png" alt="App Logo" />
+						<img className="img-fluid" src="/static/img/Logo-vputih.png" alt="App Logo" />
 						<img className="img-text-vputih" src="/static/img/Logo-text-vputih.png" alt="App Logo" />
 					</NavbarBrand>
 					<NavbarToggler onClick={this.toggleCollapse} />

pages/laporan/new/index.js

@@ -44,16 +44,16 @@ const checkIfFilesAreCorrectType = (files) => {
 
 const laporanSchema = Yup.object().shape({
 	no_laporan: Yup.string().required("Harap Diisi"),
-	no_hp: Yup.number().required("Harap Diisi"),
+	no_hp: Yup.number().required("Wajib Di Isi"),
 	nama: Yup.string().notRequired(),
 	setuju: Yup.boolean().isTrue(),
 	alamat: Yup.string().min(3).max(200).notRequired(),
-	keterangan: Yup.string().min(3).max(200).required("Harap Diisi"),
+	keterangan: Yup.string().min(3).max(200).required("Wajib Di Isi"),
 	email: Yup.string().email().notRequired(),
-	pelanggaran_id: Yup.array().min(1).required("Harap Diisi"),
-	pt_id: Yup.string().required("Harap Diisi"),
+	pelanggaran_id: Yup.array().min(1).required("Wajib Di Isi"),
+	pt_id: Yup.string().required("Wajib Di Isi"),
 	foto: Yup.array().notRequired().test("filesize", "Maksimal ukuran foto 15mb", checkIfFilesAreTooBig).test("type", "harus jpeg/png", checkIfFilesAreCorrectType),
-	dokumen: Yup.array().nullable().notRequired().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
+	dokumen: Yup.array().min(1).required().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
 	is_private: Yup.boolean().notRequired(),
 });
 
@@ -275,7 +275,7 @@ class App extends Component {
 												</div>
 											</FormGroup>
 											<FormGroup row>
-												<label className="col-md-2 col-form-label">Nomor Aktif</label>
+												<label className="col-md-2 col-form-label">Nomor Aktif<span className="star-color">*</span></label>
 												<div className="col-md-10">
 													<Field name="no_hp">{({ field, form }) => <Input type="tel" {...field} />}</Field>
 													<ErrorMessage name="no_hp" component="div" className="form-text text-danger" />
@@ -323,7 +323,7 @@ class App extends Component {
 												</div>
 											</FormGroup>
 											<FormGroup row>
-												<label className="col-md-2 col-form-label">Perguruan Tinggi yang Dilaporkan</label>
+												<label className="col-md-2 col-form-label">Perguruan Tinggi yang Dilaporkan<span className="star-color">*</span></label>
 												<div className="col-md-10">
 													<Field name="pt_id">
 														{({ field, form }) => (
@@ -343,7 +343,7 @@ class App extends Component {
 												</div>
 											</FormGroup>
 											<FormGroup row>
-												<label className="col-md-2 col-form-label">Jenis Pelanggaran</label>
+												<label className="col-md-2 col-form-label">Jenis Pelanggaran<span className="star-color">*</span></label>
 												<div className="col-md-10">
 													<Field name="pelanggaran_id">
 														{({ field, form }) => (
@@ -367,14 +367,14 @@ class App extends Component {
 												</div>
 											</FormGroup>
 											<FormGroup row>
-												<label className="col-md-2 col-form-label">Keterangan Laporan</label>
+												<label className="col-md-2 col-form-label">Keterangan Laporan<span className="star-color">*</span></label>
 												<div className="col-md-10">
 													<Field name="keterangan">{({ field }) => <Input type="textarea" {...field} />}</Field>
 													<ErrorMessage name="keterangan" component="div" className="form-text text-danger" />
 												</div>
 											</FormGroup>
 											<FormGroup row>
-												<label className="col-md-2 col-form-label">File Pendukung</label>
+												<label className="col-md-2 col-form-label">File Pendukung<span className="star-color">*</span></label>
 												<div className="col-md-10">
 													<Field name="dokumen">{({ field, form }) => <Input type="file" multiple onChange={(e) => form.setFieldValue(field.name, Array.from(e.currentTarget.files))} />}</Field>
 													<ErrorMessage name="dokumen" component="div" className="form-text text-danger" />

pages/pemantauan.js

@@ -63,7 +63,7 @@ class App extends Component {
 			<div>
 				<Navbar className="navbar-color" expand="md" dark>
 					<NavbarBrand href="/">
-					<img className="img-fluid" src="/static/img/Logo-vputih.png" alt="App Logo" /><img className="img-text-vputih" src="/static/img/Logo-text-vputih.png" alt="App Logo" />
+						<img className="img-fluid" src="/static/img/Logo-vputih.png" alt="App Logo" /><img className="img-text-vputih" src="/static/img/Logo-text-vputih.png" alt="App Logo" />
 					</NavbarBrand>
 					<NavbarToggler onClick={this.toggleCollapse} />
 					<Collapse isOpen={this.state.isOpen} navbar>
@@ -92,9 +92,9 @@ class App extends Component {
 										onSubmit={this.handleLihatPemantaun}
 									>
 										<Form className="form-horizontal">
-												<div class="header-1">
-    												<h2 class="card-title-1">Pemantauan</h2>
-												</div>
+											<div class="header-1">
+												<h2 class="card-title-1">Pemantauan</h2>
+											</div>
 											{/* <p className="lead bb">Pemantauan</p> */}
 											<FormGroup row>
 												<label className="col-md-2 col-form-label">Nomor Laporan</label>
@@ -123,20 +123,20 @@ class App extends Component {
 							</Card>
 							<Card className="card-default">
 								<CardBody>
-								<div class="header-1">
-    								<h2 class="card-title-1">Rekap Laporan</h2>
-								</div>
-								<div className="">
-									{laporan && log ? (
-										<>
-											<DetailLaporan data={laporan} />
-											<p className="lead bb tengah">Pemantauan</p>
-											<Timeline data={log} noFile />{" "}
-										</>
-									) : (
-										<p className="tengah">Tidak Ada Laporan</p>
-									)}
-								</div>
+									<div class="header-1">
+										<h2 class="card-title-1">Rekap Laporan</h2>
+									</div>
+									<div className="">
+										{laporan && log ? (
+											<>
+												<DetailLaporan data={laporan} />
+												<p className="lead bb tengah">Pemantauan</p>
+												<Timeline data={log} noFile />{" "}
+											</>
+										) : (
+											<p className="tengah">Tidak Ada Laporan</p>
+										)}
+									</div>
 								</CardBody>
 							</Card>
 						</Col>