ultimate-jekyll-manager 0.0.118 → 0.0.119

package/dist/assets/js/libs/dev.js

@@ -121,159 +121,222 @@ function setupBreakpointLogger() {
 function setupTrackingInterceptors() {
   console.log('🔍 Setting up tracking interceptors...');
 
-  // Intercept Google Analytics (gtag)
-  if (typeof window.gtag !== 'undefined') {
-    const originalGtag = window.gtag;
-    window.gtag = function() {
-      const args = Array.from(arguments);
-      const command = args[0];
-      const eventNameOrParams = args[1];
-      const params = args[2];
-
-      // Log the gtag call
-      console.log('📊 gtag:', {
-        command: command,
-        event: eventNameOrParams,
-        params: params || eventNameOrParams,
-        fullArgs: args
-      });
-
-      // Call the original gtag function
-      return originalGtag.apply(this, arguments);
-    };
-    console.log('✅ gtag interceptor installed');
-  }
+  // Track which interceptors have been installed
+  const installed = {
+    gtag: false,
+    fbq: false,
+    ttq: false,
+  };
 
-  // Intercept Facebook Pixel (fbq)
-  if (typeof window.fbq !== 'undefined') {
-    const originalFbq = window.fbq;
+  // Try to install interceptors
+  const tryInstallInterceptors = () => {
+    // Try installing gtag if not already installed
+    if (!installed.gtag && typeof window.gtag !== 'undefined') {
+      installGtagInterceptor();
+      installed.gtag = true;
+    }
 
-    // Create wrapper function that preserves all properties
-    const fbqWrapper = function() {
-      const args = Array.from(arguments);
-      const command = args[0];
-      const event = args[1];
-      const params = args[2];
-
-      // Log the fbq call
-      console.log('📘 fbq:', {
-        command: command,
-        event: event,
-        params: params,
-        fullArgs: args
-      });
-
-      // Call the original fbq function
-      return originalFbq.apply(this, arguments);
-    };
+    // Try installing fbq if not already installed
+    if (!installed.fbq && typeof window.fbq !== 'undefined') {
+      installFbqInterceptor();
+      installed.fbq = true;
+    }
 
-    // Copy all properties from original fbq to wrapper
-    Object.keys(originalFbq).forEach(key => {
-      fbqWrapper[key] = originalFbq[key];
-    });
+    // Try installing ttq if not already installed
+    if (!installed.ttq && typeof window.ttq !== 'undefined' && window.ttq.track) {
+      // Check if it's a stub (contains 'push' in the function)
+      const isStub = window.ttq.track.toString().includes('push');
 
-    // If callMethod exists, wrap it too
-    if (originalFbq.callMethod) {
-      const originalCallMethod = originalFbq.callMethod;
-      fbqWrapper.callMethod = function() {
-        const args = Array.from(arguments);
-        console.log('📘 fbq.callMethod:', args);
-        return originalCallMethod.apply(originalFbq, arguments);
-      };
+      if (!isStub) {
+        installTtqInterceptor();
+        installed.ttq = true;
+      }
     }
 
-    // Preserve queue if it exists (for stub implementation)
-    if (originalFbq.queue) {
-      fbqWrapper.queue = originalFbq.queue;
+    // Return true if all interceptors are installed
+    return installed.gtag && installed.fbq && installed.ttq;
+  };
+
+  // Try installing immediately
+  if (tryInstallInterceptors()) {
+    return;
+  }
+
+  // Poll every 500ms to check if tracking libraries are ready
+  const pollInterval = setInterval(() => {
+    if (tryInstallInterceptors()) {
+      clearInterval(pollInterval);
     }
+  }, 500);
+
+  // Stop polling after 10 seconds regardless
+  setTimeout(() => {
+    clearInterval(pollInterval);
+    console.log('⏱️ Tracking interceptor polling stopped');
 
-    // Preserve push method if it exists (for stub implementation)
-    if (originalFbq.push) {
-      fbqWrapper.push = originalFbq.push;
+    if (!installed.gtag) {
+      console.log('⚠️ gtag interceptor was never installed');
     }
+    if (!installed.fbq) {
+      console.log('⚠️ fbq interceptor was never installed');
+    }
+    if (!installed.ttq) {
+      console.log('⚠️ ttq interceptor was never installed');
+    }
+  }, 10000);
+}
 
-    window.fbq = fbqWrapper;
-    console.log('✅ fbq interceptor installed');
+function installGtagInterceptor() {
+  if (typeof window.gtag === 'undefined') {
+    return;
   }
 
-  // Intercept TikTok Pixel (ttq)
-  if (typeof window.ttq !== 'undefined' && window.ttq.track) {
-    const originalTtq = window.ttq;
-    const originalTrack = window.ttq.track;
-    const originalPage = window.ttq.page;
-    const originalIdentify = window.ttq.identify;
-    const originalLoad = window.ttq.load;
+  const originalGtag = window.gtag;
 
-    // Intercept track method
-    window.ttq.track = function() {
-      const args = Array.from(arguments);
-      const event = args[0];
-      const params = args[1];
-
-      // Log the ttq.track call
-      console.log('🎵 ttq.track:', {
-        event: event,
-        params: params,
-        fullArgs: args
-      });
-
-      // Call the original track function
-      return originalTrack.apply(originalTtq, arguments);
-    };
+  window.gtag = function() {
+    const args = Array.from(arguments);
+    const command = args[0];
+    const eventNameOrParams = args[1];
+    const params = args[2];
 
-    // Intercept page method
-    window.ttq.page = function() {
-      const args = Array.from(arguments);
+    // Log the gtag call
+    console.log('📊 gtag:', {
+      command: command,
+      event: eventNameOrParams,
+      params: params || eventNameOrParams,
+      fullArgs: args
+    });
 
-      // Log the ttq.page call
-      console.log('🎵 ttq.page:', {
-        fullArgs: args
-      });
+    // Call the original gtag function
+    return originalGtag.apply(this, arguments);
+  };
 
-      // Call the original page function
-      return originalPage.apply(originalTtq, arguments);
-    };
+  console.log('✅ gtag interceptor installed');
+}
 
-    // Intercept identify method
-    window.ttq.identify = function() {
-      const args = Array.from(arguments);
+function installFbqInterceptor() {
+  if (typeof window.fbq === 'undefined') {
+    return;
+  }
 
-      // Log the ttq.identify call
-      console.log('🎵 ttq.identify:', {
-        fullArgs: args
-      });
+  const originalFbq = window.fbq;
+
+  // Create wrapper function that preserves all properties
+  const fbqWrapper = function() {
+    const args = Array.from(arguments);
+    const command = args[0];
+    const event = args[1];
+    const params = args[2];
+
+    // Log the fbq call
+    console.log('📘 fbq:', {
+      command: command,
+      event: event,
+      params: params,
+      fullArgs: args
+    });
 
-      // Call the original identify function
-      return originalIdentify.apply(originalTtq, arguments);
-    };
+    // Call the original fbq function
+    return originalFbq.apply(this, arguments);
+  };
 
-    // Intercept load method
-    window.ttq.load = function() {
+  // Copy all properties from original fbq to wrapper
+  Object.keys(originalFbq).forEach(key => {
+    fbqWrapper[key] = originalFbq[key];
+  });
+
+  // If callMethod exists, wrap it too
+  if (originalFbq.callMethod) {
+    const originalCallMethod = originalFbq.callMethod;
+    fbqWrapper.callMethod = function() {
       const args = Array.from(arguments);
+      console.log('📘 fbq.callMethod:', args);
+      return originalCallMethod.apply(originalFbq, arguments);
+    };
+  }
+
+  // Preserve queue if it exists (for stub implementation)
+  if (originalFbq.queue) {
+    fbqWrapper.queue = originalFbq.queue;
+  }
 
-      // Log the ttq.load call
-      console.log('🎵 ttq.load:', {
-        pixelId: args[0],
-        fullArgs: args
-      });
+  // Preserve push method if it exists (for stub implementation)
+  if (originalFbq.push) {
+    fbqWrapper.push = originalFbq.push;
+  }
 
-      // Call the original load function
-      return originalLoad.apply(originalTtq, arguments);
-    };
+  window.fbq = fbqWrapper;
+  console.log('✅ fbq interceptor installed');
+}
 
-    console.log('✅ ttq interceptor installed');
+function installTtqInterceptor() {
+  if (typeof window.ttq === 'undefined' || !window.ttq.track) {
+    return;
   }
 
-  // Check again after a delay in case tracking libraries load asynchronously
-  setTimeout(() => {
-    if (typeof window.gtag === 'undefined') {
-      console.log('⚠️ gtag not found - may load later');
-    }
-    if (typeof window.fbq === 'undefined') {
-      console.log('⚠️ fbq not found - may load later');
-    }
-    if (typeof window.ttq === 'undefined' || !window.ttq.track) {
-      console.log('⚠️ ttq not found or is a stub - may load later');
-    }
-  }, 3000);
+  const originalTtq = window.ttq;
+  const originalTrack = window.ttq.track;
+  const originalPage = window.ttq.page;
+  const originalIdentify = window.ttq.identify;
+  const originalLoad = window.ttq.load;
+
+  // Intercept track method
+  window.ttq.track = function() {
+    const args = Array.from(arguments);
+    const event = args[0];
+    const params = args[1];
+
+    // Log the ttq.track call
+    console.log('🎵 ttq.track:', {
+      event: event,
+      params: params,
+      fullArgs: args
+    });
+
+    // Call the original track function
+    return originalTrack.apply(originalTtq, arguments);
+  };
+
+  // Intercept page method
+  window.ttq.page = function() {
+    const args = Array.from(arguments);
+
+    // Log the ttq.page call
+    console.log('🎵 ttq.page:', {
+      fullArgs: args
+    });
+
+    // Call the original page function
+    return originalPage.apply(originalTtq, arguments);
+  };
+
+  // Intercept identify method
+  window.ttq.identify = function() {
+    const args = Array.from(arguments);
+
+    // Log the ttq.identify call
+    console.log('🎵 ttq.identify:', {
+      userData: args[0],
+      fullArgs: args
+    });
+
+    // Call the original identify function
+    return originalIdentify.apply(originalTtq, arguments);
+  };
+
+  // Intercept load method
+  window.ttq.load = function() {
+    const args = Array.from(arguments);
+
+    // Log the ttq.load call
+    console.log('🎵 ttq.load:', {
+      pixelId: args[0],
+      fullArgs: args
+    });
+
+    // Call the original load function
+    return originalLoad.apply(originalTtq, arguments);
+  };
+
+  console.log('✅ ttq interceptor installed');
 }

package/dist/assets/js/pages/account/index.js

@@ -338,7 +338,8 @@ function trackAccountSectionView(sectionId) {
     section: sectionId
   });
   ttq.track('ViewContent', {
-    content_name: `Account ${sectionId}`,
-    content_type: 'account_section'
+    content_id: `account-${sectionId}`,
+    content_type: 'product',
+    content_name: `Account ${sectionId}`
   });
 }

package/dist/assets/js/pages/account/sections/delete.js

@@ -1,7 +1,9 @@
 // Delete account section module
-import fetch from 'wonderful-fetch';
+import { FormManager } from '__main_assets__/js/libs/form-manager.js';
+import authorizedFetch from '__main_assets__/js/libs/authorized-fetch.js';
 
 let webManager = null;
+let formManager = null;
 
 // Initialize delete section
 export async function init(wm) {
@@ -15,9 +17,21 @@ function setupDeleteAccountForm() {
   const $checkbox = document.getElementById('delete-confirm-checkbox');
   const $deleteBtn = document.getElementById('delete-account-btn');
   const $cancelBtn = document.getElementById('cancel-delete-btn');
-  const $reason = document.getElementById('delete-reason');
 
-  if (!$form || !$checkbox || !$deleteBtn) return;
+  if (!$form || !$checkbox || !$deleteBtn) {
+    return;
+  }
+
+  // Initialize FormManager
+  formManager = new FormManager('#delete-account-form', {
+    autoDisable: true,
+    showSpinner: true,
+    validateOnSubmit: false, // We'll handle validation manually due to custom confirmation flow
+    allowMultipleSubmissions: false,
+    resetOnSuccess: false,
+    submitButtonLoadingText: 'Deleting account...',
+    initialState: 'ready',
+  });
 
   // Enable/disable delete button based on checkbox
   $checkbox.addEventListener('change', (e) => {
@@ -32,75 +46,80 @@ function setupDeleteAccountForm() {
     });
   }
 
-  // Handle form submission
-  $form.addEventListener('submit', async (e) => {
-    e.preventDefault();
+  // Listen to FormManager submit event
+  formManager.addEventListener('submit', handleFormSubmit);
+}
 
-    // Check if checkbox is checked
-    if (!$checkbox.checked) {
-      alert('Please confirm that you understand this action is permanent.');
-      return;
-    }
+// Handle form submission
+async function handleFormSubmit(event) {
+  // Prevent default FormManager submission
+  event.preventDefault();
 
-    // Show confirmation dialog
-    const confirmMessage = `Are you absolutely sure you want to delete your account?\n\nThis action CANNOT be undone.\n\nType "DELETE" to confirm:`;
-    const userInput = prompt(confirmMessage);
+  const formData = event.detail.data;
+  const $checkbox = document.getElementById('delete-confirm-checkbox');
 
-    if (userInput !== 'DELETE') {
-      alert('Account deletion cancelled. You must type "DELETE" exactly to confirm.');
-      return;
-    }
+  // Check if checkbox is checked
+  if (!$checkbox.checked) {
+    formManager.showError('Please confirm that you understand this action is permanent.');
+    formManager.setFormState('ready');
+    return;
+  }
 
-    // Final confirmation
-    const finalConfirm = confirm('This is your last chance to cancel.\n\nAre you sure you want to permanently delete your account?');
-    
-    if (!finalConfirm) {
-      return;
-    }
+  // Show confirmation dialog
+  const confirmMessage = `Are you absolutely sure you want to delete your account?\n\nThis action CANNOT be undone.\n\nType "DELETE" to confirm:`;
+  const userInput = prompt(confirmMessage);
 
-    // Disable button and show loading
-    $deleteBtn.disabled = true;
-    $deleteBtn.innerHTML = `<span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span><span class="button-text">Deleting account...</span>`;
-
-    try {
-      // Get API base URL
-      const apiBaseUrl = webManager.isDevelopment()
-        ? 'http://localhost:5002'
-        : 'https://api.itwcreativeworks.com';
-
-      // Send delete request to server
-      const response = await fetch(`${apiBaseUrl}/account/delete`, {
-        method: 'POST',
-        response: 'json',
-        body: {
-          reason: $reason.value || '',
+  if (userInput !== 'DELETE') {
+    formManager.showError('Account deletion cancelled. You must type "DELETE" exactly to confirm.');
+    formManager.setFormState('ready');
+    return;
+  }
+
+  // Final confirmation
+  const finalConfirm = confirm('This is your last chance to cancel.\n\nAre you sure you want to permanently delete your account?');
+
+  if (!finalConfirm) {
+    formManager.setFormState('ready');
+    return;
+  }
+
+  try {
+    // Send delete request to server
+    const response = await authorizedFetch(webManager.getApiUrl(), {
+      method: 'POST',
+      timeout: 30000,
+      response: 'json',
+      tries: 2,
+      body: {
+        command: 'user:delete',
+        payload: {
+          reason: formData.reason || '',
           confirmed: true
         }
-      });
-
-      console.log('Delete account response:', response);
-
-      if (response.success) {
-        // Show success message
-        alert('Your account has been successfully deleted. You will now be signed out.');
-        
-        // Sign out the user
-        await webManager.auth().signOut();
-        
-        // Redirect to home page
-        window.location.href = '/';
-      } else {
-        throw new Error(response.message || 'Failed to delete account');
       }
-    } catch (error) {
-      console.error('Failed to delete account:', error);
-      alert(`Failed to delete account: ${error.message}`);
-      
-      // Re-enable button
-      $deleteBtn.disabled = !$checkbox.checked;
-      $deleteBtn.innerHTML = `<i class="fa-solid fa-trash fa-sm me-2"></i><span class="button-text">Delete My Account Permanently</span>`;
+    });
+
+    console.log('Delete account response:', response);
+
+    if (response.success) {
+      // Show success message
+      formManager.showSuccess('Your account has been successfully deleted. You will now be signed out.');
+
+      // Sign out the user
+      await webManager.auth().signOut();
+
+      // Redirect to home page
+      setTimeout(() => {
+        window.location.href = '/';
+      }, 1500);
+    } else {
+      throw new Error(response.message || 'Failed to delete account');
     }
-  });
+  } catch (error) {
+    console.error('Failed to delete account:', error);
+    formManager.showError(`Failed to delete account: ${error.message}`);
+    formManager.setFormState('ready');
+  }
 }
 
 // Load delete section data (if needed)
@@ -111,25 +130,5 @@ export async function loadData(account) {
 
 // Called when section is shown
 export function onShow() {
-  // Reset form when shown
-  const $form = document.getElementById('delete-account-form');
-  const $checkbox = document.getElementById('delete-confirm-checkbox');
-  const $deleteBtn = document.getElementById('delete-account-btn');
-  const $reason = document.getElementById('delete-reason');
 
-  if ($form) {
-    $form.reset();
-  }
-
-  if ($checkbox) {
-    $checkbox.checked = false;
-  }
-
-  if ($deleteBtn) {
-    $deleteBtn.disabled = true;
-  }
-
-  if ($reason) {
-    $reason.value = '';
-  }
-}
+}

package/dist/assets/js/pages/account/sections/security.js

@@ -406,10 +406,13 @@ function initializeSignoutAllForm() {
     signoutAllForm.addEventListener('submit', async (event) => {
       event.preventDefault();
 
+      // 1ms wait to allow form state to update and show processing
+      await new Promise(resolve => setTimeout(resolve, 1));
+
       try {
         // Confirm sign out
         if (!confirm('Are you sure you want to sign out of all sessions? This will log you out everywhere, including this device.')) {
-          throw new Error('Sign out cancelled');
+          return signoutAllForm.setFormState('ready');
         }
 
         // Sign out of all sessions

package/dist/assets/js/pages/admin/notifications/new/index.js

@@ -1,6 +1,7 @@
 // Libraries
 import { FormManager } from '__main_assets__/js/libs/form-manager.js';
 import authorizedFetch from '__main_assets__/js/libs/authorized-fetch.js';
+import { getPrerenderedIcon } from '__main_assets__/js/libs/prerendered-icons.js';
 let webManager = null;
 
 // Module
@@ -416,7 +417,9 @@ function updateChannelBadges(formData) {
   const channels = formData.channels || {};
   const $badgesContainer = document.querySelector('.card .d-flex.gap-2.flex-wrap');
 
-  if (!$badgesContainer) return;
+  if (!$badgesContainer) {
+    return;
+  }
 
   // Clear existing badges
   $badgesContainer.innerHTML = '';
@@ -430,20 +433,24 @@ function updateChannelBadges(formData) {
   };
 
   Object.keys(channelConfigs).forEach(channel => {
-    if (channels[channel]?.enabled) {
-      const config = channelConfigs[channel];
-      const $badge = document.createElement('span');
-      $badge.className = `badge bg-${config.color}`;
-      $badge.innerHTML = `<i class="bi bi-${config.icon} me-1"></i>${channel.charAt(0).toUpperCase() + channel.slice(1)}`;
-      $badgesContainer.appendChild($badge);
+    if (!channels[channel]?.enabled) {
+      return;
     }
+
+    const config = channelConfigs[channel];
+    const iconHTML = getPrerenderedIcon(config.icon);
+    const $badge = document.createElement('span');
+    $badge.className = `badge bg-${config.color}`;
+    $badge.innerHTML = `${iconHTML}${channel.charAt(0).toUpperCase() + channel.slice(1)}`;
+    $badgesContainer.appendChild($badge);
   });
 
   // Default to push if no channels selected
   if ($badgesContainer.children.length === 0) {
+    const iconHTML = getPrerenderedIcon('mobile');
     const $badge = document.createElement('span');
     $badge.className = 'badge bg-primary';
-    $badge.innerHTML = '<i class="bi bi-mobile me-1"></i>Push';
+    $badge.innerHTML = `${iconHTML}Push`;
     $badgesContainer.appendChild($badge);
   }
 }
@@ -573,9 +580,9 @@ function trackNotificationSent(payload) {
   // TikTok Pixel
   if (typeof ttq !== 'undefined') {
     ttq.track('SubmitForm', {
+      content_id: 'admin-notification',
+      content_type: 'product',
       content_name: 'Admin Notification',
-      content_type: 'notification',
-      value: stats.filteredUsers
     });
   }
 }

package/dist/assets/js/pages/blog/index.js

@@ -156,13 +156,14 @@ function trackNewsletterSignup() {
     event_label: 'blog_page',
     value: 1
   });
-  fbq('track', 'CompleteRegistration', {
+  fbq('track', 'Lead', {
     content_name: 'Newsletter',
     status: 'success'
   });
   ttq.track('Subscribe', {
-    content_name: 'Newsletter',
-    status: 'success'
+    content_id: 'newsletter-blog',
+    content_type: 'product',
+    content_name: 'Newsletter'
   });
 }
 
@@ -177,7 +178,8 @@ function trackBlogSearch(query) {
     content_category: 'blog'
   });
   ttq.track('Search', {
-    query: query,
-    content_type: 'blog'
+    content_id: 'blog-search',
+    content_type: 'product',
+    search_string: query
   });
 }