Skip to content
Snippets Groups Projects
Commit 9fdaf587 authored by Michelle Lim's avatar Michelle Lim
Browse files

fix: router readiness verification

parent e5015771
Branches
Tags
1 merge request!5merge branch angel to develop
......@@ -13,11 +13,12 @@ const Create = () => {
const statusPelanggan = "Calon"
useEffect(() => {
if (!router.isReady) return;
if (router.query.kelasID) {
setKelasPelanggan(router.query.kelasID);
setIsDisabled(true);
}
})
}, [router.isReady, router.query.kelasID])
const handleUpdate = async () => {
const body = JSON.stringify({
......@@ -45,18 +46,19 @@ const Create = () => {
}
toast.success("Successfully created!")
const token = window.localStorage.getItem("token")
if (!token){
if (!token) {
router.push("/")
return
}
const tokenParsed = token.split(" ")[1]
fetch(`https://rpl-backend-production.up.railway.app/v1/auth/verify/${tokenParsed}`).then(async (response) => {
const responsejson = await response.json();
if (responsejson.data.tipe_user === "ADMIN"){
if (responsejson.data.tipe_user === "ADMIN") {
router.push("/calonpelanggan")
return
}
}).catch(error=>{
router.push("/")
}).catch(error => {
console.error(error)
return
})
......
......@@ -50,6 +50,7 @@ const Edit = () => {
}
useEffect(() => {
if (!router.isReady) return;
const token = window.localStorage.getItem("token")
if (token === undefined || token === null) {
window.location.replace("/auth/login")
......@@ -76,7 +77,7 @@ const Edit = () => {
setAdminKursus(responsejson.data.adminKursus)
})
//eslint-disable-next-line
}, [])
}, [router.isReady])
return <>
<Template>
<main className="min-h-screen px-14 py-5 bg-[#FFF6F6]">
......@@ -129,7 +130,8 @@ const Edit = () => {
<div className="flex flex-row align-middle justify-between">
<span className="h-min my-auto font-bold text-lg">Status Pelanggan</span>
<select value={statusPelanggan} onChange={(e) => {
setStatusPelanggan(e.target.value)}}>
setStatusPelanggan(e.target.value)
}}>
<option value="Calon">Calon</option>
<option value="Siswa">Siswa</option>
<option value="Lulus">Lulus</option> </select>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment