ultimate-jekyll-manager 0.0.118 → 0.0.120

package/dist/assets/js/core/auth.js

@@ -32,7 +32,7 @@ export default function (Manager, options) {
       console.log('[Auth] state changed:', state);
 
       // Set user ID for analytics tracking
-      setAnalyticsUserId(user);
+      setAnalyticsUserId(user, webManager);
 
       // Check if we're in the process of signing out
       if (authSignout === 'true' && user) {
@@ -119,9 +119,10 @@ function redirect(url, returnUrl) {
   window.location.href = newURL;
 }
 
-function setAnalyticsUserId(user) {
+function setAnalyticsUserId(user, webManager) {
   const userId = user?.uid;
   const email = user?.email;
+  const metaPixelId = webManager.config.tracking['meta-pixel'];
 
   // Short-circuit if no user
   if (!userId) {
@@ -129,7 +130,7 @@ function setAnalyticsUserId(user) {
     gtag('set', { user_id: null });
 
     // Facebook Pixel - Clear advanced matching
-    fbq('init', fbq.pixelId, {});
+    fbq('init', metaPixelId, {});
 
     // TikTok Pixel - Clear user data
     ttq.identify({});
@@ -147,7 +148,7 @@ function setAnalyticsUserId(user) {
   });
 
   // Facebook Pixel - Set advanced matching with user data
-  fbq('init', fbq.pixelId, {
+  fbq('init', metaPixelId, {
     external_id: userId,
     // em: email ? btoa(email.toLowerCase().trim()) : undefined,
     em: email,

package/dist/assets/js/core/cookieconsent.js

@@ -310,59 +310,66 @@ export default function (Manager, options) {
 
   // Tracking functions
   function trackCookieBannerShown() {
-    gtag('event', 'cookie_banner_shown', {
+    gtag('event', 'cookie_banner_show', {
       event_category: 'consent'
     });
-    fbq('trackCustom', 'CookieBannerShown');
+    fbq('trackCustom', 'CookieBannerShow');
     ttq.track('ViewContent', {
-      content_name: 'Cookie Banner'
+      content_id: 'cookie-banner-show',
+      content_type: 'product',
+      content_name: 'Cookie Banner Show'
     });
   }
 
   function trackCookieAccepted() {
-    gtag('event', 'cookie_consent_accepted', {
+    gtag('event', 'cookie_consent_accept', {
       event_category: 'consent',
       consent_type: config.type
     });
-    fbq('trackCustom', 'CookieConsentAccepted');
+    fbq('trackCustom', 'CookieConsentAccept');
     ttq.track('ClickButton', {
-      content_name: 'Cookie Consent Accept',
-      content_type: 'consent'
+      content_id: 'cookie-consent-accept',
+      content_type: 'product',
+      content_name: 'Cookie Consent Accept'
     });
   }
 
   function trackCookieDenied() {
-    gtag('event', 'cookie_consent_denied', {
+    gtag('event', 'cookie_consent_deny', {
       event_category: 'consent',
       consent_type: config.type
     });
-    fbq('trackCustom', 'CookieConsentDenied');
+    fbq('trackCustom', 'CookieConsentDeny');
     ttq.track('ClickButton', {
-      content_name: 'Cookie Consent Deny',
-      content_type: 'consent'
+      content_id: 'cookie-consent-deny',
+      content_type: 'product',
+      content_name: 'Cookie Consent Deny'
     });
   }
 
   function trackCookieAutoAccepted(trigger) {
-    gtag('event', 'cookie_consent_auto_accepted', {
+    gtag('event', 'cookie_consent_auto_accept', {
       event_category: 'consent',
       trigger: trigger
     });
-    fbq('trackCustom', 'CookieConsentAutoAccepted', {
+    fbq('trackCustom', 'CookieConsentAutoAccept', {
       trigger: trigger
     });
     ttq.track('ViewContent', {
-      content_name: 'Cookie Consent Auto Accept',
-      content_type: trigger
+      content_id: 'cookie-consent-auto-accept',
+      content_type: 'product',
+      content_name: 'Cookie Consent Auto Accept'
     });
   }
 
   function trackCookiePolicyReopened() {
-    gtag('event', 'cookie_policy_reopened', {
+    gtag('event', 'cookie_policy_reopen', {
       event_category: 'consent'
     });
-    fbq('trackCustom', 'CookiePolicyReopened');
+    fbq('trackCustom', 'CookiePolicyReopen');
     ttq.track('ClickButton', {
+      content_id: 'cookie-policy-reopen',
+      content_type: 'product',
       content_name: 'Cookie Policy Reopen'
     });
   }

package/dist/assets/js/core/exit-popup.js

@@ -177,20 +177,21 @@ export default function (Manager, options) {
 
   // Tracking functions
   function trackExitPopupShown() {
-    gtag('event', 'exit_popup_shown', {
+    gtag('event', 'exit_popup_show', {
       event_category: 'engagement',
       event_label: config.title,
       page_path: window.location.pathname
     });
 
-    fbq('trackCustom', 'ExitPopupShown', {
-      content_name: config.title,
+    fbq('trackCustom', 'ExitPopupShow', {
+      content_name: 'Exit Popup Show',
       page_path: window.location.pathname
     });
 
     ttq.track('ViewContent', {
-      content_name: 'Exit Popup',
-      content_type: config.title
+      content_id: 'exit-popup-show',
+      content_type: 'product',
+      content_name: 'Exit Popup Show'
     });
   }
 
@@ -207,24 +208,26 @@ export default function (Manager, options) {
     });
 
     ttq.track('ClickButton', {
-      content_name: 'Exit Popup CTA',
-      content_type: config.okButton?.text || 'OK'
+      content_id: 'exit-popup-click',
+      content_type: 'product',
+      content_name: 'Exit Popup Click'
     });
   }
 
   function trackExitPopupDismissed() {
-    gtag('event', 'exit_popup_dismissed', {
+    gtag('event', 'exit_popup_dismiss', {
       event_category: 'engagement',
       event_label: config.title
     });
 
-    fbq('trackCustom', 'ExitPopupDismissed', {
-      content_name: config.title
+    fbq('trackCustom', 'ExitPopupDismiss', {
+      content_name: 'Exit Popup Dismiss'
     });
 
     ttq.track('ViewContent', {
-      content_name: 'Exit Popup Dismissed',
-      content_type: config.title
+      content_id: 'exit-popup-dismiss',
+      content_type: 'product',
+      content_name: 'Exit Popup Dismiss'
     });
   }
 };

package/dist/assets/js/core/social-sharing.js

@@ -289,6 +289,8 @@ export default function (Manager, options) {
 
   // Tracking functions
   function trackShare(platformKey, shareConfig) {
+    const platformName = platforms[platformKey]?.name || platformKey;
+
     gtag('event', 'share', {
       method: platformKey,
       content_type: 'article',
@@ -302,9 +304,9 @@ export default function (Manager, options) {
     });
 
     ttq.track('Share', {
-      content_name: shareConfig.title,
-      content_url: shareConfig.url,
-      share_method: platformKey
+      content_id: `social-share-${platformKey}`,
+      content_type: 'product',
+      content_name: `Social Share ${platformName}`
     });
   }
 
@@ -319,7 +321,9 @@ export default function (Manager, options) {
     });
 
     ttq.track('ClickButton', {
-      content_name: 'Copy Link'
+      content_id: 'social-share-copy-link',
+      content_type: 'product',
+      content_name: 'Social Share Copy Link'
     });
   }
 };

package/dist/assets/js/libs/auth/pages.js

@@ -9,12 +9,6 @@ export default function (Manager) {
   // Form manager instance
   let formManager = null;
 
-  // Shared FormManager configuration
-  const formManagerConfig = {
-    allowMultipleSubmissions: false,
-    validateOnSubmit: true,
-  };
-
   // Check query string for popup parameter
   const url = new URL(window.location.href);
   const useAuthPopup = url.searchParams.get('authPopup') === 'true' || window !== window.top;
@@ -61,125 +55,66 @@ export default function (Manager) {
     }
   }
 
-  // Initialize signin form
-  function initializeSigninForm() {
-    formManager = new FormManager('#signin-form', {
-      ...formManagerConfig,
-      submitButtonLoadingText: 'Signing in...'
-    });
+  // Shared validation for signin/signup forms - only validate when email provider is selected
+  function validateEmailProvider({ data, setError, $submitButton }) {
+    const provider = $submitButton?.getAttribute('data-provider');
 
-    // Handle form submission
-    formManager.addEventListener('submit', async (e) => {
-      // Prevent FormManager's default submit handler
-      e.preventDefault();
+    if (provider === 'email') {
+      if (!data.email?.trim()) {
+        setError('email', 'Email is required');
+      }
+      if (!data.password) {
+        setError('password', 'Password is required');
+      }
+    }
+  }
 
-      const { submitButton, data } = e.detail;
-      const provider = submitButton?.getAttribute('data-provider');
+  // Shared submit handler factory for signin/signup forms
+  function createAuthSubmitHandler(action, emailHandler) {
+    return async ({ data, $submitButton }) => {
+      const provider = $submitButton?.getAttribute('data-provider');
 
-      // Only validate for email provider
       if (provider === 'email') {
-        const validation = formManager.validate(data);
-        if (!validation.isValid) {
-          formManager.showErrors(validation.errors);
-          formManager.setFormState('ready');
-          return;
-        }
+        await emailHandler(data);
+      } else if (provider) {
+        await signInWithProvider(provider, action);
       }
+    };
+  }
 
-      try {
-        if (provider === 'email') {
-          // Pass the already collected data to avoid re-collecting from disabled fields
-          await handleEmailSignin(data);
-        } else if (provider) {
-          await signInWithProvider(provider, 'signin');
-        }
-      } catch (error) {
-        // Set form back to ready state
-        formManager.setFormState('ready');
-
-        // Show the error to the user
-        formManager.showError(error.message || 'An error occurred during sign in');
-
-        // Log for debugging
-        console.error('Signin error:', error);
-      }
+  // Initialize signin form
+  function initializeSigninForm() {
+    formManager = new FormManager('#signin-form', {
+      allowResubmit: false,
+      submittingText: 'Signing in...',
+      submittedText: 'Signed In!',
     });
+
+    formManager.on('validation', validateEmailProvider);
+    formManager.on('submit', createAuthSubmitHandler('signin', handleEmailSignin));
   }
 
   // Initialize signup form
   function initializeSignupForm() {
     formManager = new FormManager('#signup-form', {
-      ...formManagerConfig,
-      submitButtonLoadingText: 'Creating account...'
+      allowResubmit: false,
+      submittingText: 'Creating account...',
+      submittedText: 'Account Created!',
     });
 
-    // Handle form submission
-    formManager.addEventListener('submit', async (e) => {
-      // Prevent FormManager's default submit handler
-      e.preventDefault();
-
-      const { submitButton, data } = e.detail;
-      const provider = submitButton?.getAttribute('data-provider');
-
-      // Only validate for email provider
-      if (provider === 'email') {
-        const validation = formManager.validate(data);
-        if (!validation.isValid) {
-          formManager.showErrors(validation.errors);
-          formManager.setFormState('ready');
-          return;
-        }
-      }
-
-      try {
-        if (provider === 'email') {
-          // Pass the already collected data to avoid re-collecting from disabled fields
-          await handleEmailSignup(data);
-        } else if (provider) {
-          await signInWithProvider(provider, 'signup');
-        }
-      } catch (error) {
-        // Set form back to ready state
-        formManager.setFormState('ready');
-
-        // Show the error to the user
-        formManager.showError(error.message || 'An error occurred during sign up');
-
-        // Log for debugging
-        console.error('Signup error:', error);
-      }
-    });
+    formManager.on('validation', validateEmailProvider);
+    formManager.on('submit', createAuthSubmitHandler('signup', handleEmailSignup));
   }
 
   // Initialize reset form
   function initializeResetForm() {
     formManager = new FormManager('#reset-form', {
-      ...formManagerConfig,
-      submitButtonLoadingText: 'Sending...',
-      submitButtonSuccessText: 'Email Sent!'
+      allowResubmit: false,
+      submittingText: 'Sending...',
+      submittedText: 'Email Sent!',
     });
 
-    // Handle form submission
-    formManager.addEventListener('submit', async (e) => {
-      // Prevent FormManager's default submit handler
-      e.preventDefault();
-
-      const { data } = e.detail;
-
-      try {
-        // Pass the already collected data to avoid re-collecting from disabled fields
-        await handlePasswordReset(data);
-      } catch (error) {
-        // Set form back to ready state
-        formManager.setFormState('ready');
-
-        // Show the error to the user
-        formManager.showError(error.message || 'An error occurred during password reset');
-
-        // Log for debugging
-        console.error('Reset error:', error);
-      }
-    });
+    formManager.on('submit', ({ data }) => handlePasswordReset(data));
   }
 
   async function handleRedirectResult() {
@@ -211,14 +146,10 @@ export default function (Manager) {
 
       if (isNewUser || isSignupPage) {
         trackSignup(providerId, result.user);
-        // Show success message
         formManager.showSuccess('Account created successfully!');
-        formManager.setFormState('submitted');
       } else {
         trackLogin(providerId, result.user);
-        // Show success message
         formManager.showSuccess('Successfully signed in!');
-        formManager.setFormState('submitted');
       }
     } catch (error) {
       // Only capture unexpected errors to Sentry
@@ -353,9 +284,6 @@ export default function (Manager) {
 
       // Show success message
       formManager.showSuccess('Account created successfully!');
-
-      // FormManager will handle the success state
-      formManager.setFormState('submitted');
     } catch (error) {
       // Handle Firebase-specific errors
       if (error.code === 'auth/email-already-in-use') {
@@ -370,9 +298,6 @@ export default function (Manager) {
 
           // Show success message
           formManager.showSuccess('Successfully signed in!');
-
-          // Set success state
-          formManager.setFormState('submitted');
           return;
         } catch (signInError) {
           // Throw error for outer catch to handle
@@ -403,9 +328,6 @@ export default function (Manager) {
 
     // Show success message
     formManager.showSuccess('Successfully signed in!');
-
-    // FormManager will handle the success state
-    formManager.setFormState('submitted');
   }
 
   async function handlePasswordReset(formData) {
@@ -429,9 +351,6 @@ export default function (Manager) {
 
       // Show success message
       formManager.showSuccess(`Password reset email sent to ${email}. Please check your inbox.`);
-
-      // Set form to submitted state
-      formManager.setFormState('submitted');
     } catch (error) {
       // Handle Firebase-specific errors
       if (error.code === 'auth/user-not-found') {
@@ -439,7 +358,6 @@ export default function (Manager) {
         // Still show success to prevent email enumeration
         trackPasswordReset(email); // Track as success for security
         formManager.showSuccess(`If an account exists for ${email}, a password reset email has been sent.`);
-        formManager.setFormState('submitted');
         return;
       }
 
@@ -484,19 +402,32 @@ export default function (Manager) {
           throw new Error(`Unsupported provider: ${providerName}`);
       }
 
-      // Show warning in dev mode when using redirect
-      if (webManager.isDevelopment() && !useAuthPopup) {
-        webManager.utilities().showNotification(
-          'OAuth redirect may fail in development. Use localhost:4000 or add ?authPopup=true to the URL',
-          {
-            type: 'warning',
-            timeout: 10000 // Show for 10 seconds
-          }
-        );
-
-        // Wait
-        await new Promise(resolve => setTimeout(resolve, 1000));
+      /* @dev-only:start */
+      {
+        // // Add device_id and device_name for private IP addresses (required by Firebase)
+        // const deviceId = webManager.storage().get('devDeviceId') || crypto.randomUUID();
+        // webManager.storage().set('devDeviceId', deviceId);
+
+        // provider.setCustomParameters({
+        //   device_id: deviceId,
+        //   device_name: navigator.userAgent.substring(0, 100),
+        // });
+
+        // Show warning in dev mode when using redirect
+        if (!useAuthPopup) {
+          webManager.utilities().showNotification(
+            'OAuth redirect may fail in development. Use localhost:4000 or add ?authPopup=true to the URL',
+            {
+              type: 'warning',
+              timeout: 10000 // Show for 10 seconds
+            }
+          );
+
+          // Wait
+          await new Promise(resolve => setTimeout(resolve, 2000));
+        }
       }
+      /* @dev-only:end */
 
       // Use popup if query parameter is set, otherwise use redirect
       if (useAuthPopup) {
@@ -516,9 +447,6 @@ export default function (Manager) {
             // Show success message
             formManager.showSuccess('Successfully signed in!');
           }
-
-          // Set form to submitted state
-          formManager.setFormState('submitted');
         } catch (popupError) {
           // Check if popup was blocked or failed
           if (popupError.code === 'auth/popup-blocked' ||
@@ -620,6 +548,7 @@ export default function (Manager) {
 
   function trackLogin(method, user) {
     const userId = user.uid;
+    const methodName = method.charAt(0).toUpperCase() + method.slice(1);
 
     // Google Analytics 4
     gtag('event', 'login', {
@@ -629,21 +558,22 @@ export default function (Manager) {
 
     // Facebook Pixel
     fbq('trackCustom', 'Login', {
+      content_name: `Account Login ${methodName}`,
       method: method,
-      status: 'success'
     });
 
     // TikTok Pixel
     ttq.track('Login', {
-      content_name: 'Account',
-      content_id: userId,
-      status: 'success'
+      content_id: `account-login-${method}`,
+      content_type: 'product',
+      content_name: `Account Login ${methodName}`
     });
   }
 
   // Analytics tracking functions
   function trackSignup(method, user) {
     const userId = user.uid;
+    const methodName = method.charAt(0).toUpperCase() + method.slice(1);
 
     // Google Analytics 4
     gtag('event', 'sign_up', {
@@ -653,17 +583,15 @@ export default function (Manager) {
 
     // Facebook Pixel
     fbq('track', 'CompleteRegistration', {
-      content_name: 'Account',
-      status: 'success',
-      value: 0,
-      currency: 'USD'
+      content_name: `Account Registration ${methodName}`,
+      method: method,
     });
 
     // TikTok Pixel
     ttq.track('CompleteRegistration', {
-      content_name: 'Account',
-      content_id: userId,
-      status: 'success'
+      content_id: `account-registration-${method}`,
+      content_type: 'product',
+      content_name: `Account Registration ${methodName}`
     });
   }
 
@@ -683,8 +611,9 @@ export default function (Manager) {
 
     // TikTok Pixel
     ttq.track('SubmitForm', {
-      content_name: 'Password Reset',
-      content_type: 'account_recovery'
+      content_id: 'password-reset',
+      content_type: 'product',
+      content_name: 'Password Reset'
     });
   }
 }