itDisplay token after user flag submission - scoreboard - Interactive scoreboard for CTF-like games Err z3bra.org 70 hgit clone git://git.z3bra.org/scoreboard.git URL:git://git.z3bra.org/scoreboard.git z3bra.org 70 1Log /scm/scoreboard/log.gph z3bra.org 70 1Files /scm/scoreboard/files.gph z3bra.org 70 1Refs /scm/scoreboard/refs.gph z3bra.org 70 i--- Err z3bra.org 70 1commit 3f2e8d5a04c80bf53ecdfc6c4d855e2816be1624 /scm/scoreboard/commit/3f2e8d5a04c80bf53ecdfc6c4d855e2816be1624.gph z3bra.org 70 1parent 5c9d5d6fc331ae6b72ce6ceed2c24444efc45135 /scm/scoreboard/commit/5c9d5d6fc331ae6b72ce6ceed2c24444efc45135.gph z3bra.org 70 hAuthor: Willy Goiffon URL:mailto:contact@z3bra.org z3bra.org 70 iDate: Tue, 22 Aug 2023 16:24:56 +0200 Err z3bra.org 70 i Err z3bra.org 70 iDisplay token after user flag submission Err z3bra.org 70 i Err z3bra.org 70 iDiffstat: Err z3bra.org 70 i M main.go | 7 +++---- Err z3bra.org 70 i M ui.go | 11 ++++++++--- Err z3bra.org 70 i Err z3bra.org 70 i2 files changed, 11 insertions(+), 7 deletions(-) Err z3bra.org 70 i--- Err z3bra.org 70 1diff --git a/main.go b/main.go /scm/scoreboard/file/main.go.gph z3bra.org 70 it@@ -47,7 +47,7 @@ type Application struct { Err z3bra.org 70 i app *tview.Application Err z3bra.org 70 i html string Err z3bra.org 70 i pages *tview.Pages Err z3bra.org 70 i- frame *tview.Grid Err z3bra.org 70 i+ frame *tview.Frame Err z3bra.org 70 i board *tview.Flex Err z3bra.org 70 i player *Player Err z3bra.org 70 i } Err z3bra.org 70 it@@ -120,8 +120,8 @@ func pageBoard() tview.Primitive { Err z3bra.org 70 i cyboard.SetupFrame() Err z3bra.org 70 i cyboard.DrawBoard() Err z3bra.org 70 i Err z3bra.org 70 i- // center frame on screen, counting borders + header Err z3bra.org 70 i- return center(BOARD_WIDTH + 2, BOARD_HEIGHT + 4, cyboard.frame) Err z3bra.org 70 i+ // center frame on screen, counting borders + header + footer Err z3bra.org 70 i+ return center(BOARD_WIDTH + 2, BOARD_HEIGHT + 7, cyboard.frame) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func main() { Err z3bra.org 70 it@@ -159,7 +159,6 @@ func main() { Err z3bra.org 70 i cyboard.html = *html Err z3bra.org 70 i cyboard.app = tview.NewApplication() Err z3bra.org 70 i cyboard.pages = tview.NewPages() Err z3bra.org 70 i- cyboard.frame = tview.NewGrid() Err z3bra.org 70 i cyboard.board = tview.NewFlex() Err z3bra.org 70 i cyboard.player = &Player{ db: cyboard.db } Err z3bra.org 70 i Err z3bra.org 70 1diff --git a/ui.go b/ui.go /scm/scoreboard/file/ui.go.gph z3bra.org 70 it@@ -73,13 +73,16 @@ func RankTable(offset, limit, rank int, fill bool) *tview.Table { Err z3bra.org 70 i Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) SetupFrame() { Err z3bra.org 70 i- a.frame. Err z3bra.org 70 i+ Err z3bra.org 70 i+ var grid = tview.NewGrid(). Err z3bra.org 70 i SetColumns(BOARD_WIDTH). Err z3bra.org 70 i SetRows(1, BOARD_HEIGHT). Err z3bra.org 70 i SetBorders(true) Err z3bra.org 70 i Err z3bra.org 70 i- a.frame.AddItem(BoardHeader(), 0, 0, 1, 1, 1, BOARD_WIDTH, false) Err z3bra.org 70 i- a.frame.AddItem(a.board, 1, 0, 1, 1, BOARD_HEIGHT, BOARD_WIDTH, true) Err z3bra.org 70 i+ grid.AddItem(BoardHeader(), 0, 0, 1, 1, 1, BOARD_WIDTH, false) Err z3bra.org 70 i+ grid.AddItem(a.board, 1, 0, 1, 1, BOARD_HEIGHT, BOARD_WIDTH, true) Err z3bra.org 70 i+ Err z3bra.org 70 i+ a.frame = tview.NewFrame(grid) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) DrawBoard() { Err z3bra.org 70 it@@ -93,6 +96,8 @@ func (a *Application) HighlightBoard(line int) { Err z3bra.org 70 i SetDirection(tview.FlexRow). Err z3bra.org 70 i AddItem(RankTable(0, -1, 0, true).Select(line - 1, 0), BOARD_HEIGHT, 1, true) Err z3bra.org 70 i a.app.SetFocus(a.board) Err z3bra.org 70 i+ Err z3bra.org 70 i+ a.frame.AddText(fmt.Sprintf("🔑 %s", a.player.token), false, tview.AlignCenter, 0) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i func (a *Application) NewPlayer(rank int) { Err z3bra.org 70 .