From d38d825e3484d822ea3c1f0fb1df37ecf386b18a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 04 Jan 2026 19:54:16 +0000
Subject: [PATCH] =TaxonomyCreator.js debugging
---
inc/blocks/FormBlock.php | 98 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/inc/blocks/FormBlock.php b/inc/blocks/FormBlock.php
index 6cec6de..edffbe7 100644
--- a/inc/blocks/FormBlock.php
+++ b/inc/blocks/FormBlock.php
@@ -5,6 +5,7 @@
use JVBase\meta\MetaManager;
use JVBase\managers\CloudflareTurnstile;
use Exception;
+use JVBase\utility\Features;
use WP_Block;
if (!defined('ABSPATH')) {
@@ -35,8 +36,7 @@
public function __construct()
{
- $this->cache = new CacheManager('form_blocks', HOUR_IN_SECONDS);
-
+ $this->cache = CacheManager::for('form_blocks', WEEK_IN_SECONDS);
// Initialize forms from filter
$this->forms = $this->registerForms();
$this->form_contact = apply_filters('jvb_form_contact', '');
@@ -46,14 +46,36 @@
// Register forms data for the block editor
add_action('enqueue_block_editor_assets', [$this, 'localizeFormsData']);
-
add_action('init', [$this, 'registerBlock']);
+ add_filter('render_block', [$this, 'maybeEnqueueScripts'], 10, 2);
+ }
+
+ /**
+ * Enqueue scripts when rendering form block
+ */
+ public function maybeEnqueueScripts(string $block_content, array $block): string
+ {
+ // Only process our form blocks
+ if ($block['blockName'] !== 'jvb/forms') {
+ return $block_content;
+ }
+
+ // Enqueue Turnstile if needed
+ if (Features::forSite()->hasIntegration('cloudflare')) {
+ $cloudflare = JVB()->connect('cloudflare');
+ if ($cloudflare->isSetUp()) {
+ $cloudflare->enqueueTurnstileScripts();
+ }
+ }
+
+ return $block_content;
}
public function registerBlock()
{
register_block_type($this->path, [
- 'render_callback' => [$this, 'render']
+ 'render_callback' => [$this, 'render'],
+ 'style' => 'jvb-icons-forms',
]);
}
@@ -112,7 +134,7 @@
$cache_key = $this->cache->generateKey($block);
$cached = $this->cache->get($cache_key);
-
+ $cached = false;
if ($cached) {
return $cached;
}
@@ -264,7 +286,7 @@
}
echo '<form id="' . esc_attr($form_id) . '" data-form-id="'.esc_attr($type).'" data-save="form" data-noautosave>';
- wp_nonce_field('jvb_form_' . $type);
+// wp_nonce_field('jvb_form_' . $type);
}
/**
@@ -285,10 +307,13 @@
if (!empty($form_config['sections'])) {
$this->renderSections($type, $meta);
} else {
+ echo jvbFormStatus();
// Render fields directly
foreach ($form_config['fields'] as $field_name => $field_config) {
$meta->render('form', $field_name, $field_config);
}
+ $submit_text = $form_config['submit'] ?? 'Submit';
+ echo '<button type="submit" class="button primary">' . esc_html($submit_text) . '</button>';
}
}
@@ -300,8 +325,14 @@
$form_config = $this->forms[$type];
$sections = $form_config['sections'];
$fields = $form_config['fields'];
+ $total = count($sections);
echo '<div class="container">';
+ if ($total > 1) {
+ echo '<div class="form-progress">';
+ jvbRenderProgressBar('<span class="step-text">Step <span class="current">1</span> of ' . $total . '</span>');
+ echo '</div>';
+ }
// Render navigation if multiple sections
if (count($sections) > 1) {
@@ -311,21 +342,24 @@
$active_class = $i === 1 ? ' active' : '';
$aria_selected = $i === 1 ? 'true' : 'false';
- echo '<button type="button" class="tab' . $active_class . '" data-tab="' . esc_attr($slug) . '" role="tab" aria-selected="' . $aria_selected . '">';
+ echo '<button type="button" class="tab' . $active_class . '" data-tab="' . esc_attr($slug) . '" data-step="'.$i.'" role="tab" aria-selected="' . $aria_selected . '">';
+ echo '<span class="step-number">' . $i . '</span>';
echo '<h2>' . esc_html($section['label'] ?? $section) . '</h2>';
echo '</button>';
$i++;
}
echo '</nav>';
}
+ echo jvbFormStatus();
// Render section content
$i = 0;
$total = count($sections);
foreach ($sections as $slug => $section) {
$active_class = $i === 0 ? ' active' : '';
+ $is_last = $i === ($total -1);
- echo '<section id="' . esc_attr($slug) . '" class="tab-content' . $active_class . '" data-tab="' . esc_attr($slug) . '" role="tabpanel">';
+ echo '<section id="' . esc_attr($slug) . '" class="tab-content' . $active_class . '" data-tab="' . esc_attr($slug) . '" data-step="'.($i + 1).'" role="tabpanel">';
if (is_array($section) && !empty($section['title'])) {
echo '<h2>' . esc_html($section['title']) . '</h2>';
@@ -344,14 +378,30 @@
$meta->render('form', $field_name, $field_config);
}
- if ($i === ($total - 1)){
- $submit_text = $form_config['submit'] ?? 'Submit';
- // Submit button
- echo '<div class="form-actions">';
- echo '<button type="submit">' . esc_html($submit_text) . '</button>';
- echo '</div>';
+ // Add step navigation buttons
+ echo '<div class="step-navigation row btw">';
+
+ if ($i > 0) {
+ echo '<button type="button" class="button secondary prev-step" data-action="prev-step">';
+ echo jvbIcon('caret-left');
+ echo '<span>Previous</span>';
+ echo '</button>';
+ } else {
+ echo '<div></div>'; // Spacer for flex layout
}
+ if ($is_last) {
+ $submit_text = $form_config['submit'] ?? 'Submit';
+ echo '<button type="submit" class="button primary">' . esc_html($submit_text) . '</button>';
+ } else {
+ echo '<button type="button" class="button primary next-step" data-action="next-step">';
+ echo '<span>Next Step</span>';
+ echo jvbIcon('caret-right');
+ echo '</button>';
+ }
+
+ echo '</div>'; // .step-navigation
+
echo '</section>';
$i++;
}
@@ -364,7 +414,7 @@
*/
protected function renderTurnstile(): void
{
- if (!jvbSiteUsesCloudflare()) {
+ if (!Features::hasIntegration('cloudflare')) {
return;
}
@@ -389,19 +439,6 @@
echo '<input type="hidden" name="timestamp" value="' . time() . '">';
echo '</form>';
-
- echo '<template class="formSummary">
- <section class="form-summary">
- <h2></h2>
- <div class="message"><p>You\'ll get an email with this information, too. If you need to make any changes, respond to that email.</p></div>
- <h3>Summary:</h3>';
-
- foreach($form_config['fields'] as $field=>$config) {
- $label = $config['summaryTitle'] ?? $config['label'];
-
- echo '<div id="'.$field.'"><h4>'.$label.'</h4><div></div></div>';
- }
- echo '</section></template>';
}
/**
@@ -423,11 +460,6 @@
];
}
- error_log('Form Localization: '.print_r([
- 'formTypes' => $form_types,
- 'availableForms' => $this->forms,
- 'nonce' => wp_create_nonce('jvbForm')
- ], true));
wp_localize_script('jvb-forms-editor-script', 'jvbFormsData', [
'formTypes' => $form_types,
'availableForms' => $this->forms,
--
Gitblit v1.10.0