diff --git a/server/router/pages/components/invoice.templ b/server/router/pages/components/invoice.templ index b5aa5d2..d24b748 100644 --- a/server/router/pages/components/invoice.templ +++ b/server/router/pages/components/invoice.templ @@ -1,18 +1,18 @@ package components -import ( - "fmt" -) +import "fmt" templ Invoice(hash string, bolt11 string, msats int, expiresIn int, paid bool, redirectUrl templ.SafeURL) { -
-
-
Payment Required
-
@Qr(bolt11, "lightning:"+bolt11)
-
{ format(msats) }
- @InvoiceStatus(hash, expiresIn, paid, redirectUrl) -
- -
+ } templ InvoiceStatus(hash string, expiresIn int, paid bool, redirectUrl templ.SafeURL) { - if paid { -
PAID
-
- } - else if expiresIn <= 0 { -
EXPIRED
- } else { - -
- -
- } +
+ } } func format(msats int) string { - sats := msats / 1000 - if sats == 1 { - return fmt.Sprintf("%d sat", sats) - } - return fmt.Sprintf("%d sats", sats) -} \ No newline at end of file + sats := msats / 1000 + if sats == 1 { + return fmt.Sprintf("%d sat", sats) + } + return fmt.Sprintf("%d sats", sats) +} diff --git a/server/router/pages/components/marketForm.templ b/server/router/pages/components/marketForm.templ index 96b098e..9ca09a0 100644 --- a/server/router/pages/components/marketForm.templ +++ b/server/router/pages/components/marketForm.templ @@ -1,65 +1,64 @@ package components import ( - "git.ekzyis.com/ekzyis/delphi.market/types" - - "fmt" - "strconv" + "fmt" + "git.ekzyis.com/ekzyis/delphi.market/types" + "strconv" ) templ MarketForm(m types.Market, outcome int, q types.MarketQuote, uQ int) { -
- -
- -
{formatPrice(q.AvgPrice)}
- - - -
{formatPrice(q.TotalPrice)}
- -
+{formatPrice(q.Reward)}
- -
{ fmt.Sprint(uQ) }
- - +
+ +
+ +
{ formatPrice(q.AvgPrice) }
+ + + +
{ formatPrice(q.TotalPrice) }
+ +
+{ formatPrice(q.Reward) }
+ +
{ fmt.Sprint(uQ) }
+ +
} -func formId (outcome int) string { - return fmt.Sprintf("outcome-%d-form", outcome) +func formId(outcome int) string { + return fmt.Sprintf("outcome-%d-form", outcome) } -func inputId (outcome int) string { - return fmt.Sprintf("outcome-%d-q", outcome) +func inputId(outcome int) string { + return fmt.Sprintf("outcome-%d-q", outcome) } -func hxIndicator (outcome int) string { - return fmt.Sprintf( - "#%s>#p, #%s>#total, #%s>#reward", - formId(outcome), formId(outcome), formId(outcome)) +func hxIndicator(outcome int) string { + return fmt.Sprintf( + "#%s>#p, #%s>#total, #%s>#reward", + formId(outcome), formId(outcome), formId(outcome)) } func formatPrice(p float64) string { diff --git a/server/router/pages/index.templ b/server/router/pages/index.templ index 968525b..b5c4e99 100644 --- a/server/router/pages/index.templ +++ b/server/router/pages/index.templ @@ -1,10 +1,10 @@ package pages import ( + "fmt" c "git.ekzyis.com/ekzyis/delphi.market/server/router/context" "git.ekzyis.com/ekzyis/delphi.market/server/router/pages/components" "git.ekzyis.com/ekzyis/delphi.market/types" - "fmt" "github.com/dustin/go-humanize" ) @@ -30,14 +30,14 @@ templ Index(markets []types.Market) {
if ctx.Value(c.ReqPathContextKey).(string) == "/" {
- for _, m := range markets { - - { m.Question } -
{m.User.Name} / {humanize.Time(m.CreatedAt)} / {humanize.Time(m.EndDate)}
-
-
51%
-
0
- } + for _, m := range markets { + + { m.Question } +
{ m.User.Name } / { humanize.Time(m.CreatedAt) } / { humanize.Time(m.EndDate) }
+
+
51%
+
0
+ }
} else {
+ @components.Head() + hx-preserve + > @components.Nav()
@components.Figlet("random", "market")
{ m.Question }
-
{humanize.Time(m.EndDate)}
+
{ humanize.Time(m.EndDate) }
if m.Description != "" { @@ -29,7 +29,7 @@ templ Market(m types.Market, q0 types.MarketQuote, q1 types.MarketQuote, uQ0 int } else { <empty> } -
― {m.User.Name}, { humanize.Time(m.CreatedAt) }
+
― { m.User.Name }, { humanize.Time(m.CreatedAt) }
@@ -55,11 +55,9 @@ templ Market(m types.Market, q0 types.MarketQuote, q1 types.MarketQuote, uQ0 int @components.MarketForm(m, 0, q0, uQ0)
- -
+
@components.Modal(nil) @components.Footer() } -