From 53ae04404b523a0e44e39fbbafc163749cbf8b09 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mravi@ungleich.ch>
Date: Wed, 15 May 2024 01:44:31 +0000
Subject: [PATCH 01/18] Changes on the nations server

---
 publichealth/settings/dev.py          | 14 ++++++++++++--
 publichealth/static/css/subsites.scss | 16 ++++++++++++++++
 publichealth/templates/header.html    | 16 +++++++++++++---
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py
index afa6a7d..e53fcf1 100644
--- a/publichealth/settings/dev.py
+++ b/publichealth/settings/dev.py
@@ -17,10 +17,20 @@ BASE_URL = 'http://localhost:8000'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
+#DATABASES = {
+#    'default': {
+#        'ENGINE': 'django.db.backends.sqlite3',
+#        'NAME': 'publichealth-dev.sqlite3',
+#    }
+#}
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'publichealth-dev.sqlite3',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'publichealth',
+        'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
+
+        # User, host and port can be configured by the PGUSER, PGHOST and
+        # PGPORT environment variables (these get picked up by libpq).
     }
 }
 
diff --git a/publichealth/static/css/subsites.scss b/publichealth/static/css/subsites.scss
index 488d854..ba117f8 100644
--- a/publichealth/static/css/subsites.scss
+++ b/publichealth/static/css/subsites.scss
@@ -49,6 +49,7 @@
 html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
   background-image: url('/static/org/NGO-Allianz_Logo-fr.jpg');
 }
+
 // -site-ngo-allianz-ebk
 
 // Custom styles for gesundheitsmanifest.ch
@@ -61,3 +62,18 @@ html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
     border-bottom: 1px solid #ddd;
   }
 }
+
+.site-dev-pro-salutech {
+  .navbar-brand {
+    width: 240px;
+    height: 64px;
+    background-size: contain !important;
+    background-repeat: no-repeat;
+    background-image: url('/static/images/pro-salute-logo.png');
+
+    font-size: 0px !important;
+    img { display: none !important; }
+  }
+  #carousel-banner .carousel-caption { display: none; }
+}
+
diff --git a/publichealth/templates/header.html b/publichealth/templates/header.html
index 2f4033f..7594be0 100644
--- a/publichealth/templates/header.html
+++ b/publichealth/templates/header.html
@@ -2,6 +2,9 @@
 {% get_site_root as site_root %}
 {% get_site as the_site %}
 
+
+<style>
+</style>
 <nav class="navbar-pre navbar-fixed-top">
   <div class="container">
       <div class="nav">
@@ -27,9 +30,16 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-      <a class="navbar-brand" href="{% pageurl site_root %}">
-        <img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
-        <span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
+
+	   <a class="navbar-brand" href="{% pageurl site_root %}">
+
+               {% if the_site|default:""|truncatechars:"255" == "dev.pro-salute.ch"%}
+               <img src="{% static 'images/pro-salute-logo.png' %}" alt="Pro Salute Logo">
+     	       {% else %}
+               <img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
+   	       {% endif %}
+
+          <span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
     </div>
 
     {% block menu %}

From 4099b039f5f9daa9f0ea625b115895309edada9e Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mravi@ungleich.ch>
Date: Wed, 15 May 2024 04:04:32 +0000
Subject: [PATCH 02/18] Add Dockerfile

---
 Dockerfile | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ec46d16
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,88 @@
+#FROM python:3.10-alpine
+FROM docker.io/python:3.10-slim AS base
+
+ENV \
+   LANG=C.UTF-8 \
+   LC_ALL=C.UTF-8 \
+   # python:
+   PYTHONFAULTHANDLER=1 \
+   PYTHONUNBUFFERED=1 \
+   PYTHONHASHSEED=random \
+   PYTHONDONTWRITEBYTECODE=1
+
+RUN apt-get update
+
+RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpango-1.0-0 libpangoft2-1.0-0
+
+ENV VIRTUAL_ENV=/venv
+
+# Use production configuration.
+ENV DJANGO_SETTINGS_MODULE=project.settings
+ENV DJANGO_CONFIGURATION=production
+
+
+### builder image
+
+FROM base as build
+
+ENV \
+   # pip:
+   PIP_NO_CACHE_DIR=off \
+   PIP_DISABLE_PIP_VERSION_CHECK=on \
+   PIP_DEFAULT_TIMEOUT=100 \
+
+RUN apt-get install -y --no-install-recommends build-essential gcc
+
+# Install python build tools.
+RUN pip install --upgrade pip
+RUN pip install poetry wheel
+
+RUN python3 -m venv $VIRTUAL_ENV
+
+RUN mkdir -p /build
+WORKDIR /build
+
+# Install python dependencies.
+COPY requirements.txt requirements.txt ./
+RUN . /venv/bin/activate && pip install -r requirements.txt
+
+# We will run dumb-init as pid 1.
+RUN . /venv/bin/activate && pip install dumb-init
+
+# We will run our app using gunicorn.
+RUN . /venv/bin/activate && pip install gunicorn
+
+# Copy local code into to the build image.
+COPY . /build
+
+# Copy code required for runtime to the /app folder.
+RUN mkdir /app
+RUN cp -r apps project templates manage.py /app/
+
+# Collect static data into /app/static.
+RUN . /venv/bin/activate && \
+   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+
+RUN ls -al /app/
+
+
+### runtime image
+
+FROM base as runtime
+
+#RUN apt-get install -y --no-install-recommends libpango-1.0-0 libpangoft2-1.0-0
+#RUN apt-get install -y --no-install-recommends procps iproute2 curl
+
+COPY --from=build /venv /venv
+COPY --from=build /app /app
+
+WORKDIR /app
+
+# Ensure exectutables from virtualenv are prefered.
+ENV PATH="/venv/bin:$PATH"
+ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
+   "-b [::]:8000", \
+   "--log-file=-", \
+   "--worker-tmp-dir", "/dev/shm", \
+   "--workers=2", "--threads=4", "--worker-class=gthread"]
+CMD ["project.wsgi"]

