feat: Adds route query parameter to home, htmx updates url, and working next parameter for login

Sources/App/Controllers/ViewController.swift

@@ -5,34 +5,30 @@ import Vapor
 struct ViewController: RouteCollection {
 
   private let api = ApiController()
+  private let employees = EmployeeViewController()
 
   func boot(routes: any RoutesBuilder) throws {
     let protected = routes.protected
-    let login = routes.grouped("login")
 
     // MARK: - Non-protected routes.
 
-    routes.get(use: index(req:))
-    login.get(use: getLogin(req:))
-    login.post(use: postLogin(req:))
-    routes.post("logout", use: logout(req:))
+    // routes.get(use: index(req:))
+    routes.get("login", use: getLogin(req:))
+    routes.post(use: postLogin(req:))
 
     // MARK: Protected routes.
 
-    protected.get("home", use: home(req:))
+    protected.get(use: home(req:))
+    protected.post("logout", use: logout(req:))
     protected.get("users", use: users(req:))
-
-    try routes.register(collection: EmployeeViewController())
-  }
-
-  @Sendable
-  func index(req: Request) async throws -> View {
-    try await req.view.render("index")
+    try routes.register(collection: employees)
   }
 
   @Sendable
   func getLogin(req: Request) async throws -> View {
-    try await req.view.render("login")
+    req.logger.info("Query: \(req.url.query ?? "n/a")")
+    let params = try? req.query.decode(LoginParameter.self)
+    return try await req.view.render("login", ["route": params?.next ?? "/"])
   }
 
   @Sendable
@@ -51,7 +47,7 @@ struct ViewController: RouteCollection {
     req.auth.login(user)
 
     req.logger.debug("User logged in: \(user.toDTO())")
-    return try await req.view.render("home")
+    return try await home(req: req)
   }
 
   @Sendable
@@ -60,11 +56,19 @@ struct ViewController: RouteCollection {
     return try await req.view.render("login")
   }
 
-  // TODO: Add route parameters for active route / tab.
-
   @Sendable
   func home(req: Request) async throws -> View {
-    try await req.view.render("home")
+    let ctx = try req.query.decode(HomeCTX.self)
+    guard let route = ctx.route else {
+      return try await req.view.render("home", ctx)
+    }
+
+    switch route {
+    case .users:
+      return try await users(req: req)
+    case .employees:
+      return try await employees.employees(req: req)
+    }
   }
 
   @Sendable
@@ -79,3 +83,16 @@ private struct UserForm: Content {
   let username: String
   let password: String
 }
+
+enum HomeRoute: String, Content {
+  case employees
+  case users
+}
+
+struct HomeCTX: Content {
+  let route: HomeRoute?
+}
+
+struct LoginParameter: Content {
+  let next: String
+}