From 938328cd077d40b75e0834d56ff8d43ad035fd2b Mon Sep 17 00:00:00 2001 From: f0x52 Date: Thu, 29 Sep 2022 12:02:41 +0200 Subject: [frontend] Unified panels (#812) * settings panel restructuring * clean up old Gin handlers * colorscheme redesign, some other small css tweaks * basic router layout, error boundary * colorscheme redesign, some other small css tweaks * kebab-case consistency * superfluous padding on applist * remove unused consts * redux, whitespace changes.. * use .jsx extensions for components * login flow up till app registration * full redux oauth implementation, with basic error handling * split oauth api functions * oauth api revocation handling * basic profile change submission * move old dir * profile overview * fix keeping track of the wrong instance url (for different instance/api domains) * use redux state for profile form * delete old/index.js, old/basic.js, fully implemented * implement old/user/profile.js * implement password change * remove debug logging * support future api for removing files * customize profile css * remove unneeded wrapper components * restructure form fields * start on admin pages * admin panel settings * admin settings panel * remove old/admin files * add top-level redirect * refactor/cleanup forms * only do API checks on logged-in state * admin-status based routing * federation block routing * federation blocks * upgrade dependencies * react 18 changes * media cleanup * fix useEffect hooks * remove unused require * custom emoji base * emoji uploader * delete last old panel files * sidebar styling, remove unused page * refactor submit functions * fix sidebar boxshadow-border * fix old css variables * fix fake-toot avatar * fix non-square emoji * fix user settings redux keys * properly get admin account contact from instance response * Account.source default values * source.status_format key * mobile responsiveness * mobile element tweaks * proper redirect after removing block * add redirects for old setting panel urls * deletes * fix mobile overflow * clean up debug logging calls --- internal/web/web.go | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'internal/web/web.go') diff --git a/internal/web/web.go b/internal/web/web.go index a74fc8e19..a816f3f08 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -37,9 +37,9 @@ const ( profilePath = "/@:" + usernameKey customCSSPath = profilePath + "/custom.css" statusPath = profilePath + "/statuses/:" + statusIDKey - adminPanelPath = "/admin" - userPanelpath = "/user" assetsPathPrefix = "/assets" + userPanelPath = "/settings/user" + adminPanelPath = "/settings/admin" tokenParam = "token" usernameKey = "username" @@ -70,20 +70,24 @@ func (m *Module) Route(s router.Router) error { assetsGroup := s.AttachGroup(assetsPathPrefix) m.mountAssetsFilesystem(assetsGroup) - s.AttachHandler(http.MethodGet, adminPanelPath, m.AdminPanelHandler) - // redirect /admin/ to /admin - s.AttachHandler(http.MethodGet, adminPanelPath+"/", func(c *gin.Context) { - c.Redirect(http.StatusMovedPermanently, adminPanelPath) + s.AttachHandler(http.MethodGet, "/settings", m.SettingsPanelHandler) + s.AttachHandler(http.MethodGet, "/settings/*panel", m.SettingsPanelHandler) + + // User panel redirects + // used by clients + s.AttachHandler(http.MethodGet, "/auth/edit", func(c *gin.Context) { + c.Redirect(http.StatusMovedPermanently, userPanelPath) }) - s.AttachHandler(http.MethodGet, userPanelpath, m.UserPanelHandler) - // redirect /user/ to /user - s.AttachHandler(http.MethodGet, userPanelpath+"/", func(c *gin.Context) { - c.Redirect(http.StatusMovedPermanently, userPanelpath) + // old version of settings panel + s.AttachHandler(http.MethodGet, "/user", func(c *gin.Context) { + c.Redirect(http.StatusMovedPermanently, userPanelPath) }) - // redirect /auth/edit to /user - s.AttachHandler(http.MethodGet, "/auth/edit", func(c *gin.Context) { - c.Redirect(http.StatusMovedPermanently, userPanelpath) + + // Admin panel redirects + // old version of settings panel + s.AttachHandler(http.MethodGet, "/admin", func(c *gin.Context) { + c.Redirect(http.StatusMovedPermanently, adminPanelPath) }) // serve front-page -- cgit v1.2.3