feat: Refactoring route declarations.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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?
|
||||
// }
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user