Upload main.js

main.js

@@ -1,9 +1,9 @@
-const APP_PATHNAME =
-  typeof window !== "undefined" && window.location && typeof window.location.pathname === "string"
-    ? window.location.pathname.replace(/\/$/, "")
-    : "";
-
-const VAT_OPTIONS = [
+const APP_PATHNAME =
+  typeof window !== "undefined" && window.location && typeof window.location.pathname === "string"
+    ? window.location.pathname.replace(/\/$/, "")
+    : "";
+
+const VAT_OPTIONS = [
   { value: "23", label: "23%" },
   { value: "8", label: "8%" },
   { value: "5", label: "5%" },
@@ -792,24 +792,24 @@ function exitInvoiceEdit() {
   cancelEditInvoiceButton.classList.add("hidden");
 }
 
-function buildApiUrl(path = "") {
-  if (!path) {
-    return APP_PATHNAME || "/";
-  }
-  if (/^https?:\/\//i.test(path)) {
-    return path;
-  }
-  return path.startsWith("/")
-    ? `${APP_PATHNAME}${path}` || "/"
-    : `${APP_PATHNAME}/${path}`.replace(/\/{2,}/g, "/");
-}
-
-async function apiRequest(path, { method = "GET", body, headers = {} } = {}, requireAuth = false) {
-  const options = {
-    method,
-    headers: {
-      "Content-Type": "application/json",
-      ...headers,
+function buildApiUrl(path = "") {
+  if (!path) {
+    return APP_PATHNAME || "/";
+  }
+  if (/^https?:\/\//i.test(path)) {
+    return path;
+  }
+  return path.startsWith("/")
+    ? `${APP_PATHNAME}${path}` || "/"
+    : `${APP_PATHNAME}/${path}`.replace(/\/{2,}/g, "/");
+}
+
+async function apiRequest(path, { method = "GET", body, headers = {} } = {}, requireAuth = false) {
+  const options = {
+    method,
+    headers: {
+      "Content-Type": "application/json",
+      ...headers,
     },
   };
 
@@ -824,8 +824,8 @@ async function apiRequest(path, { method = "GET", body, headers = {} } = {}, req
     options.headers.Authorization = `Bearer ${authToken}`;
   }
 
-  const url = buildApiUrl(path);
-  const response = await fetch(url, options);
+  const url = buildApiUrl(path);
+  const response = await fetch(url, options);
   const isJson = response.headers.get("content-type")?.includes("application/json");
   const data = isJson ? await response.json() : {};
 
@@ -1679,28 +1679,19 @@ async function initialize() {
   closeRegisterPanel({ resetForm: true, focusTrigger: false });
   clearFeedback(registerFeedback);
   clearFeedback(loginFeedback);
-  try {
-    const status = await apiRequest("/api/status");
-    if (typeof status.max_logo_size === "number") {
-      maxLogoSize = status.max_logo_size;
-    }
-    if (status.legacy_login_hint) {
-      legacyLoginHint.textContent = `Zaloguj się korzystajac ze starego loginu "${status.legacy_login_hint}", a nastepnie dodaj adres email.`;
-      legacyLoginHint.classList.remove("hidden");
-    } else {
-      legacyLoginHint.classList.add("hidden");
-      legacyLoginHint.textContent = "";
-    }
-
-    if (authToken) {
-      await bootstrapApp();
-    }
-  } catch (error) {
-    console.error(error);
-    showFeedback(registerFeedback, "Nie udało się nawiązać połączenia z serwerem.");
+  if (legacyLoginHint) {
+    legacyLoginHint.classList.add("hidden");
+    legacyLoginHint.textContent = "";
+  }
+  if (authToken) {
+    await bootstrapApp().catch((error) => {
+      console.error(error);
+      showFeedback(registerFeedback, "Nie uda?o si? nawi?za? po??czenia z serwerem.");
+    });
   }
 }
 
+
 if (registerForm && registerFeedback && loginFeedback) {
   registerForm.addEventListener("submit", async (event) => {
     event.preventDefault();
@@ -1728,6 +1719,8 @@ if (registerForm && registerFeedback && loginFeedback) {
 
     const payload = {
       email: emailValue,
+      password,
+      confirm_password: confirmPassword,
       company_name: formData.get("company_name")?.toString().trim(),
       owner_name: formData.get("owner_name")?.toString().trim(),
       address_line: formData.get("address_line")?.toString().trim(),
@@ -1735,11 +1728,10 @@ if (registerForm && registerFeedback && loginFeedback) {
       city: formData.get("city")?.toString().trim(),
       tax_id: formData.get("tax_id")?.toString().trim(),
       bank_account: formData.get("bank_account")?.toString().trim(),
-      password,
     };
 
     try {
-      await apiRequest("/api/setup", { method: "POST", body: payload });
+      await apiRequest("/api/register", { method: "POST", body: payload });
       showFeedback(registerFeedback, "Konto utworzone. Możesz sie zalogowac.", "success");
       if (loginForm && loginForm.elements.email) {
         loginForm.elements.email.value = emailValue;
@@ -1811,7 +1803,7 @@ if (loginForm && loginFeedback) {
       const errorMessage = error instanceof Error ? error.message : String(error || "");
       let feedbackMessage = errorMessage || "Logowanie nie powiodło się.";
       if (/nieprawidlowy (login|email) lub hasło/i.test(errorMessage)) {
-        feedbackMessage = "Podany email lub hasło są nieprawidłowe. Utwórz konto, jeśli jeszcze go nie masz.";
+        feedbackMessage = "Podany email lub hasło są nieprawidłowe. Utwórz konto, jeśli jeszcze go nie masz.";
       } else if (/brak autoryzacji/i.test(errorMessage) || /brak tokenu autoryzacyjnego/i.test(errorMessage)) {
         feedbackMessage = "Sesja wygasła. Zaloguj się ponownie.";
       } else if (/failed to fetch|networkerror/i.test(errorMessage) || error instanceof TypeError) {
@@ -1859,7 +1851,7 @@ if (businessForm && businessFeedback) {
     };
 
     try {
-      const data = await apiRequest("/api/business", { method: "PUT", body: payload }, true);
+      const data = await apiRequest("/api/business", { method: "POST", body: payload }, true);
       currentBusiness = data.business;
       renderBusinessDisplay(currentBusiness);
       fillBusinessForm(currentBusiness);