diff --git a/front/src/index.ts b/front/src/index.ts index b40f514..07d56bf 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -7,22 +7,8 @@ const request = (resource: string, data: any) => credentials: "include", }).then((res) => res.json()); -const openLocker = (lat: string, lon: string, openCode: string, id: string) => { - (document.querySelector(".areyousure-box") as HTMLElement).style.display = - "block"; - document - .querySelector(".areyousure-button")! - .addEventListener("click", () => openLockerConfirm(lat, lon, openCode, id)); -}; - -const openLockerConfirm = ( - lat: string, - lon: string, - openCode: string, - id: string -) => { - (document.querySelector(".areyousure-box") as HTMLElement).style.display = - "none"; +const openLockerConfirm = (lat: string, lon: string, openCode: string, id: string) => { + (document.querySelector(".areyousure-box") as HTMLElement).style.display = "none"; request("collect", { lat, lon, @@ -30,9 +16,7 @@ const openLockerConfirm = ( id, }).then((res) => { if (res.status != 200) { - const errorBoxText = ( - document.querySelector(".error-box-text")! - ); + const errorBoxText = document.querySelector(".error-box-text")!; const errorBoxWindow = document.querySelector(".error-box")!; errorBoxWindow.style.display = "block"; if (res.description != null) { @@ -44,9 +28,16 @@ const openLockerConfirm = ( }); }; +const openLocker = (lat: string, lon: string, openCode: string, id: string) => { + (document.querySelector(".areyousure-box") as HTMLElement).style.display = "block"; + document + .querySelector(".areyousure-button")! + .addEventListener("click", () => openLockerConfirm(lat, lon, openCode, id)); +}; + window.addEventListener("load", () => { const login = document.querySelector(".login-form")!; - login.addEventListener("submit", function (event) { + login.addEventListener("submit", (event) => { event.preventDefault(); const form = event.target as HTMLFormElement; request("login", { @@ -56,7 +47,7 @@ window.addEventListener("load", () => { }); const register = document.querySelector(".register-form")!; - register.addEventListener("submit", function (event) { + register.addEventListener("submit", (event) => { event.preventDefault(); const form = event.target as HTMLFormElement; request("register", { @@ -68,32 +59,30 @@ window.addEventListener("load", () => { }); const sms = document.querySelector(".sms-form")!; - sms.addEventListener("submit", function (event) { + sms.addEventListener("submit", (event) => { event.preventDefault(); const form = event.target as HTMLFormElement; request("smscode", { code: form.code.value, - phone: phone, + phone, }); }); const errorBoxWindow = document.querySelector(".error-box")!; - const errorBoxButton = ( - document.querySelector(".error-box-button")! - ); - errorBoxButton.addEventListener("click", (event) => { + const errorBoxButton = document.querySelector(".error-box-button")!; + errorBoxButton.addEventListener("click", () => { errorBoxWindow.style.display = "none"; }); request("packages", {}).then((res) => { const table = document.querySelector("tbody")!; res.forEach((shipment: Package) => { - let row = table.insertRow(); - let id = row.insertCell(0); - let sender = row.insertCell(1); - let status = row.insertCell(2); - let locker = row.insertCell(3); - let openAction = row.insertCell(4); + const row = table.insertRow(); + const id = row.insertCell(0); + const sender = row.insertCell(1); + const status = row.insertCell(2); + const locker = row.insertCell(3); + const openAction = row.insertCell(4); row.dataset.lat = shipment.pickupPoint.location.latitude.toString(); row.dataset.lon = shipment.pickupPoint.location.longitude.toString(); @@ -103,12 +92,10 @@ window.addEventListener("load", () => { id.innerText = shipment.shipmentNumber; sender.innerText = shipment.senderName; status.innerText = shipment.status; - locker.innerText = - shipment.pickupPoint.name + " - " + shipment.pickupPoint.description; + locker.innerText = `${shipment.pickupPoint.name} - ${shipment.pickupPoint.description}`; openAction.innerHTML = "Open"; openAction.addEventListener("click", (event) => { - let data = ((event.target as Element).parentNode as HTMLElement) - .dataset; + const data = ((event.target as Element).parentNode as HTMLElement).dataset; openLocker(data.lat!, data.lon!, data.openCode!, data.id!); });