From 77c2adf4c19403e89f4e6b3ae207244743023b63 Mon Sep 17 00:00:00 2001
From: VnPower <vnpower@disroot.org>
Date: Sat, 17 Aug 2024 10:52:29 +0700
Subject: [PATCH] Fix the settings redirect system #85

---
 pages/settings.go          |  8 ++--
 views/css/style.css        |  2 +-
 views/css/style.scss       |  2 +-
 views/js/illust-preview.js |  8 ++--
 views/pages/novel.jet.html | 83 +++++++++++++++++++-------------------
 5 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/pages/settings.go b/pages/settings.go
index d00011d..8d687a6 100644
--- a/pages/settings.go
+++ b/pages/settings.go
@@ -171,7 +171,7 @@ func SettingsPost(c *fiber.Ctx) error {
 	// NOTE: VnPower: Future maintainers should leave this function alone.
 
 	t := c.Params("type")
-	noredirect := c.Params("noredirect", "") == ""
+	noredirect := c.FormValue("noredirect", "") == ""
 	var err error
 
 	switch t {
@@ -204,10 +204,8 @@ func SettingsPost(c *fiber.Ctx) error {
 	}
 
 	if !noredirect {
-		c.Path("/settings")
-		c.RestartRouting()
-		// c.Redirect("/settings", http.StatusFound)
+		return nil
 	}
 
-	return nil
+	return c.Redirect("/settings", http.StatusSeeOther)
 }
diff --git a/views/css/style.css b/views/css/style.css
index 6cfe1c8..d47c4c5 100644
--- a/views/css/style.css
+++ b/views/css/style.css
@@ -1020,7 +1020,7 @@ nav .sidebar-item img {
   display: none;
   position: absolute;
   background-color: #131516;
-  min-width: 100px;
+  min-width: 160px;
   box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.4);
   z-index: 1;
   padding: 1rem;
diff --git a/views/css/style.scss b/views/css/style.scss
index 8e9c0ed..af726fc 100644
--- a/views/css/style.scss
+++ b/views/css/style.scss
@@ -1185,7 +1185,7 @@ nav {
       display: none;
       position: absolute;
       background-color: $bg;
-      min-width: 100px;
+      min-width: 160px;
       box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.4);
       z-index: 1;
       padding: 1rem;
diff --git a/views/js/illust-preview.js b/views/js/illust-preview.js
index d18140b..11b3d97 100644
--- a/views/js/illust-preview.js
+++ b/views/js/illust-preview.js
@@ -17,9 +17,9 @@ function OpenPreviewer(url) {
   const img = document.createElement("img");
   img.src = imageLink;
   img.style.cssText = `
-			    margin: 3rem auto;
-			    max-width: 90%;
-			    max-height: 90%;
+	margin: 3rem auto;
+	max-width: 90%;
+	max-height: 90%;
     `
 
   viewer.appendChild(img);
@@ -43,6 +43,8 @@ function AddOverlay() {
   } else if (type === "button") {
     className = "overlay-button";
     html = "↗";
+  } else {
+    return;
   }
 
   document.querySelectorAll('.artwork-small .artwork-image img').forEach(illust => {
diff --git a/views/pages/novel.jet.html b/views/pages/novel.jet.html
index 4b3a5de..e8edb1e 100644
--- a/views/pages/novel.jet.html
+++ b/views/pages/novel.jet.html
@@ -61,47 +61,48 @@
   <!-- ----------- -->
   <div class="novel-settings">
     <div class="novel-settings-wrapper">
-    <span class="dropdown">
-      {{ url := "/settings/novelFontType?noredirect=t&r=" + OriginalURL + "#content" }}
-      <input type="checkbox" class="dropdown-toggler" id="font-type-toggler" />
-      <label for="font-type-toggler" class="dropdown-toggler-label">
-        <img src="/assets/font-family.png" alt="Font family" />
-      </label>
-      <div class="dropdown-content">
-        <div>Font type</div>
-        <form action="{{ url }}" method="post">
-          <input type="text" name="font-type" value="gothic" class="value-holder" />
-          <input type="submit" value="Gothic" />
-        </form>
-        <form action="{{ url }}" method="post">
-          <input type="text" name="font-type" value="mincho" class="value-holder" />
-          <input type="submit" value="Mincho" />
-        </form>
-      </div>
-    </span>
-    <img src="/assets/font-size.png" alt="Font size" />
-    <span class="dropdown">
-      {{ url := "/settings/novelViewMode?noredirect=t&r=" + OriginalURL + "#content" }}
-      <input type="checkbox" class="dropdown-toggler" id="view-mode-toggler" />
-      <label for="view-mode-toggler" class="dropdown-toggler-label">
-        <img src="/assets/orientation.png" alt="Orientation" />
-      </label>
-      <div class="dropdown-content">
-        <div>Force text orientation</div>
-        <form action="{{ url }}" method="post">
-          <input type="text" name="view-mode" value="1" class="value-holder" />
-          <input type="submit" value="Horizontal" />
-        </form>
-        <form action="{{ url }}" method="post">
-          <input type="text" name="view-mode" value="2" class="value-holder" />
-          <input type="submit" value="Vertical" />
-        </form>
-        <form action="{{ url }}" method="post">
-          <input type="text" name="view-mode" value="" class="value-holder" />
-          <input type="submit" value="Don't force" />
-        </form>
-      </div>
-    </span>
+      <span class="dropdown">
+        {{ url := "/settings/novelFontType?noredirect=t&r=" + OriginalURL + "#content" }}
+        <input type="checkbox" class="dropdown-toggler" id="font-type-toggler" />
+        <label for="font-type-toggler" class="dropdown-toggler-label">
+          <img src="/assets/font-family.png" alt="Font family" />
+        </label>
+        <div class="dropdown-content">
+          <div>Font type</div>
+          <form action="{{ url }}" method="post">
+            <input type="text" name="font-type" value="gothic" class="value-holder" />
+            <input type="submit" value="Gothic" />
+          </form>
+          <form action="{{ url }}" method="post">
+            <input type="text" name="font-type" value="mincho" class="value-holder" />
+            <input type="submit" value="Mincho" />
+          </form>
+        </div>
+      </span>
+      <img src="/assets/font-size.png" alt="Font size" />
+      <span class="dropdown">
+        {{ url := "/settings/novelViewMode?r=" + OriginalURL + "#content" }}
+        <input type="checkbox" class="dropdown-toggler" id="view-mode-toggler" />
+        <label for="view-mode-toggler" class="dropdown-toggler-label">
+          <img src="/assets/orientation.png" alt="Orientation" />
+        </label>
+        <div class="dropdown-content">
+          <div>Text orientation</div>
+          <form action="{{ url }}" method="post">
+            <input id="vm-1" type="radio" name="view-mode" value="1" />
+            <label for="vm-1">Horizontal</label>
+            <br />
+            <input id="vm-2" type="radio" name="view-mode" value="2" />
+            <label for="vm-2">Vertical</label>
+            <br />
+            <input id="vm-d" type="radio" name="view-mode" value="d" />
+            <label for="vm-d">Don't force</label>
+            <br />
+            <input type="hidden" name="noredirect" value="t" />
+            <input type="submit" value="Submit!" />
+          </form>
+        </div>
+      </span>
     </div>
   </div>
   <!-- ----------- -->