NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 13:46:44 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Rename 'pit' display to 'rankings'.

Browse Source
This commit is contained in:
Patrick Fairbank
2022-08-20 20:03:55 -07:00
parent 996331d60c
commit c75baa8210
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/api.go
View File

@@ -113,7 +113,7 @@ func (web *Web) sponsorSlidesApiHandler(w http.ResponseWriter, r *http.Request)
}
}
// Generates a JSON dump of the qualification rankings, primarily for use by the pit display.
// Generates a JSON dump of the qualification rankings, primarily for use by the rankings display.
func (web *Web) rankingsApiHandler(w http.ResponseWriter, r *http.Request) {
rankings, err := web.arena.Database.GetAllRankings()
if err != nil {

14
web/pit_display.go → web/rankings_display.go
View File

@@ -1,7 +1,7 @@
// Copyright 2014 Team 254. All Rights Reserved.
// Author: pat@patfairbank.com (Patrick Fairbank)
//
// Web handlers for the pit rankings display.
// Web handlers for the rankings display.
package web
@@ -11,13 +11,13 @@ import (
"net/http"
)
// Renders the pit display which shows scrolling rankings.
func (web *Web) pitDisplayHandler(w http.ResponseWriter, r *http.Request) {
// Renders the display which shows scrolling rankings.
func (web *Web) rankingsDisplayHandler(w http.ResponseWriter, r *http.Request) {
if !web.enforceDisplayConfiguration(w, r, map[string]string{"scrollMsPerRow": "1000"}) {
return
}
template, err := web.parseFiles("templates/pit_display.html")
template, err := web.parseFiles("templates/rankings_display.html")
if err != nil {
handleWebErr(w, err)
return
@@ -25,15 +25,15 @@ func (web *Web) pitDisplayHandler(w http.ResponseWriter, r *http.Request) {
data := struct {
*model.EventSettings
}{web.arena.EventSettings}
err = template.ExecuteTemplate(w, "pit_display.html", data)
err = template.ExecuteTemplate(w, "rankings_display.html", data)
if err != nil {
handleWebErr(w, err)
return
}
}
// The websocket endpoint for the pit display, used only to force reloads remotely.
func (web *Web) pitDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
// The websocket endpoint for the rankings display, used only to force reloads remotely.
func (web *Web) rankingsDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
display, err := web.registerDisplay(r)
if err != nil {
handleWebErr(w, err)

10
web/pit_display_test.go → web/rankings_display_test.go
View File

@@ -10,20 +10,20 @@ import (
"testing"
)
func TestPitDisplay(t *testing.T) {
func TestRankingsDisplay(t *testing.T) {
web := setupTestWeb(t)
recorder := web.getHttpResponse("/displays/pit?displayId=1&scrollMsPerRow=700")
recorder := web.getHttpResponse("/displays/rankings?displayId=1&scrollMsPerRow=700")
assert.Equal(t, 200, recorder.Code)
assert.Contains(t, recorder.Body.String(), "Pit Display - Untitled Event - Cheesy Arena")
assert.Contains(t, recorder.Body.String(), "Rankings Display - Untitled Event - Cheesy Arena")
}
func TestPitDisplayWebsocket(t *testing.T) {
func TestRankingsDisplayWebsocket(t *testing.T) {
web := setupTestWeb(t)
server, wsUrl := web.startTestServer()
defer server.Close()
conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/displays/pit/websocket?displayId=1", nil)
conn, _, err := gorillawebsocket.DefaultDialer.Dial(wsUrl+"/displays/rankings/websocket?displayId=1", nil)
assert.Nil(t, err)
defer conn.Close()
ws := websocket.NewTestWebsocket(conn)

4
web/web.go
View File

@@ -132,10 +132,10 @@ func (web *Web) newHandler() http.Handler {
router.HandleFunc("/displays/audience/websocket", web.audienceDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/field_monitor", web.fieldMonitorDisplayHandler).Methods("GET")
router.HandleFunc("/displays/field_monitor/websocket", web.fieldMonitorDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/pit", web.pitDisplayHandler).Methods("GET")
router.HandleFunc("/displays/pit/websocket", web.pitDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/queueing", web.queueingDisplayHandler).Methods("GET")
router.HandleFunc("/displays/queueing/websocket", web.queueingDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/rankings", web.rankingsDisplayHandler).Methods("GET")
router.HandleFunc("/displays/rankings/websocket", web.rankingsDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/twitch", web.twitchDisplayHandler).Methods("GET")
router.HandleFunc("/displays/twitch/websocket", web.twitchDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/login", web.loginHandler).Methods("GET")