Closed #1275 The Google Analytics upload script has been changed.

linea-it · Dec 21, 2020 · ab56151 · ab56151
1 parent 316c0e3
commit ab56151
Show file tree

Hide file tree

Showing 12 changed files with 136 additions and 39 deletions.
diff --git a/Docs/exemplo_importacao_coadd_object_dr1.json b/Docs/exemplo_importacao_coadd_object_dr1.json
@@ -0,0 +1,65 @@
+{
+    "products": [
+        {
+            "display_name": "DR1",
+            "fields": [],
+            "releases": [
+                "dr1"
+            ],
+            "table": "DR1_MAIN",
+            "schema": "DES_ADMIN",
+            "database": "desdr",
+            "type": "catalog",
+            "class": "coadd_objects",
+            "name": "dr1_coadd",
+            "association": [
+                {
+                    "ucd": "meta.id;meta.main",
+                    "property": "coadd_object_id"
+                },
+                {
+                    "ucd": "pos.eq.ra;meta.main",
+                    "property": "ra"
+                },
+                {
+                    "ucd": "pos.eq.dec;meta.main",
+                    "property": "dec"
+                },
+                {
+                    "ucd": "phys.size.smajAxis;instr.det;meta.main",
+                    "property": "a_image"
+                },
+                {
+                    "ucd": "phys.size.sminAxis;instr.det;meta.main",
+                    "property": "b_image"
+                },
+                {
+                    "ucd": "pos.posAng;instr.det;meta.main",
+                    "property": "theta_j2000"
+                },
+                {
+                    "ucd": "phot.mag;meta.main;em.opt.g",
+                    "property": "mag_auto_g"
+                },
+                {
+                    "ucd": "phot.mag;meta.main;em.opt.r",
+                    "property": "mag_auto_r"
+                },
+                {
+                    "ucd": "phot.mag;meta.main;em.opt.i",
+                    "property": "mag_auto_i"
+                },
+                {
+                    "ucd": "phot.mag;meta.main;em.opt.z",
+                    "property": "mag_auto_z"
+                },
+                {
+                    "ucd": "phot.mag;meta.main;em.opt.Y",
+                    "property": "mag_auto_y"
+                }
+            ]
+        }
+    ],
+    "ticket": "GZY650",
+    "register_username": "gverde"
+}
diff --git a/docker-compose-production.yml b/docker-compose-production.yml
@@ -57,7 +57,8 @@ services:
       - ./archive/django_static:/var/www/django_static
       # Diretório de dados da aplicação
       - ./archive:/var/www/data
-
+      # Google Analytics Script 
+      - ./google-analytics.js:/var/www/ga/google-analytics.js
     depends_on:
       - backend
       - iipserver

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -55,3 +55,5 @@ COPY --from=eyeballing /app/build /var/www/eyeballing
 # Add Landing Page React App to image
 COPY --from=landingpage /app/build /var/www/landing_page
 
+# Add Directory where google analytics scripts are located
+COPY ./ga /var/www/ga
diff --git a/frontend/explorer/index.html b/frontend/explorer/index.html
@@ -4,6 +4,10 @@
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="UTF-8">
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script src="ga/google-analytics.js"></script>
+
     <link rel="icon" href="favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
@@ -55,9 +59,6 @@
         }
     </script>
 
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script src="ga/google-analytics.js"></script>
-
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
     <script id="microloader" data-app="1739eae9-ca05-49a0-800a-3c2bd487fa19" type="text/javascript"
         src="bootstrap.js"></script>

diff --git a/frontend/eyeballing/public/index.html b/frontend/eyeballing/public/index.html
@@ -3,6 +3,10 @@
 
 <head>
   <meta charset="utf-8" />
+
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script src="ga/google-analytics.js"></script>
+
   <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
   <meta name="theme-color" content="#000000" />
@@ -33,9 +37,6 @@
   <link rel='stylesheet' href="%PUBLIC_URL%/visiomatic/Leaflet/dist/leaflet.css" />
   <link rel='stylesheet' href="%PUBLIC_URL%/visiomatic/visiomatic/dist/visiomatic.css" />
 
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script src="ga/google-analytics.js"></script>
-
 
   <title>Tile Viewer</title>
   <!-- <script src="%PUBLIC_URL%/env-config.js"></script> -->

diff --git a/frontend/ga/google-analytics.js b/frontend/ga/google-analytics.js
@@ -1,23 +1,26 @@
 // ## EXEMPLO DE GOOGLE ANALYTICS ##
+// To enable Google Analytics in one of the environments.
+// Create a new file called google-analytics.js copy and paste the template below, replace the ID G-XXXXXXXXXX with the Google Analitcs key.
+// In the compose docker mount the file in order to overwrite the template in the /var/www/ga directory.
 
-// COLABORATION
-// <!-- Global site tag (gtag.js) - Google Analytics -->
-// <script async src="https://www.googletagmanager.com/gtag/js?id=G-EEW8XVF479"></script>
-// <script>
-//   window.dataLayer = window.dataLayer || [];
-//   function gtag(){dataLayer.push(arguments);}
-//   gtag('js', new Date());
+// GA ID for Colaboration enviroment: G-EEW8XVF479
+// GA ID for Public enviroment: G-2JMWE98YJD
 
