From 340ab1236ed954fd67c4545ee01d210815a7b356 Mon Sep 17 00:00:00 2001 From: Julian Appel Date: Mon, 6 May 2024 21:51:13 +0200 Subject: [PATCH] Cleanup --- scoreboard/controllers/timer.js | 6 ++---- scoreboard/public/stylesheets/style.css | 4 +++- scoreboard/routes/index.js | 17 ++++++----------- scoreboard/views/index.hbs | 14 +++++++------- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/scoreboard/controllers/timer.js b/scoreboard/controllers/timer.js index 6ae4e7b..93c4cf7 100644 --- a/scoreboard/controllers/timer.js +++ b/scoreboard/controllers/timer.js @@ -2,10 +2,8 @@ const moment = require('moment'); const io = require('./socketio') let timerInterval; -// let duration = moment.duration(7, 'minutes'); // Initial duration -// let durationLeft = moment.duration(7, 'minutes'); // durationLeft after the timer has been started -let duration = moment.duration(7, 'seconds'); -let durationLeft = moment.duration(10, 'seconds'); +let duration = moment.duration(7, 'minutes'); // Initial duration +let durationLeft = moment.duration(7, 'minutes'); // durationLeft after the timer has been started let isPaused = true; // Status of the timer diff --git a/scoreboard/public/stylesheets/style.css b/scoreboard/public/stylesheets/style.css index 635bfbe..3fbbe08 100644 --- a/scoreboard/public/stylesheets/style.css +++ b/scoreboard/public/stylesheets/style.css @@ -6,6 +6,7 @@ html, body { body { /* padding: 50px; */ font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; + background-color: #47BAEA; } a { @@ -17,7 +18,8 @@ a { font-family: 'Seven Segment', sans-serif; font-weight: bold; height: 100%; - font-size: 50vh + font-size: 50vh; + } .score { diff --git a/scoreboard/routes/index.js b/scoreboard/routes/index.js index 15ae2bd..f5dde8d 100644 --- a/scoreboard/routes/index.js +++ b/scoreboard/routes/index.js @@ -3,23 +3,18 @@ var router = express.Router(); let io = require('../controllers/socketio') const timer = require('../controllers/timer') - - - /* GET home page. */ router.get('/', function(req, res, next) { - res.render('index', { durationLeft: timer.print()}); + res.render('index', { durationLeft: timer.print()}); }); io.on('connection', (socket) => { - console.log("A user connected"); - socket.emit("Hello user from server"); - - socket.on('message', (message) => { - console.log(message) - }) - + console.log("A user connected"); + socket.emit("Hello user from server"); + socket.on('message', (message) => { + console.log(message) + }) }) diff --git a/scoreboard/views/index.hbs b/scoreboard/views/index.hbs index d8fa528..349ecd5 100644 --- a/scoreboard/views/index.hbs +++ b/scoreboard/views/index.hbs @@ -8,19 +8,19 @@ -
+
{{ durationLeft }}
-
-
-

L
LLLLLLLLLLLLLL
L
+
+
+

Team A

-
+
5:2
-
-

R
R
RRRRRRRRRRRRR
+
+

Team B