Merge pull request #270 from valor-software/development

Update master

Author: CaioRolla

apps/valor-software-site/src/app/app.component.ts

@@ -6,6 +6,7 @@ import { filter, pairwise } from "rxjs/operators";
 import { Subscription } from "rxjs";
 
 const notFoundPageUrl = '/404';
+declare const gtag: any;
 
 @Component({
   selector: 'valor-software-site-base-root',
@@ -16,6 +17,7 @@ export class AppComponent implements OnDestroy, AfterViewInit {
     title = 'valor-software-site';
     scrollPosition = 0;
     $routeEvents?: Subscription;
+    $gaRouteEvents?: Subscription;
     $routerEventNavigationEnd: Subscription;
     showFooterAndHeader = true;
 
@@ -45,6 +47,7 @@ export class AppComponent implements OnDestroy, AfterViewInit {
     }
 
     ngAfterViewInit() {
+        this.handleGoogleAnalyticsTracking();
         setTimeout(() => {
             if (this.scrollPosition) {
                 this.scrollToPosition(this.scrollPosition);
@@ -77,5 +80,22 @@ export class AppComponent implements OnDestroy, AfterViewInit {
     ngOnDestroy() {
         this.$routeEvents?.unsubscribe();
         this.$routerEventNavigationEnd?.unsubscribe();
+        this.$gaRouteEvents?.unsubscribe();
     }
+
+    private handleGoogleAnalyticsTracking(): void {
+        let configured = false;
+        this.$gaRouteEvents = this.router.events.subscribe((event) => {
+          if (event instanceof NavigationEnd) {
+            if(!configured){
+                gtag('config', 'UA-73071494-2', { send_page_view: false });
+                configured = true;
+            }
+            gtag('event', 'page_view', {
+                page_location: window.location.href,
+                page_path: event.urlAfterRedirects,
+            });
+          }
+        });
+      }
 }

apps/valor-software-site/src/index.html

@@ -25,8 +25,6 @@
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-
-      gtag('config', 'UA-73071494-2');
     </script>
        <script type="text/javascript">
         window.onload = function () {

libs/route-pages/press-release/src/press-release.component.html

@@ -26,7 +26,7 @@ <h1 class="text-light_title_col text-40 font-bold lg:w-10/12">Rspack: The Rust-B
 
                 <p class="The docs put us on a clear migration path, and Rspack itself came with the right level of ecosystem backwards compatibility, so it only took an afternoon to get it up and running."></p>
 
-                <p>We can’t wait to see Rspack also make it to the hands of Netlify customers and speed up their development workflows!" Kaelig Deloumeau-Prigent, principal software engineer at Netlify when highlighting the benefits of Rspack."</p>
+                <p>We can’t wait to see Rspack also make it to the hands of Netlify customers and speed up their development workflows!"</p>
             </quote>
 
             <p>Rspack offers developers a new and innovative solution for web bundling, combining multi-threaded high performance with webpack interoperability. </p>