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

app/private/lib/gui/GUIHandler.php

@@ -215,7 +215,7 @@ class GUIHandler {
 					<div class="leftBanner topBanner mediaContent">
 						<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
 					</div>
-					<div class="logo"><a href="http://ifattidinapoli.it/index.php"><img src="http://ifattidinapoli.it/images/logo_uff.png"></a></div>
+					<div class="logo"><a href="http://www.ifattidinapoli.it/index.php"><img src="http://www.ifattidinapoli.it/images/logo_uff.png"></a></div>
 					<div class="rightBanner topBanner mediaContent">
 						<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
 					</div>
@@ -449,19 +449,16 @@ class GUIHandler {
 	
 	public static function generateGoogleAnalyticsScripts(){
 		?>
-		<script>
+        <!-- Google tag (gtag.js) -->
-		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        <script async src="https://www.googletagmanager.com/gtag/js?id=G-5YTMS8G32Q"></script>
-		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        <script>
-		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+            window.dataLayer = window.dataLayer || [];
-		  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
 
-// 		  ga('create', 'UA-75287906-1', 'auto');
+            gtag('config', 'G-5YTMS8G32Q');
-// 		  ga('send', 'pageview');
+        </script>
 
-		  ga('create', 'UA-6137905-1', 'auto');
-		  ga('send', 'pageview');
-		
-		</script>
 		<?php 
 	}
 

app/private/lib/gui/GUIHandlerMobile.php

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

cicd/environments/production/webserver.env

@@ -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

cicd/environments/production/worker.env

@@ -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

cicd/environments/test/webserver.env

@@ -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

cicd/environments/test/worker.env

@@ -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