From 6e835a10e6fdc466c29dc8f30275ef18d5a965af Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 15 May 2024 11:01:32 +0530
Subject: [PATCH 03/18] Fix required changes

---
 Dockerfile       | 13 +++++++------
 requirements.txt |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ec46d16..5a26a1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpa
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
-ENV DJANGO_SETTINGS_MODULE=project.settings
+ENV DJANGO_SETTINGS_MODULE=publichealth.settings
 ENV DJANGO_CONFIGURATION=production
 
 
@@ -29,13 +29,14 @@ ENV \
    # pip:
    PIP_NO_CACHE_DIR=off \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
-   PIP_DEFAULT_TIMEOUT=100 \
+   PIP_DEFAULT_TIMEOUT=100
+
 
 RUN apt-get install -y --no-install-recommends build-essential gcc
 
 # Install python build tools.
-RUN pip install --upgrade pip
-RUN pip install poetry wheel
+RUN pip install --upgrade pip setuptools==58
+RUN pip install wheel
 
 RUN python3 -m venv $VIRTUAL_ENV
 
@@ -57,7 +58,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app
-RUN cp -r apps project templates manage.py /app/
+RUN cp -r publichealth yarn.lock manage.py /app/
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
@@ -85,4 +86,4 @@ ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
    "--log-file=-", \
    "--worker-tmp-dir", "/dev/shm", \
    "--workers=2", "--threads=4", "--worker-class=gthread"]
-CMD ["project.wsgi"]
+CMD ["publichealth.wsgi"]
diff --git a/requirements.txt b/requirements.txt
index 7faa249..5e6e6d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,5 +30,5 @@ Pillow==8.4.0
 gunicorn
 whitenoise
 python-dotenv
-ConcurrentLogHandler
+#ConcurrentLogHandler
 unidecode

From 9863959d88eb4bed5fe919a6b8a88c7438656b85 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 17 May 2024 19:06:50 +0530
Subject: [PATCH 04/18] Add feedler module to the app folder

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5a26a1f..b443d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app
-RUN cp -r publichealth yarn.lock manage.py /app/
+RUN cp -r publichealth feedler yarn.lock manage.py /app/
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \

From 0e0b464534181b0ddf97f2dbfb5340c79ceb73e4 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 16:53:37 +0530
Subject: [PATCH 05/18] Add django-configurations requirement

---
 requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5e6e6d3..9f5f471 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-# Updated: 21.07.2021
+# Updated: 22.05.2024
 
 # Core
 wagtail==2.15.1
@@ -32,3 +32,5 @@ whitenoise
 python-dotenv
 #ConcurrentLogHandler
 unidecode
+
+django-configurations

From 1af8fe37672679f035b21f3a8dba371f09d1869e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:50:52 +0530
Subject: [PATCH 06/18] Use RotatingFileHandler instead of ConcurrentLogHandler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Why?
  error: subprocess-exited-with-error

  × python setup.py egg_info did not run successfully.
  │ exit code: 1
  ╰─> [1 lines of output]
      error in ConcurrentLogHandler setup command: use_2to3 is invalid.
      [end of output]

Looks like the module is incompatible with the latest setuptools. The recommended solution on the Internet seems to be to downgrade setuptools to 57.5.0 ;; however, this still does not solve the issue for my setup
---
 publichealth/settings/production.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index 78f27dc..e46caee 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -1,6 +1,8 @@
+import logging
 import os
 import dj_database_url
 
