diff --git a/front/.browserslistrc b/front/.browserslistrc new file mode 100644 index 0000000..257597d --- /dev/null +++ b/front/.browserslistrc @@ -0,0 +1 @@ +>0.25%, not dead \ No newline at end of file diff --git a/front/src/index.ts b/front/src/index.ts index 74d8c46..3cbc631 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -10,6 +10,13 @@ const request = (resource: string, data: any) => }, }).then((res) => res.json()); +const openError = (content: string) => { + const errorBox = document.querySelector(".error-box")!; + const txt = errorBox.querySelector(".error-box-text")!; + txt.innerText = content; + errorBox.style.display = "block"; +}; + const openLockerConfirm = (lat: string, lon: string, openCode: string, id: string) => { (document.querySelector(".areyousure-box") as HTMLElement).style.display = "none"; request("collect", { @@ -19,14 +26,7 @@ const openLockerConfirm = (lat: string, lon: string, openCode: string, id: strin id, }).then((res) => { if (res.status != 200) { - const errorBoxText = document.querySelector(".error-box-text")!; - const errorBoxWindow = document.querySelector(".error-box")!; - errorBoxWindow.style.display = "block"; - if (res.description != null) { - errorBoxText.innerText = res.description; - } else { - errorBoxText.innerText = res.error; - } + openError(res.description || res.error); } }); }; @@ -82,29 +82,44 @@ window.addEventListener("load", () => { }); const register = document.querySelector(".register-form")!; - register.addEventListener("submit", (event) => { + register.addEventListener("submit", async (event) => { event.preventDefault(); const form = event.target as HTMLFormElement; - request("register", { + phone = form.phone.value; + const res = await request("register", { login: form.login.value, password: form.password.value, phone: form.phone.value, }); - phone = form.phone.value; + if (res.status == 200) { + [".register-box", ".login-box"].forEach( + (element) => ((document.querySelector(element)! as HTMLDivElement).style.display = "none"), + ); + (document.querySelector(".sms-box")! as HTMLDivElement).style.display = "block"; + } else { + openError(res.description || res.error); + } }); const sms = document.querySelector(".sms-form")!; - sms.addEventListener("submit", (event) => { + sms.addEventListener("submit", async (event) => { event.preventDefault(); const form = event.target as HTMLFormElement; - request("smscode", { + const res = await request("smscode", { code: form.code.value, phone, }); + if (res.status == 200) { + (document.querySelector(".sms-box")! as HTMLDivElement).style.display = "none"; + await refreshPackages(); + (document.querySelector(".package-list")! as HTMLDivElement).style.display = "block"; + } else { + openError(res.description || res.error); + } }); - const errorBoxWindow = document.querySelector(".error-box")!; - const errorBoxButton = document.querySelector(".error-box-button")!; + const errorBoxWindow = document.querySelector(".error-box")!; + const errorBoxButton = document.querySelector(".error-box-button")!; errorBoxButton.addEventListener("click", () => { errorBoxWindow.style.display = "none"; });