From 60ae330d7b1fc2238019bfa5264fc7a5722ddee7 Mon Sep 17 00:00:00 2001 From: VnPower Date: Thu, 8 Feb 2024 14:32:42 +0700 Subject: [PATCH] Merge login page with settings page --- main.go | 1 - pages/personal.go | 6 +++--- pages/settings.go | 6 +----- views/pages/settings.jet.html | 39 +++++++++++++++++++++++++++++++---- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/main.go b/main.go index 883fcdd..ccb6291 100644 --- a/main.go +++ b/main.go @@ -147,7 +147,6 @@ func main() { server.Get("artworks/:id/", pages.ArtworkPage).Name("artworks") // Settings group - server.Get("login", pages.LoginPage) settings := server.Group("settings") settings.Get("/", pages.SettingsPage) settings.Post("/:type", pages.SettingsPost) diff --git a/pages/personal.go b/pages/personal.go index 4f1a6a5..2fd0b3d 100644 --- a/pages/personal.go +++ b/pages/personal.go @@ -13,7 +13,7 @@ func LoginUserPage(c *fiber.Ctx) error { token := session.CheckToken(c) if token == "" { - return c.Redirect("/login") + return c.Redirect("/settings") } // The left part of the token is the member ID @@ -26,7 +26,7 @@ func LoginUserPage(c *fiber.Ctx) error { func LoginBookmarkPage(c *fiber.Ctx) error { token := session.CheckToken(c) if token == "" { - return c.Redirect("/login") + return c.Redirect("/settings") } // The left part of the token is the member ID @@ -38,7 +38,7 @@ func LoginBookmarkPage(c *fiber.Ctx) error { func FollowingWorksPage(c *fiber.Ctx) error { if token := session.CheckToken(c); token == "" { - return c.Redirect("/login") + return c.Redirect("/settings") } mode := c.Query("mode", "all") diff --git a/pages/settings.go b/pages/settings.go index c715a3a..d0714d0 100644 --- a/pages/settings.go +++ b/pages/settings.go @@ -78,10 +78,6 @@ func setLogout(c *fiber.Ctx) error { return nil } -func LoginPage(c *fiber.Ctx) error { - return c.Render("pages/login", fiber.Map{}) -} - func SettingsPage(c *fiber.Ctx) error { return c.Render("pages/settings", fiber.Map{}) } @@ -104,6 +100,6 @@ func SettingsPost(c *fiber.Ctx) error { if err != nil { return err } - c.Redirect("/settings") + c.Redirect("/") return nil } diff --git a/views/pages/settings.jet.html b/views/pages/settings.jet.html index 813e9c3..33cd906 100644 --- a/views/pages/settings.jet.html +++ b/views/pages/settings.jet.html @@ -1,9 +1,40 @@
-

Login

-

Go to this page to login

-

Settings

+

Login

+

Supported features (for now):

+ +

+ You can only login using your account's cookie, check out + this page + to see how to get it. +

+

+ Note that you will get logged out automatically every time the server + updates, if you are logged in before but got logged out recently, it is + probably because the instance owner restarted the server. +

+
+ + +
+
+

Logout

+

+ You can safely logout here. This button will just delete the token directly + from this session. +

+
+ +
+
+ +

Image proxy server

-

Image proxy server