From 3fdac1f9b6b956e0e9c5e0aa5143332dc08bdcca Mon Sep 17 00:00:00 2001 From: "niklastasler@gmail.com" Date: Fri, 29 Dec 2023 15:16:47 +0100 Subject: [PATCH] feat: mobile ui for rounds --- internal/skat/skat.go | 9 ++ templates/GameDetails.templ | 11 +- templates/GameDetails_templ.go | 16 +- templates/GameOverview.templ | 2 +- templates/GameOverview_templ.go | 2 +- templates/components/game_card.templ | 2 +- templates/components/game_card_templ.go | 2 +- templates/components/rounds_grid.templ | 80 ++++++++-- templates/components/rounds_grid_templ.go | 166 ++++++++++++++++++--- templates/components/rounds_table.templ | 54 ++++--- templates/components/rounds_table_templ.go | 10 +- 11 files changed, 275 insertions(+), 79 deletions(-) diff --git a/internal/skat/skat.go b/internal/skat/skat.go index 53526b4..84e0007 100644 --- a/internal/skat/skat.go +++ b/internal/skat/skat.go @@ -1,6 +1,7 @@ package skat import ( + "fmt" "slices" "github.com/tarow/skat-counter/internal/skat/gen/model" @@ -32,6 +33,14 @@ func (g Game) GetTotalPlayerScore(player model.Player) int32 { return sum } +func (g Game) FormatTotalPlayerPayment(player model.Player) string { + return fmt.Sprintf("%.2f €", float32(g.GetTotalPlayerScore(player))*g.Stake/float32(100)) +} + +func (g Game) FormatTotalPayment() string { + return fmt.Sprintf("%.2f €", float32(g.GetTotalPayment())/float32(100)) +} + func (g Game) GetTotalPayment() float32 { sum := int32(0) for _, player := range g.Players { diff --git a/templates/GameDetails.templ b/templates/GameDetails.templ index 4cc76df..81518d2 100644 --- a/templates/GameDetails.templ +++ b/templates/GameDetails.templ @@ -5,7 +5,7 @@ import "github.com/tarow/skat-counter/templates/components" import "fmt" templ GameDetailsNavbar() { -
+
@@ -18,14 +18,15 @@ templ GameDetailsNavbar() { templ GameDetails (game skat.Game) { @Base() { +
@GameDetailsNavbar() -
-
-
+
+
+
-
+
@component.RoundGrid(game)
diff --git a/templates/GameDetails_templ.go b/templates/GameDetails_templ.go index 5fd1179..ca574ad 100644 --- a/templates/GameDetails_templ.go +++ b/templates/GameDetails_templ.go @@ -27,7 +27,7 @@ func GameDetailsNavbar() templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -74,19 +74,23 @@ func GameDetails(game skat.Game) templ.Component { templ_7745c5c3_Buffer = templ.GetBuffer() defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - templ_7745c5c3_Err = GameDetailsNavbar().Render(ctx, templ_7745c5c3_Buffer) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = GameDetailsNavbar().Render(ctx, templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"none\" hx-select-oob=\"#gamecard:outerHTML,#roundlist:outerHTML\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -94,7 +98,7 @@ func GameDetails(game skat.Game) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/templates/GameOverview.templ b/templates/GameOverview.templ index f0aa18e..23292f3 100644 --- a/templates/GameOverview.templ +++ b/templates/GameOverview.templ @@ -4,7 +4,7 @@ import "github.com/tarow/skat-counter/internal/skat" import "github.com/tarow/skat-counter/templates/components" templ GameOverviewNavbar() { -
+
diff --git a/templates/GameOverview_templ.go b/templates/GameOverview_templ.go index 43e00da..4990636 100644 --- a/templates/GameOverview_templ.go +++ b/templates/GameOverview_templ.go @@ -26,7 +26,7 @@ func GameOverviewNavbar() templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/templates/components/game_card.templ b/templates/components/game_card.templ index 9e4a2db..6f70022 100644 --- a/templates/components/game_card.templ +++ b/templates/components/game_card.templ @@ -83,7 +83,7 @@ templ GameCard(game skat.Game, detailsBtn, editBtn, deleteBtn bool) { hx-target="#content" hx-trigger="confirmed" _="on click call Swal.fire({title: 'Are you sure?', text:'Deletion cannot be undone', icon: 'question', showCancelButton: true, width: 300}) - if result.isConfirmed trigger confirmed" + if result.isConfirmed trigger confirmed" > diff --git a/templates/components/game_card_templ.go b/templates/components/game_card_templ.go index 8f87937..e360f1a 100644 --- a/templates/components/game_card_templ.go +++ b/templates/components/game_card_templ.go @@ -158,7 +158,7 @@ func GameCard(game skat.Game, detailsBtn, editBtn, deleteBtn bool) templ.Compone if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#content\" hx-trigger=\"confirmed\" _=\"on click call Swal.fire({title: 'Are you sure?', text:'Deletion cannot be undone', icon: 'question', showCancelButton: true, width: 300})\n if result.isConfirmed trigger confirmed\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#content\" hx-trigger=\"confirmed\" _=\"on click call Swal.fire({title: 'Are you sure?', text:'Deletion cannot be undone', icon: 'question', showCancelButton: true, width: 300})\n if result.isConfirmed trigger confirmed\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/templates/components/rounds_grid.templ b/templates/components/rounds_grid.templ index e54b23d..d547a16 100644 --- a/templates/components/rounds_grid.templ +++ b/templates/components/rounds_grid.templ @@ -2,28 +2,86 @@ package component import "github.com/tarow/skat-counter/internal/skat" import "github.com/tarow/skat-counter/internal/skat/gen/model" +import "fmt" -templ RoundCard(players []model.Player, round skat.Round, roundNumber int) { +templ RoundEntry(players []model.Player, round skat.Round, roundNumber int) {
-
-

Round { toString(roundNumber+1) }

- +
+
+
+ { toString(round.Value) } +
+
+

Round { toString(roundNumber + 1) }

+
+ + +
for _, player := range players {
{ player.Name }: { formatRoundScore(round.GetRoundScore(player)) }
}
-
+
+} + +templ TotalEntry(game skat.Game) { +
+
+
+
{ toString(game.FormatTotalPayment()) }
+
+

Total

+
+
+
+ for _, player := range game.Players { +
+
+
{ player.Name }
+
{ game.FormatTotalPlayerPayment(player) }
+
Score: { toString(game.GetTotalPlayerScore(player)) }
+
+
+ } +
} templ RoundGrid(game skat.Game) { -
- for idx, round := range game.Rounds { - @RoundCard(game.Players, round, idx) - } +
+
+ for idx, round := range game.Rounds { +
+ @RoundEntry(game.Players, round, idx) +
+
+ } +
+
+ @TotalEntry(game) +
} diff --git a/templates/components/rounds_grid_templ.go b/templates/components/rounds_grid_templ.go index f480297..2a166c0 100644 --- a/templates/components/rounds_grid_templ.go +++ b/templates/components/rounds_grid_templ.go @@ -12,8 +12,9 @@ import "bytes" import "github.com/tarow/skat-counter/internal/skat" import "github.com/tarow/skat-counter/internal/skat/gen/model" +import "fmt" -func RoundCard(players []model.Player, round skat.Round, roundNumber int) templ.Component { +func RoundEntry(players []model.Player, round skat.Round, roundNumber int) templ.Component { return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) if !templ_7745c5c3_IsBuffer { @@ -26,21 +27,46 @@ func RoundCard(players []model.Player, round skat.Round, roundNumber int) templ. templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Var2 := `Round ` - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2) + var templ_7745c5c3_Var2 string = toString(round.Value) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var3 string = toString(roundNumber + 1) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + templ_7745c5c3_Var3 := `Round ` + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string = toString(roundNumber + 1) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -49,18 +75,18 @@ func RoundCard(players []model.Player, round skat.Round, roundNumber int) templ. if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var4 string = player.Name - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + var templ_7745c5c3_Var5 string = player.Name + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Var5 := `: ` - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) + templ_7745c5c3_Var6 := `: ` + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var6 string = formatRoundScore(round.GetRoundScore(player)) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + var templ_7745c5c3_Var7 string = formatRoundScore(round.GetRoundScore(player)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -69,7 +95,91 @@ func RoundCard(players []model.Player, round skat.Round, roundNumber int) templ. return templ_7745c5c3_Err } } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) + } + return templ_7745c5c3_Err + }) +} + +func TotalEntry(game skat.Game) templ.Component { + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var8 := templ.GetChildren(ctx) + if templ_7745c5c3_Var8 == nil { + templ_7745c5c3_Var8 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var9 string = toString(game.FormatTotalPayment()) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Var10 := `Total` + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for _, player := range game.Players { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var11 string = player.Name + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var12 string = game.FormatTotalPlayerPayment(player) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Var13 := `Score: ` + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var14 string = toString(game.GetTotalPlayerScore(player)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -88,22 +198,38 @@ func RoundGrid(game skat.Game) templ.Component { defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var7 := templ.GetChildren(ctx) - if templ_7745c5c3_Var7 == nil { - templ_7745c5c3_Var7 = templ.NopComponent + templ_7745c5c3_Var15 := templ.GetChildren(ctx) + if templ_7745c5c3_Var15 == nil { + templ_7745c5c3_Var15 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } for idx, round := range game.Rounds { - templ_7745c5c3_Err = RoundCard(game.Players, round, idx).Render(ctx, templ_7745c5c3_Buffer) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = RoundEntry(game.Players, round, idx).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = TotalEntry(game).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/templates/components/rounds_table.templ b/templates/components/rounds_table.templ index 8e6b5d7..e085968 100644 --- a/templates/components/rounds_table.templ +++ b/templates/components/rounds_table.templ @@ -26,33 +26,31 @@ templ RoundsTable(game skat.Game) { } { fmt.Sprintf("%v", round.Value) } - + > + + + + +
} @@ -69,9 +67,9 @@ templ RoundsTable(game skat.Game) { Payment for _, player := range game.Players { - { fmt.Sprintf("%.2f €", float32(game.GetTotalPlayerScore(player))*game.Stake / float32(100)) } + { game.FormatTotalPlayerPayment(player) } } - { fmt.Sprintf("%.2f €", float32(game.GetTotalPayment()) / float32(100)) } + { game.FormatTotalPayment() } diff --git a/templates/components/rounds_table_templ.go b/templates/components/rounds_table_templ.go index e32d805..c742920 100644 --- a/templates/components/rounds_table_templ.go +++ b/templates/components/rounds_table_templ.go @@ -105,7 +105,7 @@ func RoundsTable(game skat.Game) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#content\" hx-trigger=\"confirmed\" _=\"on click call Swal.fire({title: 'Are you sure?', text:'Deletion cannot be undone', icon: 'question', showCancelButton: true, width: 300})\n if result.isConfirmed trigger confirmed\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -172,7 +172,7 @@ func RoundsTable(game skat.Game) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var11 string = fmt.Sprintf("%.2f €", float32(game.GetTotalPlayerScore(player))*game.Stake/float32(100)) + var templ_7745c5c3_Var11 string = game.FormatTotalPlayerPayment(player) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err @@ -186,7 +186,7 @@ func RoundsTable(game skat.Game) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var12 string = fmt.Sprintf("%.2f €", float32(game.GetTotalPayment())/float32(100)) + var templ_7745c5c3_Var12 string = game.FormatTotalPayment() _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err