Skip to content

Commit

Permalink
Merge pull request #81 from vincentiusantu/master
Browse files Browse the repository at this point in the history
UPDATE: modify maximum character of NIM
  • Loading branch information
vincentiusantu authored Sep 24, 2023
2 parents a15cac1 + 1b67d5a commit 30bd9ff
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/PraktikanLoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function login(Request $request){

// Validate the form data
$this->validate($request, [
'nim' => 'required|size:10|string',
'nim' => 'required|max:12|string',
'password' => 'required|min:6|string',
]);

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/PraktikanController.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function store(Request $request)
{
$request->validate([
'nama' => 'required|unique:praktikans|unique:asistens|string',
'nim' => 'required|unique:praktikans|size:10|string',
'nim' => 'required|unique:praktikans|max:12|string',
'password' => 'required|min:6|string',
'kelas_id' => 'required|integer',
'alamat' => 'required|min:10|string',
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/js/Pages/Lihat_Tp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<div class="w-full h-3/4">
<input v-model="praktikanNim"
class="font-overpass-mono-bold text-xl bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full h-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500"
id="Kelas" type="text" placeholder="1102174055">
id="Kelas" type="text" placeholder="101022130600">
</div>
</div>
<div class="w-full h-1/4 flex-row py-2 px-5">
Expand Down
8 changes: 3 additions & 5 deletions resources/js/Pages/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</label>
</div>
<div class="w-2/3">
<input v-model="formLoginPraktikan.nim" class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500" id="inline-full-name" type="text" placeholder="1102174055" maxlength="10">
<input v-model="formLoginPraktikan.nim" class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500" id="inline-full-name" type="text" placeholder="101022130600" maxlength="12">
</div>
</div>
<div class="flex items-center mb-6">
Expand Down Expand Up @@ -134,7 +134,7 @@
</label>
</div>
<div class="w-2/3">
<input v-model="formPraktikan.nim" class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500" id="Nim" type="text" placeholder="1102112011" maxlength="10">
<input v-model="formPraktikan.nim" class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500" id="Nim" type="text" placeholder="101022130600" maxlength="12">
</div>
</div>
<div class="flex items-center mb-6">
Expand Down Expand Up @@ -481,9 +481,7 @@ export default {
formLoginPraktikan: {
nim: '',
password: '',
},
hostname: "http://localhost:3000"
}
};
},
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/SetPraktikan.vue
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<div class="w-full h-3/4">
<input v-model="praktikanNim"
class="font-overpass-mono-bold text-xl bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full h-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500"
id="Kelas" type="text" placeholder="1102174055">
id="Kelas" type="text" placeholder="101022130600">
</div>
</div>
<div class="w-full h-1/4 flex-row py-2 px-5">
Expand Down Expand Up @@ -338,7 +338,7 @@
<div class="w-full h-3/4">
<input v-model="praktikanNimPass"
class="font-overpass-mono-bold text-xl bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full h-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-teal-500"
id="Kelas" type="text" placeholder="1102174055">
id="Kelas" type="text" placeholder="101022130600">
</div>
</div>
<div class="w-full h-1/4 flex-row pt-2 px-5">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ if (typeof io !== 'undefined') {
Vue.toasted.register('showError',
(payload) => {
if(! payload.message) {
return "Maaf, telah terjadi sesuatu<br>(Panggil DIP untuk dilihat lebih lanjut)"
return "Maaf, telah terjadi sesuatu<br>(Panggil CEN untuk dilihat lebih lanjut)"
}
return payload.message;
},
Expand Down

0 comments on commit 30bd9ff

Please sign in to comment.