From 69bac9bc3fbb2016e7076ce7c230d3b7c719dc52 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Sat, 4 Dec 2021 23:12:26 +0000
Subject: [PATCH] Reorganize routes

---
 http/http.go | 65 ++++++++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/http/http.go b/http/http.go
index 4b0c1c7..65ca32a 100644
--- a/http/http.go
+++ b/http/http.go
@@ -46,45 +46,36 @@ func (h *Handler) Serve() {
 	router.GET("/", func(c *gin.Context) { c.HTML(http.StatusOK, "index.html", nil) })
 	router.GET("/login", h.login)
 	router.GET("/register", h.register)
+	router.Group("").Use(h.verifyLoginWithRedirect).GET("/dashboard", h.dashboard)
+
 	withBudget := router.Group("")
-	{
-		withBudget.Use(h.verifyLoginWithRedirect)
-		withBudget.Use(h.getImportantData)
-		withBudget.GET("/dashboard", h.dashboard)
-		withBudget.GET("/budget/:budgetid", h.budget)
-		withBudget.GET("/budget/:budgetid/accounts", h.accounts)
-		withBudget.GET("/budget/:budgetid/account/:accountid", h.account)
-		withBudget.GET("/admin", h.admin)
-		withBudget.GET("/admin/clear-database", h.clearDatabase)
-	}
+	withBudget.Use(h.verifyLoginWithRedirect)
+	withBudget.Use(h.getImportantData)
+	withBudget.GET("/budget/:budgetid", h.budget)
+	withBudget.GET("/budget/:budgetid/accounts", h.accounts)
+	withBudget.GET("/budget/:budgetid/account/:accountid", h.account)
+	withBudget.GET("/admin", h.admin)
+	withBudget.GET("/admin/clear-database", h.clearDatabase)
+
 	api := router.Group("/api/v1")
-	{
-		user := api.Group("/user")
-		{
-			unauthenticated := user.Group("")
-			{
-				unauthenticated.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
-				unauthenticated.POST("/login", h.loginPost)
-				unauthenticated.POST("/register", h.registerPost)
-			}
-			authenticated := user.Group("")
-			{
-				authenticated.Use(h.verifyLoginWithRedirect)
-				authenticated.GET("/logout", logout)
-			}
-		}
-		budget := api.Group("/budget")
-		{
-			budget.Use(h.verifyLoginWithRedirect)
-			budget.POST("/new", h.newBudget)
-		}
-		transaction := api.Group("/transaction")
-		{
-			transaction.Use(h.verifyLoginWithRedirect)
-			transaction.POST("/new", h.newTransaction)
-			transaction.POST("/import/ynab", h.importYNAB)
-		}
-	}
+
+	unauthenticated := api.Group("/user")
+	unauthenticated.GET("/login", func(c *gin.Context) { c.Redirect(http.StatusPermanentRedirect, "/login") })
+	unauthenticated.POST("/login", h.loginPost)
+	unauthenticated.POST("/register", h.registerPost)
+
+	authenticated := api.Group("")
+	authenticated.Use(h.verifyLoginWithRedirect)
+
+	user := authenticated.Group("/user")
+	user.GET("/logout", logout)
+
+	budget := api.Group("/budget")
+	budget.POST("/new", h.newBudget)
+
+	transaction := api.Group("/transaction")
+	transaction.POST("/new", h.newTransaction)
+	transaction.POST("/import/ynab", h.importYNAB)
 
 	router.Run(":1323")
 }