From e3e76d6f7ef2939fe86b6f87851fbec312c6cfd6 Mon Sep 17 00:00:00 2001
From: Ian Abbott <ij.abbott2306@gmail.com>
Date: Thu, 11 May 2023 13:21:05 -0500
Subject: [PATCH 1/4] remove extra quotes, default to urbanos logo for favicon,
 and remove unneeded icon from config

---
 config/config.js    | 5 ++---
 src/HelmetStyles.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/config.js b/config/config.js
index 2a5e677..21bcfb2 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,6 +1,6 @@
 window.CONTRIBUTE_HOST = 'http://localhost:4001'
 window.GTM_ID = ''
-window.DISC_API_URL = 'http://localhost:4000'
+window.DISC_API_URL = 'http://localhost:4001'
 window.DISC_UI_URL = 'https://www.example.com'
 window.STREETS_TILE_LAYER_URL = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
 window.LOGO_URL = 'https://placekitten.com/530/530'
@@ -15,5 +15,4 @@ window.AUTH0_CLIENT_ID = 'SHqaonqYEYiS4El57rGHplqLMG00pQKR'
 window.AUTH0_AUDIENCE = 'discovery_api'
 window.REQUIRE_API_KEY = 'false'
 window.REGENERATE_API_KEY_FF = 'true'
-window.PRIMARY_COLOR = '#28807C'
-window.CUSTOM_FAV_ICON_URL = 'https://michigan.gov/favicon.ico'
\ No newline at end of file
+window.PRIMARY_COLOR = '#28807C'
\ No newline at end of file
diff --git a/src/HelmetStyles.js b/src/HelmetStyles.js
index 3afc27c..3c57912 100644
--- a/src/HelmetStyles.js
+++ b/src/HelmetStyles.js
@@ -5,7 +5,7 @@ export default class HelmetStyles extends Component {
     render() {
         return (
             <Helmet>
-                <link href={`"${window.CUSTOM_FAV_ICON_URL}"`} rel="icon" type="image/x-icon" />
+              {window.CUSTOM_FAV_ICON_URL && (<link href={`${window.CUSTOM_FAV_ICON_URL}`} rel="icon" type="image/x-icon" />)}
 
                 <style type="text/css">{`
                     content {

From 9bc095ea467ba291adb7c182211408ab529b4f5d Mon Sep 17 00:00:00 2001
From: Ian Abbott <ij.abbott2306@gmail.com>
Date: Thu, 11 May 2023 13:23:27 -0500
Subject: [PATCH 2/4] version bump

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e100bac..cedd205 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "discovery_ui",
-  "version": "2.1.39",
+  "version": "2.1.40",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index be86d9c..105dd0b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discovery_ui",
-  "version": "2.1.39",
+  "version": "2.1.40",
   "description": "UI for dataset discovery",
   "main": "./src/index.js",
   "repository": {

From 186beeef426a41d8f7366f6516205c085b8ebd8d Mon Sep 17 00:00:00 2001
From: Ian Abbott <ij.abbott2306@gmail.com>
Date: Thu, 11 May 2023 13:30:55 -0500
Subject: [PATCH 3/4] fix version and config after merge

---
 config/config.js  | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/config.js b/config/config.js
index 21bcfb2..f92b0fe 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,6 +1,6 @@
 window.CONTRIBUTE_HOST = 'http://localhost:4001'
 window.GTM_ID = ''
-window.DISC_API_URL = 'http://localhost:4001'
+window.DISC_API_URL = 'http://localhost:4000'
 window.DISC_UI_URL = 'https://www.example.com'
 window.STREETS_TILE_LAYER_URL = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
 window.LOGO_URL = 'https://placekitten.com/530/530'
diff --git a/package-lock.json b/package-lock.json
index cedd205..97c4073 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "discovery_ui",
-  "version": "2.1.40",
+  "version": "2.1.41",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 105dd0b..53a7204 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discovery_ui",
-  "version": "2.1.40",
+  "version": "2.1.41",
   "description": "UI for dataset discovery",
   "main": "./src/index.js",
   "repository": {

From d33471c4d74c0f7864ce16e0004415f9bbce72de Mon Sep 17 00:00:00 2001
From: Ian Abbott <ij.abbott2306@gmail.com>
Date: Thu, 11 May 2023 13:31:34 -0500
Subject: [PATCH 4/4] add new line to helmet styles

---
 src/HelmetStyles.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/HelmetStyles.js b/src/HelmetStyles.js
index 7876f46..d41850d 100644
--- a/src/HelmetStyles.js
+++ b/src/HelmetStyles.js
@@ -5,7 +5,8 @@ export default class HelmetStyles extends Component {
     render() {
         return (
             <Helmet>
-                {window.CUSTOM_FAV_ICON_URL && (<link href={`${window.CUSTOM_FAV_ICON_URL}`} rel="icon" type="image/x-icon" />)}                <title>{`${window.HEADER_TITLE}`}</title>
+                {window.CUSTOM_FAV_ICON_URL && (<link href={`${window.CUSTOM_FAV_ICON_URL}`} rel="icon" type="image/x-icon" />)}
+                <title>{`${window.HEADER_TITLE}`}</title>
                 <style type="text/css">{`
                     content {
                         accent-color: ${window.PRIMARY_COLOR};