From 65f8f09114446547f7a795ccf95e7e0989e522e7 Mon Sep 17 00:00:00 2001 From: ItsNotGoodName Date: Thu, 14 Sep 2023 03:25:28 -0700 Subject: [PATCH] fix(web): multiple ui issues --- web/components/layout.templ | 4 +- web/components/layout_templ.go | 4 +- web/components/rule_form.templ | 2 +- web/components/rule_form_templ.go | 2 +- web/components/table_order_th.templ | 10 ++-- web/components/table_order_th_templ.go | 62 +++++++++++++++---- web/pages/envelope.templ | 82 ++++++++++++++------------ web/pages/envelope_templ.go | 75 ++++++++++++----------- 8 files changed, 147 insertions(+), 94 deletions(-) diff --git a/web/components/layout.templ b/web/components/layout.templ index 007342f0..abe36536 100644 --- a/web/components/layout.templ +++ b/web/components/layout.templ @@ -9,15 +9,13 @@ import ( templ LayoutDefault(m meta.Meta) {
-
-
+
@Header(m)
{ children... }
@Footer()
-
    diff --git a/web/components/layout_templ.go b/web/components/layout_templ.go index 762dce8e..2f6fb210 100644 --- a/web/components/layout_templ.go +++ b/web/components/layout_templ.go @@ -28,7 +28,7 @@ func LayoutDefault(m meta.Meta) templ.Component { var_1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, err = templBuffer.WriteString("
    ") + _, err = templBuffer.WriteString("
    ") if err != nil { return err } @@ -52,7 +52,7 @@ func LayoutDefault(m meta.Meta) templ.Component { if err != nil { return err } - _, err = templBuffer.WriteString("
    • ") + _, err = templBuffer.WriteString("
    • ") if err != nil { return err } diff --git a/web/components/rule_form.templ b/web/components/rule_form.templ index 01806f59..2d6f1e1b 100644 --- a/web/components/rule_form.templ +++ b/web/components/rule_form.templ @@ -111,7 +111,7 @@ templ RuleFormUpdate(props RuleFormUpdateProps) { if props.Rule.Internal {
      @icons.Alert("h-6 w-6") - Cannot be edited because it is an internal rule. + Rule cannot be edited because it is internal.
      } diff --git a/web/components/rule_form_templ.go b/web/components/rule_form_templ.go index c7ab335a..3df90c3a 100644 --- a/web/components/rule_form_templ.go +++ b/web/components/rule_form_templ.go @@ -408,7 +408,7 @@ func RuleFormUpdate(props RuleFormUpdateProps) templ.Component { if err != nil { return err } - var_17 := `Cannot be edited because it is an internal rule.` + var_17 := `Rule cannot be edited because it is internal.` _, err = templBuffer.WriteString(var_17) if err != nil { return err diff --git a/web/components/table_order_th.templ b/web/components/table_order_th.templ index 13883bd6..380d3794 100644 --- a/web/components/table_order_th.templ +++ b/web/components/table_order_th.templ @@ -23,12 +23,14 @@ func tableOrderTHAscending(enable, ascending bool) string { templ TableOrderTH(props TableOrderTHProps) { { children... } - if props.Order == props.Field { - if props.Ascending { + if props.Ascending { +
      @icons.ArrowUpS("h-4 w-4") - } else { +
      + } else { +
      @icons.ArrowDownS("h-4 w-4") - } +
      }       } diff --git a/web/components/table_order_th_templ.go b/web/components/table_order_th_templ.go index f79e249c..1917d642 100644 --- a/web/components/table_order_th_templ.go +++ b/web/components/table_order_th_templ.go @@ -59,17 +59,57 @@ func TableOrderTH(props TableOrderTHProps) templ.Component { if err != nil { return err } - if props.Order == props.Field { - if props.Ascending { - err = icons.ArrowUpS("h-4 w-4").Render(ctx, templBuffer) - if err != nil { - return err - } - } else { - err = icons.ArrowDownS("h-4 w-4").Render(ctx, templBuffer) - if err != nil { - return err - } + if props.Ascending { + var var_3 = []any{templ.KV("opacity-0", props.Order != props.Field)} + err = templ.RenderCSSItems(ctx, templBuffer, var_3...) + if err != nil { + return err + } + _, err = templBuffer.WriteString("
      ") + if err != nil { + return err + } + err = icons.ArrowUpS("h-4 w-4").Render(ctx, templBuffer) + if err != nil { + return err + } + _, err = templBuffer.WriteString("
      ") + if err != nil { + return err + } + } else { + var var_4 = []any{templ.KV("opacity-0", props.Order != props.Field)} + err = templ.RenderCSSItems(ctx, templBuffer, var_4...) + if err != nil { + return err + } + _, err = templBuffer.WriteString("
      ") + if err != nil { + return err + } + err = icons.ArrowDownS("h-4 w-4").Render(ctx, templBuffer) + if err != nil { + return err + } + _, err = templBuffer.WriteString("
      ") + if err != nil { + return err } } _, err = templBuffer.WriteString("") diff --git a/web/pages/envelope.templ b/web/pages/envelope.templ index d2940481..6aa75774 100644 --- a/web/pages/envelope.templ +++ b/web/pages/envelope.templ @@ -40,7 +40,7 @@ templ envelopeView(m meta.Meta, props envelopeViewProps) { To - + for _, to := range props.Envelope.Message.To { { to } @@ -62,7 +62,7 @@ templ envelopeView(m meta.Meta, props envelopeViewProps) {