ultimate-jekyll-manager 0.0.117 → 0.0.119

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

@@ -11,10 +11,10 @@ export function init(wm) {
 // Load referrals data
 export function loadData(account) {
   if (!account) return;
-  
+
   // Update referral code (real code only)
   updateReferralCode(account.affiliate?.code);
-  
+
   // Update referrals list
   updateReferralsList(account.affiliate?.referrals);
 }
@@ -22,7 +22,7 @@ export function loadData(account) {
 // Update referral code display
 function updateReferralCode(code) {
   const $codeInput = document.getElementById('referral-code-input');
-  
+
   if ($codeInput) {
     if (code) {
       const baseUrl = window.location.origin;
@@ -39,19 +39,19 @@ function updateReferralsList(referrals) {
   const $recentReferrals = document.getElementById('recent-referrals');
   const $referralsBadge = document.getElementById('referrals-badge');
   const $referralsList = document.getElementById('referrals-list');
-  
+
   // Initialize referrals array
   let referralData = referrals || [];
-  
-  // Add fake data if _test_prefill=true is in query string
+
+  // Add fake data if _dev_prefill=true is in query string
   const urlParams = new URLSearchParams(window.location.search);
-  if (urlParams.get('_test_prefill') === 'true') {
+  if (urlParams.get('_dev_prefill') === 'true') {
     console.log('Adding fake referral data for testing');
     const fakeReferrals = generateFakeReferrals();
     // Add fake referrals to existing data
     referralData = [...referralData, ...fakeReferrals];
   }
-  
+
   // Handle empty state
   if (!referralData || !Array.isArray(referralData) || referralData.length === 0) {
     // No referrals - show empty state
@@ -67,7 +67,7 @@ function updateReferralsList(referrals) {
     }
     return;
   }
-  
+
   // Calculate stats
   const totalCount = referralData.length;
   const now = new Date();
@@ -76,19 +76,19 @@ function updateReferralsList(referrals) {
     const timestamp = ref.timestamp || ref.timestampUNIX * 1000;
     return timestamp >= thisMonth;
   }).length;
-  
+
   // Update stats
   if ($totalReferrals) $totalReferrals.textContent = totalCount.toString();
   if ($recentReferrals) $recentReferrals.textContent = recentCount.toString();
   if ($referralsBadge) $referralsBadge.textContent = totalCount.toString();
-  
+
   // Sort referrals by timestamp in reverse order (newest first)
   const sortedReferrals = [...referralData].sort((a, b) => {
     const timeA = a.timestamp || (a.timestampUNIX * 1000) || 0;
     const timeB = b.timestamp || (b.timestampUNIX * 1000) || 0;
     return timeB - timeA; // Reverse order
   });
-  
+
   // Generate referral list HTML
   if ($referralsList) {
     if (sortedReferrals.length === 0) {
@@ -103,7 +103,7 @@ function updateReferralsList(referrals) {
         const date = timestamp ? new Date(timestamp) : null;
         const dateStr = date ? formatDate(date) : 'Unknown date';
         const timeStr = date ? formatTime(date) : '';
-        
+
         return `
           <div class="list-group-item px-0">
             <div class="d-flex justify-content-between align-items-center">
@@ -123,7 +123,7 @@ function updateReferralsList(referrals) {
           </div>
         `;
       }).join('');
-      
+
       $referralsList.innerHTML = referralHTML;
     }
   }
@@ -149,45 +149,45 @@ function formatTime(date) {
 // Get time since string
 function getTimeSince(timestamp) {
   if (!timestamp) return '<small class="text-muted">Unknown</small>';
-  
+
   const now = Date.now();
   const diff = now - timestamp;
-  
+
   // Less than 1 minute
   if (diff < 60000) {
     return '<small class="text-success">Just now</small>';
   }
-  
+
   // Less than 1 hour
   if (diff < 3600000) {
     const minutes = Math.floor(diff / 60000);
     return `<small class="text-muted">${minutes} min${minutes > 1 ? 's' : ''} ago</small>`;
   }
-  
+
   // Less than 24 hours
   if (diff < 86400000) {
     const hours = Math.floor(diff / 3600000);
     return `<small class="text-muted">${hours} hour${hours > 1 ? 's' : ''} ago</small>`;
   }
-  
+
   // Less than 7 days
   if (diff < 604800000) {
     const days = Math.floor(diff / 86400000);
     return `<small class="text-muted">${days} day${days > 1 ? 's' : ''} ago</small>`;
   }
-  
+
   // Less than 30 days
   if (diff < 2592000000) {
     const weeks = Math.floor(diff / 604800000);
     return `<small class="text-muted">${weeks} week${weeks > 1 ? 's' : ''} ago</small>`;
   }
-  
+
   // More than 30 days
   const months = Math.floor(diff / 2592000000);
   if (months < 12) {
     return `<small class="text-muted">${months} month${months > 1 ? 's' : ''} ago</small>`;
   }
-  
+
   const years = Math.floor(months / 12);
   return `<small class="text-muted">${years} year${years > 1 ? 's' : ''} ago</small>`;
 }
@@ -205,31 +205,31 @@ function setupButtons() {
 async function handleCopyReferralCode() {
   const $codeInput = document.getElementById('referral-code-input');
   const $copyBtn = document.getElementById('copy-referral-code-btn');
-  
+
   if (!$codeInput || !$codeInput.value || $codeInput.value === 'No referral link available') {
     webManager.utilities().showNotification('No referral link to copy', 'warning');
     return;
   }
-  
+
   try {
     // Copy the full URL directly from the input (it now contains the full URL)
     await webManager.utilities().clipboardCopy($codeInput);
-    
+
     // Update button text temporarily
     const $text = $copyBtn.querySelector('.button-text');
     const originalText = $text.textContent;
-    
+
     $text.textContent = 'Copied!';
     $copyBtn.classList.remove('btn-primary');
     $copyBtn.classList.add('btn-success');
-    
+
     // Reset after 2 seconds
     setTimeout(() => {
       $text.textContent = originalText;
       $copyBtn.classList.remove('btn-success');
       $copyBtn.classList.add('btn-primary');
     }, 2000);
-    
+
   } catch (err) {
     console.error('Failed to copy referral link:', err);
     webManager.utilities().showNotification('Failed to copy referral link', 'danger');
@@ -240,7 +240,7 @@ async function handleCopyReferralCode() {
 function generateFakeReferrals() {
   const now = Date.now();
   const oneDay = 24 * 60 * 60 * 1000;
-  
+
   return [
     {
       uid: 'user_k9m2n8p4q1r7',

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

@@ -1,6 +1,7 @@
 // Security section module
-import fetch from 'wonderful-fetch';
+import authorizedFetch from '__main_assets__/js/libs/authorized-fetch.js';
 import { FormManager } from '__main_assets__/js/libs/form-manager.js';
+import { getPrerenderedIcon } from '__main_assets__/js/libs/prerendered-icons.js';
 
 let webManager = null;
 let firebaseAuth = null;
@@ -98,20 +99,17 @@ async function updateSigninMethods() {
   // Update Google signin display
   const $googleEmail = document.getElementById('google-email');
   const $googleForm = document.getElementById('signin-method-google-form');
-  const $googleBtn = $googleForm?.querySelector('button[type="submit"]');
-  const $googleBtnText = $googleBtn?.querySelector('.button-text');
-  const $googleAction = $googleForm?.querySelector('input[name="action"]');
-  const $googleIcon = $googleBtn?.querySelector('.fa-icon');
+  const $connectButton = $googleForm?.querySelector('button[data-action="connect"]');
+  const $disconnectButton = $googleForm?.querySelector('button[data-action="disconnect"]');
 
   console.log('[DEBUG] security.js - Google DOM elements:', {
     $googleEmail: !!$googleEmail,
-    $googleBtn: !!$googleBtn,
-    $googleBtnText: !!$googleBtnText,
-    $googleAction: !!$googleAction,
-    $googleIcon: !!$googleIcon
+    $googleForm: !!$googleForm,
+    $connectButton: !!$connectButton,
+    $disconnectButton: !!$disconnectButton
   });
 
-  if ($googleEmail && $googleBtn) {
+  if ($googleEmail && $connectButton && $disconnectButton) {
     // Check if user has Google provider using firebaseUser for most up-to-date data
     const googleProvider = firebaseUser.providerData?.find(provider => provider.providerId === 'google.com');
 
@@ -119,45 +117,19 @@ async function updateSigninMethods() {
     console.log('[DEBUG] security.js - googleProvider found:', !!googleProvider);
 
     if (googleProvider) {
-      console.log('[DEBUG] security.js - Setting button to DISCONNECT state');
-      console.log('[DEBUG] security.js - Button text before:', $googleBtnText?.textContent);
-      console.log('[DEBUG] security.js - Button classes before:', $googleBtn.className);
+      console.log('[DEBUG] security.js - Showing disconnect button');
 
       $googleEmail.textContent = googleProvider.email || 'Connected';
-      if ($googleBtnText) $googleBtnText.textContent = 'Disconnect';
-      if ($googleAction) $googleAction.value = 'disconnect';
-      $googleBtn.classList.remove('btn-primary');
-      $googleBtn.classList.add('btn-outline-danger');
-
-      // Update icon from link to unlink
-      if ($googleIcon) {
-        $googleIcon.classList.remove('fa-link');
-        $googleIcon.classList.add('fa-unlink');
-      }
-
-      console.log('[DEBUG] security.js - Button text after:', $googleBtnText?.textContent);
-      console.log('[DEBUG] security.js - Button classes after:', $googleBtn.className);
-      console.log('[DEBUG] security.js - Action value:', $googleAction?.value);
+      // Hide connect button, show disconnect button
+      $connectButton.classList.add('d-none');
+      $disconnectButton.classList.remove('d-none');
     } else {
-      console.log('[DEBUG] security.js - Setting button to CONNECT state');
-      console.log('[DEBUG] security.js - Button text before:', $googleBtnText?.textContent);
-      console.log('[DEBUG] security.js - Button classes before:', $googleBtn.className);
+      console.log('[DEBUG] security.js - Showing connect button');
 
       $googleEmail.textContent = 'Not connected';
-      if ($googleBtnText) $googleBtnText.textContent = 'Connect';
-      if ($googleAction) $googleAction.value = 'connect';
-      $googleBtn.classList.remove('btn-outline-danger');
-      $googleBtn.classList.add('btn-primary');
-
-      // Update icon from unlink to link
-      if ($googleIcon) {
-        $googleIcon.classList.remove('fa-unlink');
-        $googleIcon.classList.add('fa-link');
-      }
-
-      console.log('[DEBUG] security.js - Button text after:', $googleBtnText?.textContent);
-      console.log('[DEBUG] security.js - Button classes after:', $googleBtn.className);
-      console.log('[DEBUG] security.js - Action value:', $googleAction?.value);
+      // Show connect button, hide disconnect button
+      $connectButton.classList.remove('d-none');
+      $disconnectButton.classList.add('d-none');
     }
   }
 }
@@ -214,16 +186,14 @@ async function updateActiveSessions(account) {
 
   // Fetch other active sessions from server
   try {
-    const token = await webManager.auth().getIdToken();
     const serverApiURL = webManager.getApiUrl() + '/backend-manager';
 
-    const data = await fetch(serverApiURL, {
+    const data = await authorizedFetch(serverApiURL, {
       method: 'POST',
       timeout: 60000,
       response: 'json',
       tries: 2,
       body: {
-        authenticationToken: token,
         command: 'user:get-active-sessions',
         payload: {
           // id: 'app',
@@ -231,14 +201,12 @@ async function updateActiveSessions(account) {
       },
     });
 
-    console.log('Active sessions data from server:', data);
-
     // Process sessions from server response
     let sessionData = data || {};
 
-    // Add fake data if _test_prefill=true is in query string
+    // Add fake data if _dev_prefill=true is in query string
     const urlParams = new URLSearchParams(window.location.search);
-    if (urlParams.get('_test_prefill') === 'true') {
+    if (urlParams.get('_dev_prefill') === 'true') {
       console.log('Adding fake session data for testing');
       const fakeSessions = generateFakeSessions();
       // Merge fake sessions with existing data (fake sessions don't override real ones)
@@ -308,23 +276,24 @@ async function updateActiveSessions(account) {
     return;
   }
 
-  const sessionHTML = sessions.map(session => {
+  const sessionHTML = sessions.map((session, index) => {
     const deviceName = session.device || 'Unknown Device';
     const browserName = session.browser || 'Unknown Browser';
     const location = formatSessionLocation(session);
+    const isLast = index === sessions.length - 1;
 
     return `
-    <div class="list-group-item px-0 bg-body-tertiary">
+    <div class="px-0 py-3${isLast ? '' : ' border-bottom'}">
       <div class="d-flex justify-content-between align-items-start">
-        <div class="d-flex align-items-start">
-          <div class="me-3 mt-1">
+        <div class="d-flex align-items-center">
+          <div class="d-flex align-items-center justify-content-center me-3 flex-shrink-0 text-muted">
             ${getDeviceIcon(session.platform || deviceName)}
           </div>
           <div>
-            <div class="fw-semibold">${deviceName}</div>
-            <small class="text-muted d-block">${browserName}${session.mobile !== undefined ? ` • ${session.mobile ? 'Mobile' : 'Desktop'}` : ''}</small>
-            ${location ? `<small class="text-muted d-block">${location}</small>` : ''}
-            ${session.ip ? `<small class="text-muted d-block">IP: ${session.ip}</small>` : ''}
+            <strong>${deviceName}</strong>
+            <div class="text-muted small">${browserName}${session.mobile !== undefined ? ` • ${session.mobile ? 'Mobile' : 'Desktop'}` : ''}</div>
+            ${location ? `<div class="text-muted small">${location}</div>` : ''}
+            ${session.ip ? `<div class="text-muted small">IP: ${session.ip}</div>` : ''}
           </div>
         </div>
         <div class="text-end">
@@ -385,12 +354,15 @@ function initializeSigninMethodForms() {
 
     formManager.addEventListener('submit', async (event) => {
       event.preventDefault();
-      const { data } = event.detail;
+      const { submitButton } = event.detail;
+
+      // Determine action from the clicked button's data-action attribute
+      const action = submitButton?.getAttribute('data-action');
 
       try {
-        if (data.action === 'disconnect') {
+        if (action === 'disconnect') {
           await disconnectGoogleProvider();
-        } else {
+        } else if (action === 'connect') {
           await connectGoogleProvider();
         }
 
@@ -434,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
@@ -632,20 +607,25 @@ function getPlatformName(platform) {
 // Get device icon based on device type
 function getDeviceIcon(device) {
   const deviceLower = (device || '').toLowerCase();
+  let iconName = 'desktop'; // default
 
-  if (deviceLower.includes('iphone') || deviceLower.includes('ipad') || deviceLower.includes('ios') || deviceLower.includes('mac')) {
-    return '<i class="fa-brands fa-apple fa-lg"></i>';
+  if (deviceLower.includes('iphone')
+      || deviceLower.includes('ipad')
+      || deviceLower.includes('ios')
+      || deviceLower.includes('mac')) {
+    iconName = 'apple';
   } else if (deviceLower.includes('android')) {
-    return '<i class="fa-brands fa-android fa-lg"></i>';
+    iconName = 'android';
   } else if (deviceLower.includes('windows')) {
-    return '<i class="fa-brands fa-windows fa-lg"></i>';
+    iconName = 'windows';
   } else if (deviceLower.includes('linux')) {
-    return '<i class="fa-brands fa-linux fa-lg"></i>';
+    iconName = 'linux';
   } else if (deviceLower.includes('chrome')) {
-    return '<i class="fa-brands fa-chrome fa-lg"></i>';
-  } else {
-    return '<i class="fa-solid fa-desktop fa-lg"></i>';
+    iconName = 'chrome';
   }
+
+  // Get the pre-rendered icon
+  return getPrerenderedIcon(iconName);
 }
 
 // Format location from session data

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
   });
 }

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

@@ -55,8 +55,6 @@ function setupFormScrolling() {
       const href = link.getAttribute('href');
 
       if (href === '#chat') {
-        trackChatClick();
-
         // Open chat window
         try {
           chatsy.open();
@@ -65,8 +63,6 @@ function setupFormScrolling() {
           webManager.utilities().showNotification('Chat is currently unavailable. Please try again later.', 'danger');
         }
       } else if (href === '#form') {
-        trackFormClick();
-
         // Find the form section by ID
         const $formSection = document.getElementById('form');
 
@@ -193,31 +189,6 @@ function handleFieldChange(event) {
   }
 }
 
-// Tracking functions
-function trackChatClick() {
-  // gtag('event', 'contact_method_click', {
-  //   method: 'chat'
-  // });
-  // fbq('track', 'Contact', {
-  //   content_name: 'Chat'
-  // });
-  // ttq.track('ClickButton', {
-  //   content_name: 'Chat'
-  // });
-}
-
-function trackFormClick() {
-  // gtag('event', 'contact_method_click', {
-  //   method: 'form'
-  // });
-  // fbq('track', 'Contact', {
-  //   content_name: 'Form'
-  // });
-  // ttq.track('ClickButton', {
-  //   content_name: 'Contact Form'
-  // });
-}
-
 function trackContactSpam() {
   gtag('event', 'contact_form_spam', {
     content_type: 'honeypot'
@@ -225,15 +196,17 @@ function trackContactSpam() {
 }
 
 function trackContactFormSubmit(subject) {
-  gtag('event', 'contact_form_submit', {
+  gtag('event', 'generate_lead', {
+    lead_source: 'contact_form',
     subject: subject
   });
   fbq('track', 'Lead', {
     content_name: 'Contact Form',
     content_category: subject
   });
-  ttq.track('FormSubmit', {
-    content_name: 'Contact Form',
-    content_type: subject
+  ttq.track('Contact', {
+    content_id: 'contact-form',
+    content_type: 'product',
+    content_name: 'Contact Form'
   });
 }

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

@@ -174,8 +174,9 @@ function trackDownloadClick(platform, downloadName, downloadUrl) {
   });
 
   ttq.track('Download', {
-    content_name: downloadName,
-    content_type: platform
+    content_id: `download-${platform}`,
+    content_type: 'product',
+    content_name: downloadName
   });
 }
 

package/dist/assets/js/pages/payment/checkout/index.js

@@ -298,8 +298,8 @@ async function initializeCheckout() {
     const urlParams = new URLSearchParams(window.location.search);
     const productId = urlParams.get('product');
     const frequency = urlParams.get('frequency') || 'annually';
-    const _test_appId = urlParams.get('_test_appId');
-    const _test_trialEligible = urlParams.get('_test_trialEligible');
+    const _dev_appId = urlParams.get('_dev_appId');
+    const _dev_trialEligible = urlParams.get('_dev_trialEligible');
 
     // Product ID is required
     if (!productId) {
@@ -307,7 +307,7 @@ async function initializeCheckout() {
     }
 
     // Check for testing parameters
-    const appId = _test_appId || webManager.config.brand.id;
+    const appId = _dev_appId || webManager.config.brand.id;
 
     // Warmup server (fire and forget)
     warmupServer(webManager);
@@ -331,10 +331,10 @@ async function initializeCheckout() {
     let trialEligibilityResult = trialEligible;
 
     // Override trial eligibility for testing (only in development)
-    if (_test_trialEligible && webManager.isDevelopment()) {
-      if (_test_trialEligible === 'false') {
+    if (_dev_trialEligible && webManager.isDevelopment()) {
+      if (_dev_trialEligible === 'false') {
         trialEligibilityResult = { status: 'fulfilled', value: false };
-      } else if (_test_trialEligible === 'true') {
+      } else if (_dev_trialEligible === 'true') {
         trialEligibilityResult = { status: 'fulfilled', value: true };
       }
     }

package/dist/assets/js/pages/payment/checkout/modules/processors-main.js

@@ -41,9 +41,9 @@ export class PaymentProcessorManager {
 
     // Determine processor based on payment method and available API keys
     if (paymentMethod === 'card') {
-      // Check for _test_cardProcessor override in URL params (for testing)
+      // Check for _dev_cardProcessor override in URL params (for testing)
       const urlParams = new URLSearchParams(window.location.search);
-      const forcedProcessor = urlParams.get('_test_cardProcessor');
+      const forcedProcessor = urlParams.get('_dev_cardProcessor');
 
       if (forcedProcessor && this.processors[forcedProcessor]) {
         processorName = forcedProcessor;