From 9c44ae7b0180aa66a637abd15b8d24d73fff882d Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 9 Jul 2024 14:08:29 -0400 Subject: [PATCH 1/2] updated google analytics code to GA4 --- app/views/layouts/application.html.erb | 19 ++++++++----------- app/views/layouts/fullscreen.html.erb | 23 ++++++++--------------- public/UI_redesign/index.html | 11 ++++++++--- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cadaf776e..6b7a65aab 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -93,18 +93,15 @@ <%#= stylesheet_link_tag 'themes/default' %> <%#= stylesheet_link_tag 'themes/alphacube' %> - + - <%#= stylesheet_link_tag "scaffold" %> diff --git a/app/views/layouts/fullscreen.html.erb b/app/views/layouts/fullscreen.html.erb index f443da5c4..b3b3fbd09 100644 --- a/app/views/layouts/fullscreen.html.erb +++ b/app/views/layouts/fullscreen.html.erb @@ -20,23 +20,16 @@ <% end %> + + + - <% end %> - - - + <%= yield %> diff --git a/public/UI_redesign/index.html b/public/UI_redesign/index.html index 7f0ff160c..602a78f97 100644 --- a/public/UI_redesign/index.html +++ b/public/UI_redesign/index.html @@ -456,10 +456,15 @@

Translate Page

}); - + + + + diff --git a/app/views/layouts/fullscreen.html.erb b/app/views/layouts/fullscreen.html.erb index b3b3fbd09..cbd192f40 100644 --- a/app/views/layouts/fullscreen.html.erb +++ b/app/views/layouts/fullscreen.html.erb @@ -21,13 +21,13 @@ - + diff --git a/config/defaults.yml b/config/defaults.yml index 209fa2269..782c4a068 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -12,9 +12,11 @@ site_identification_markup: "PEcAndb The PEcAn + ## Contact Information admin_phone: "(000) 000-0000" admin_email: "admin@example.com" # a test diff --git a/docker-compose.yml b/docker-compose.yml index 0e4553d44..ff17ef40d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: # BETY rails frontend to the database bety: @@ -11,6 +9,7 @@ services: environment: - UNICORN_WORKER_PROCESSES=1 - SECRET_KEY_BASE=thisisnotasecret + - GOOGLE_ANALYTICS_ID=G-0000000000 depends_on: - postgres restart: unless-stopped @@ -18,8 +17,8 @@ services: # postgresql + postgis to hold all the data postgres: image: postgis/postgis:12-3.3 - env: - POSTGRES_PASSWORD: bety + environment: + POSTGRES_PASSWORD: postgres networks: - bety #ports: @@ -33,4 +32,3 @@ networks: volumes: postgres: -