WIP: Initial effective length views.

This commit is contained in:
2026-01-01 18:41:48 -05:00
parent 95d35f0392
commit 8fe650e142
7 changed files with 145 additions and 16 deletions

View File

@@ -93,6 +93,8 @@ extension EffectiveLength {
} }
} }
// TODO: Add total effective length field so that we can lookup / compare which one is
// the longest for a given project.
final class EffectiveLengthModel: Model, @unchecked Sendable { final class EffectiveLengthModel: Model, @unchecked Sendable {
static let schema = "effective_length" static let schema = "effective_length"

View File

@@ -132,6 +132,7 @@ extension SiteRoute.View.FrictionRateRoute {
extension SiteRoute.View { extension SiteRoute.View {
public enum EffectiveLengthRoute: Equatable, Sendable { public enum EffectiveLengthRoute: Equatable, Sendable {
case field(FieldType)
case form(dismiss: Bool = false) case form(dismiss: Bool = false)
case index case index
@@ -152,6 +153,23 @@ extension SiteRoute.View {
Field("dismiss", default: false) { Bool.parser() } Field("dismiss", default: false) { Bool.parser() }
} }
} }
Route(.case(Self.field)) {
Path {
rootPath
"field"
}
Method.get
Query {
Field("type") { FieldType.parser() }
}
}
} }
} }
} }
extension SiteRoute.View.EffectiveLengthRoute {
public enum FieldType: String, CaseIterable, Equatable, Sendable {
case straightLength
case group
}
}

View File

