Merge pull request #224 from JasonHHouse/improvement/html_optimizations

Improvement/html optimizations

.run/Gaps Dev.run.xml

@@ -0,0 +1,62 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Gaps Dev" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value="" />
+        <option name="removeVolumesOnComposeDown" value="true" />
+        <option name="commandLineOptions" value="--build" />
+        <option name="sourceFilePath" value="docker-compose-dev.yaml" />
+        <option name="upExitCodeFromService" value="" />
+        <option name="upTimeout" value="" />
+      </settings>
+    </deployment>
+    <method v="2">
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="eslint-cypress" />
+        </scripts>
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="uglifyjs-modules" />
+        </scripts>
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="uglifyjs-pages" />
+        </scripts>
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="eslint-cypress" />
+        </scripts>
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+      <option name="NpmBeforeRunTask" enabled="true">
+        <package-json value="$PROJECT_DIR$/package.json" />
+        <command value="run" />
+        <scripts>
+          <script value="eslint-gaps" />
+        </scripts>
+        <node-interpreter value="project" />
+        <envs />
+      </option>
+      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="clean install" />
+    </method>
+  </configuration>
+</component>

Core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.11</version>
+        <version>0.8.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Dockerfile

@@ -1,15 +1,21 @@
-FROM adoptopenjdk/openjdk11-openj9:jre-11.0.10_9_openj9-0.24.0
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
+FROM adoptopenjdk/openjdk11-openj9:jre-11.0.11_9_openj9-0.26.0
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
 LABEL github="https://github.com/JasonHHouse/Gaps" 
 
 EXPOSE 8484
 
-RUN apt-get -y update
-
-RUN apt-get -y upgrade
-
 ENV JAR_FILE gaps.jar
 
 ENV ENABLE_SSL false
@@ -24,17 +30,9 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
 CMD ./start.sh
 
-##Figure out how to do Unraid configuration
-#docker build -f Dockerfile -t gaps-dev .
-#docker run -p 8484:8484 --env ENABLE_SSL=true --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_SSL=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-
-#docker buildx build --platform linux/ppc64le,linux/s390x,linux/amd64 -t housewrecker/gaps:latest -f Dockerfile .

Dockerfile.arm64

@@ -1,13 +1,19 @@
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
 FROM lsiobase/mono:arm64v8-LTS
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
 LABEL github="https://github.com/JasonHHouse/Gaps"
 
-RUN apt-get update
-
-RUN apt-get upgrade -y
-
 RUN apt-get install -y openjdk-11-jre
 
 EXPOSE 32400
@@ -26,15 +32,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
 CMD ./start.sh
-
-##Figure out how to do Unraid configuration
-#docker build -f Dockerfile -t gaps-dev .
-#docker run -p 8484:8484 --env ENABLE_SSL=true --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_SSL=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev

Dockerfile.dev

@@ -1,4 +1,14 @@
-FROM adoptopenjdk/openjdk11-openj9:jre-11.0.10_9_openj9-0.24.0
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
+FROM adoptopenjdk/openjdk11-openj9:jre-11.0.11_9_openj9-0.26.0
 
 ## Build image with sensible default environment values ##
 ENV gapsVersion=*

Dockerfile.ppc64le

@@ -1,4 +1,14 @@
-FROM adoptopenjdk/openjdk11-openj9:ppc64le-tumbleweed-jre-11.0.10_9_openj9-0.24.0
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
+FROM adoptopenjdk/openjdk11-openj9:ppc64le-tumbleweed-jre-11.0.11_9_openj9-0.26.0
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
@@ -20,15 +30,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
 CMD ./start.sh
-
-##Figure out how to do Unraid configuration
-#docker build -f Dockerfile -t gaps-dev .
-#docker run -p 8484:8484 --env ENABLE_SSL=true --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_SSL=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev

Dockerfile.raspbian

@@ -1,4 +1,14 @@
-FROM bellsoft/liberica-openjdk-alpine:11
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
+FROM bellsoft/liberica-openjdk-alpine:11.0.11
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
@@ -20,15 +30,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
 CMD ./start.sh
-
-##Figure out how to do Unraid configuration
-#docker build -f Dockerfile -t gaps-dev .
-#docker run -p 8484:8484 --env ENABLE_SSL=true --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_SSL=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev

Dockerfile.riscv64

@@ -1,11 +1,19 @@
+##
+# Copyright 2019 Jason H House
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+##
+
 FROM renefonseca/base-ubuntu-riscv32
 
 LABEL maintainer="[email protected]"
 LABEL name="Jason House" 
 LABEL github="https://github.com/JasonHHouse/Gaps"
 
