From d03ba974993b19c6c665a812dbdd3ae0d1a6a89a Mon Sep 17 00:00:00 2001
From: GilbN <GilbN@users.noreply.github.com>
Date: Tue, 29 Mar 2022 19:33:56 +0000
Subject: [PATCH] deploy: 9b2d43722dc49df0526c4975350384abb81ad1a4

---
 Dockerfile                            |  3 +--
 docker/root/defaults/default          | 16 +++++++++++-----
 docker/root/etc/cont-init.d/50-config | 24 +++++++++++++++++++++++-
 resources/landing-page/css/custom.css | 12 ++++++++----
 resources/landing-page/css/styles.css |  2 +-
 resources/landing-page/js/scripts.js  |  2 +-
 6 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56604234..c8bc0f11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,7 @@ LABEL maintainer="gilbn"
 RUN \
 echo " ## Installing packages ## " && \
 apk add --no-cache --virtual=build-dependencies \
-    python3 \
-    curl && \
+    python3 && \
   echo "**** install theme.park ****" && \
     mkdir -p /app/themepark
 
diff --git a/docker/root/defaults/default b/docker/root/defaults/default
index 5e698386..336c39c6 100644
--- a/docker/root/defaults/default
+++ b/docker/root/defaults/default
@@ -9,17 +9,23 @@ server {
     ssl_certificate /config/keys/cert.crt;
     ssl_certificate_key /config/keys/cert.key;
 
-    root /config/www;
     index index.html index.htm index.php;
 
+    #location#/ {return 302 $scheme://TP_DOMAIN/TP_URLBASE$request_uri;}
+
     location / {
+        alias /config/www/;
         sub_filter_types *;
-        sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN;
-        sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN;
-        sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN;
-        sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN;
+        sub_filter 'https://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
+        sub_filter 'http://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
+        sub_filter 'https://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
+        sub_filter 'http://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/;
         sub_filter_once off;
         try_files $uri $uri/ /index.html;
+
+        #SUBFOLDER SUBFILTERS
+        #sub_filter 'https://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE;
+        #sub_filter 'http://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE;
     }
 
     # Don't cache
diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config
index e4c17df2..c0733ea0 100644
--- a/docker/root/etc/cont-init.d/50-config
+++ b/docker/root/etc/cont-init.d/50-config
@@ -10,6 +10,7 @@ PUID=${PUID}\\n\
 PGID=${PGID}\\n\
 TZ=${TZ}\\n\
 TP_SCHEME=${TP_SCHEME}\\n\
+TP_URLBASE=${TP_URLBASE}\\n\
 TP_DOMAIN=${TP_DOMAIN}\\n"
 
 if [[ -z ${TP_DOMAIN} ]]; then
@@ -22,8 +23,29 @@ if [[ -z ${TP_SCHEME} ]]; then
     TP_SCHEME='https'
 fi
 
+if [[ -z ${TP_URLBASE} ]]; then
+    TP_URLBASE=''
+fi
+
+# Remove forward slash
+case ${TP_URLBASE} in
+  *"/"*)
+  TP_URLBASE=$(echo "${TP_URLBASE}" | sed 's/\///g')
+    ;;
+esac
+
 DEFAULT='/defaults/default'
-sed -i "s/TP_DOMAIN/${TP_DOMAIN} /g" ${DEFAULT}
+if [[ ${TP_URLBASE} ]]; then
+    echo "seding location"
+    sed -i "s/location \//location \/${TP_URLBASE}/g" ${DEFAULT}
+    echo "seding TP_DOMAIN"
+    sed -i "s/TP_DOMAIN/${TP_DOMAIN}/g" ${DEFAULT}
+    sed -i "s/TP_URLBASE/${TP_URLBASE}/g" ${DEFAULT}
+    sed -i "s/#sub_filter/sub_filter/g" ${DEFAULT}
+    sed -i "s/#location#/location /g" ${DEFAULT}
+elif [[ -z ${TP_URLBASE} ]]; then
+    sed -i "s/TP_DOMAIN\/TP_URLBASE/${TP_DOMAIN}/g" ${DEFAULT}
+fi
 cp /defaults/default /config/nginx/site-confs
 
 # make our folders and links
diff --git a/resources/landing-page/css/custom.css b/resources/landing-page/css/custom.css
index 7a737bc8..a2f04186 100644
--- a/resources/landing-page/css/custom.css
+++ b/resources/landing-page/css/custom.css
@@ -73,7 +73,15 @@ section {
         background-color: rgba(0, 0, 0, 0.9);
     }
 }
+#mainNav .navbar-nav .nav-item .nav-link {
+    color: var(--label-text-color);
+  }
 
+#mainNav .navbar-nav .nav-item .nav-link:hover,
+#mainNav .navbar-nav .nav-item .nav-link:active {
+    color: var(--label-text-color);
+    opacity: .8;
+}
 @media (min-width: 992px) {
     #mainNav {
         box-shadow: none;
@@ -127,10 +135,6 @@ section {
     }
 }
 
-#mainNav .navbar-nav .nav-item .nav-link:hover,
-#mainNav .navbar-nav .nav-item .nav-link:active {
-    color: var(--text-hover);
-}
 
 #mainNav .navbar-nav .nav-item .nav-link.active {
     color: var(--link-color-hover) !important;
diff --git a/resources/landing-page/css/styles.css b/resources/landing-page/css/styles.css
index 50c9f91c..a9a30227 100644
--- a/resources/landing-page/css/styles.css
+++ b/resources/landing-page/css/styles.css
@@ -11006,7 +11006,7 @@ hr.light {
 }
 
 #mainNav .navbar-nav .nav-item .nav-link {
-  color: #6c757d;
+  color: var(--label-text-color);
   font-family: "Merriweather Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-weight: 700;
   font-size: 0.9rem;
diff --git a/resources/landing-page/js/scripts.js b/resources/landing-page/js/scripts.js
index b11cd4ad..80b17ab0 100644
--- a/resources/landing-page/js/scripts.js
+++ b/resources/landing-page/js/scripts.js
@@ -69,7 +69,7 @@ function injectTheme(theme,container="head") {
   var themeOptions;
 
   function addThemeData() {
-  let themeJsonUrl = "/themes.json"
+  let themeJsonUrl = "themes.json"
   fetch(themeJsonUrl)
   .then(response =>  response.json())
   .then(json => {