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

feat: Begins vendor views

Browse Source
This commit is contained in:
Michael Housh
2025-01-15 16:37:18 -05:00
parent 24570e7191
commit 6f2e87e886
13 changed files with 199 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Sources/App/Controllers/View/UsersViewController.swift
View File

@@ -77,125 +77,3 @@ struct UserViewController: RouteCollection {
}
}
}
// import Dependencies
// import Fluent
// import Vapor
//
// struct UserViewController: RouteCollection {
//
// @Dependency(\.users) var users
//
// private let api = UserApiController()
//
// func boot(routes: any RoutesBuilder) throws {
// let users = routes.protected.grouped("users")
// users.get(use: index(req:))
// users.post(use: create(req:))
// users.group(":id") {
// $0.get(use: details(req:))
// $0.delete(use: delete(req:))
// }
// }
//
// @Sendable
// func index(req: Request) async throws -> View {
// try await renderIndex(req)
// }
//
// @Sendable
// private func renderIndex(_ req: Request, _ user: User.DTO? = nil) async throws -> View {
// let users = try await api.getSortedUsers(req: req)
// return try await req.view.render("users/index", UsersCTX(user: user, users: users))
// }
//
// @Sendable
// func create(req: Request) async throws -> View {
// let user = try await api.create(req: req)
// return try await req.view.render("users/table-row", user)
// }
//
// @Sendable
// func details(req: Request) async throws -> View {
// let user = try await users.get(req.ensureIDPathComponent())
// // Check if the page has been rendered before.
// guard req.isHtmxRequest else {
// // Not an htmx-request, so render the whole page with the details.
// return try await renderIndex(req, user)
// }
// // An htmx-request header was present, so just return the details,
// return try await req.view.render("users/detail", ["user": user])
// }
//
// @Sendable
// func delete(req: Request) async throws -> View {
// _ = try await api.delete(req: req)
// return try await req.view.render("users/table", ["users": api.getSortedUsers(req: req)])
// }
// }
//
// struct UserFormCTX: Content {
// let htmxForm: HtmxFormCTX<Context>
//
// struct Context: Content {
// let showConfirmPassword: Bool
// let showEmailInput: Bool
// let buttonLabel: String
// }
//
// static func signIn(next: String?) -> Self {
// .init(
// htmxForm: .init(
// formClass: "user-form",
// formId: "user-form",
// htmxTargetUrl: .post("/login\((next != nil && next != "/") ? "?next=\(next!)" : "")"),
// htmxTarget: "user-table",
// htmxPushUrl: true,
// htmxResetAfterRequest: true,
// htmxSwapOob: nil,
// htmxSwap: .afterbegin,
// 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 user: User.DTO?
// let users: [User.DTO]
// let form: UserFormCTX
//
// init(
// user: User.DTO? = nil,
// users: [User.DTO],
// form: UserFormCTX? = nil
// ) {
// self.user = user
// self.users = users
// self.form = form ?? .create()
// }
// }
//
// private extension UserApiController {
//
// func getSortedUsers(req: Request) async throws -> [User.DTO] {
// try await index(req: req)
// .sorted { ($0.username ?? "") < ($1.username ?? "") }
// }
// }

3
Sources/App/DependenciesMiddleware.swift
View File

