4 files changed, 24 insertions, 42 deletions
diff --git a/internal/web/profile.go b/internal/web/profile.go
index c6bc5ee5a..a4332b0c1 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -117,6 +117,7 @@ func (m *Module) profileGETHandler(c *gin.Context) {
 		"show_back_to_top": showBackToTop,
 		"stylesheets":      stylesheets,
 		"javascript": []string{
+			"/assets/dist/bundle.js",
 			"/assets/dist/frontend.js",
 		},
 	})
diff --git a/internal/web/panels.go b/internal/web/settings-panel.go
index fdec87a33..3ba396998 100644
--- a/internal/web/panels.go
+++ b/internal/web/settings-panel.go
@@ -27,7 +27,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 )
 
-func (m *Module) UserPanelHandler(c *gin.Context) {
+func (m *Module) SettingsPanelHandler(c *gin.Context) {
 	host := config.GetHost()
 	instance, err := m.processor.InstanceGet(c.Request.Context(), host)
 	if err != nil {
@@ -41,37 +41,13 @@ func (m *Module) UserPanelHandler(c *gin.Context) {
 			assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
 			assetsPathPrefix + "/dist/_colors.css",
 			assetsPathPrefix + "/dist/base.css",
-			assetsPathPrefix + "/dist/panels-base.css",
-			assetsPathPrefix + "/dist/panels-user-style.css",
+			assetsPathPrefix + "/dist/profile.css",
+			assetsPathPrefix + "/dist/status.css",
+			assetsPathPrefix + "/dist/settings-panel-style.css",
 		},
 		"javascript": []string{
 			assetsPathPrefix + "/dist/bundle.js",
-			assetsPathPrefix + "/dist/user-panel.js",
-		},
-	})
-}
-
-// TODO: abstract the {admin, user}panel handlers in some way
-func (m *Module) AdminPanelHandler(c *gin.Context) {
-	host := config.GetHost()
-	instance, err := m.processor.InstanceGet(c.Request.Context(), host)
-	if err != nil {
-		api.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGet)
-		return
-	}
-
-	c.HTML(http.StatusOK, "frontend.tmpl", gin.H{
-		"instance": instance,
-		"stylesheets": []string{
-			assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
-			assetsPathPrefix + "/dist/_colors.css",
-			assetsPathPrefix + "/dist/base.css",
-			assetsPathPrefix + "/dist/panels-base.css",
-			assetsPathPrefix + "/dist/panels-admin-style.css",
-		},
-		"javascript": []string{
-			assetsPathPrefix + "/dist/bundle.js",
-			assetsPathPrefix + "/dist/admin-panel.js",
+			assetsPathPrefix + "/dist/settings.js",
 		},
 	})
 }
diff --git a/internal/web/thread.go b/internal/web/thread.go
index 48c53c448..fb5006c34 100644
--- a/internal/web/thread.go
+++ b/internal/web/thread.go
@@ -119,6 +119,7 @@ func (m *Module) threadGETHandler(c *gin.Context) {
 		"ogMeta":      ogBase(instance).withStatus(status),
 		"stylesheets": stylesheets,
 		"javascript": []string{
+			"/assets/dist/bundle.js",
 			"/assets/dist/frontend.js",
 		},
 	})
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