@@ -1,10 +1,28 @@
import Elementary import Elementary
public struct Input: HTML, Sendable { public struct Input: HTML, Sendable {
let id: String
let id: String?
let name: String? let name: String?
let placeholder: String let placeholder: String
private var _name: String {
guard let name else {
return id ?? ""
}
return name
}
init(
id: String? = nil,
name: String? = nil,
placeholder: String
) {
self.id = id
self.name = name
self.placeholder = placeholder
}
public init( public init(
id: String, id: String,
name: String? = nil, name: String? = nil,
@@ -15,9 +33,16 @@ public struct Input: HTML, Sendable {
self.placeholder = placeholder self.placeholder = placeholder
} }
public init(
name: String,
placeholder: String
) {
self.init(id: nil, name: name, placeholder: placeholder)
}
public var body: some HTML<HTMLTag.input> { public var body: some HTML<HTMLTag.input> {
input( input(
.id(id), .name(name ?? id), .placeholder(placeholder), .id(id ?? ""), .name(_name), .placeholder(placeholder),
.class( .class(
""" """
w-full rounded-md bg-white px-3 py-1.5 text-slate-900 outline-1 w-full rounded-md bg-white px-3 py-1.5 text-slate-900 outline-1

View File

@@ -15,11 +15,16 @@ public struct SVG: HTML, Sendable {
extension SVG { extension SVG {
public enum Key: Sendable { public enum Key: Sendable {
case circlePlus
case close case close
case squarePen case squarePen
var svg: String { var svg: String {
switch self { switch self {
case .circlePlus:
return """
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-plus-icon lucide-circle-plus"><circle cx="12" cy="12" r="10"/><path d="M8 12h8"/><path d="M12 8v8"/></svg>
"""
case .close: case .close:
return """ return """
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-x-icon lucide-x"><path d="M18 6 6 18"/><path d="m6 6 12 12"/></svg> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-x-icon lucide-x"><path d="M18 6 6 18"/><path d="m6 6 12 12"/></svg>

View File

@@ -101,6 +101,14 @@ extension SiteRoute.View.EffectiveLengthRoute {
return div(.id("effectiveLengthForm")) {} return div(.id("effectiveLengthForm")) {}
} }
return EffectiveLengthForm() return EffectiveLengthForm()
case .field(let type):
switch type {
case .straightLength:
return StraightLengthField()
case .group:
return GroupField()
}
} }
} }
} }

View File

@@ -18,11 +18,55 @@ struct EffectiveLengthForm: HTML, Sendable {
) { ) {
h1(.class("text-2xl font-bold")) { "Effective Length" } h1(.class("text-2xl font-bold")) { "Effective Length" }
form(.class("space-y-4 p-4")) { form(.class("space-y-4 p-4")) {
// FIX: Add fields div {
label(.for("name")) { "Name" }
Input(id: "name", placeholder: "Name")
.attributes(.type(.text), .required, .autofocus)
}
div {
label(.for("type")) { "Type" }
// FIX: Add select field.
select(
.id("type"), .name("type"),
.class("w-full border rounded-md")
) {
option(.value("supply")) { "Supply" }
option(.value("return")) { "Return" }
}
}
Row {
Label { "Straigth Lengths" }
button(
.type(.button),
.hx.get(route: .effectiveLength(.field(.straightLength))),
.hx.target("#straightLengths"),
.hx.swap(.beforeEnd)
) {
SVG(.circlePlus)
}
}
div(.id("straightLengths")) {
StraightLengthField()
}
Row {
Label { "Groups" }
button(
.type(.button),
.hx.get(route: .effectiveLength(.field(.group))),
.hx.target("#groups"),
.hx.swap(.beforeEnd)
) {
SVG(.circlePlus)
}
}
div(.id("groups"), .class("space-y-4")) {
GroupField()
}
Row { Row {
div {} div {}
div { div(.class("space-x-4")) {
CancelButton() CancelButton()
.attributes( .attributes(
.hx.get(route: .effectiveLength(.form(dismiss: true))), .hx.get(route: .effectiveLength(.form(dismiss: true))),
@@ -36,3 +80,38 @@ struct EffectiveLengthForm: HTML, Sendable {
} }
} }
} }
struct StraightLengthField: HTML, Sendable {
let value: Int?
init(value: Int? = nil) {
self.value = value
}
var body: some HTML<HTMLTag.div> {
div(.class("pb-4")) {
Input(
name: "straightLengths[]",
placeholder: "Length"
)
.attributes(.type(.number), .min("0"))
}
}
}
struct GroupField: HTML, Sendable {
var body: some HTML {
Row {
Input(name: "group[][group]", placeholder: "Group")
.attributes(.type(.number), .min("0"))
Input(name: "group[][letter]", placeholder: "Letter")
.attributes(.type(.text))
Input(name: "group[][length]", placeholder: "Length")
.attributes(.type(.number), .min("0"))
Input(name: "group[][quantity]", placeholder: "Quantity")
.attributes(.type(.number), .min("1"), .value("1"))
}
.attributes(.class("space-x-2"))
}
}

View File

@@ -9,11 +9,7 @@ struct EffectiveLengthsView: HTML, Sendable {
var body: some HTML { var body: some HTML {
div( div(
.class( .class("m-4")
"""
m-4
"""
)
) { ) {
Row { Row {
h1(.class("text-2xl font-bold")) { "Effective Lengths" } h1(.class("text-2xl font-bold")) { "Effective Lengths" }
@@ -29,11 +25,7 @@ struct EffectiveLengthsView: HTML, Sendable {
div( div(
.id("effectiveLengths"), .id("effectiveLengths"),
.class( .class("space-y-6")
"""
border border-gray-200 rounded-lg shadow-lg
"""
)
) { ) {
for row in effectiveLengths { for row in effectiveLengths {
EffectiveLengthView(effectiveLength: row) EffectiveLengthView(effectiveLength: row)
@@ -63,7 +55,7 @@ struct EffectiveLengthsView: HTML, Sendable {
div( div(
.class( .class(
""" """
pb-6 border border-gray-200 rounded-lg shadow-lg p-4
""" """
) )
) { ) {
@@ -99,7 +91,7 @@ struct EffectiveLengthsView: HTML, Sendable {
Number(Double(straightLengthsTotal) + groupsTotal, digits: 0) Number(Double(straightLengthsTotal) + groupsTotal, digits: 0)
.attributes(.class("text-xl font-bold")) .attributes(.class("text-xl font-bold"))
} }
.attributes(.class("border border-gray-200")) .attributes(.class("border-b border-t border-gray-200"))
} }
} }
} }