@@ -2,6 +2,9 @@ import DatabaseClientLive
import Dependencies
import Vapor
// Taken from discussions page on `swift-dependencies`.
// TODO: Pass dependencies to set into this middleware.
struct DependenciesMiddleware: AsyncMiddleware {
private let values: DependencyValues.Continuation

3
Sources/App/Views/Main.swift
View File

@@ -4,6 +4,7 @@ import ElementaryHTMX
struct MainPage<Inner: HTML>: SendableHTMLDocument where Inner: Sendable {
var title: String { "Purchase Orders" }
var lang: String { "en" }
let inner: Inner
let displayNav: Bool
@@ -56,7 +57,7 @@ struct RouteHeaderView: HTML {
div(.class("container"), .style("padding: 20px 20px;")) {
h1 { title }
br()
p { description }
p(.class("secondary")) { i { description } }
br()
}
}

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

@@ -19,20 +19,20 @@ struct UserDetail: HTML, Sendable {
) {
div(.class("row")) {
makeLabel(for: "username", value: "Username:")
input(.class("col-5"), .type(.text), .id("username"), .name("username"), .value(user.username), .required)
input(.class("col-4"), .type(.text), .id("username"), .name("username"), .value(user.username), .required)
makeLabel(for: "email", value: "Email:")
input(.class("col-5"), .type(.email), .id("email"), .name("email"), .value(user.email), .required)
input(.class("col-4"), .type(.email), .id("email"), .name("email"), .value(user.email), .required)
}
div(.class("row")) {
span(.class("label col-1")) { "Created:" }
span(.class("label col-2")) { "Created:" }
span(.class("date col-4")) { dateFormatter.formattedDate(user.createdAt) }
span(.class("label col-1")) { "Updated:" }
span(.class("label col-2")) { "Updated:" }
span(.class("date col-4")) { dateFormatter.formattedDate(user.updatedAt) }
}
div(.class("btn-row user-buttons")) {
button(
.type(.submit),
.style("background-color: blue; color: white;")
.class("btn-secondary")
) { "Update" }
Button.danger { "Delete" }
.attributes(
@@ -40,6 +40,7 @@ struct UserDetail: HTML, Sendable {
.hx.trigger(.event(.click)),
.hx.swap(.outerHTML),
.hx.target("#user_\(user.id)"),
.hx.confirm("Are you sure you want to delete this user?"),
.custom(name: "hx-on::after-request", value: "toggleContent('float'); window.location.href='/users';")
)
}
@@ -52,7 +53,7 @@ struct UserDetail: HTML, Sendable {
for name: String,
value: String
) -> some HTML {
label(.for(name), .class("col-1")) { span(.class("label")) { value } }
label(.for(name), .class("col-2")) { span(.class("label")) { value } }
}
func row(_ label: String, _ value: String) -> some HTML<HTMLTag.tr> {

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

@@ -1,6 +1,7 @@
import Elementary
import ElementaryHTMX
// Form used to login or create a new user.
struct UserForm: HTML, Sendable {
let context: Context
@@ -27,25 +28,31 @@ struct UserForm: HTML, Sendable {
value: "if(event.detail.successful) this.reset(); toggleContent('float');"
)
) {
input(.type(.text), .id("username"), .name("username"), .placeholder("Username"), .autofocus, .required)
br()
div(.class("row")) {
input(.type(.text), .id("username"), .name("username"), .placeholder("Username"), .autofocus, .required)
}
if context.showEmailInput {
input(.type(.email), .id("email"), .name("email"), .placeholder("Email"), .required)
br()
div(.class("row")) {
input(.type(.email), .id("email"), .name("email"), .placeholder("Email"), .required)
}
}
div(.class("row")) {
input(.type(.password), .id("password"), .name("password"), .placeholder("Password"), .required)
}
input(.type(.password), .id("password"), .name("password"), .placeholder("Password"), .required)
br()
if context.showConfirmPassword {
input(
.type(.password),
.id("confirmPassword"),
.name("confirmPassword"),
.placeholder("Confirm Password"),
.required
)
br()
div(.class("row")) {
input(
.type(.password),
.id("confirmPassword"),
.name("confirmPassword"),
.placeholder("Confirm Password"),
.required
)
}
}
div(.class("row")) {
button(.type(.submit), .class("btn-primary")) { context.buttonLabel }
}
input(.type(.submit), .value(context.buttonLabel))
}
}

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

@@ -44,15 +44,12 @@ struct UserTable: HTML {
td { user.username }
td { user.email }
td {
button(
Button.detail().attributes(
.hx.get("/users/\(user.id.uuidString)"),
.hx.target("#float"),
.hx.swap(.outerHTML),
.hx.pushURL(true),
.class("btn-detail")
) {
"〉"
}
.hx.pushURL(true)
)
}
}
}

10
Sources/App/Views/Buttons.swift → Sources/App/Views/Utils/Buttons.swift
View File

@@ -11,7 +11,7 @@ struct ToggleFormButton: HTML {
enum Button {
static func add() -> some HTML<HTMLTag.button> {
button(.class("btn-add")) { "+" }
button(.class("btn btn-add")) { "+" }
}
static func danger<C: HTML>(@HTMLBuilder body: () -> C) -> some HTML<HTMLTag.button> {
@@ -28,8 +28,14 @@ enum Button {
button(.class("btn-update")) { "Update" }
}
static func detail() -> some HTML<HTMLTag.button> {
button(.class("btn-detail")) {
"〉"
}
}
private static func makeOnClick(_ id: String, _ resetURL: String?) -> String {
var output = "toggleContent('\(id)');"
let output = "toggleContent('\(id)');"
if let resetURL {
return "\(output) window.location.href='\(resetURL)';"
}

0
Sources/App/Views/Float.swift → Sources/App/Views/Utils/Float.swift
View File

0
Sources/App/Views/Navbar.swift → Sources/App/Views/Utils/Navbar.swift
View File

15
Sources/App/Views/Vendors/VendorDetail.swift Normal file
View File

@@ -0,0 +1,15 @@
import Elementary
import ElementaryHTMX
import SharedModels
struct VendorDetail: HTML {
let vendor: Vendor?
var content: some HTML {
div(.class("container")) {
VendorForm(vendor: vendor)
// TODO: Branch table + form.
}
}
}

37
Sources/App/Views/Vendors/VendorForm.swift Normal file
View File

@@ -0,0 +1,37 @@
import Elementary
import ElementaryHTMX
import SharedModels
struct VendorForm: HTML {
let vendor: Vendor?
var content: some HTML<HTMLTag.form> {
form(
.id("vendor-form"),
vendor != nil ? .hx.put(targetURL) : .hx.post(targetURL),
.hx.target("this"),
.hx.swap(.outerHTML)
) {
div(.class("row")) {
input(
.id("vendor-name"),
.name("name"),
.value(vendor?.name ?? ""),
.placeholder("Vendor Name"),
.required
)
button(.type(.submit), .class("btn-primary")) { buttonLabel }
}
}
}
private var buttonLabel: String {
guard vendor != nil else { return "Update" }
return "Create"
}
var targetURL: String {
guard let vendor else { return "/vendors" }
return "/vendors/\(vendor.id)"
}
}

34
Sources/App/Views/Vendors/VendorTable.swift Normal file
View File

@@ -0,0 +1,34 @@
import Elementary
import ElementaryHTMX
import SharedModels
struct VendorTable: HTML {
let vendors: [Vendor]
var content: some HTML {
table {
thead {
th { "Name" }
th {}
th { Button.add() }
}
tbody(.id("vendor-table")) {
for vendor in vendors {
Row(vendor: vendor)
}
}
}
}
struct Row: HTML {
let vendor: Vendor
var content: some HTML<HTMLTag.tr> {
tr(.id("vendor_\(vendor.id)")) {
td { vendor.name.capitalized }
td { "(\(vendor.branches?.count ?? 0)) Branches" }
td {}
}
}
}
}