From 2d6b1717dbcc325d9f3239584a1230750cce5c99 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Tue, 20 Oct 2020 23:33:32 +0100
Subject: [PATCH] move all shared typescript to common.ts

---
 data/templates/admin.html |  2 +-
 data/templates/form.html  |  2 +-
 ts/admin.ts               | 39 -------------------
 ts/common.ts              | 79 +++++++++++++++++++++++++++++++++++++++
 ts/form.ts                | 57 +++++++---------------------
 ts/serialize.ts           | 35 -----------------
 6 files changed, 94 insertions(+), 120 deletions(-)
 create mode 100644 ts/common.ts
 delete mode 100644 ts/serialize.ts

diff --git a/data/templates/admin.html b/data/templates/admin.html
index 3fdabc6..6860a79 100644
--- a/data/templates/admin.html
+++ b/data/templates/admin.html
@@ -465,7 +465,7 @@
                 <p>{{ .contactMessage }}</p>
             </div>
         </div>
-        <script src="serialize.js"></script>
+        <script src="common.js"></script>
             <script>
             var availableProfiles = [];
             {{ if .notifications }}
diff --git a/data/templates/form.html b/data/templates/form.html
index c7f113a..d9da755 100644
--- a/data/templates/form.html
+++ b/data/templates/form.html
@@ -114,7 +114,7 @@
                 </div>
             </div>
         </div>
-        <script src="serialize.js"></script>
+        <script src="common.js"></script>
         <script>
             var usernameEnabled = {{ .username }}
             var validationStrings = {
diff --git a/ts/admin.ts b/ts/admin.ts
index d417566..0134512 100644
--- a/ts/admin.ts
+++ b/ts/admin.ts
@@ -1,45 +1,6 @@
-interface Window {
-    token: string;
-}
-
 // Set in admin.html
 var cssFile: string;
 
-const _get = (url: string, data: Object, onreadystatechange: () => void): void => {
-    let req = new XMLHttpRequest();
-    req.open("GET", url, true);
-    req.responseType = 'json';
-    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
-    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    req.onreadystatechange = onreadystatechange;
-    req.send(JSON.stringify(data));
-};
-
-const _post = (url: string, data: Object, onreadystatechange: () => void): void => {
-    let req = new XMLHttpRequest();
-    req.open("POST", url, true);
-    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
-    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    req.onreadystatechange = onreadystatechange;
-    req.send(JSON.stringify(data));
-};
-
-function _delete(url: string, data: Object, onreadystatechange: () => void): void {
-    let req = new XMLHttpRequest();
-    req.open("DELETE", url, true);
-    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
-    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    req.onreadystatechange = onreadystatechange;
-    req.send(JSON.stringify(data));
-}
-
-const rmAttr = (el: HTMLElement, attr: string): void => {
-    if (el.classList.contains(attr)) {
-        el.classList.remove(attr);
-    }
-};
-const addAttr = (el: HTMLElement, attr: string): void => el.classList.add(attr);
-
 const Focus = (el: HTMLElement): void => rmAttr(el, 'unfocused');
 const Unfocus = (el: HTMLElement): void => addAttr(el, 'unfocused');
 
diff --git a/ts/common.ts b/ts/common.ts
new file mode 100644
index 0000000..f4aa24e
--- /dev/null
+++ b/ts/common.ts
@@ -0,0 +1,79 @@
+interface Window {
+    token: string;
+}
+
+function serializeForm(id: string): Object {
+    const form = document.getElementById(id) as HTMLFormElement;
+    let formData = {};
+    for (let i = 0; i < form.elements.length; i++) {
+        const el = form.elements[i];
+        if ((el as HTMLInputElement).type == "submit") {
+            continue;
+        }
+        let name = (el as HTMLInputElement).name;
+        if (!name) {
+            name = el.id;
+        }
+        switch ((el as HTMLInputElement).type) {
+            case "checkbox":
+                formData[name] = (el as HTMLInputElement).checked;
+                break;
+            case "text":
+            case "password":
+            case "email":
+            case "number":
+                formData[name] = (el as HTMLInputElement).value;
+                break;
+            case "select-one":
+            case "select":
+                let val: string = (el as HTMLSelectElement).value.toString();
+                if (!isNaN(val as any)) {
+                    formData[name] = +val;
+                } else {
+                    formData[name] = val;
+                }
+                break;
+        }
+    }
+    return formData;
+}
+
+const rmAttr = (el: HTMLElement, attr: string): void => {
+    if (el.classList.contains(attr)) {
+        el.classList.remove(attr);
+    }
+};
+
+const addAttr = (el: HTMLElement, attr: string): void => el.classList.add(attr);
+
+const _get = (url: string, data: Object, onreadystatechange: () => void): void => {
+    let req = new XMLHttpRequest();
+    req.open("GET", url, true);
+    req.responseType = 'json';
+    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
+    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+    req.onreadystatechange = onreadystatechange;
+    req.send(JSON.stringify(data));
+};
+
+const _post = (url: string, data: Object, onreadystatechange: () => void, response?: boolean): void => {
+    let req = new XMLHttpRequest();
+    req.open("POST", url, true);
+    if (response) {
+        req.responseType = 'json';
+    }
+    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
+    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+    req.onreadystatechange = onreadystatechange;
+    req.send(JSON.stringify(data));
+};
+
+function _delete(url: string, data: Object, onreadystatechange: () => void): void {
+    let req = new XMLHttpRequest();
+    req.open("DELETE", url, true);
+    req.setRequestHeader("Authorization", "Basic " + btoa(window.token + ":"));
+    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+    req.onreadystatechange = onreadystatechange;
+    req.send(JSON.stringify(data));
+}
+
diff --git a/ts/form.ts b/ts/form.ts
index d5ecf0a..804b113 100644
--- a/ts/form.ts
+++ b/ts/form.ts
@@ -7,35 +7,6 @@ interface pwValStrings {
     length, uppercase, lowercase, number, special: pwValString;
 }
 
-const _post = (url: string, data: Object, onreadystatechange: () => void): void => {
-    let req = new XMLHttpRequest();
-    req.open("POST", url, true);
-    req.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
-    req.responseType = 'json';
-    req.onreadystatechange = onreadystatechange;
-    req.send(JSON.stringify(data));
-};
-
-const toggleSpinner = (): void => {
-    const submitButton = document.getElementById('submitButton') as HTMLButtonElement;
-    if (document.getElementById('createAccountSpinner')) {
-        submitButton.innerHTML = `<span>Create Account</span>`;
-        submitButton.disabled = false;
-    } else {
-        submitButton.innerHTML = ` 
-        <span id="createAccountSpinner" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>Creating...
-        `;
-    }
-};
-
-const rmAttr = (el: HTMLElement, attr: string): void => {
-    if (el.classList.contains(attr)) {
-        el.classList.remove(attr);
-    }
-};
-
-const addAttr = (el: HTMLElement, attr: string): void => el.classList.add(attr);
-
 var validationStrings: pwValStrings;
 var bsVersion: number;
 
@@ -62,8 +33,19 @@ var defaultPwValStrings: pwValStrings = {
     }
 }
 