-//   gtag('config', 'G-EEW8XVF479');
-// </script>
+// Global site tag(gtag.js) - Google Analytics
+// NOTE: Uncomment the script below
 
-// PUBLIC
-// <!-- Global site tag (gtag.js) - Google Analytics -->
-// <script async src="https://www.googletagmanager.com/gtag/js?id=G-2JMWE98YJD"></script>
-// <script>
-//   window.dataLayer = window.dataLayer || [];
-//   function gtag(){dataLayer.push(arguments);}
-//   gtag('js', new Date());
+// function loadGoogleAnalytics() {
+//     var ga = document.createElement('script');
+//     ga.type = 'text/javascript';
+//     ga.async = true;
+//     ga.src = 'https://www.googletagmanager.com/gtag/js?id=G-EEW8XVF479';
+//     var s = document.getElementsByTagName('script')[0];
+//     s.parentNode.insertBefore(ga, s);
+// }
 
-//   gtag('config', 'G-2JMWE98YJD');
-// </script>
+// loadGoogleAnalytics(); 
+
+// window.dataLayer = window.dataLayer || [];
+// function gtag() { dataLayer.push(arguments); }
+// gtag('js', new Date());
+// gtag('config', 'G-EEW8XVF479');
diff --git a/frontend/landing_page/public/index.html b/frontend/landing_page/public/index.html
@@ -3,14 +3,18 @@
 
 <head>
   <meta charset="utf-8" />
+
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script src="ga/google-analytics.js"></script>
+
   <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
   <script src="https://kit.fontawesome.com/10636d4c83.js" crossorigin="anonymous"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="description" content="LIneA Science Server" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Oxanium|Roboto:300,400,500,700&display=swap" />
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script src="ga/google-analytics.js"></script>
+
+
   <title>LIneA Science Server</title>
 </head>
 

diff --git a/frontend/nginx-proxy-develop.conf b/frontend/nginx-proxy-develop.conf
@@ -73,6 +73,13 @@ server {
       autoindex off;
     }
 
+    # Diretório com os arquivos de google analytics
+    location /ga {
+      alias /var/www/ga/;
+      try_files $uri $uri/ /index.html;
+      autoindex off;
+    }
+
     # Frontend Development with Sencha app Watch
     location /sky/ {
       proxy_pass http://sky:1841$request_uri;
@@ -144,4 +151,6 @@ server {
       proxy_set_header X-Forwarded-Host $server_name;
       proxy_set_header X-Real-IP $remote_addr;
     }
+
+
 }
diff --git a/frontend/nginx-proxy.conf b/frontend/nginx-proxy.conf
@@ -1,6 +1,6 @@
-upstream iipsrv {
-    server iipserver:9000;
-}
+# upstream iipsrv {
+#     server iipserver:9000;
+# }
 
 server {
     listen 8080;
@@ -112,4 +112,12 @@ server {
       try_files $uri $uri/ /index.html;
       autoindex off;
     }
+
+    # Diretório com os arquivos de google analytics
+    location /ga {
+      alias /var/www/ga/;
+      try_files $uri $uri/ /index.html;
+      autoindex off;
+    }
+
 }
diff --git a/frontend/sky/index.html b/frontend/sky/index.html
@@ -4,6 +4,10 @@
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="UTF-8">
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script src="ga/google-analytics.js"></script>
+
     <link rel="icon" href="favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <script src="./google-analytics.js"></script>
@@ -55,10 +59,6 @@
         }
     </script>
 
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script src="ga/google-analytics.js"></script>
-
-
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
     <script id="microloader" data-app="23e8d35d-093f-4581-a508-3922dc20fcbf" type="text/javascript"
         src="bootstrap.js"></script>

diff --git a/frontend/target/index.html b/frontend/target/index.html
@@ -4,6 +4,10 @@
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="UTF-8">
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script src="ga/google-analytics.js"></script>
+
     <link rel="icon" href="favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
@@ -62,9 +66,6 @@
         }
     </script>
 
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script src="ga/google-analytics.js"></script>
-
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
     <script id="microloader" data-app="85a0e2c2-ad9b-4f4a-84ed-649bd3f711fd" type="text/javascript"
         src="bootstrap.js"></script>

diff --git a/frontend/userquery/index.html b/frontend/userquery/index.html
@@ -4,6 +4,10 @@
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="UTF-8">
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script src="ga/google-analytics.js"></script>
+
     <link rel="icon" href="favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
@@ -53,8 +57,6 @@
             linea_logo.style.display = 'none';
         }
     </script>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script src="ga/google-analytics.js"></script>
 
     <!-- The line below must be kept intact for Sencha Cmd to build your application -->
     <script id="microloader" data-app="ec311b0b-1ca2-4f2f-b672-f7e9bf9f9023" type="text/javascript"