Improved the header...

RealMangorage · RealMangorage · commit 38124f243ac9 · 2025-02-22T23:39:50.000-08:00
diff --git a/src/main/java/org/mangorage/mangobotsite/website/Header.java b/src/main/java/org/mangorage/mangobotsite/website/Header.java
@@ -0,0 +1,13 @@
+package org.mangorage.mangobotsite.website;
+
+import java.util.List;
+
+public record Header(String page, String text) {
+    public static final List<Header> DEFAULT = List.of(
+            new Header("/home", "Home"),
+            new Header("/info", "Info"),
+            new Header("/trick", "Tricks"),
+            new Header("/upload", "Upload"),
+            new Header("https://discord.mangorage.org/", "Discord")
+    );
+}
diff --git a/src/main/java/org/mangorage/mangobotsite/website/WebServer.java b/src/main/java/org/mangorage/mangobotsite/website/WebServer.java
@@ -23,6 +23,7 @@
 import org.mangorage.mangobotsite.website.servlet.ChatServlet;
 import org.mangorage.mangobotsite.website.servlet.FileServlet;
 import org.mangorage.mangobotsite.website.servlet.FileUploadServlet;
+import org.mangorage.mangobotsite.website.servlet.HomeServlet;
 import org.mangorage.mangobotsite.website.servlet.InfoServlet;
 import org.mangorage.mangobotsite.website.servlet.LoginServlet;
 import org.mangorage.mangobotsite.website.servlet.TestAuthServlet;
@@ -115,6 +116,7 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
                     h.setErrorHandler(new DefaultErrorHandler());
                 })
                 .addServlet(DefaultServlet.class, "/*")
+                .addServlet(HomeServlet.class, "/home")
                 .addHttpServlet(InfoServlet.class, "/info")
                 .addHttpServlet(TricksServlet.class, "/trick")
                 .addHttpServlet(FileServlet.class, "/file")