-RUN apt-get update
-
 RUN apt-get install -y openjdk-11-jre
 
 EXPOSE 32400
@@ -24,15 +32,8 @@ RUN mkdir -p /usr/app && chmod 777 /usr/data
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.8.11.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.8.12.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 
-CMD ./start.sh
-
-##Figure out how to do Unraid configuration
-#docker build -f Dockerfile -t gaps-dev .
-#docker run -p 8484:8484 --env ENABLE_SSL=true --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_SSL=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --env ENABLE_LOGIN=true --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
-#docker run -p 8484:8484 --name gaps-dev -v /home/jason/gaps:/usr/data:Z gaps-dev
+CMD ./start.sh

GapsAsJar/gaps.nsi

@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.8.11-installer.exe"
+OutFile "gaps-0.8.12-installer.exe"

GapsWeb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.8.11</version>
+        <version>0.8.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

GapsWeb/src/main/resources/application.yaml

@@ -47,7 +47,7 @@ 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.11
+    version: 0.8.12
     storageFolder: /usr/data
     properties:
       rssFeed: rssFeed.json

GapsWeb/src/main/resources/templates/about.html

@@ -24,7 +24,7 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <a class="" href=".">
-        <img src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
+        <img loading="lazy" src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
     </a>
     <div class="collapse navbar-collapse" id="navbarColor01">
         <ul class="navbar-nav mr-auto">
@@ -75,10 +75,10 @@
 </nav>
 
 <div class="container">
-    <img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
+    <img loading="lazy" src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">About</h3>
-    <h4 class="top-margin text-primary">v0.8.11</h4>
+    <h4 class="top-margin text-primary">v0.8.12</h4>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known

GapsWeb/src/main/resources/templates/configuration.html

@@ -24,7 +24,7 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <a class="" href=".">
-        <img src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
+        <img loading="lazy" src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
     </a>
     <div class="collapse navbar-collapse" id="navbarColor01">
         <ul class="navbar-nav mr-auto">

GapsWeb/src/main/resources/templates/emptyState.html

@@ -24,7 +24,7 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <a class="" href=".">
-        <img src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
+        <img loading="lazy" src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
     </a>
     <div class="collapse navbar-collapse" id="navbarColor01">
         <ul class="navbar-nav mr-auto">
@@ -77,7 +77,7 @@
 <div class="container">
     <div class="top-margin">
         <div class="card mx-auto" style="width: 24rem;">
-            <img alt="..." class="card-img-top" src="/images/mind_the_gap.png">
+            <img loading="lazy" alt="..." class="card-img-top" src="/images/mind_the_gap.png">
             <div class="card-body">
                 <h5 class="card-title">Your movies are really missing</h5>
                 <p class="card-text">You need to run Gaps at least once to have found the missing movies. Once you have

GapsWeb/src/main/resources/templates/error.html

@@ -25,7 +25,7 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <a class="" href=".">
-        <img src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
+        <img alt="" class="d-inline-block align-top" height="96" loading="lazy" src="/images/final-gaps.svg" width="96">
     </a>
     <div class="collapse navbar-collapse" id="navbarColor01">
         <ul class="navbar-nav mr-auto">
@@ -78,7 +78,7 @@
 <div class="container">
     <div class="top-margin">
         <div class="card mx-auto" style="width: 24rem;">
-            <img alt="..." class="card-img-top" src="/images/broken-bridge-2.jpg">
+            <img loading="lazy" alt="..." class="card-img-top" src="/images/broken-bridge-2.jpg">
             <div class="card-body">
                 <h5 class="card-title">The gap is only getting bigger...</h5>
                 <p class="card-text">Check the logs to see what went wrong. You can message /u/whitefox111 on Reddit or

GapsWeb/src/main/resources/templates/error/404.html

@@ -26,7 +26,7 @@
 
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <a class="" href=".">
-        <img src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
+        <img loading="lazy" src="/images/final-gaps.svg" class="d-inline-block align-top" alt="" width="96" height="96">
     </a>
     <div class="collapse navbar-collapse" id="navbarColor01">
         <ul class="navbar-nav mr-auto">
@@ -79,7 +79,7 @@
 <div class="container">
     <div class="top-margin">
         <div class="card mx-auto" style="width: 24rem;">
-            <img alt="..." class="card-img-top all-padding" src="/images/dead_end.png">
+            <img loading="lazy" alt="..." class="card-img-top all-padding" src="/images/dead_end.png">
             <div class="card-body">
                 <h5 class="card-title">You're lost</h5>
                 <p class="card-text">Let's head back to the landing page and try again.</p>