Form flow view and impression notes added, Workbox updated, Opcache D…

…ev Metabox check, CF7 invalid order fix
chrisblakley · May 7, 2024 · e9a8b8f · e9a8b8f
1 parent 8f27d1b
commit e9a8b8f
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 27 deletions.
diff --git a/.github/package.json b/.github/package.json
@@ -2,7 +2,7 @@
 	"name": "nebula-wp",
 	"title": "Nebula",
 	"description": "Advanced Starter WordPress Theme for Developers",
-	"version": "12.0.1.008",
+	"version": "12.0.7.435",
 	"homepage": "https://gearside.com/nebula/",
 	"repository": {
 		"type": "git",

diff --git a/Nebula-Child/assets/css/admin.css b/Nebula-Child/assets/css/admin.css
diff --git a/Nebula-Child/resources/sw.js b/Nebula-Child/resources/sw.js
@@ -1,14 +1,14 @@
 //BEGIN automated edits. These will be automatically overwritten.
 const THEME_NAME = 'nebula-child';
-const NEBULA_VERSION = 'v12.0.1.008'; //Wednesday, May 1, 2024 12:12:13 AM
+const NEBULA_VERSION = 'v12.0.7.435'; //Tuesday, May 7, 2024 10:26:15 AM
 const OFFLINE_URL = 'https://nebula.gearside.com/offline/';
 const OFFLINE_IMG = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/offline.svg';
 const META_ICON = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/meta/android-chrome-512x512.png';
 const MANIFEST = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/inc/manifest.json';
 const HOME_URL = 'https://nebula.gearside.com/';
 //END automated edits
 
-importScripts('https://cdn.jsdelivr.net/npm/workbox-sw@7.0.0/build/workbox-sw.min.js'); //DO NOT FORGET: Update Workbox Window in the optimization.js module!
+importScripts('https://cdn.jsdelivr.net/npm/workbox-sw@7.1.0/build/workbox-sw.min.js'); //DO NOT FORGET: Update Workbox Window in the optimization.js module!
 workbox.setConfig({debug: false}); //https://developers.google.com/web/tools/workbox/guides/troubleshoot-and-debug
 //The Service Worker console can be inspected by visiting chrome://inspect/#service-workers
 

diff --git a/Nebula-Child/style.css b/Nebula-Child/style.css
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/critical.css b/assets/css/critical.css
diff --git a/assets/css/login.css b/assets/css/login.css
diff --git a/assets/css/pre.css b/assets/css/pre.css
diff --git a/assets/js/modules/forms.js b/assets/js/modules/forms.js
@@ -5,6 +5,12 @@ nebula.cf7Functions = async function(){
 		return false;
 	}
 
+	//Indicate a form page on all CF7 forms
+	jQuery('.wpcf7').each(function(){
+		let formID = jQuery(this).attr('id');
+		nebula.updateFormFlow(formID, '[Form Page View]');
+	});
+
 	jQuery('.wpcf7-form p:empty').remove(); //Remove empty <p> tags within CF7 forms
 
 	let formStarted = {};
@@ -22,15 +28,19 @@ nebula.cf7Functions = async function(){
 		let cf7Observer = new IntersectionObserver(function(entries){
 			entries.forEach(function(entry){
 				if ( entry.intersectionRatio > 0 ){
+					let formID = jQuery(entry.target).closest('.wpcf7').attr('id') || jQuery(entry.target).attr('id');
+
 					let thisEvent = {
 						event_name: 'cf7_form_impression',
 						event_category: 'CF7 Form',
 						event_action: 'Impression',
 						event_label: jQuery(entry.target).closest('.wpcf7').attr('id') || jQuery(entry.target).attr('id'),
-						form_id: jQuery(entry.target).closest('.wpcf7').attr('id') || jQuery(entry.target).attr('id'),
+						form_id: formID,
 						non_interaction: true
 					};
 
+					thisEvent.form_flow = nebula.updateFormFlow(formID, '[Impression]');
+
 					nebula.dom.document.trigger('nebula_event', thisEvent);
 					if ( typeof gaEventObject === 'function' ){ //If the page is loaded pre-scrolled this may not be available for the very first intersection
 						gtag('event', thisEvent.event_name, nebula.gaEventObject(thisEvent));
@@ -449,6 +459,10 @@ nebula.updateFormFlow = function(formID, field, info = ''){
 		nebula.formFlow = {};
 	}
 
+	if ( !formID ){
+		return false;
+	}
+
 	if ( info !== '' ){
 		if ( info.length > 25 ){
 			info = info.substring(0, 25) + '...'; //Truncate long info text

diff --git a/assets/js/modules/optimization.js b/assets/js/modules/optimization.js
@@ -165,7 +165,7 @@ nebula.workbox = async function(){
 			window.performance.mark('(Nebula) SW Registration [Start]');
 
 			//Dynamically import Workbox-Window
-			import('https://cdn.jsdelivr.net/npm/workbox-window@7.0.0/build/workbox-window.prod.mjs').then(async function(module){
+			import('https://cdn.jsdelivr.net/npm/workbox-window@7.1.0/build/workbox-window.prod.mjs').then(async function(module){
 				const Workbox = module.Workbox;
 				const workbox = new Workbox(nebula.site.sw_url);
 

diff --git a/assets/scss/admin.scss b/assets/scss/admin.scss
@@ -73,6 +73,9 @@ th#id {width: 50px;}
 
 //Dev Metabox
 #nebula_developer_info {
+	.highlight-good {color: $success_color;}
+	.highlight-bad {color: $danger_color;}
+
 	.secured-connection {
 		i, svg {color: $success_color;}
 	}