From 2d567fcfa13e5913b1f50ad66dcfe57b0fd9f7fb Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Wed, 2 Oct 2019 13:17:39 -0500 Subject: [PATCH] Dont have to join competition to see leaderboard --- codebox/controllers/leaderboard/update.moon | 2 +- codebox/controllers/leaderboard/view.moon | 2 +- codebox/middleware/competition_started.moon | 5 ++++- codebox/middleware/during_competition.moon | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/codebox/controllers/leaderboard/update.moon b/codebox/controllers/leaderboard/update.moon index 1cab4ad..59efe8d 100644 --- a/codebox/controllers/leaderboard/update.moon +++ b/codebox/controllers/leaderboard/update.moon @@ -3,7 +3,7 @@ Leaderboard = require 'views.ssr.leaderboard' make_controller layout: false - middleware: { 'logged_in', 'joined_competition', 'competition_started' } + middleware: { 'logged_in', 'competition_started' } get: => @placements = @competition\get_leaderboard! diff --git a/codebox/controllers/leaderboard/view.moon b/codebox/controllers/leaderboard/view.moon index ae13b89..b5f59db 100644 --- a/codebox/controllers/leaderboard/view.moon +++ b/codebox/controllers/leaderboard/view.moon @@ -4,7 +4,7 @@ import capture_errors, capture_errors_json, yield_error from require 'lapis.appl import LeaderboardProblems, LeaderboardPlacements from require 'models' make_controller - middleware: { 'logged_in', 'joined_competition', 'competition_started' } + middleware: { 'logged_in', 'competition_started' } scripts: { 'leaderboard_update' } raw_scripts: { '/socket.io/socket.io.js' } diff --git a/codebox/middleware/competition_started.moon b/codebox/middleware/competition_started.moon index c816c21..ec0bb4b 100644 --- a/codebox/middleware/competition_started.moon +++ b/codebox/middleware/competition_started.moon @@ -2,7 +2,10 @@ import Competitions from require 'models' => unless @competition - @write json: 'No active competition' + @competition = Competitions\find active: true + + unless @competition + @write json: 'No active competition' current_time = os.time() start_time = @competition\get_start_time_num! diff --git a/codebox/middleware/during_competition.moon b/codebox/middleware/during_competition.moon index 1814f33..39afe61 100644 --- a/codebox/middleware/during_competition.moon +++ b/codebox/middleware/during_competition.moon @@ -2,7 +2,10 @@ import Competitions from require 'models' => unless @competition - @write json: 'No active competition' + @competition = Competitions\find active: true + + unless @competition + @write json: 'No active competition' current_time = os.time() start_time = @competition\get_start_time_num! -- 2.25.1