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

feat: Cleans up routes.

Browse Source
This commit is contained in:
Michael Housh
2025-01-19 13:33:01 -05:00
parent 1c8748211c
commit b23dc6bf07
32 changed files with 958 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,8 @@ struct EmployeeForm: HTML {
"Delete"
}
.attributes(
.hx.delete(route: .employee(.shared(.delete(id: employee.id)))),
.hx.confirm("Are you sure you want to delete this employee?"),
.hx.delete(route: .employee(.delete(id: employee.id))),
.hx.target("#employee_\(employee.id)"),
.hx.swap(.outerHTML.transition(true).swap("1s"))
)
@@ -75,7 +75,7 @@ struct EmployeeForm: HTML {
}
private var targetURL: SharedModels.ViewRoute {
guard let employee else { return .employee(.shared(.index)) }
return .employee(.shared(.get(id: employee.id)))
guard let employee else { return .employee(.index) }
return .employee(.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: .employee(.shared(.index))),
.hx.get(route: .employee(.form)),
.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: .employee(.shared(.get(id: employee.id)))),
.hx.get(route: .employee(.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: .purchaseOrder(.shared(.index))),
.hx.post(route: .purchaseOrder(.index)),
.hx.target(.purchaseOrders(.table)),
.hx.swap(.afterBegin),
.customToggleFloatAfterRequest

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

@@ -23,7 +23,7 @@ struct PurchaseOrderSearch: HTML {
div(.class("btn-row")) {
button(
.class("btn-secondary"), .style("position: absolute; top: 80px; right: 20px;"),
.hx.get(route: .purchaseOrder(.shared(.index))), .hx.pushURL(true), .hx.target("body")
.hx.get(route: .purchaseOrder(.index)), .hx.pushURL(true), .hx.target("body")
)
{ "x" }
}
@@ -61,16 +61,3 @@ struct PurchaseOrderSearch: HTML {
}
}
// 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?
// }

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

@@ -45,7 +45,7 @@ struct PurchaseOrderTable: HTML {
if context != .search {
Button.add()
.attributes(
.hx.get(route: .purchaseOrder(.shared(.index))), .hx.target(.float),
.hx.get(route: .purchaseOrder(.index)), .hx.target(.float),
.hx.swap(.outerHTML), .hx.pushURL(true)
)
}
@@ -82,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: .purchaseOrder(.shared(.page(page: page.metadata.page + 1, limit: page.metadata.per)))),
.hx.get(route: .purchaseOrder(.page(page: page.metadata.page + 1, limit: page.metadata.per))),
.hx.trigger(.event(.revealed)),
.hx.swap(.outerHTML.transition(true).swap("1s")),
.hx.target(.this),
@@ -111,7 +111,7 @@ struct PurchaseOrderTable: HTML {
td {
Button.detail()
.attributes(
.hx.get(route: .purchaseOrder(.shared(.get(id: purchaseOrder.id)))),
.hx.get(route: .purchaseOrder(.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: .user(.shared(.get(id: user.id)))),
.hx.post(route: .user(.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: .user(.shared(.get(id: user.id)))),
.hx.delete(route: .user(.get(id: user.id))),
.hx.trigger(.event(.click)),
.hx.swap(.outerHTML),
.hx.target(.user(.row(id: user.id))),

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

@@ -1,5 +1,6 @@
import Elementary
import ElementaryHTMX
import SharedModels
// Form used to login or create a new user.
struct UserForm: HTML, Sendable {
@@ -28,6 +29,9 @@ struct UserForm: HTML, Sendable {
value: "if(event.detail.successful) this.reset(); toggleContent('float');"
)
) {
if case let .login(next) = context, let next {
input(.type(.hidden), .name("next"), .value(next))
}
div(.class("row")) {
input(.type(.text), .id("username"), .name("username"), .placeholder("Username"), .autofocus, .required)
}
@@ -104,12 +108,13 @@ struct UserForm: HTML, Sendable {
switch self {
case .create:
return "/users"
case let .login(next: next):
let path = "/login"
if let next {
return "\(path)?next=\(next)"
}
return path
case .login:
return "/login"
// let path = "/login"
// if let next {
// return "\(path)?next=\(next)"
// }
// return path
}
}
}

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

@@ -45,7 +45,7 @@ struct UserTable: HTML {
td { user.email }
td {
Button.detail().attributes(
.hx.get(route: .user(.shared(.get(id: user.id)))),
.hx.get(route: .user(.get(id: user.id))),
.hx.target(.float),
.hx.swap(.outerHTML),
.hx.pushURL(true)

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

@@ -2,6 +2,7 @@ import Elementary
import ElementaryHTMX
import SharedModels
// TODO: Lazy Load branches when view appears.
struct VendorDetail: HTML {
let vendor: Vendor
@@ -15,7 +16,7 @@ struct VendorDetail: HTML {
} closeButton: {
Button.close(id: "float")
.attributes(
.hx.get(route: .vendor(.shared(.index(withBranches: true)))),
.hx.get(route: .vendor(.index)),
.hx.pushURL(true),
.hx.target(.body),
.hx.swap(.outerHTML)
@@ -25,6 +26,7 @@ struct VendorDetail: HTML {
// TODO: What route for here??
var branchForm: some HTML {
// TODO: Add hidden input field with vendor id.
form(
.id("branch-form"),
.hx.post("/vendors/\(vendor.id)/branches"),
@@ -34,7 +36,8 @@ struct VendorDetail: HTML {
) {
input(
.type(.text), .class("col-9"), .name("name"), .placeholder("Add branch..."), .required,
.hx.post(route: .vendorBranch(.index(for: vendor.id))),
// FIX: route
// .hx.post(route: .vendorBranch(.index(for: vendor.id))),
.hx.trigger(.event(.keyup).changed().delay("800ms")),
.hx.target("#branches"),
.hx.swap(.beforeEnd) // ,

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

@@ -86,7 +86,7 @@ struct VendorForm: HTML {
}
var targetURL: SharedModels.ViewRoute {
guard let vendor else { return .vendor(.shared(.index(withBranches: true))) }
return .vendor(.shared(.get(id: vendor.id)))
guard let vendor else { return .vendor(.index) }
return .vendor(.get(id: vendor.id))
}
}

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

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

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

@@ -19,23 +19,6 @@ extension HTMLAttribute.hx {
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 {
@@ -51,89 +34,6 @@ extension HTMLAttribute where Tag: HTMLTrait.Attributes.Global {
}
}
// TODO: Remove.
enum RouteKey {
case employees(EmployeeRoute? = nil)
case purchaseOrders(PurchaseOrderRoute? = nil)
case users(UserRoute? = nil)
var url: String {
switch self {
case let .employees(employees):
let path = "/employees"
guard let employees else { return path }
return "\(path)/\(employees.path)"
case let .purchaseOrders(route):
let path = "/purchase-orders"
guard let route else { return path }
return "\(path)/\(route.path)"
case let .users(route):
let path = "/users"
guard let route else { return path }
return "\(path)/\(route.path)"
}
}
enum EmployeeRoute {
case create
case id(Employee.ID)
var path: String {
switch self {
case .create: return "create"
case let .id(id): return id.uuidString
}
}
}
enum PurchaseOrderRoute {
case create
case nextPage(PageMetadata)
// case search(SearchQuery? = nil)
//
var path: String {
switch self {
case .create:
return "create"
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)"
}
}
// 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 {
case create
case id(User.ID)
var path: String {
switch self {
case .create: return "create"
case let .id(id): return id.uuidString
}
}
}
}
enum HXTarget {
case body
case employee(EmployeeKey)
@@ -212,6 +112,7 @@ enum HXTarget {
}
}
// TODO: Move to MainPage
enum ViewRoute: String {
case employees