hhe/vapor-po
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Refactoring route declarations.

Browse Source
This commit is contained in:
Michael Housh
2025-01-19 10:52:15 -05:00
parent d27a19863a
commit 1c8748211c
20 changed files with 954 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/App/Views/Employees/EmployeeForm.swift
View File

@@ -19,7 +19,7 @@ struct EmployeeForm: HTML {
var content: some HTML {
Float(shouldDisplay: shouldShow, resetURL: "/employees") {
form(
employee == nil ? .hx.post(targetURL) : .hx.put(targetURL),
employee == nil ? .hx.post(route: targetURL) : .hx.put(route: targetURL),
.hx.target(target),
employee == nil
? .hx.swap(.beforeEnd.transition(true).swap("0.5s"))
@@ -51,7 +51,7 @@ struct EmployeeForm: HTML {
"Delete"
}
.attributes(
.hx.delete("/api/v1/employees/\(employee.id)"),
.hx.delete(route: .employee(.shared(.delete(id: employee.id)))),
.hx.confirm("Are you sure you want to delete this employee?"),
.hx.target("#employee_\(employee.id)"),
.hx.swap(.outerHTML.transition(true).swap("1s"))
@@ -74,8 +74,8 @@ struct EmployeeForm: HTML {
return "Update"
}
private var targetURL: String {
guard let employee else { return "/employees" }
return "/employees/\(employee.id)"
private var targetURL: SharedModels.ViewRoute {
guard let employee else { return .employee(.shared(.index)) }
return .employee(.shared(.get(id: employee.id)))
}
}

4
Sources/App/Views/Employees/EmployeeTable.swift
View File

@@ -14,7 +14,7 @@ struct EmployeeTable: HTML {
Button.add()
.attributes(
.style("padding: 0px 10px;"),
.hx.get(route: .employees(.create)),
.hx.get(route: .employee(.shared(.index))),
.hx.target(.float),
.hx.swap(.outerHTML.transition(true).swap("0.5s"))
)
@@ -39,7 +39,7 @@ struct EmployeeTable: HTML {
Button.detail()
.attributes(
.style("padding-left: 15px;"),
.hx.get(route: .employees(.id(employee.id))),
.hx.get(route: .employee(.shared(.get(id: employee.id)))),
.hx.target(.float),
.hx.pushURL(true),
.hx.swap(.outerHTML.transition(true).swap("0.5s"))

2
Sources/App/Views/PurchaseOrders/PurchaseOrderForm.swift
View File

@@ -27,7 +27,7 @@ struct PurchaseOrderForm: HTML {
}
}
form(
.hx.post(route: .purchaseOrders()),
.hx.post(route: .purchaseOrder(.shared(.index))),
.hx.target(.purchaseOrders(.table)),
.hx.swap(.afterBegin),
.customToggleFloatAfterRequest

38
Sources/App/Views/PurchaseOrders/PurchaseOrderSearch.swift
View File

@@ -5,35 +5,37 @@ import Vapor
struct PurchaseOrderSearch: HTML {
let context: PurchaseOrderSearchContext
typealias Context = SharedModels.ViewRoute.PurchaseOrderRoute.Search.Context
init(context: PurchaseOrderSearchContext? = nil) {
let context: Context
init(context: Context? = nil) {
self.context = context ?? .employee
}
var content: some HTML {
form(
.id(.search),
.hx.post(route: .purchaseOrders(.search())),
.hx.post(route: .purchaseOrder(.search(.index()))),
.hx.target(.purchaseOrders()),
.hx.swap(.outerHTML)
) {
div(.class("btn-row")) {
button(
.class("btn-secondary"), .style("position: absolute; top: 80px; right: 20px;"),
.hx.get(route: .purchaseOrders()), .hx.pushURL(true), .hx.target("body")
.hx.get(route: .purchaseOrder(.shared(.index))), .hx.pushURL(true), .hx.target("body")
)
{ "x" }
}
div(.class("row")) {
select(
.name("context"), .class("col-3"),
.hx.get(route: .purchaseOrders(.search())),
.hx.get(route: .purchaseOrder(.search(.index()))),
.hx.target(.search),
.hx.swap(.outerHTML.transition(true).swap("0.5s")),
.hx.pushURL(true)
) {
for context in PurchaseOrderSearchContext.allCases {
for context in Context.allCases {
option(.value(context.rawValue)) { context.rawValue.capitalized }
.attributes(.selected, when: self.context == context)
}
@@ -44,7 +46,7 @@ struct PurchaseOrderSearch: HTML {
} else if context == .customer {
input(
.type(.text), .class("col-6"), .style("margin-left: 60px; margin-top: 18px;"),
.name("search"), .placeholder("Search"), .required
.name("customerSearch"), .placeholder("Search"), .required
)
} else if context == .vendor {
VendorBranchSelect.purchaseOrderSearch()
@@ -60,15 +62,15 @@ struct PurchaseOrderSearch: HTML {
}
enum PurchaseOrderSearchContext: String, Codable, Content, CaseIterable {
case employee
case customer
case vendor
}
// enum PurchaseOrderSearchContext: String, Codable, Content, CaseIterable {
// case employee
// case customer
// case vendor
// }
struct PurchaseOrderSearchContent: Content {
let context: PurchaseOrderSearchContext
let createdForID: Employee.ID?
let search: String?
let vendorBranchID: VendorBranch.ID?
}
// struct PurchaseOrderSearchContent: Content {
// let context: PurchaseOrderSearchContext
// let createdForID: Employee.ID?
// let search: String?
// let vendorBranchID: VendorBranch.ID?
// }

13
Sources/App/Views/PurchaseOrders/PurchaseOrderTable.swift
View File

@@ -5,15 +5,16 @@ import SharedModels
import Vapor
struct PurchaseOrderTable: HTML {
typealias SearchContext = SharedModels.ViewRoute.PurchaseOrderRoute.Search.Context
let page: Page<PurchaseOrder>
let context: Context
let searchContext: PurchaseOrderSearchContext?
let searchContext: SearchContext?
init(
page: Page<PurchaseOrder>,
context: Context = .default,
searchContext: PurchaseOrderSearchContext? = nil
searchContext: SearchContext? = nil
) {
self.page = page
self.context = context
@@ -44,7 +45,7 @@ struct PurchaseOrderTable: HTML {
if context != .search {
Button.add()
.attributes(
.hx.get(route: .purchaseOrders(.create)), .hx.target(.float),
.hx.get(route: .purchaseOrder(.shared(.index))), .hx.target(.float),
.hx.swap(.outerHTML), .hx.pushURL(true)
)
}
@@ -59,7 +60,7 @@ struct PurchaseOrderTable: HTML {
button(
.id("btn-search"),
.class("btn-primary"), .style("position: absolute; top: 80px; right: 20px;"),
.hx.get(route: .purchaseOrders(.search(.context(.employee, table: true)))),
.hx.get(route: .purchaseOrder(.search(.index(context: .employee, table: true)))),
.hx.target(.body),
.hx.swap(.outerHTML.transition(true).swap("0.5s")),
.hx.pushURL(true)
@@ -81,7 +82,7 @@ struct PurchaseOrderTable: HTML {
if page.metadata.pageCount > page.metadata.page {
tr(
// .hx.get("/purchase-orders/next?page=\(page.metadata.page + 1)&limit=\(page.metadata.per)"),
.hx.get(route: .purchaseOrders(.nextPage(page.metadata))),
.hx.get(route: .purchaseOrder(.shared(.page(page: page.metadata.page + 1, limit: page.metadata.per)))),
.hx.trigger(.event(.revealed)),
.hx.swap(.outerHTML.transition(true).swap("1s")),
.hx.target(.this),
@@ -110,7 +111,7 @@ struct PurchaseOrderTable: HTML {
td {
Button.detail()
.attributes(
.hx.get("/purchase-orders/\(purchaseOrder.id)"),
.hx.get(route: .purchaseOrder(.shared(.get(id: purchaseOrder.id)))),
.hx.target("#float"),
.hx.swap(.outerHTML.transition(true).swap("0.5s")),
.hx.pushURL(true)

4
Sources/App/Views/Users/UserDetail.swift
View File

@@ -12,7 +12,7 @@ struct UserDetail: HTML, Sendable {
Float(shouldDisplay: user != nil, resetURL: "/users") {
if let user {
form(
.hx.post(route: .users(.id(user.id))),
.hx.post(route: .user(.shared(.get(id: user.id)))),
.hx.swap(.outerHTML),
.hx.target(.user(.row(id: user.id))),
.custom(name: "hx-on::after-request", value: "toggleContent('float'); window.location.href='/users';")
@@ -36,7 +36,7 @@ struct UserDetail: HTML, Sendable {
) { "Update" }
Button.danger { "Delete" }
.attributes(
.hx.delete(route: .users(.id(user.id))),
.hx.delete(route: .user(.shared(.get(id: user.id)))),
.hx.trigger(.event(.click)),
.hx.swap(.outerHTML),
.hx.target(.user(.row(id: user.id))),

2
Sources/App/Views/Users/UserForm.swift
View File

@@ -99,7 +99,7 @@ struct UserForm: HTML, Sendable {
}
}
// TODO: Return a route container.
// TODO: Return a ViewRoute.
var targetURL: String {
switch self {
case .create:

4
Sources/App/Views/Users/UserTable.swift
View File

@@ -17,7 +17,7 @@ struct UserTable: HTML {
th(.style("width: 50px;")) {
Button.add()
.attributes(
.hx.get(route: .users(.create)),
.hx.get(route: .user(.form)),
.hx.target(.float),
.hx.swap(.outerHTML)
)
@@ -45,7 +45,7 @@ struct UserTable: HTML {
td { user.email }
td {
Button.detail().attributes(
.hx.get(route: .users(.id(user.id))),
.hx.get(route: .user(.shared(.get(id: user.id)))),
.hx.target(.float),
.hx.swap(.outerHTML),
.hx.pushURL(true)

9
Sources/App/Views/Vendors/VendorDetail.swift
View File

@@ -15,14 +15,15 @@ struct VendorDetail: HTML {
} closeButton: {
Button.close(id: "float")
.attributes(
.hx.get("/vendors"),
.hx.get(route: .vendor(.shared(.index(withBranches: true)))),
.hx.pushURL(true),
.hx.target("body"),
.hx.target(.body),
.hx.swap(.outerHTML)
)
}
}
// TODO: What route for here??
var branchForm: some HTML {
form(
.id("branch-form"),
@@ -33,7 +34,7 @@ struct VendorDetail: HTML {
) {
input(
.type(.text), .class("col-9"), .name("name"), .placeholder("Add branch..."), .required,
.hx.post("/vendors/\(vendor.id)/branches"),
.hx.post(route: .vendorBranch(.index(for: vendor.id))),
.hx.trigger(.event(.keyup).changed().delay("800ms")),
.hx.target("#branches"),
.hx.swap(.beforeEnd) // ,
@@ -65,7 +66,7 @@ struct VendorDetail: HTML {
span(.class("label")) { branch.name.capitalized }
button(
.class("btn"),
.hx.delete("/api/v1/vendors/branches/\(branch.id)"),
.hx.delete(route: .vendorBranch(.delete(id: branch.id))),
.hx.target("#branch_\(branch.id)"),
.hx.swap(.outerHTML.transition(true).swap("0.5s"))
) {

12
Sources/App/Views/Vendors/VendorForm.swift
View File

@@ -41,7 +41,7 @@ struct VendorForm: HTML {
func makeForm(vendor: Vendor?) -> some HTML {
form(
.id("vendor-form"),
vendor != nil ? .hx.put(targetURL) : .hx.post(targetURL),
vendor != nil ? .hx.put(route: targetURL) : .hx.post(route: targetURL),
.hx.target("#content"),
.hx.swap(.outerHTML)
) {
@@ -53,7 +53,7 @@ struct VendorForm: HTML {
.name("name"),
.value(vendor?.name ?? ""),
.placeholder("Vendor Name"),
vendor != nil ? .hx.put(targetURL) : .hx.post(targetURL),
vendor != nil ? .hx.put(route: targetURL) : .hx.post(route: targetURL),
.hx.trigger(.event(.keyup).changed().delay("500ms")),
.required
)
@@ -61,7 +61,7 @@ struct VendorForm: HTML {
button(
.class("danger"),
.style("font-size: 1.25em; padding: 10px 20px; border-radius: 10px;"),
.hx.delete("/api/v1/vendors/\(vendor.id)"),
.hx.delete(route: .vendor(.delete(id: vendor.id))),
.hx.confirm("Are you sure you want to delete this vendor?"),
.hx.target("#vendor_\(vendor.id)"),
.hx.swap(.outerHTML.transition(true).swap("1s")),
@@ -85,8 +85,8 @@ struct VendorForm: HTML {
return "Update"
}
var targetURL: String {
guard let vendor else { return "/vendors" }
return "/vendors/\(vendor.id)"
var targetURL: SharedModels.ViewRoute {
guard let vendor else { return .vendor(.shared(.index(withBranches: true))) }
return .vendor(.shared(.get(id: vendor.id)))
}
}

4
Sources/App/Views/Vendors/VendorTable.swift
View File

@@ -15,7 +15,7 @@ struct VendorTable: HTML {
Button.add()
.attributes(
.style("padding: 0px 10px;"),
.hx.get("/vendors/create"),
.hx.get(route: .vendor(.form)),
.hx.target("#float"),
.hx.swap(.outerHTML)
)
@@ -41,7 +41,7 @@ struct VendorTable: HTML {
Button.detail()
.attributes(
.style("padding-left: 15px;"),
.hx.get("/vendors/\(vendor.id)"),
.hx.get(route: .vendor(.shared(.get(id: vendor.id)))),
.hx.target("#float"),
.hx.pushURL(true),
.hx.swap(.outerHTML)

69
Sources/App/Views/ViewRoute.swift
View File

@@ -4,21 +4,38 @@ import Fluent
import SharedModels
extension HTMLAttribute.hx {
static func get(route: RouteKey) -> HTMLAttribute {
get(route.url)
static func get(route: SharedModels.ViewRoute) -> HTMLAttribute {
get(SharedModels.ViewRoute.router.path(for: route))
}
static func post(route: RouteKey) -> HTMLAttribute {
post(route.url)
static func post(route: SharedModels.ViewRoute) -> HTMLAttribute {
post(SharedModels.ViewRoute.router.path(for: route))
}
static func put(route: RouteKey) -> HTMLAttribute {
put(route.url)
static func put(route: SharedModels.ViewRoute) -> HTMLAttribute {
put(SharedModels.ViewRoute.router.path(for: route))
}
static func delete(route: RouteKey) -> HTMLAttribute {
delete(route.url)
static func delete(route: SharedModels.ViewRoute) -> HTMLAttribute {
delete(SharedModels.ViewRoute.router.path(for: route))
}
// static func get(route: SharedModels.ApiRoute) -> HTMLAttribute {
// get(route: .shared(route))
// }
//
// static func post(route: SharedModels.ApiRoute) -> HTMLAttribute {
// post(SharedModels.ApiRoute.router.path(for: route))
// }
//
// static func put(route: SharedModels.ApiRoute) -> HTMLAttribute {
// put(SharedModels.ApiRoute.router.path(for: route))
// }
//
// static func delete(route: SharedModels.ApiRoute) -> HTMLAttribute {
// delete(SharedModels.ApiRoute.router.path(for: route))
// }
}
extension HTMLAttribute.hx {
@@ -34,6 +51,7 @@ extension HTMLAttribute where Tag: HTMLTrait.Attributes.Global {
}
}
// TODO: Remove.
enum RouteKey {
case employees(EmployeeRoute? = nil)
case purchaseOrders(PurchaseOrderRoute? = nil)
@@ -73,8 +91,8 @@ enum RouteKey {
enum PurchaseOrderRoute {
case create
case nextPage(PageMetadata)
case search(SearchQuery? = nil)
// case search(SearchQuery? = nil)
//
var path: String {
switch self {
case .create:
@@ -82,25 +100,24 @@ enum RouteKey {
case let .nextPage(currentPage):
return "next?page=\(currentPage.page + 1)&limit\(currentPage.per)"
case let .search(query):
guard let query else { return "search" }
return "search?\(query.query)"
// case let .search(query):
// guard let query else { return "search" }
// return "search?\(query.query)"
}
}
enum SearchQuery {
case context(PurchaseOrderSearchContext, table: Bool? = nil)
var query: String {
switch self {
case let .context(context, table):
let query = "context=\(context.rawValue)"
guard let table else { return query }
return "\(query)&table=\(table)"
}
}
}
// enum SearchQuery {
// case context(PurchaseOrderSearchContext, table: Bool? = nil)
//
// var query: String {
// switch self {
// case let .context(context, table):
// let query = "context=\(context.rawValue)"
// guard let table else { return query }
// return "\(query)&table=\(table)"
// }
// }
// }
}
enum UserRoute {