Updated font awesome to 5.12.0

- Adds support for fonts to Plan webserver

Plan/common/build.gradle

@@ -40,10 +40,6 @@ shadowJar {
 
     // Exclude these files
     exclude "**/*.svg"
-    exclude "**/*.ttf"
-    exclude "**/*.woff"
-    exclude "**/*.eot"
-    exclude "**/*.woff2"
     exclude "**/*.psd"
 
     exclude "**/module-info.class"

Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java

@@ -165,6 +165,19 @@ public class NetworkPageExporter extends FileExporter {
                 "vendor/highcharts/drilldown.js",
                 "vendor/highcharts/highcharts-more.js",
                 "vendor/highcharts/no-data-to-display.js",
+                "vendor/fontawesome-free/css/all.min.css",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.eot",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.tff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
                 "js/sb-admin-2.js",
                 "js/xmlhttprequests.js",
                 "js/color-selector.js",

Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayerPageExporter.java

@@ -152,6 +152,19 @@ public class PlayerPageExporter extends FileExporter {
                 "vendor/fullcalendar/fullcalendar.min.css",
                 "vendor/momentjs/moment.js",
                 "vendor/fullcalendar/fullcalendar.min.js",
+                "vendor/fontawesome-free/css/all.min.css",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.eot",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.tff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
                 "js/sb-admin-2.js",
                 "js/xmlhttprequests.js",
                 "js/color-selector.js",

Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java

@@ -181,6 +181,19 @@ public class ServerPageExporter extends FileExporter {
                 "vendor/fullcalendar/fullcalendar.min.css",
                 "vendor/momentjs/moment.js",
                 "vendor/fullcalendar/fullcalendar.min.js",
+                "vendor/fontawesome-free/css/all.min.css",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.eot",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.tff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff",
+                "vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.eot",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.tff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff",
+                "vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
                 "js/sb-admin-2.js",
                 "js/xmlhttprequests.js",
                 "js/color-selector.js",

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/RequestTarget.java

@@ -81,6 +81,10 @@ public class RequestTarget {
         return resourceString.endsWith(suffix);
     }
 
+    public boolean endsWithAny(String... suffixes) {
+        return StringUtils.endsWithAny(resourceString, suffixes);
+    }
+
     public Optional<String> getParameter(String key) {
         return Optional.ofNullable(parameters.get(key));
     }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseResolver.java

@@ -133,6 +133,9 @@ public class ResponseResolver extends CompositePageResolver {
         if (target.endsWith("favicon.ico")) {
             return responseFactory.faviconResponse();
         }
+        if (target.endsWithAny(".woff", ".woff2", ".eot", ".tff")) {
+            return responseFactory.fontResponse(resource);
+        }
 
         boolean isAuthRequired = webServer.get().isAuthRequired();
         if (isAuthRequired && !authentication.isPresent()) {

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseFactory.java

@@ -131,6 +131,20 @@ public class ResponseFactory {
         return new ByteResponse(ResponseType.IMAGE, FileResponse.format(fileName), files);
     }
 
+    public Response fontResponse(String fileName) {
+        ResponseType type = ResponseType.FONT_BYTESTREAM;
+        if (fileName.endsWith(".woff")) {
+            type = ResponseType.FONT_WOFF;
+        } else if (fileName.endsWith(".woff2")) {
+            type = ResponseType.FONT_WOFF2;
+        } else if (fileName.endsWith(".eot")) {
+            type = ResponseType.FONT_EOT;
+        } else if (fileName.endsWith(".ttf")) {
+            type = ResponseType.FONT_TTF;
+        }
+        return new ByteResponse(type, FileResponse.format(fileName), files);
+    }
+
     /**
      * Redirect somewhere
      *

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/response/ResponseType.java

@@ -27,7 +27,12 @@ public enum ResponseType {
     JSON("application/json"),
     JAVASCRIPT("application/javascript"),
     IMAGE("image/gif"),
-    X_ICON("image/x-icon");
+    X_ICON("image/x-icon"),
+    FONT_TTF("application/x-font-ttf"),
+    FONT_WOFF("application/font-woff"),
+    FONT_WOFF2("application/font-woff2"),
+    FONT_EOT("application/vnd.ms-fontobject"),
+    FONT_BYTESTREAM("application/octet-stream");
 
     private final String type;
 

Plan/common/src/main/resources/assets/plan/web/error.html

@@ -12,9 +12,8 @@
     <title>${titleText}</title>
 
     <!-- Custom fonts for this template-->
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-          integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
+    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+    <link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
           rel="stylesheet">
 
     <!-- Custom styles for this template-->

Plan/common/src/main/resources/assets/plan/web/network.html

@@ -13,9 +13,9 @@
     <title>Plan | Network</title>
 
     <!-- Custom fonts for this template-->
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-          integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
+    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+    <link crossorigin="anonymous"
+          href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
           rel="stylesheet">
 
     <!-- Custom styles for this template-->

Plan/common/src/main/resources/assets/plan/web/player.html

@@ -13,9 +13,9 @@
     <title>Plan | ${playerName}</title>
 
     <!-- Custom fonts for this template-->
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-          integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
+    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+    <link crossorigin="anonymous"
+          href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
           rel="stylesheet">
 
     <!-- Custom styles for this template-->

Plan/common/src/main/resources/assets/plan/web/players.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -12,9 +12,8 @@
     <title>Plan | Players</title>
 
     <!-- Custom fonts for this template-->
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-          integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
+    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+    <link crossorigin="anonymous" href="https://fonts.googleapis.com/css?family=Nunito:300,400,600,700,800,900"
           rel="stylesheet">
 
     <!-- Custom styles for this template-->

Plan/common/src/main/resources/assets/plan/web/server.html

@@ -12,9 +12,9 @@
     <title>Plan | Server Analysis</title>
 
     <!-- Custom fonts for this template-->
-    <link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css"
-          integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
+    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+    <link crossorigin="anonymous"
+          href="https://fonts.googleapis.com/css?family=Nunito:400,700,800,900&display=swap&subset=latin-ext"
           rel="stylesheet">
 
     <!-- Custom styles for this template-->

Plan/common/src/main/resources/assets/plan/web/vendor/fontawesome-free/css/v4-shims.css

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.6.3 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.12.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa.fa-glass:before {
@@ -199,6 +199,14 @@
     content: "\f064";
 }
 
+.fa.fa-expand:before {
+    content: "\f424";
+}
+
+.fa.fa-compress:before {
+    content: "\f422";
+}
+
 .fa.fa-eye {
     font-family: 'Font Awesome 5 Free';
     font-weight: 400;
@@ -967,7 +975,7 @@
 }
 
 .fa.fa-sort-alpha-desc:before {
-    content: "\f15e";
+    content: "\f881";
 }
 
 .fa.fa-sort-amount-asc:before {
@@ -975,7 +983,7 @@
 }
 
 .fa.fa-sort-amount-desc:before {
-    content: "\f161";
+    content: "\f884";
 }
 
 .fa.fa-sort-numeric-asc:before {
@@ -983,7 +991,7 @@
 }
 
 .fa.fa-sort-numeric-desc:before {
-    content: "\f163";
+    content: "\f886";
 }
 
 .fa.fa-youtube-square {
@@ -1359,10 +1367,6 @@
     content: "\f1b9";
 }
 
-.fa.fa-cab:before {
-    content: "\f1ba";
-}
-
 .fa.fa-envelope-o {
     font-family: 'Font Awesome 5 Free';
     font-weight: 400;
@@ -1372,6 +1376,11 @@
     content: "\f0e0";
 }
 
+.fa.fa-spotify {
+    font-family: 'Font Awesome 5 Brands';
+    font-weight: 400;
+}
+
 .fa.fa-deviantart {
     font-family: 'Font Awesome 5 Brands';
     font-weight: 400;
@@ -2771,7 +2780,6 @@
     font-weight: 400;
 }
 
-.fa.fa-spotify {
-    font-family: 'Font Awesome 5 Brands';
-    font-weight: 400;
+.fa.fa-cab:before {
+    content: "\f1ba";
 }

Plan/common/src/test/java/utilities/mocks/Mocker.java

@@ -83,6 +83,19 @@ abstract class Mocker {
                 "web/vendor/datatables/dataTables.bootstrap4.min.css",
                 "web/vendor/datatables/dataTables.bootstrap4.min.js",
                 "web/vendor/jquery/jquery.min.js",
+                "web/vendor/fontawesome-free/css/all.min.css",
+                "web/vendor/fontawesome-free/webfonts/fa-brands-400.eot",
+                "web/vendor/fontawesome-free/webfonts/fa-brands-400.tff",
+                "web/vendor/fontawesome-free/webfonts/fa-brands-400.woff",
+                "web/vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
+                "web/vendor/fontawesome-free/webfonts/fa-regular-400.eot",
+                "web/vendor/fontawesome-free/webfonts/fa-regular-400.tff",
+                "web/vendor/fontawesome-free/webfonts/fa-regular-400.woff",
+                "web/vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
+                "web/vendor/fontawesome-free/webfonts/fa-solid-900.eot",
+                "web/vendor/fontawesome-free/webfonts/fa-solid-900.tff",
+                "web/vendor/fontawesome-free/webfonts/fa-solid-900.woff",
+                "web/vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
                 "web/vendor/fullcalendar/fullcalendar.min.js",
                 "web/vendor/fullcalendar/fullcalendar.min.css",
                 "web/vendor/highcharts/drilldown.js",