From 5553c291afe936d46cb581d4807289941c5571bf Mon Sep 17 00:00:00 2001
From: Tendo Martin <tmkmart@gmail.com>
Date: Thu, 26 Sep 2024 00:57:34 +0300
Subject: [PATCH] make default favicon overridable

---
 docker-compose.yml             |   4 ++--
 frontend/Dockerfile            |   5 +++--
 frontend/favicon.ico           | Bin 0 -> 4365 bytes
 frontend/spa-build-config.json |   4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 frontend/favicon.ico

diff --git a/docker-compose.yml b/docker-compose.yml
index e0d1340f4..0ae45851e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
     environment:
       SPA_PATH: /openmrs/spa
       API_URL: /openmrs
-      OMRS_PAGE_TITLE: UVI-EMR
-      OMRS_FAVICON: 
+      OMRS_PAGE_TITLE: 
+      OMRS_FAVICON: $SPA_PATH/frontend/favicon.ico
       SPA_CONFIG_URLS: /openmrs/spa/config-core_demo.json
       SPA_DEFAULT_LOCALE:
     healthcheck:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index ca2ccdc9d..bcf060b66 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -6,6 +6,7 @@ FROM --platform=$BUILDPLATFORM node:18-alpine as dev
 
 ARG APP_SHELL_VERSION=next
 ARG OMRS_PAGE_TITLE=OpenMRS
+ARG OMRS_FAVICON=/frontend/favicon.ico
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -15,7 +16,7 @@ COPY spa-build-config.json .
 
 ARG CACHE_BUST
 RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa --page-title ${OMRS_PAGE_TITLE:-UVI-EMR}
+RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa --page-title ${OMRS_PAGE_TITLE:-UVI-EMR0000} 
 
 RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi
 
@@ -40,4 +41,4 @@ COPY nginx.conf /etc/nginx/nginx.conf
 COPY --from=dev /app/spa /usr/share/nginx/html
 COPY config-core_demo.json /usr/share/nginx/html
 
-CMD ["/usr/local/bin/startup.sh"]
+CMD ["nodeman", "/usr/local/bin/startup.sh"]
diff --git a/frontend/favicon.ico b/frontend/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f6c805d7ca1e4e60087668a367fe515ebc1248e5
GIT binary patch
literal 4365
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

literal 0
HcmV?d00001

diff --git a/frontend/spa-build-config.json b/frontend/spa-build-config.json
index 68c3ce8f9..52eadcd8e 100644
--- a/frontend/spa-build-config.json
+++ b/frontend/spa-build-config.json
@@ -6,5 +6,7 @@
   "importmap": "$SPA_PATH/importmap.json",
   "routes": "$SPA_PATH/routes.registry.json",
   "supportOffline": false,
-  "pageTitle": "UVI-EMR"
+  "pageTitle": "$OMRS_PAGE_TITLE",
+  "favicon":"$SPA_PATH/frontend/favicon.ico"
+
 }