Merge pull request #225 from JasonHHouse/issue/base_url#193

Issue/base url#193
JasonHHouse · May 11, 2021 · 1ba4051 · 1ba4051
2 parents 2a100ad + e3eb307
commit 1ba4051
Show file tree

Hide file tree

Showing 84 changed files with 633 additions and 7,081 deletions.
diff --git a/.run/Gaps Dev.run.xml b/.run/Gaps Dev.run.xml
@@ -15,7 +15,7 @@
         <package-json value="$PROJECT_DIR$/package.json" />
         <command value="run" />
         <scripts>
-          <script value="eslint-cypress" />
+          <script value="minify-input-css" />
         </scripts>
         <node-interpreter value="project" />
         <envs />

diff --git a/Core/pom.xml b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.12</version>
+        <version>0.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Dockerfile b/Dockerfile
@@ -22,6 +22,8 @@ ENV ENABLE_SSL false
 
 ENV ENABLE_LOGIN false
 
+ENV BASE_URL ""
+
 RUN mkdir -p /usr/data && chmod 777 /usr/data
 
 COPY movieIds.json /usr/data
@@ -30,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -26,6 +26,8 @@ ENV ENABLE_SSL false
 
 ENV ENABLE_LOGIN false
 
+ENV BASE_URL ""
+
 RUN mkdir -p /usr/data && chmod 777 /usr/data
 
 COPY movieIds.json /usr/data
@@ -34,8 +36,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
-CMD ./start.sh
+CMD ./start.sh
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -14,6 +14,8 @@ FROM adoptopenjdk/openjdk11-openj9:jre-11.0.11_9_openj9-0.26.0
 ENV gapsVersion=*
 ENV springProfile=no-ssl-no-login
 ENV javaInitialHeapSize=150M
+ENV baseUrl ""
+#ENV baseUrl="/gaps"
 
 EXPOSE 32400
 
@@ -36,5 +38,6 @@ ENTRYPOINT  java  \
             -XX:+UseStringCache   \
             -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 \
             -jar  \
+            -Dserver.servlet.context-path=${baseUrl} \
             -Dspring.profiles.active=${springProfile} \
             ./GapsWeb-${gapsVersion}.jar
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -22,6 +22,8 @@ ENV ENABLE_SSL false
 
 ENV ENABLE_LOGIN false
 
+ENV BASE_URL ""
+
 RUN mkdir -p /usr/data && chmod 777 /usr/data
 
 COPY movieIds.json /usr/data
@@ -30,8 +32,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
-CMD ./start.sh
+CMD ./start.sh
diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian
@@ -22,6 +22,8 @@ ENV ENABLE_SSL false
 
 ENV ENABLE_LOGIN false
 
+ENV BASE_URL ""
+
 RUN mkdir -p /usr/data && chmod 777 /usr/data
 
 COPY movieIds.json /usr/data
@@ -30,8 +32,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
-CMD ./start.sh
+CMD ./start.sh
diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
@@ -26,6 +26,8 @@ ENV ENABLE_SSL false
 
 ENV ENABLE_LOGIN false
 
+ENV BASE_URL ""
+
 RUN mkdir -p /usr/data && chmod 777 /usr/data
 
 COPY movieIds.json /usr/data
