Merge branch 'master' of https://git.jappel.io/jappel/scoreboard-js
Konflikt in scoreboard/controllers/cli.js zugunsten der Remote-Version aufgeloest: openBrowser()/killBrowser() bleiben erhalten, da routes/admin.js sie verwendet. Der lokale Testcode wurde verworfen (er rief zudem das child_process-Modul faelschlich als Funktion auf). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
commit
c4325ae8ac
19 changed files with 546 additions and 78 deletions
|
|
@ -2,14 +2,19 @@ var express = require('express');
|
|||
var router = express.Router();
|
||||
let io = require('../controllers/socketio');
|
||||
|
||||
const score = require("../controllers/score");
|
||||
const score = require('../controllers/score');
|
||||
const etc = require('../controllers/etc');
|
||||
|
||||
/* GET home page. */
|
||||
router.get('/', function(req, res, next) {
|
||||
if (score.getEnabled()) { // If scoreboard is enabled
|
||||
res.render('indexScore', {}); // Render the site with scoreboard
|
||||
} else { // If scoreboard is not enabled
|
||||
res.render('index', {}); // Render the site without scoreboard
|
||||
if(etc.getSplashscreen()) { // If splashscreen is enabled
|
||||
res.render('splashscreen', {}); // Render splashscreen
|
||||
} else {
|
||||
if (score.getEnabled()) { // If scoreboard is enabled
|
||||
res.render('indexScore', {}); // Render the site with scoreboard
|
||||
} else { // If scoreboard is not enabled
|
||||
res.render('index', {}); // Render the site without scoreboard
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue