From b16d297b4f31a8afb223239a442c4a8e623a88d1 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Tue, 17 Sep 2019 17:51:16 -0500 Subject: [PATCH] Added messages when the competition has not begun or finished --- codebox/middleware/competition_started.moon | 2 +- codebox/middleware/during_competition.moon | 4 ++-- codebox/views/competition/Tupfile | 1 + codebox/views/competition/finished.moon | 6 ++++++ codebox/views/competition/not_started.moon | 7 +++++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 codebox/views/competition/Tupfile create mode 100644 codebox/views/competition/finished.moon create mode 100644 codebox/views/competition/not_started.moon diff --git a/codebox/middleware/competition_started.moon b/codebox/middleware/competition_started.moon index b04ed9d..bee3a2f 100644 --- a/codebox/middleware/competition_started.moon +++ b/codebox/middleware/competition_started.moon @@ -11,4 +11,4 @@ import Competitions from require 'models' start_time = time_to_number @competition.start unless start_time <= current_time - @write '

Competition has not begun

' \ No newline at end of file + @write render: 'competition.not_started' \ No newline at end of file diff --git a/codebox/middleware/during_competition.moon b/codebox/middleware/during_competition.moon index a5a2303..51b4e48 100644 --- a/codebox/middleware/during_competition.moon +++ b/codebox/middleware/during_competition.moon @@ -12,6 +12,6 @@ import Competitions from require 'models' end_time = time_to_number @competition.end unless start_time <= current_time - @write '

Competition has not begun

' + @write render: 'competition.not_started' unless current_time <= end_time - @write '

Competition has ended

' \ No newline at end of file + @write render: 'competition.finished' \ No newline at end of file diff --git a/codebox/views/competition/Tupfile b/codebox/views/competition/Tupfile new file mode 100644 index 0000000..71f051b --- /dev/null +++ b/codebox/views/competition/Tupfile @@ -0,0 +1 @@ +include_rules \ No newline at end of file diff --git a/codebox/views/competition/finished.moon b/codebox/views/competition/finished.moon new file mode 100644 index 0000000..a1695a1 --- /dev/null +++ b/codebox/views/competition/finished.moon @@ -0,0 +1,6 @@ +html = require 'lapis.html' + +class CompetitionFinished extends html.Widget + content: => + h1 'Competition has ended' + h3 style: 'text-align: center', -> text "Ended at #{@competition.end}" \ No newline at end of file diff --git a/codebox/views/competition/not_started.moon b/codebox/views/competition/not_started.moon new file mode 100644 index 0000000..6d7d2b6 --- /dev/null +++ b/codebox/views/competition/not_started.moon @@ -0,0 +1,7 @@ +html = require 'lapis.html' + +class CompetitionNotStarted extends html.Widget + content: => + h1 'Competition has not started' + + h3 style: 'text-align: center', -> text "Starts at #{@competition.start}" \ No newline at end of file -- 2.25.1