@@ -34,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.0.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.8.12-installer.exe"
+OutFile "gaps-0.9.0-installer.exe"
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.12</version>
+        <version>0.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/ConfigurationController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/ConfigurationController.java
@@ -72,6 +72,7 @@ public ModelAndView getConfiguration() {
         ModelAndView modelAndView = new ModelAndView("configuration");
         modelAndView.addObject("plexProperties", plexProperties);
         modelAndView.addObject("schedules", schedulerService.getAllSchedules());
+        modelAndView.addObject("configurationPage", true);
         return modelAndView;
     }
 

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java
@@ -88,7 +88,10 @@ public ResponseEntity<Payload> putNuke() {
             produces = MediaType.TEXT_HTML_VALUE)
     public ModelAndView getAbout() {
         LOGGER.info("getAbout()");
-        return new ModelAndView("about");
+
+        ModelAndView modelAndView = new ModelAndView("about");
+        modelAndView.addObject("aboutPage", true);
+        return modelAndView;
     }
 
     @GetMapping(value = "/login",
@@ -102,7 +105,9 @@ public ModelAndView getLogin() {
             produces = MediaType.TEXT_HTML_VALUE)
     public ModelAndView getUpdates() {
         LOGGER.info("getUpdates()");
-        return new ModelAndView("updates");
+        ModelAndView modelAndView = new ModelAndView("updates");
+        modelAndView.addObject("updatesPage", true);
+        return modelAndView;
     }
 
     @GetMapping(value = "/sounds",

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/LibraryController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/LibraryController.java
@@ -77,6 +77,7 @@ public ModelAndView getLibraries() {
         modelAndView.addObject("plexServer", plexServer);
         modelAndView.addObject("plexLibrary", plexLibrary);
         modelAndView.addObject("plexServersFound", plexServersFound);
+        modelAndView.addObject("librariesPage", true);
         return modelAndView;
     }
 

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/MislabeledController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/MislabeledController.java
@@ -52,7 +52,10 @@ public MislabeledController(FileIoService fileIoService, PlexQuery plexQuery, Mi
     public ModelAndView getMislabeled() {
         LOGGER.info("getMislabeled()");
 
-        return new ModelAndView("mislabeled");
+
+        ModelAndView modelAndView = new ModelAndView("mislabeled");
+        modelAndView.addObject("mislabeledPage", true);
+        return modelAndView;
     }
 
     @GetMapping(value = "/{machineIdentifier}/{key}")

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java
@@ -71,6 +71,7 @@ public ModelAndView getRssCheck() {
         Map<PlexLibrary, PlexServer> map = rssService.foundAnyRssFeeds();
         modelAndView.addObject("plexServers", plexProperties.getPlexServers());
         modelAndView.addObject("plexServerMap", map);
+        modelAndView.addObject("rssCheckPage", true);
         modelAndView.addObject("foundPlexLibraries", MapUtils.isNotEmpty(map));
         return modelAndView;
     }

diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java
@@ -77,6 +77,7 @@ public ModelAndView getRecommended() {
         modelAndView.addObject("plexProperties", plexProperties);
         modelAndView.addObject("plexServer", plexServer);
         modelAndView.addObject("plexLibrary", plexLibrary);
+        modelAndView.addObject("recommendedPage", true);
         return modelAndView;
     }
 

diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml
@@ -33,6 +33,8 @@ spring:
     username: admin
     password: admin
 server:
+  servlet:
+    context-path: /
   http2:
     enabled: true
   port: 8484
@@ -43,11 +45,12 @@ server:
   error:
     whitelabel:
       enabled: false
+    path: /error
 info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.8.12
+    version: 0.9.0
     storageFolder: /usr/data
     properties:
       rssFeed: rssFeed.json

diff --git a/GapsWeb/src/main/resources/static/css/input.css b/GapsWeb/src/main/resources/static/css/input.css
@@ -71,88 +71,12 @@
     margin-right: auto;
 }
 
-.list-ul-default {
+.default {
     background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/list-ul.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/list-ul.svg) no-repeat center / contain;
 }
 
-.list-ul-active {
+.activePage {
     background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/list-ul.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/list-ul.svg) no-repeat center / contain;
-}
-
-.collection-fill-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/collection-fill.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/collection-fill.svg) no-repeat center / contain;
-}
-
-.collection-fill-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/collection-fill.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/collection-fill.svg) no-repeat center / contain;
-}
-
-.exclamation-triangle-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/exclamation-triangle.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/exclamation-triangle.svg) no-repeat center / contain;
-}
-
-.exclamation-triangle-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/exclamation-triangle.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/exclamation-triangle.svg) no-repeat center / contain;
-}
-
-.rss-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/rss.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/rss.svg) no-repeat center / contain;
-}
-
-.rss-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/rss.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/rss.svg) no-repeat center / contain;
-}
-
-.gear-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/gear.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/gear.svg) no-repeat center / contain;
-}
-
-.gear-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/gear.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/gear.svg) no-repeat center / contain;
-}
-
-.arrow-clockwise-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/arrow-clockwise.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/arrow-clockwise.svg) no-repeat center / contain;
-}
-
-.arrow-clockwise-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/arrow-clockwise.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/arrow-clockwise.svg) no-repeat center / contain;
-}
-
-.info-circle-default {
-    background-color: #fafafa; /* defines the background color of the image */
-    mask: url(/images/info-circle.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/info-circle.svg) no-repeat center / contain;
-}
-
-.info-circle-active {
-    background-color: #00bc8c; /* defines the background color of the image */
-    mask: url(/images/info-circle.svg) no-repeat center / contain;
-    -webkit-mask: url(/images/info-circle.svg) no-repeat center / contain;
 }
 
 .long-text {