Merge branch 'development' of ssh://gogs.didato.ninja:2022/Work/fdn2 into development

#16 - Inserito nuovo tag
Update 'cicd/environments/production/worker.env'
2023-06-26 21:34:08 +02:00 · 2023-06-26 21:34:06 +02:00 · 2022-12-24 00:49:26 +00:00 · 2022-12-24 00:49:13 +00:00 · 2022-12-24 00:46:05 +00:00 · 2022-12-24 00:45:53 +00:00
6 changed files with 22 additions and 28 deletions
@@ -449,19 +449,16 @@ class GUIHandler {
 	
 	public static function generateGoogleAnalyticsScripts(){
 		?>
-		<script>
-		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-		
-// 		  ga('create', 'UA-75287906-1', 'auto');
-// 		  ga('send', 'pageview');
+        <!-- Google tag (gtag.js) -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id=G-5YTMS8G32Q"></script>
+        <script>
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', 'G-5YTMS8G32Q');
+        </script>

-		  ga('create', 'UA-6137905-1', 'auto');
-		  ga('send', 'pageview');
-		
-		</script>
 		<?php 
 	}

@@ -467,19 +467,16 @@ class GUIHandlerMobile {
 	
 	public static function generateGoogleAnalyticsScripts(){
 		?>
-		<script>
-		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-		
-		  ga('create', 'UA-75287906-1', 'auto');
-		  ga('send', 'pageview');
+        <!-- Google tag (gtag.js) -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id=G-5YTMS8G32Q"></script>
+        <script>
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', 'G-5YTMS8G32Q');
+        </script>

-		  ga('create', 'UA-6137905-1', 'auto');
-		  ga('send', 'pageview');
-		
-		</script>
 		<?php 
 	}

@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=production
 DDNINJA_IS_PRODUCTION=true

 DDNINJA_MONGO_DBNAME=fdn2
-DDNINJA_MONGO_LOCATION=database
+DDNINJA_MONGO_LOCATION=mongo

 DDNINJA_PUBLIC_URL=http://www.ifattidinapoli.it
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=production
 DDNINJA_IS_PRODUCTION=true

 DDNINJA_MONGO_DBNAME=fdn2
-DDNINJA_MONGO_LOCATION=database
+DDNINJA_MONGO_LOCATION=mongo

 DDNINJA_PUBLIC_URL=http://www.ifattidinapoli.it
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=test
 DDNINJA_IS_PRODUCTION=false

 DDNINJA_MONGO_DBNAME=fdn2_test
-DDNINJA_MONGO_LOCATION=database
+DDNINJA_MONGO_LOCATION=mongo

 DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=test
 DDNINJA_IS_PRODUCTION=false

 DDNINJA_MONGO_DBNAME=fdn2_test
-DDNINJA_MONGO_LOCATION=database
+DDNINJA_MONGO_LOCATION=mongo

 DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
Author	SHA1	Message	Date
r.didato	b1a33940ff	Merge branch 'development' of ssh://gogs.didato.ninja:2022/Work/fdn2 into development	2023-06-26 21:34:08 +02:00
r.didato	b9be324698	#16 - Inserito nuovo tag	2023-06-26 21:34:06 +02:00
r.didato	40d0e6071a	Update 'cicd/environments/production/worker.env'	2022-12-24 00:49:26 +00:00
r.didato	60dfebc676	Update 'cicd/environments/production/webserver.env'	2022-12-24 00:49:13 +00:00
r.didato	0479701b70	Update 'cicd/environments/test/worker.env'	2022-12-24 00:46:05 +00:00
r.didato	f80dc6ec64	Update 'cicd/environments/test/webserver.env'	2022-12-24 00:45:53 +00:00