diff --git a/static/css/alliance_station_display.css b/static/css/alliance_station_display.css index f0961d8..6d37e61 100644 --- a/static/css/alliance_station_display.css +++ b/static/css/alliance_station_display.css @@ -44,6 +44,7 @@ body[data-mode=timeout] .mode#match { bottom: 0; left: 0; right: 0; + height: 80%; margin: auto auto; } diff --git a/static/css/audience_display.css b/static/css/audience_display.css index 52886c8..1f0300e 100644 --- a/static/css/audience_display.css +++ b/static/css/audience_display.css @@ -111,11 +111,11 @@ html { padding-top: 5px; padding-bottom: 5px; top: 30px; - height: 85px; + height: 80px; } #matchTime { position: relative; - top: 1px; + top: 11px; height: 60px; color: #222; font-family: "FuturaLTBold"; @@ -203,8 +203,8 @@ html { } #blindsLogo { position: relative; - top: 37px; - height: 185px; + top: 65px; + height: 160px; } #finalScore { position: fixed; diff --git a/static/img/frc-logo.png b/static/img/frc-logo.png index d2e97ed..26fe61e 100644 Binary files a/static/img/frc-logo.png and b/static/img/frc-logo.png differ diff --git a/static/js/audience_display.js b/static/js/audience_display.js index e877994..5894060 100644 --- a/static/js/audience_display.js +++ b/static/js/audience_display.js @@ -23,7 +23,7 @@ var overlayCenteringTopHideParams = {queue: false, top: overlayCenteringTopUp}; var overlayCenteringTopShowParams = {queue: false, top: "50px"}; var eventMatchInfoDown = "30px"; var eventMatchInfoUp = $("#eventMatchInfo").css("height"); -var logoUp = "10px"; +var logoUp = "15px"; var logoDown = $("#logo").css("top"); var scoreIn = $(".score").css("width"); var scoreMid = "135px"; diff --git a/web/scores.go b/web/scores.go index d056a4e..1363cfc 100644 --- a/web/scores.go +++ b/web/scores.go @@ -53,7 +53,6 @@ package web import ( "encoding/json" - "fmt" "github.com/Team254/cheesy-arena/field" "github.com/Team254/cheesy-arena/game" "io/ioutil" @@ -87,17 +86,16 @@ func (web *Web) getScoresHandler(w http.ResponseWriter, r *http.Request) { } func (web *Web) setScoresHandler(w http.ResponseWriter, r *http.Request) { - if web.arena.MatchState == field.PreMatch || web.arena.MatchState == field.TimeoutActive || web.arena.MatchState == field.PostTimeout { - fmt.Fprintf(w, "Score cannot be updated in this match state") - w.WriteHeader(http.StatusNotAcceptable) + if web.arena.MatchState == field.PreMatch || web.arena.MatchState == field.TimeoutActive || + web.arena.MatchState == field.PostTimeout { + http.Error(w, "Score cannot be updated in this match state", http.StatusBadRequest) return } var scores jsonScore reqBody, err := ioutil.ReadAll(r.Body) if err != nil { - fmt.Fprintf(w, "Score data missing") - w.WriteHeader(http.StatusNoContent) + handleWebErr(w, err) return } json.Unmarshal(reqBody, &scores) @@ -114,6 +112,4 @@ func (web *Web) setScoresHandler(w http.ResponseWriter, r *http.Request) { web.arena.BlueScore.TeleopPoints += scores.Blue.Teleop web.arena.BlueScore.EndgamePoints += scores.Blue.Endgame web.arena.RealtimeScoreNotifier.Notify() - - w.WriteHeader(http.StatusOK) } diff --git a/web/scores_test.go b/web/scores_test.go index 252b90e..c39d894 100644 --- a/web/scores_test.go +++ b/web/scores_test.go @@ -43,8 +43,8 @@ func TestPatchScores(t *testing.T) { web.arena.MatchState = field.PreMatch recorder = web.patchHttpResponse("/api/scores", "{}") - assert.Equal(t, 200, recorder.Code) - assert.Equal(t, recorder.Body.String(), "Score cannot be updated in this match state") + assert.Equal(t, 400, recorder.Code) + assert.Equal(t, "Score cannot be updated in this match state\n", recorder.Body.String()) score1 := game.TestScore1() score2 := game.TestScore2() @@ -85,8 +85,8 @@ func TestPutScores(t *testing.T) { web.arena.MatchState = field.PreMatch recorder = web.putHttpResponse("/api/scores", "{}") - assert.Equal(t, 200, recorder.Code) - assert.Equal(t, recorder.Body.String(), "Score cannot be updated in this match state") + assert.Equal(t, 400, recorder.Code) + assert.Equal(t, "Score cannot be updated in this match state\n", recorder.Body.String()) score1 := game.TestScore1() score2 := game.TestScore2()