feat: Begins a generic htmx form context and template, integrates user form, begins views for vendor and purchase orders.

Sources/App/Controllers/ApiController.swift

@@ -35,6 +35,9 @@ struct ApiController: RouteCollection {
     users.group("login") {
       $0.get(use: self.login(req:))
     }
+    users.group(":userID") {
+      $0.delete(use: self.deleteUser(req:))
+    }
 
     vendors.get(use: vendorsIndex)
     vendors.post(use: createVendor)
@@ -174,6 +177,16 @@ struct ApiController: RouteCollection {
     try await User.query(on: req.db).all().map { $0.toDTO() }
   }
 
+  @Sendable
+  func deleteUser(req: Request) async throws -> HTTPStatus {
+    guard let user = try await User.find(req.parameters.get("userID"), on: req.db) else {
+      throw Abort(.notFound)
+    }
+
+    try await user.delete(on: req.db)
+    return .noContent
+  }
+
   // MARK: - Vendors
 
   @Sendable

Sources/App/Controllers/PurchaseOrderViewController.swift

@@ -0,0 +1,10 @@
+import Fluent
+import Vapor
+
+struct PurchaseOrderViewController: RouteCollection {
+  private let api = ApiController()
+
+  func boot(routes: any RoutesBuilder) throws {
+    // Do something.
+  }
+}

Sources/App/Controllers/UsersViewController.swift

@@ -8,29 +8,89 @@ struct UserViewController: RouteCollection {
   func boot(routes: any RoutesBuilder) throws {
     let users = routes.protected.grouped("users")
     users.get(use: index(req:))
+    users.post(use: create(req:))
+    users.group(":userID") {
+      $0.delete(use: delete(req:))
+    }
   }
 
   @Sendable
   func index(req: Request) async throws -> View {
-    let users = try await api.usersIndex(req: req)
-    return try await req.view.render("users", ["users": users])
+    try await req.view.render(
+      "users",
+      UsersCTX(users: api.getSortedUsers(req: req))
+    )
+  }
+
+  @Sendable
+  func create(req: Request) async throws -> View {
+    _ = try await api.createUser(req: req)
+    return try await req.view.render("user-table", ["users": api.getSortedUsers(req: req)])
+  }
+
+  @Sendable
+  func delete(req: Request) async throws -> View {
+    _ = try await api.deleteUser(req: req)
+    return try await req.view.render("user-table", ["users": api.getSortedUsers(req: req)])
   }
 }
 
 struct UserFormCTX: Content {
-  let htmxTargetUrl: String
-  let htmxTarget: String
-  let htmxPushUrl: String
-  let showConfirmPassword: Bool
-  let buttonLabel: String
+  let htmxForm: HtmxFormCTX<Context>
 
-  static func signIn(route: String) -> Self {
+  struct Context: Content {
+    let showConfirmPassword: Bool
+    let showEmailInput: Bool
+    let buttonLabel: String
+  }
+
+  static func signIn(next: String?) -> Self {
     .init(
-      htmxTargetUrl: route,
-      htmxTarget: "body",
-      htmxPushUrl: "true",
-      showConfirmPassword: false,
-      buttonLabel: "Sign In"
+      htmxForm: .init(
+        formClass: "user-form",
+        formId: "user-form",
+        htmxTargetUrl: .post("/login\(next != nil ? "?next=\(next!)" : "")"),
+        htmxTarget: "body",
+        htmxPushUrl: true,
+        htmxResetAfterRequest: true,
+        htmxSwapOob: nil,
+        htmxSwap: nil,
+        context: .init(showConfirmPassword: false, showEmailInput: false, buttonLabel: "Sign In")
+      )
+    )
+  }
+
+  static func create() -> Self {
+    .init(
+      htmxForm: .init(
+        formClass: "user-form",
+        formId: "user-form",
+        htmxTargetUrl: .post("/users"),
+        htmxTarget: "#user-table",
+        htmxPushUrl: false,
+        htmxResetAfterRequest: true,
+        htmxSwapOob: nil,
+        htmxSwap: nil,
+        context: .init(showConfirmPassword: true, showEmailInput: true, buttonLabel: "Create")
+      )
     )
   }
 }
+
+private struct UsersCTX: Content {
+  let users: [User.DTO]
+  let form: UserFormCTX
+
+  init(users: [User.DTO], form: UserFormCTX? = nil) {
+    self.users = users
+    self.form = form ?? .create()
+  }
+}
+
+private extension ApiController {
+
+  func getSortedUsers(req: Request) async throws -> [User.DTO] {
+    try await usersIndex(req: req)
+      .sorted { ($0.username ?? "") < ($1.username ?? "") }
+  }
+}

Sources/App/Controllers/VendorViewController.swift

@@ -0,0 +1,20 @@
+import Fluent
+import Vapor
+
+struct VendorViewController: RouteCollection {
+  private let api = ApiController()
+
+  func boot(routes: any RoutesBuilder) throws {
+    // Do something.
+  }
+}
+
+struct VendorFormCTX: Content {
+  let vendor: Vendor?
+  let buttonLabel: String
+
+  init(vendor: Vendor? = nil, buttonLabel: String = "Create") {
+    self.vendor = vendor
+    self.buttonLabel = buttonLabel
+  }
+}

Sources/App/Controllers/ViewController.swift

@@ -15,11 +15,12 @@ struct ViewController: RouteCollection {
 
     // routes.get(use: index(req:))
     routes.get("login", use: getLogin(req:))
-    routes.post(use: postLogin(req:))
+    routes.post("login", use: postLogin(req:))
 
     // MARK: Protected routes.
 
     protected.get(use: home(req:))
+    protected.get("**", use: catchAll(req:))
     protected.post("logout", use: logout(req:))
     // protected.get("users", use: users(req:))
     try routes.register(collection: employees)
@@ -30,7 +31,7 @@ struct ViewController: RouteCollection {
   func getLogin(req: Request) async throws -> View {
     req.logger.debug("Login Query: \(req.url.query ?? "n/a")")
     let params = try? req.query.decode(LoginParameter.self)
-    return try await req.view.render("login", UserFormCTX.signIn(route: params?.next ?? "/"))
+    return try await req.view.render("login", UserFormCTX.signIn(next: params?.next))
   }
 
   @Sendable
@@ -60,17 +61,32 @@ struct ViewController: RouteCollection {
 
   @Sendable
   func home(req: Request) async throws -> View {
-    let ctx = try req.query.decode(HomeCTX.self)
-    guard let route = ctx.route else {
-      return try await req.view.render("home", ctx)
+    var route: HomeRoute?
+
+    if let loginParams = try? req.query.decode(LoginParameter.self),
+       let next = loginParams.next.split(separator: "/").last
+    {
+      route = HomeRoute(rawValue: String(next))
+    } else if let routeString = req.parameters.getCatchall().first {
+      route = HomeRoute(rawValue: routeString)
     }
 
-    switch route {
-    case .users:
-      return try await users.index(req: req)
-    case .employees:
-      return try await employees.index(req: req)
+    return try await req.view.render("home", HomeCTX(route: route))
+  }
+
+  @Sendable
+  func catchAll(req: Request) async throws -> View {
+    var route: HomeRoute?
+
+    if let loginParams = try? req.query.decode(LoginParameter.self),
+       let next = loginParams.next.split(separator: "/").last
+    {
+      route = HomeRoute(rawValue: String(next))
+    } else if let routeString = req.parameters.getCatchall().last {
+      route = HomeRoute(rawValue: routeString)
     }
+
+    return try await req.view.render("home", HomeCTX(route: route))
   }
 
 }