From 021ddf50c5f4bc99b9ffa4b2b6e57f6a16309166 Mon Sep 17 00:00:00 2001
From: Andrey <i_a.d.ivanov@mpt.ru>
Date: Tue, 9 Jul 2024 17:29:57 +0300
Subject: [PATCH] googleAnalytics

---
 src/app/_services/googleAnalytics.service.ts | 57 --------------------
 src/app/app.component.ts                     |  6 ---
 src/app/request/request.component.ts         |  5 ++
 src/index.html                               |  9 ++++
 4 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100644 src/app/_services/googleAnalytics.service.ts

diff --git a/src/app/_services/googleAnalytics.service.ts b/src/app/_services/googleAnalytics.service.ts
deleted file mode 100644
index 8bc5ca6..0000000
--- a/src/app/_services/googleAnalytics.service.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Injectable } from '@angular/core';
-import { NavigationEnd, Router } from '@angular/router';
-import { environment } from '../../environments/environment';
-
-declare var gtag: Function;
-
-@Injectable({
-  providedIn: 'root',
-})
-export class GoogleAnalyticsService {
-  constructor(private router: Router) {}
-
-  public initialize() {
-    this.onRouteChange();
-
-    // dynamically add analytics scripts to document head
-    try {
-      const url = 'https://www.googletagmanager.com/gtag/js?id=';
-      const gTagScript = document.createElement('script');
-      gTagScript.async = true;
-      gTagScript.src = `${url}${environment.googleAnalyticsId}`;
-      document.head.appendChild(gTagScript);
-
-      const dataLayerScript = document.createElement('script');
-      dataLayerScript.innerHTML = `
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', '${environment.googleAnalyticsId}', {'send_page_view': false});`;
-      document.head.appendChild(dataLayerScript);
-    } catch (e) {
-      console.error('Error adding Google Analytics', e);
-    }
-  }
-
-  // track visited routes
-  private onRouteChange() {
-    this.router.events.subscribe((event) => {
-      if (event instanceof NavigationEnd) {
-        gtag('config', environment.googleAnalyticsId, {
-          page_path: event.urlAfterRedirects,
-        });
-        console.log('Sending Google Analytics tracking for: ', event.urlAfterRedirects);
-        console.log('Google Analytics property ID: ', environment.googleAnalyticsId);
-      }
-    });
-  }
-
-  // use gtag.js to send Google Analytics Events
-  public event(action: string, eventCategory?: string, eventLabel?: string, value?: string) {
-    gtag('event', action, {
-      ...(eventCategory && { event_category: eventCategory }),
-      ...(eventLabel && { event_label: eventLabel }),
-      ...(value && { value: value }),
-    });
-  }
-}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 00bff7f..1a64365 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -2,8 +2,6 @@ import {Component, OnInit} from '@angular/core';
 import { CommonModule, DatePipe, ViewportScroller } from '@angular/common';
 import { RouterOutlet, NavigationEnd, Router, RouterLink, RouterLinkActive  } from '@angular/router';
 import { RequestComponent } from './request/request.component';
-import {GoogleAnalyticsService} from "./_services/googleAnalytics.service";
-import {environment} from "../environments/environment";
 
 @Component({
   selector: 'app-root',
@@ -20,15 +18,11 @@ export class AppComponent implements OnInit{
 
   ngOnInit(){
     this.dateNow = new Date;
-    if (environment.production) {
-      this.googleAnalyticsService.initialize();
-    }
   }
 
   constructor(
     readonly router: Router,
     readonly viewportScroller: ViewportScroller,
-    private readonly googleAnalyticsService: GoogleAnalyticsService
   ) {
 
     router.events.subscribe((event) => {
diff --git a/src/app/request/request.component.ts b/src/app/request/request.component.ts
index 8bd5a8b..5ec3531 100644
--- a/src/app/request/request.component.ts
+++ b/src/app/request/request.component.ts
@@ -4,6 +4,7 @@ import {FormGroup, ReactiveFormsModule, FormBuilder, Validators} from "@angular/
 import {ActivatedRoute, Router} from "@angular/router";
 import {NgIf} from "@angular/common";
 import {Metrika} from "ng-yandex-metrika";
+declare var gtag
 
 @Component({
   selector: 'request',
@@ -57,6 +58,8 @@ export class RequestComponent implements OnInit {
     this.hidden = false;
     this.success = false;
     this.metrika.reachGoal('form-open').then();
+    gtag('event', 'form-open', {'event_name':'form-open',
+      'value': 'form-open'   })
     this.ngOnInit()
   }
 
@@ -71,6 +74,8 @@ export class RequestComponent implements OnInit {
     if (this.feedbackForm.valid)
       this.formsService.save('model', 'feedback-form-support', null, this.feedbackForm.value).subscribe(res => {
         this.metrika.reachGoal('form-sent').then();
+        gtag('event', 'form-sent', {'event_name':'form-sent',
+          'value': 'form-sent'   })
         this.success = true;
       }, error => {
         console.log(error);
diff --git a/src/index.html b/src/index.html
index f80008d..10a9e19 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,6 +6,15 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="assets/favicon.svg">
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-B8183299MH"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
+
+    gtag('config', 'G-B8183299MH');
+  </script>
 </head>
 <body>
   <app-root></app-root>