+const toggleSpinner = (): void => {
+    const submitButton = document.getElementById('submitButton') as HTMLButtonElement;
+    if (document.getElementById('createAccountSpinner')) {
+        submitButton.innerHTML = `<span>Create Account</span>`;
+        submitButton.disabled = false;
+    } else {
+        submitButton.innerHTML = `
+        <span id="createAccountSpinner" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>Creating...
+        `;
+    }
+};
+
 for (let key in validationStrings) {
-    console.log(key);
     if (validationStrings[key].singular == "" || !(validationStrings[key].plural.includes("{n}"))) {
         validationStrings[key].singular = defaultPwValStrings[key].singular;
     }
@@ -154,19 +136,6 @@ var usernameEnabled: boolean;
                 }
             }
         }
-    });
+    }, true);
     return false;
 });
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ts/serialize.ts b/ts/serialize.ts
deleted file mode 100644
index 4f8c165..0000000
--- a/ts/serialize.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-function serializeForm(id: string): Object {
-    const form = document.getElementById(id) as HTMLFormElement;
-    let formData = {};
-    for (let i = 0; i < form.elements.length; i++) {
-        const el = form.elements[i];
-        if ((el as HTMLInputElement).type == "submit") {
-            continue;
-        }
-        let name = (el as HTMLInputElement).name;
-        if (!name) {
-            name = el.id;
-        }
-        switch ((el as HTMLInputElement).type) {
-            case "checkbox":
-                formData[name] = (el as HTMLInputElement).checked;
-                break;
-            case "text":
-            case "password":
-            case "email":
-            case "number":
-                formData[name] = (el as HTMLInputElement).value;
-                break;
-            case "select-one":
-            case "select":
-                let val: string = (el as HTMLSelectElement).value.toString();
-                if (!isNaN(val as any)) {
-                    formData[name] = +val;
-                } else {
-                    formData[name] = val;
-                }
-                break;
-        }
-    }
-    return formData;
-}