+from logging.handlers import RotatingFileHandler
 from .base import *
 
 # Do not set SECRET_KEY, Postgres or LDAP password or any other sensitive data here.
@@ -194,7 +196,7 @@ if 'LOG_DIR' in env:
     # Public Health Schweiz log
     LOGGING['handlers']['publichealth_file'] = {
         'level':        'INFO',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'publichealth.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5
@@ -204,7 +206,7 @@ if 'LOG_DIR' in env:
     # Wagtail log
     LOGGING['handlers']['wagtail_file'] = {
         'level':        'WARNING',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'wagtail.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5
@@ -214,7 +216,7 @@ if 'LOG_DIR' in env:
     # Error log
     LOGGING['handlers']['errors_file'] = {
         'level':        'ERROR',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'error.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5

From aaf1fc1d9b2ec9041df28e9c5ceaffe6649a5176 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:52:23 +0530
Subject: [PATCH 07/18] Install yarn + tools

---
 Dockerfile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b443d30..6cafa97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,16 @@ RUN apt-get update
 
 RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpango-1.0-0 libpangoft2-1.0-0
 
+RUN apt-get update && \
+    apt-get install -y curl gnupg && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y yarn && \
+    apt-get install -y --no-install-recommends build-essential gcc && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
@@ -31,13 +41,6 @@ ENV \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
    PIP_DEFAULT_TIMEOUT=100
 
-
-RUN apt-get install -y --no-install-recommends build-essential gcc
-
-# Install python build tools.
-RUN pip install --upgrade pip setuptools==58
-RUN pip install wheel
-
 RUN python3 -m venv $VIRTUAL_ENV
 
 RUN mkdir -p /build

From c013387b03967bbf0d2d8172fa4795e4f8079828 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:55:04 +0530
Subject: [PATCH 08/18] Generate / copy staticfiles + node libraries

---
 Dockerfile | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cafa97..122ffe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ ENV \
 
 RUN python3 -m venv $VIRTUAL_ENV
 
-RUN mkdir -p /build
+RUN mkdir -p /build/static
 WORKDIR /build
 
 # Install python dependencies.
@@ -60,12 +60,23 @@ RUN . /venv/bin/activate && pip install gunicorn
 COPY . /build
 
 # Copy code required for runtime to the /app folder.
-RUN mkdir /app
+RUN mkdir -p /app
 RUN cp -r publichealth feedler yarn.lock manage.py /app/
 
+# node / yarn
+RUN rm -rf node_modules
+RUN yarn install
+
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
-   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+
+RUN mkdir -p /app/publichealth/static/libs
+RUN ls -al /app/publichealth/static/libs
+RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+#RUN mkdir -p /app/static/libs
+#RUN cp -rf node_modules/@bower_components/* /app/static/libs
+#RUN ls -al /app/publichealth/static/libs
 
 RUN ls -al /app/
 

From b5e786e09855a99e8bd8b5ad019a415da4dedad6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:55:41 +0530
Subject: [PATCH 09/18] Copy built static files to app

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 122ffe8..661cd05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,6 +80,7 @@ RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
 
 RUN ls -al /app/
 
+RUN cp -r /build/static /app/static
 
 ### runtime image
 

From daf3a6baadcd00269b22c13d99991492f622db3f Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:56:55 +0530
Subject: [PATCH 10/18] Cleanup

---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 661cd05..81417cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,11 +74,8 @@ RUN . /venv/bin/activate && \
 RUN mkdir -p /app/publichealth/static/libs
 RUN ls -al /app/publichealth/static/libs
 RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
-#RUN mkdir -p /app/static/libs
-#RUN cp -rf node_modules/@bower_components/* /app/static/libs
-#RUN ls -al /app/publichealth/static/libs
 
-RUN ls -al /app/
+
 
 RUN cp -r /build/static /app/static
 

From c18fb883cca8d949077101214e79d7e32f2c11d2 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 22:25:54 +0530
Subject: [PATCH 11/18] Revert back dev configuration

---
 publichealth/settings/dev.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py
index e53fcf1..afa6a7d 100644
--- a/publichealth/settings/dev.py
+++ b/publichealth/settings/dev.py
@@ -17,20 +17,10 @@ BASE_URL = 'http://localhost:8000'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-#DATABASES = {
-#    'default': {
-#        'ENGINE': 'django.db.backends.sqlite3',
-#        'NAME': 'publichealth-dev.sqlite3',
-#    }
-#}
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'publichealth',
-        'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
-
-        # User, host and port can be configured by the PGUSER, PGHOST and
-        # PGPORT environment variables (these get picked up by libpq).
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'publichealth-dev.sqlite3',
     }
 }
 

From c88b94f20f47636899de0e46f67784c5787c7fab Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 23 May 2024 17:05:21 +0530
Subject: [PATCH 12/18] Final changes

---
 Dockerfile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 81417cf..0fe153f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,23 +61,26 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py /app/
+RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
 
-# node / yarn
-RUN rm -rf node_modules
-RUN yarn install
+
+RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
+RUN apt install -y nodejs
+RUN npm install -g grunt-cli
 
 # Collect static data into /app/static.
-RUN . /venv/bin/activate && \
-   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
 
-RUN mkdir -p /app/publichealth/static/libs
-RUN ls -al /app/publichealth/static/libs
-RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+#RUN mkdir -p /app/publichealth/static/libs
+
+#RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
 
 
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py compress --force
 
-RUN cp -r /build/static /app/static
+#RUN cp -r /build/static /app/static
 
 ### runtime image
 

From 5c173f0ffbad86bbca1f896859054157f7d36a6e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 24 May 2024 15:55:48 +0530
Subject: [PATCH 13/18] Revert back installing grunt-cli

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0fe153f..e48bf7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,9 +64,9 @@ RUN mkdir -p /app
 RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
 
 
-RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
-RUN apt install -y nodejs
-RUN npm install -g grunt-cli
+#RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
+#RUN apt install -y nodejs
+#RUN npm install -g grunt-cli
 
 # Collect static data into /app/static.
 #RUN . /venv/bin/activate && \

From 5ba9ee52ea5057ad30882e43adf78e0fa0f91b53 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:08:08 +0530
Subject: [PATCH 14/18] Create setup_libs.sh

---
 setup_libs.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 setup_libs.sh

diff --git a/setup_libs.sh b/setup_libs.sh
new file mode 100755
index 0000000..ebd4ea3
--- /dev/null
+++ b/setup_libs.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cd /app 
+rm -rf node_modules
+yarn install
+mkdir -p /app/publichealth/static/libs
+echo "created /app/publichealth/static/libs contents "
+ls /app/publichealth/static/libs
+cp -rf node_modules/@bower_components/* /app/publichealth/static/libs/
+
+# static resources
+python manage.py collectstatic --no-input -i media --settings=publichealth.settings.production
+python manage.py compress --force --settings=publichealth.settings.production
+
+if [ -d /app/static ]; then
+  echo "Copying"
+  cp -a /app/static /pod
+fi

From b918903fcf475a7e2adeb413200b88d0d3118e38 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:08:30 +0530
Subject: [PATCH 15/18] Copy setup_libs.sh to /app

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e48bf7b..ca4358a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,7 +61,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
+RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js setup_libs.sh /app/
 
 
 #RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x

From a3cdc6b58a0ed0245f6fb84ed00c9165639f57c6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:09:01 +0530
Subject: [PATCH 16/18] Write DEBUG level logs to stdout

---
 publichealth/settings/production.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index e46caee..56096e0 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import sys
 import dj_database_url
 
 from logging.handlers import RotatingFileHandler
@@ -151,10 +152,19 @@ LOGGING = {
             'level': 'ERROR',
             'class': 'django.utils.log.AdminEmailHandler',
         },
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'stream': sys.stdout,
+            'formatter': 'simple',
+        },
     },
     'formatters': {
         'default': {
             'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
+        },
+        'simple': {
+            'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
         }
     },
     'loggers': {

From cd99b1bc4f907de4591686bb3e7f6bfb2fa2134b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 4 Jun 2024 17:07:38 +0530
Subject: [PATCH 17/18] Check variable before accessing attribute

---
 publichealth/home/templatetags/navigation.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 7082a43..9d984e9 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -54,12 +54,13 @@ def top_menu(context, parent, calling_page=None):
     menuitems = parent.get_children().live().in_menu().specific()
     for menuitem in menuitems:
         menuitem.show_dropdown = has_menu_children(menuitem)
-        menuitem.active = (calling_page.url.startswith(menuitem.url)
-                           if calling_page else False)
-        try:
-            menuitem.title = menuitem.trans_title
-        except AttributeError:
-            pass
+        if calling_page:
+            menuitem.active = (calling_page.url.startswith(menuitem.url)
+                               if calling_page else False)
+            try:
+                menuitem.title = menuitem.trans_title
+            except AttributeError:
+                pass
     return {
         'calling_page': calling_page,
         'menuitems': menuitems,

From 34ad67e8cd512a848c3bba44c4ef792a2f64c38d Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 17 Jun 2024 17:37:28 +0530
Subject: [PATCH 18/18] Add favicon-prosalute.ico

---
 .../static/images/favicon-prosalute.ico         | Bin 0 -> 15406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 publichealth/static/images/favicon-prosalute.ico

diff --git a/publichealth/static/images/favicon-prosalute.ico b/publichealth/static/images/favicon-prosalute.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7611f740c0788b6de15c012f90bfd8da6a5fc190
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001