From 0afb2c0046b55c123eafb4ab9ee77efa68d12463 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 06 Jun 2026 17:15:31 +0000
Subject: [PATCH] =Starting the Favourites.js setup, converting previous Northeh stuff to new Registrar, fixing up Square.php integration to match

---
 src/forms/view.js |  102 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/src/forms/view.js b/src/forms/view.js
index e4a88ea..788e929 100644
--- a/src/forms/view.js
+++ b/src/forms/view.js
@@ -3,58 +3,110 @@
  * Frontend JavaScript for the Form Block
  * Handles form validation and submission
  */
+/**
+ * view.js
+ * Frontend JavaScript for the Form Block
+ */
 class FormBlock {
 	constructor() {
-		this.controller = new window.jvbForm();
+		this.controller = window.jvbForm;
 
 		document.querySelectorAll('.jvb-form-block form').forEach(form => {
-			this.controller.registerForm(form, {autosave: true});
+			this.controller.registerForm(form, {
+				cache: true,
+				autoUpload: false,
+				imageMeta: false,
+			});
 		});
 
 		this.controller.subscribe((event, data) => {
 			if (event === 'form-submit') {
-				this.handleFormSubmission(data);
+				this.handleFormSubmission(data).then(()=>{});
 			}
 		});
 	}
 
-	async handleFormSubmission(data) {
-		let formId = data.formId;
-		let formConfig = data.config;
-		let formData = data.fullData;
-		let form = formConfig.element;
+	async handleFormSubmission(eventData) {
+		const { config, data } = eventData;
+		const form = config.element;
 
-		let headers = {
-			'X-WP-Nonce': jvbSettings.nonce,
-			'Content-Type': 'application/json'
-		};
+		const submitData = new FormData();
 
-		let block = form.closest('.jvb-form-block');
-		this.controller.showFormStatus(formId, 'uploading');
+		// Add regular form fields
+		for (const [key, value] of Object.entries(data)) {
+			if (Array.isArray(value)) {
+				value.forEach(v => submitData.append(`${key}[]`, v));
+			} else if (typeof value === 'object' && value !== null) {
+				submitData.append(key, JSON.stringify(value));
+			} else {
+				submitData.append(key, value);
+			}
+		}
+		config.element.querySelectorAll('[name="form_id"],[name="form_type"],[name="timestamp"],[name="cf-turnstile-response"]').forEach(input => {
+			submitData.append(input.name, input.value);
+		});
+
+		// Add uploaded files
+		if (window.jvbUploads) {
+			try {
+				const files = await window.jvbUploads.getFilesForForm(form);
+
+				files.forEach(({ file, fieldName }) => {
+					submitData.append(`${fieldName}[]`, file);
+				});
+			} catch (error) {
+				console.error('Error getting files:', error);
+			}
+		}
+
+		this.controller.showFormStatus(config.id, 'uploading');
 
 		try {
 			const response = await fetch(`${jvbSettings.api}forms`, {
 				method: 'POST',
-				headers,
-				body: JSON.stringify(formData)
+				credentials: 'same-origin',
+				body: submitData
 			});
 
+			const result = await response.json();
+
 			if (!response.ok) {
-				this.controller.showFormStatus(formId, 'error');
-				const errorData = await response.json().catch(() => ({}));
-				throw new Error(errorData.message || `Request failed with status ${response.status}`);
+				this.controller.showFormStatus(config.id, 'error');
+				this.controller.handleFormError(form, result);
+				return;
 			}
 
-			this.controller.showFormStatus(formId, 'submitted');
-			this.controller.showSummary(formId, '.jvb-form-block');
+			this.controller.showFormStatus(config.id, 'submitted');
+			// this.controller.handleFormSuccess(form, result);
+			this.controller.showSummary({ changes: data, config: config });
+			window.jvbA11y.announce('Form successfully submitted!');
+
+			// Clean up uploaded files
+			if (window.jvbUploads) {
+				const uploadFields = form.querySelectorAll('[data-upload-field]');
+				for (const field of uploadFields) {
+					const fieldId = window.jvbUploads.determineFieldId(field);
+					await window.jvbUploads.clearFieldFromStores(fieldId);
+				}
+			}
+
 		} catch (error) {
-			throw error;
+			console.error('Form submission error:', error);
+			this.controller.showFormStatus(config.id, 'error');
+			this.controller.handleFormError(form, {
+				message: 'Network error. Please check your connection and try again.',
+				code: 'network_error'
+			});
 		} finally {
-			this.controller.store.delete(formId);
+			await this.controller.store.delete(config.id);
 		}
 	}
 }
 
-document.addEventListener('DOMContentLoaded', function() {
-	new FormBlock();
+document.addEventListener('DOMContentLoaded', async function() {
+	window.auth.subscribe(event => {
+		if (event === 'auth-loaded') {
+			new FormBlock();
+		}
+	});
 });

--
Gitblit v1.10.0