diff --git a/src/main/java/org/mangorage/mangobotsite/website/handlers/DefaultErrorHandler.java b/src/main/java/org/mangorage/mangobotsite/website/handlers/DefaultErrorHandler.java
@@ -14,12 +14,12 @@ public class DefaultErrorHandler extends ErrorHandler {
     @Override
     protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) throws IOException {
         processTemplate(
-                new MapBuilder(new HashMap<>())
+                MapBuilder.of()
                         .self(this)
                         .put("code", code)
                         .put("message", message)
                         .get(),
-                "error.ftl",
+                "general/error.ftl",
                 writer
         );
     }
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/FileServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/FileServlet.java
@@ -115,7 +115,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         // Insufficient permission to delete
         if (!isOwner && delete != null) {
             processTemplate(
-                    new MapBuilder(new HashMap<>())
+                    MapBuilder.of()
                             .self(this)
                             .put("url", "/file?id=" + id)
                             .put("title", "Insufficient Permission")
@@ -137,7 +137,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                     manager.saveUpload(config);
                 } else {
                     processTemplate(
-                            new MapBuilder(new HashMap<>())
+                            MapBuilder.of()
                                     .self(this)
                                     .put("url", "/file?id=" + id)
                                     .put("title", "Invalid Target")
@@ -153,7 +153,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             }
 
             processTemplate(
-                    new MapBuilder(new HashMap<>())
+                    MapBuilder.of()
                             .self(this)
                             .put("title", "Deleted Target")
                             .put("message", "Deleted File")
@@ -169,7 +169,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         // Display file management page if no specific target is provided
         if (target == null) {
             processTemplate(
-                    new MapBuilder(new HashMap<>())
+                    MapBuilder.of()
                             .self(this)
                             .put("id", id)
                             .put("isOwner", isOwner)
@@ -205,13 +205,13 @@ private void handleFileRequest(FileUploadManager manager, TargetFile targetFile,
         if (header) {
             response.setContentType("text/html");
             processTemplate(
-                    new MapBuilder(new HashMap<>())
+                    MapBuilder.of()
                             .self(this)
                             .put("title", "MangoBot Upload")
                             .put("contentURL", "https://mangobot.mangorage.org/file?id=%s&target=%s".formatted(id, targetFile.index()))
                             .put("url", "https://mangobot.mangorage.org/file?id=%s&target=%s".formatted(id, targetFile.index()))
                             .get(),
-                    "general/header.ftl",
+                    "general/embed.ftl",
                     response.getWriter()
             );
         } else {
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/FileUploadServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/FileUploadServlet.java
@@ -23,7 +23,7 @@ public class FileUploadServlet extends StandardHttpServlet {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         processTemplate(
-                new MapBuilder(new HashMap<>())
+                MapBuilder.of()
                         .self(this)
                         .get(),
                 "file/upload.ftl",
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/HomeServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/HomeServlet.java
@@ -0,0 +1,21 @@
+package org.mangorage.mangobotsite.website.servlet;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
+import org.mangorage.mangobotsite.website.util.MapBuilder;
+import org.mangorage.mangobotsite.website.util.WebUtil;
+
+import java.io.IOException;
+
+public class HomeServlet extends StandardHttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        WebUtil.processTemplate(
+                MapBuilder.of().get(),
+                "home.ftl",
+                resp.getWriter()
+        );
+    }
+}
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/InfoServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/InfoServlet.java
@@ -7,6 +7,7 @@
 import org.mangorage.mangobotapi.core.plugin.PluginContainer;
 import org.mangorage.mangobotapi.core.plugin.PluginManager;
 import org.mangorage.mangobotapi.core.plugin.PluginMetadata;
+import org.mangorage.mangobotsite.website.Header;
 import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 
diff --git a/src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java b/src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java
@@ -55,7 +55,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
                 Long id = Long.parseLong(guildId);
                 if (command.getTricksForGuild(id).isEmpty()) {
                     processTemplate(
-                            new MapBuilder(new HashMap<>())
+                            MapBuilder.of()
                                     .self(this)
                                     .put("title", "No Tricks Exist")
                                     .put("message", "No Tricks Exist")
@@ -68,7 +68,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
                 }
             } catch (Exception e) {
                 processTemplate(
-                        new MapBuilder(new HashMap<>())
+                        MapBuilder.of()
                                 .self(this)
                                 .put("title", "Invalid GuildID")
                                 .put("message", "Invalid GuildID")
@@ -85,7 +85,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
         if (trickId != null && guildId != null && trick == null) {
             processTemplate(
-                    new MapBuilder(new HashMap<>())
+                    MapBuilder.of()
                             .self(this)
                             .put("title", "Invalid Trick")
                             .put("message", "Invalid Trick")
@@ -100,7 +100,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
 
         processTemplate(
-                new MapBuilder(new HashMap<>())
+                MapBuilder.of()
                         .self(this)
                         .put("guildId", guildId)
                         .put("trickId", trickId)
diff --git a/src/main/java/org/mangorage/mangobotsite/website/util/MapBuilder.java b/src/main/java/org/mangorage/mangobotsite/website/util/MapBuilder.java
@@ -1,5 +1,7 @@
 package org.mangorage.mangobotsite.website.util;
 
+import org.mangorage.mangobotsite.website.Header;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -11,8 +13,9 @@ public static MapBuilder of() {
 
     private final Map<String, Object> map;
 
-    public MapBuilder(Map<String, Object> map) {
+    private MapBuilder(Map<String, Object> map) {
         this.map = map;
+        put("headers", Header.DEFAULT);
     }
 
     public MapBuilder self(Object object) {
diff --git a/src/main/resources/templates/file/files.ftl b/src/main/resources/templates/file/files.ftl
@@ -11,10 +11,9 @@
         <h1>MangoBot</h1>
         <nav>
             <ul>
-                <li><a href=/>Home</a></li>
-                <li><a href=/info>Info</a></li>
-                <li><a href=/upload>Upload</a></li>
-                <li><a href=/trick>Tricks</a></li>
+                <#list headers as header>
+                    <li><a href=${header.page()}>${header.text()}</a></li>
+                </#list>
             </ul>
         </nav>
     </header>
diff --git a/src/main/resources/templates/file/upload.ftl b/src/main/resources/templates/file/upload.ftl
@@ -7,17 +7,18 @@
     <script src="js/header.js"></script>
 </head>
 <body>
+
     <header>
         <h1>MangoBot</h1>
         <nav>
             <ul>
-                <li><a href=/>Home</a></li>
-                <li><a href=/info>Info</a></li>
-                <li><a href=/upload>Upload</a></li>
-                <li><a href=/trick>Tricks</a></li>
+                <#list headers as header>
+                    <li><a href=${header.page()}>${header.text()}</a></li>
+                </#list>
             </ul>
         </nav>
     </header>
+
     <h1>Upload a File</h1>
 
     <form method="post" action="/upload" enctype="multipart/form-data">
diff --git a/src/main/resources/templates/general/embed.ftl b/src/main/resources/templates/general/embed.ftl
diff --git a/src/main/resources/templates/general/error.ftl b/src/main/resources/templates/general/error.ftl
diff --git a/src/main/resources/templates/home.ftl b/src/main/resources/templates/home.ftl
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>MangoBot Main Page</title>
+    <link rel="stylesheet" href="css/root.css">
+    <link rel="stylesheet" href="css/header.css">
+    <script src="js/header.js"></script>
+
+    <meta name="og:title" content="MangoBot">
+    <meta name="og:description" content="The Official MangoBot Discord Bot.">
+    <meta name="og:image" content="https://mangobot.mangorage.org/pink-sheep.png" http-equiv="content-type">
+    <meta name="og:url" content="https://mangobot.mangorage.org/file?id=568d44d8-b6bc-4394-a860-915fac5c085d&amp;target=0" http-equiv="content-type">
+    <meta name="og:type" content="website">
+</head>
+<body>
+    <header>
+        <h1>MangoBot</h1>
+        <nav>
+            <ul>
+                <#list headers as header>
+                    <li><a href=${header.page()}>${header.text()}</a></li>
+                </#list>
+            </ul>
+        </nav>
+    </header>
+<main>
+    <section id="home">
+        <h2>Welcome to Our Website</h2>
+        <p>Explore our content and learn more about us.</p>
+    </section>
+    <section id="about">
+        <h2>About Us</h2>
+        <p><strong>MangoBot</strong> is a versatile Discord bot providing useful utilities, owned and developed by <strong>MangoRage</strong>.</p>
+    </section>
+    <section id="contact">
+        <h2>Contact Us</h2>
+        <p>Contact MangoRage at
+            <a href="https://discord.mangorage.org/" target="_blank" rel="noopener noreferrer">
+                discord
+            </a>
+        </p>
+    </section>
+</main>
+</body>
+</html>
diff --git a/src/main/resources/templates/info.ftl b/src/main/resources/templates/info.ftl
@@ -13,17 +13,16 @@
     </head>
     <body>
 
-        <header>
-            <h1>MangoBot</h1>
-            <nav>
-                <ul>
-                    <li><a href=/>Home</a></li>
-                    <li><a href=/info>Info</a></li>
-                    <li><a href=/upload>Upload</a></li>
-                    <li><a href=/trick>Tricks</a></li>
-                </ul>
-            </nav>
-        </header>
+    <header>
+        <h1>MangoBot</h1>
+        <nav>
+            <ul>
+                <#list headers as header>
+                    <li><a href=${header.page()}>${header.text()}</a></li>
+                </#list>
+            </ul>
+        </nav>
+    </header>
 
         <div class="container">
             <h1 class="page-title">Installed Plugins:</h1>
diff --git a/src/main/resources/templates/tricks.ftl b/src/main/resources/templates/tricks.ftl
@@ -8,17 +8,18 @@
     <script src="js/header.js"></script>
 </head>
 <body class="page-body">
+
     <header>
         <h1>MangoBot</h1>
         <nav>
             <ul>
-                <li><a href=/>Home</a></li>
-                <li><a href=/info>Info</a></li>
-                <li><a href=/upload>Upload</a></li>
-                <li><a href=/trick>Tricks</a></li>
+                <#list headers as header>
+                    <li><a href=${header.page()}>${header.text()}</a></li>
+                </#list>
             </ul>
         </nav>
     </header>
+
     <div class="container">
 
         <#if (guildId?? && trickId??)>
diff --git a/src/main/resources/webpage-internal/index.html b/src/main/resources/webpage-internal/index.html
@@ -1,48 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>MangoBot Main Page</title>
-    <link rel="stylesheet" href="css/root.css">
-    <link rel="stylesheet" href="css/header.css">
-    <script src="js/header.js"></script>
-
-    <meta name="og:title" content="MangoBot">
-    <meta name="og:description" content="The Official MangoBot Discord Bot.">
-    <meta name="og:image" content="https://mangobot.mangorage.org/pink-sheep.png" http-equiv="content-type">
-    <meta name="og:url" content="https://mangobot.mangorage.org/file?id=568d44d8-b6bc-4394-a860-915fac5c085d&amp;target=0" http-equiv="content-type">
-    <meta name="og:type" content="website">
-</head>
-<body>
-<header>
-    <h1>MangoBot</h1>
-    <nav>
-        <ul>
-            <li><a href=/>Home</a></li>
-            <li><a href=/info>Info</a></li>
-            <li><a href=/upload>Upload</a></li>
-            <li><a href=/trick>Tricks</a></li>
-        </ul>
-    </nav>
-</header>
-<main>
-    <section id="home">
-        <h2>Welcome to Our Website</h2>
-        <p>Explore our content and learn more about us.</p>
-    </section>
-    <section id="about">
-        <h2>About Us</h2>
-        <p><strong>MangoBot</strong> is a versatile Discord bot providing useful utilities, owned and developed by <strong>MangoRage</strong>.</p>
-    </section>
-    <section id="contact">
-        <h2>Contact Us</h2>
-        <p>Contact MangoRage at
-            <a href="https://discord.mangorage.org/" target="_blank" rel="noopener noreferrer">
-                discord
-            </a>
-        </p>
-    </section>
-</main>
-</body>
-</html>
+<meta http-equiv="refresh" content="0;url=/home">
