aboutsummaryrefslogtreecommitdiffhomepage
path: root/backend/admin
diff options
context:
space:
mode:
Diffstat (limited to 'backend/admin')
-rw-r--r--backend/admin/handler.go91
-rw-r--r--backend/admin/renderer.go2
-rw-r--r--backend/admin/templates/audio.html14
-rw-r--r--backend/admin/templates/base.html2
-rw-r--r--backend/admin/templates/dashboard.html3
-rw-r--r--backend/admin/templates/game_edit.html16
-rw-r--r--backend/admin/templates/games.html11
7 files changed, 53 insertions, 86 deletions
diff --git a/backend/admin/handler.go b/backend/admin/handler.go
index a685d16..3e185ea 100644
--- a/backend/admin/handler.go
+++ b/backend/admin/handler.go
@@ -12,30 +12,29 @@ import (
"github.com/jackc/pgx/v5/pgtype"
"github.com/labstack/echo/v4"
- "github.com/nsfisis/iosdc-japan-2024-albatross/backend/account"
- "github.com/nsfisis/iosdc-japan-2024-albatross/backend/auth"
- "github.com/nsfisis/iosdc-japan-2024-albatross/backend/db"
+ "github.com/nsfisis/phperkaigi-2025-albatross/backend/account"
+ "github.com/nsfisis/phperkaigi-2025-albatross/backend/auth"
+ "github.com/nsfisis/phperkaigi-2025-albatross/backend/db"
)
const (
- basePath = "/iosdc-japan/2024/code-battle"
+ basePath = "/phperkaigi/2025/code-battle"
)
var jst = time.FixedZone("Asia/Tokyo", 9*60*60)
type Handler struct {
- q *db.Queries
- hubs GameHubsInterface
+ q *db.Queries
+ hub GameHubInterface
}
-type GameHubsInterface interface {
- StartGame(gameID int) error
-}
+// TODO
+type GameHubInterface any
-func NewHandler(q *db.Queries, hubs GameHubsInterface) *Handler {
+func NewHandler(q *db.Queries, hub GameHubInterface) *Handler {
return &Handler{
- q: q,
- hubs: hubs,
+ q: q,
+ hub: hub,
}
}
@@ -69,7 +68,7 @@ func (h *Handler) RegisterHandlers(g *echo.Group) {
g.GET("/games", h.getGames)
g.GET("/games/:gameID", h.getGameEdit)
g.POST("/games/:gameID", h.postGameEdit)
- g.GET("/audio", h.getAudioTest)
+ g.POST("/games/:gameID/start", h.postGameStart)
}
func (h *Handler) getDashboard(c echo.Context) error {
@@ -151,20 +150,20 @@ func (h *Handler) postUserFetchIcon(c echo.Context) error {
}
func (h *Handler) getGames(c echo.Context) error {
- rows, err := h.q.ListGames(c.Request().Context())
+ rows, err := h.q.ListAllGames(c.Request().Context())
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
games := make([]echo.Map, len(rows))
for i, g := range rows {
var startedAt string
- if !g.StartedAt.Valid {
+ if g.StartedAt.Valid {
startedAt = g.StartedAt.Time.In(jst).Format("2006-01-02T15:04")
}
games[i] = echo.Map{
"GameID": g.GameID,
"GameType": g.GameType,
- "State": g.State,
+ "IsPublic": g.IsPublic,
"DisplayName": g.DisplayName,
"DurationSeconds": g.DurationSeconds,
"StartedAt": startedAt,
@@ -193,7 +192,7 @@ func (h *Handler) getGameEdit(c echo.Context) error {
}
var startedAt string
- if !row.StartedAt.Valid {
+ if row.StartedAt.Valid {
startedAt = row.StartedAt.Time.In(jst).Format("2006-01-02T15:04")
}
@@ -203,7 +202,7 @@ func (h *Handler) getGameEdit(c echo.Context) error {
"Game": echo.Map{
"GameID": row.GameID,
"GameType": row.GameType,
- "State": row.State,
+ "IsPublic": row.IsPublic,
"DisplayName": row.DisplayName,
"DurationSeconds": row.DurationSeconds,
"StartedAt": startedAt,
@@ -217,16 +216,9 @@ func (h *Handler) postGameEdit(c echo.Context) error {
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, "Invalid game id")
}
- row, err := h.q.GetGameByID(c.Request().Context(), int32(gameID))
- if err != nil {
- if errors.Is(err, pgx.ErrNoRows) {
- return echo.NewHTTPError(http.StatusNotFound)
- }
- return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
- }
gameType := c.FormValue("game_type")
- state := c.FormValue("state")
+ isPublic := c.FormValue("is_public") == "public"
displayName := c.FormValue("display_name")
durationSeconds, err := strconv.Atoi(c.FormValue("duration_seconds"))
if err != nil {
@@ -268,7 +260,7 @@ func (h *Handler) postGameEdit(c echo.Context) error {
err = h.q.UpdateGame(c.Request().Context(), db.UpdateGameParams{
GameID: int32(gameID),
GameType: gameType,
- State: state,
+ IsPublic: isPublic,
DisplayName: displayName,
DurationSeconds: int32(durationSeconds),
StartedAt: changedStartedAt,
@@ -278,36 +270,27 @@ func (h *Handler) postGameEdit(c echo.Context) error {
return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
}
- {
- // TODO:
- if state != row.State && state == "starting" {
- err := h.hubs.StartGame(int(gameID))
- if err != nil {
- return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
- }
- }
- }
-
return c.Redirect(http.StatusSeeOther, basePath+"/admin/games")
}
-func (h *Handler) getAudioTest(c echo.Context) error {
- return c.Render(http.StatusOK, "audio", echo.Map{
- "BasePath": basePath,
- "Title": "Audio Test",
- "Audio": []echo.Map{
- {"FileName": "EX_33.wav", "Label": "終了"},
- {"FileName": "EX_34.wav", "Label": "勝敗1"},
- {"FileName": "EX_35.wav", "Label": "勝敗2"},
- {"FileName": "EX_36.wav", "Label": "グッド1"},
- {"FileName": "EX_37.wav", "Label": "グッド2"},
- {"FileName": "EX_38.wav", "Label": "グッド3"},
- {"FileName": "EX_39.wav", "Label": "グッド4"},
- {"FileName": "EX_40.wav", "Label": "スコア更新1"},
- {"FileName": "EX_41.wav", "Label": "スコア更新2"},
- {"FileName": "EX_42.wav", "Label": "スコア更新3"},
- {"FileName": "EX_43.wav", "Label": "コンパイルエラー1"},
- {"FileName": "EX_44.wav", "Label": "コンパイルエラー2"},
+func (h *Handler) postGameStart(c echo.Context) error {
+ gameID, err := strconv.Atoi(c.Param("gameID"))
+ if err != nil {
+ return echo.NewHTTPError(http.StatusBadRequest, "Invalid game id")
+ }
+
+ startedAt := time.Now().Add(11 * time.Second)
+
+ err = h.q.UpdateGameStartedAt(c.Request().Context(), db.UpdateGameStartedAtParams{
+ GameID: int32(gameID),
+ StartedAt: pgtype.Timestamp{
+ Time: startedAt,
+ Valid: true,
},
})
+ if err != nil {
+ return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+ }
+
+ return c.Redirect(http.StatusSeeOther, basePath+"/admin/games")
}
diff --git a/backend/admin/renderer.go b/backend/admin/renderer.go
index d38c701..ba9dba9 100644
--- a/backend/admin/renderer.go
+++ b/backend/admin/renderer.go
@@ -27,7 +27,7 @@ func NewRenderer() *Renderer {
}
}
-func (r *Renderer) Render(w io.Writer, name string, data interface{}, _ echo.Context) error {
+func (r *Renderer) Render(w io.Writer, name string, data any, _ echo.Context) error {
tmpl, ok := r.templates[name]
if !ok {
t, err := template.ParseFS(templatesFS, "templates/base.html", "templates/"+name+".html")
diff --git a/backend/admin/templates/audio.html b/backend/admin/templates/audio.html
deleted file mode 100644
index 21ec463..0000000
--- a/backend/admin/templates/audio.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ template "base.html" . }}
-
-{{ define "breadcrumb" }}
-<a href="{{ .BasePath }}/admin/dashboard">Dashboard</a>
-{{ end }}
-
-{{ define "content" }}
- {{ range .Audio }}
- <figure>
- <figcaption>{{ .Label }}</figcaption>
- <audio controls src="{{ $.BasePath }}/files/audio/{{ .FileName }}"></audio>
- </figure>
- {{ end }}
-{{ end }}
diff --git a/backend/admin/templates/base.html b/backend/admin/templates/base.html
index 8e71194..08c7dc5 100644
--- a/backend/admin/templates/base.html
+++ b/backend/admin/templates/base.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>ADMIN {{ .Title }} | iOSDC Japan 2024 Albatross.swift</title>
+ <title>ADMIN {{ .Title }} | PHPerKaigi 2025 Albatross</title>
<link rel="icon" href="{{ .BasePath }}/favicon.svg">
<link rel="stylesheet" href="{{ .BasePath }}/admin/css/normalize.css">
<link rel="stylesheet" href="{{ .BasePath }}/admin/css/sakura.css">
diff --git a/backend/admin/templates/dashboard.html b/backend/admin/templates/dashboard.html
index 0f1fbaf..15b10ff 100644
--- a/backend/admin/templates/dashboard.html
+++ b/backend/admin/templates/dashboard.html
@@ -7,9 +7,6 @@
<p>
<a href="{{ .BasePath }}/admin/games">Games</a>
</p>
-<p>
- <a href="{{ .BasePath }}/admin/audio">Audio Test</a>
-</p>
<form method="post" action="{{ .BasePath }}/logout">
<button type="submit">Logout</button>
</form>
diff --git a/backend/admin/templates/game_edit.html b/backend/admin/templates/game_edit.html
index 48a0625..3b9d9de 100644
--- a/backend/admin/templates/game_edit.html
+++ b/backend/admin/templates/game_edit.html
@@ -22,13 +22,10 @@
</select>
</div>
<div>
- <label>State</label>
- <select name="state" required>
- <option value="closed"{{ if eq .Game.State "closed" }} selected{{ end }}>Closed</option>
- <option value="waiting"{{ if eq .Game.State "waiting" }} selected{{ end }}>Waiting</option>
- <option value="starting"{{ if eq .Game.State "starting" }} selected{{ end }}>Starting</option>
- <option value="gaming"{{ if eq .Game.State "gaming" }} selected{{ end }}>Gaming</option>
- <option value="finished"{{ if eq .Game.State "finished" }} selected{{ end }}>Finished</option>
+ <label>Is Public</label>
+ <select name="is_public" required>
+ <option value="public"{{ if .Game.IsPublic }} selected{{ end }}>Public</option>
+ <option value="private"{{ if not .Game.IsPublic }} selected{{ end }}>Private</option>
</select>
</div>
<div>
@@ -37,7 +34,7 @@
</div>
<div>
<label>Started At</label>
- <input type="datetime-local" name="started_at" value="{{ if .Game.StartedAt }}{{ .Game.StartedAt }}{{ end }}">
+ <input type="datetime-local" name="started_at" value="{{ if .Game.StartedAt }}{{ .Game.StartedAt }}{{ end }}" readonly>
</div>
<div>
<label>Problem ID</label>
@@ -46,5 +43,8 @@
<div>
<button type="submit">Save</button>
</div>
+ <div>
+ <button type="submit" formaction="{{ .BasePath }}/admin/games/{{ .Game.GameID }}/start">Start</button>
+ </div>
</form>
{{ end }}
diff --git a/backend/admin/templates/games.html b/backend/admin/templates/games.html
index 9dd9cae..3be6726 100644
--- a/backend/admin/templates/games.html
+++ b/backend/admin/templates/games.html
@@ -9,13 +9,14 @@
{{ range .Games }}
<li>
<a href="{{ $.BasePath }}/admin/games/{{ .GameID }}">
- {{ .DisplayName }} (id={{ .GameID }} type={{ .GameType }} state={{ .State }})
+ {{ .DisplayName }} (id={{ .GameID }} type={{ .GameType }} {{ if not .IsPublic }}private{{ end }})
</a>
<ul>
- {{ if and (ne .State "closed") (ne .State "finished") }}
- <li>
- <a href="{{ $.BasePath }}/golf/{{ .GameID }}/watch">Watch</a>
- </li>
+ {{ if .IsPublic }}
+ <li><a href="{{ $.BasePath }}/golf/{{ .GameID }}/play">Play</a></li>
+ {{ end }}
+ {{ if .IsPublic }}
+ <li><a href="{{ $.BasePath }}/golf/{{ .GameID }}/watch">Watch</a></li>
{{ end }}
</ul>
</li>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-01 18:26:34 +0000