@alexsab-ru/scripts 0.0.2 → 0.0.4

package/index.js

@@ -1,6 +1 @@
-// index.js
-const analytics = require('./lib/analytics');
-
-module.exports = {
-  analytics
-};
+export * from './lib/analytics';

package/lib/analytics.js

@@ -1,25 +1,37 @@
-export function WebsiteAnalytics() {
+window.dataLayer = window.dataLayer || [];
 
-	window.dataLayer = window.dataLayer || [];
+export function reachGoal(eventAction, t = {}) {
+		t.eventAction = eventAction;
+		dl("reachGoal-"+eventAction, {
+			...t
+		})
+	}
+
+export function pageView(eventAction, t = {}) {
+		t.eventAction = eventAction;
+		dl("pageView-"+eventAction, {
+			...t
+		})
+	}
 
-	function dataLayer(event, t = {}) {
-		// console.log(event);
+export function dl(event, t = {}) {
+		console.log(event, t);
 		void 0 !== window.dataLayer && window.dataLayer.push({
 			event: event,
 			...t
 		})
 	}
 
-	function getFormDataObject(formData, form_id) {
-		let obj = {"EventProperties":{}};
-		formData.forEach((value, key) => (obj["EventProperties"][key] = value));
-		obj['EventCategory'] = 'Lead';
-		obj["EventProperties"]['formID'] = form_id;
+export function getFormDataObject(formData, form_id) {
+		let obj = {"eventProperties":{}};
+		formData.forEach((value, key) => (obj["eventProperties"][key] = value));
+		obj['eventCategory'] = 'Lead';
+		obj["eventProperties"]['formID'] = form_id;
 		obj['sourceName'] = 'page';
 		return obj;
 	}
 
-	function ymGoal(goalName,goalParams) {
+export function ymGoal(goalName,goalParams) {
 		try {
 			Ya._metrika.getCounters().forEach((me)=>{
 				ym(me.id, "reachGoal", goalName, goalParams||{})
@@ -29,7 +41,7 @@ export function WebsiteAnalytics() {
 		}
 	}
 
-	function ymPage(pageName,goalParams) {
+export function ymPage(pageName,goalParams) {
 		try {
 			Ya._metrika.getCounters().forEach((me)=>{
 				ym(me.id, "hit", pageName, goalParams||{})
@@ -39,37 +51,38 @@ export function WebsiteAnalytics() {
 		}
 	}
 
-	function addPhoneGoals(item) {
+export function addPhoneGoals(item) {
 		item.addEventListener('click', function(evt) {
-			dataLayer('phone-click');
+			reachGoal('phone_click');
 		});
 		item.addEventListener('copy', function(evt) {
-			dataLayer('phone-copy');
+			reachGoal('phone_copy');
 		});
 		item.addEventListener('contextmenu', function(evt) {
-			dataLayer('phone-contextmenu');
+			reachGoal('phone_contextmenu');
 		});
 	}
 
-	function addEmailGoals(item) {
+export function addEmailGoals(item) {
 		item.addEventListener('click', function(evt) {
-			dataLayer('email-click');
+			reachGoal('email_click');
 		});
 		item.addEventListener('copy', function(evt) {
-			dataLayer('email-copy');
+			reachGoal('email_copy');
 		});
 		item.addEventListener('contextmenu', function(evt) {
-			dataLayer('email-contextmenu');
+			reachGoal('email_contextmenu');
 		});
 	}
 
+	document.querySelectorAll('a[href^\="tel:"]').forEach((tel)=>{
+		addPhoneGoals(tel);
+	});
+	document.querySelectorAll('a[href^\="mailto:"]').forEach((tel)=>{
+		addEmailGoals(tel);
+	});
+
 	var goals = [
-		{
-			selector: 'a[href^\="#common-modal"]',
-			action: 'click',
-			goal: 'form-open',
-			title: 'Открыли любую форму',
-		},
 		{
 			selector: 'form input',
 			action: 'click',
@@ -88,43 +101,23 @@ export function WebsiteAnalytics() {
 	goals.forEach(function(value, index, array){
 		if(value.goal != null) {
 			document.querySelectorAll(value.selector).forEach(function(element) {
-				// console.log("Set \"" + value.goal + "\" goal");
+				console.log("Set \"" + value.goal + "\" goal", element);
 				element.addEventListener(value.action, function(){
-					dataLayer(value.goal);
+					reachGoal(value.goal, {
+						title: value.title,
+					});
 				});
 			});
 		} else if(value.hit != null) {
 			document.querySelectorAll(value.selector).forEach(function(element) {
-				// console.log("Set \"" + value.goal + "\" hit");
+				console.log("Set \"" + value.goal + "\" hit", element);
 				element.addEventListener(value.action, function(){
-					// ymPage(value.goal);
-					dataLayer.push({
-						event:"pageView",
-						eventAction: value.hit,
+					pageView(value.hit, {
 						title: value.title,
 					});
 				});
 			});
 		} else {
-			console.warn(["Ошибка в списке целей", value]);
+			console.warn("Ошибка в списке целей", value);
 		}
 	});
-
-	document.querySelectorAll('a[href^\="tel:"]').forEach((tel)=>{
-		addPhoneGoals(tel);
-	});
-	document.querySelectorAll('a[href^\="mailto:"]').forEach((tel)=>{
-		addEmailGoals(tel);
-	});
-
-	// возвращаем объект с публичной функцией
-	return {
-		ymGoal: ymGoal,
-		ymPage: ymPage,
-		getFormDataObject: getFormDataObject,
-		dataLayer: dataLayer,
-	};
-
-};
-
-export default { WebsiteAnalytics }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexsab-ru/scripts",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "common libs for websites",
   "main": "index.js",
   "scripts": {