Skip to content

Commit

Permalink
removed references to the ENABLE_GOOGLE_ANALYTICS env var and removed…
Browse files Browse the repository at this point in the history
… VueAnalytics from package files as they are not used anymore
  • Loading branch information
acatchpole committed Apr 25, 2024
1 parent 6fdc653 commit dc2c50f
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 29 deletions.
5 changes: 0 additions & 5 deletions app/backend/gwells/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = get_env_variable('DJANGO_DEBUG', 'False') == 'True'

# Controls availability of Google Analytics
ENABLE_GOOGLE_ANALYTICS = get_env_variable(
'ENABLE_GOOGLE_ANALYTICS', 'False', strict=True) == 'True'

# Additional Documents Feature Flag
ENABLE_ADDITIONAL_DOCUMENTS = get_env_variable(
'ENABLE_ADDITIONAL_DOCUMENTS', 'False', strict=True) == 'True'
Expand All @@ -77,7 +73,6 @@
# django-settings-export lets us make these variables available in the templates.
# This eleminate the need for setting the context for each and every view.
SETTINGS_EXPORT = [
'ENABLE_GOOGLE_ANALYTICS', # This is only enabled for production
# To temporarily disable additional documents feature
'ENABLE_ADDITIONAL_DOCUMENTS',
# This allows for moving the app around without code changes
Expand Down
2 changes: 0 additions & 2 deletions app/backend/gwells/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ def api_path_prefix():
api.KeycloakConfig.as_view(), name='keycloak'),
url(r'^' + app_root_slash + api_path_prefix() + r'/config',
api.GeneralConfig.as_view(), name='configuration'),
url(r'^' + app_root_slash + api_path_prefix() + r'/analytics',
api.AnalyticsConfig.as_view(), name='analytics'),
url(r'^' + app_root_slash + api_path_prefix() + r'/gis/insidebc',
api.InsideBC.as_view(), name='insidebc'),
url(r'^' + app_root_slash + api_path_prefix() + r'/geocoding/v\d/.+\.places/(?P<query>.+)\.json$',
Expand Down
1 change: 0 additions & 1 deletion app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"proj4": "^2.4.4",
"smoothscroll": "^0.4.0",
"vue": "~2.6.10",
"vue-analytics": "^5.16.4",
"vue-chartjs": "^3.4.2",
"vue-matomo": "^4.0.1",
"vue-moment": "^4.1.0",
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ services:
DJANGO_SECRET_KEY: secret
ENABLE_ADDITIONAL_DOCUMENTS: "True"
ENABLE_AQUIFERS_SEARCH: "True"
ENABLE_GOOGLE_ANALYTICS: "False"
GWELLS_SERVICE_HOST: "${GWELLS_SERVICE_HOST:-db}"
GWELLS_SERVICE_PORT: "${GWELLS_SERVICE_PORT:-5432}"
MINIO_ACCESS_KEY: minio
Expand Down
10 changes: 0 additions & 10 deletions openshift/backend.dc.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@
"DB_REPLICATE": null,
"DJANGO_DEBUG": null,
"ENABLE_ADDITIONAL_DOCUMENTS": null,
"ENABLE_GOOGLE_ANALYTICS": null,
"E_LICENSING_URL": null,
"S3_PRIVATE_BUCKET": null,
"S3_PRIVATE_HOST": null,
Expand Down Expand Up @@ -476,15 +475,6 @@
}
}
},
{
"name": "ENABLE_GOOGLE_ANALYTICS",
"valueFrom": {
"configMapKeyRef": {
"key": "ENABLE_GOOGLE_ANALYTICS",
"name": "gwells-global-config${NAME_SUFFIX}"
}
}
},
{
"name": "S3_AQUIFER_BUCKET",
"valueFrom": {
Expand Down
10 changes: 0 additions & 10 deletions openshift/ocp4/backend.dc.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
"DB_REPLICATE": null,
"DJANGO_DEBUG": null,
"ENABLE_ADDITIONAL_DOCUMENTS": null,
"ENABLE_GOOGLE_ANALYTICS": null,
"E_LICENSING_URL": null,
"S3_PRIVATE_BUCKET": null,
"S3_PRIVATE_HOST": null,
Expand Down Expand Up @@ -458,15 +457,6 @@
}
}
},
{
"name": "ENABLE_GOOGLE_ANALYTICS",
"valueFrom": {
"configMapKeyRef": {
"key": "ENABLE_GOOGLE_ANALYTICS",
"name": "gwells-global-config${NAME_SUFFIX}"
}
}
},
{
"name": "S3_AQUIFER_BUCKET",
"valueFrom": {
Expand Down

0 comments on commit dc2c50f

Please sign in to comment.