Adding randomize feature
This commit is contained in:
parent
f4e631f972
commit
488a9e08c1
@ -16,6 +16,5 @@ This app is intended to be simple, the initial loading of the state is done usin
|
|||||||
|
|
||||||
TODO:
|
TODO:
|
||||||
|
|
||||||
- We need a randomize teams feature
|
- Need to be able to lock names....
|
||||||
- Bessere Kontrolle be namechange
|
- nicht immer das ganze feld clearen nach nem namechange
|
||||||
- nicht immer das ganze feld klearen nach nem namechange
|
|
||||||
|
18
app.js
18
app.js
@ -7,6 +7,7 @@ bodyParser = require('body-parser'),
|
|||||||
socketio = require('socket.io'),
|
socketio = require('socket.io'),
|
||||||
session = require('express-session'),
|
session = require('express-session'),
|
||||||
low = require('lowdb');
|
low = require('lowdb');
|
||||||
|
_ = require('lodash');
|
||||||
|
|
||||||
let config = low('config.json');
|
let config = low('config.json');
|
||||||
let db = low('db.json');
|
let db = low('db.json');
|
||||||
@ -30,6 +31,15 @@ let resetState = {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function doubleArray(input) {
|
||||||
|
var array = [];
|
||||||
|
while(input.length > 0) {
|
||||||
|
array.push([input[0], input[1]]);
|
||||||
|
input = input.splice(2, input.length);
|
||||||
|
}
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
// view engine setup
|
// view engine setup
|
||||||
app.set('views', path.join(__dirname, 'views'));
|
app.set('views', path.join(__dirname, 'views'));
|
||||||
app.set('view engine', 'hbs');
|
app.set('view engine', 'hbs');
|
||||||
@ -98,6 +108,14 @@ io.on('connection', function (socket) {
|
|||||||
io.emit('clientrefresh');
|
io.emit('clientrefresh');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
socket.on('randomizeTeams', function () {
|
||||||
|
console.log("Randomizing teams");
|
||||||
|
state.teams = doubleArray(_.shuffle(_.flatten(state.teams)));
|
||||||
|
db.setState(state);
|
||||||
|
io.emit('stateChange', state); // Push state to all clients
|
||||||
|
console.log("updated state");
|
||||||
|
});
|
||||||
|
|
||||||
socket.on('editState', function (newState) {
|
socket.on('editState', function (newState) {
|
||||||
state = newState;
|
state = newState;
|
||||||
db.setState(state);
|
db.setState(state);
|
||||||
|
3196
package-lock.json
generated
Normal file
3196
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -13,6 +13,7 @@
|
|||||||
"express": "~4.13.1",
|
"express": "~4.13.1",
|
||||||
"express-session": "^1.15.1",
|
"express-session": "^1.15.1",
|
||||||
"hbs": "~3.1.0",
|
"hbs": "~3.1.0",
|
||||||
|
"lodash": "^4.17.11",
|
||||||
"lowdb": "^0.16.0",
|
"lowdb": "^0.16.0",
|
||||||
"morgan": "~1.6.1",
|
"morgan": "~1.6.1",
|
||||||
"serve-favicon": "~2.3.0",
|
"serve-favicon": "~2.3.0",
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
// This is the backend client js
|
// This is the backend client js
|
||||||
var iosocket = io.connect();
|
var iosocket = io.connect();
|
||||||
|
|
||||||
var tbdLable = 'To be determined',
|
var tbdLabel = 'To be determined',
|
||||||
noTeam = 'Kein Team';
|
noTeam = 'Kein Team';
|
||||||
|
|
||||||
// setup all my handlers
|
// setup all my handlers
|
||||||
@ -102,9 +102,12 @@ $(function() {
|
|||||||
// Dom is loaded
|
// Dom is loaded
|
||||||
$('#refresh').click(function() {
|
$('#refresh').click(function() {
|
||||||
iosocket.emit('clientrefresh');
|
iosocket.emit('clientrefresh');
|
||||||
|
});
|
||||||
|
$('#randomize').click(function() {
|
||||||
|
iosocket.emit('randomizeTeams');
|
||||||
});
|
});
|
||||||
// Reading config (not state) from dom... and after all jquery is a doomed dom lib
|
// Reading config (not state) from dom... and after all jquery is a doomed dom lib
|
||||||
tbdLable = $('#TBD').val();
|
tbdLabel = $('#TBD').val();
|
||||||
noTeam = $('#NoT').val();
|
noTeam = $('#NoT').val();
|
||||||
|
|
||||||
// get my state
|
// get my state
|
||||||
|
@ -1,23 +1,23 @@
|
|||||||
'use strict';
|
"use strict";
|
||||||
|
|
||||||
var iosocket = io.connect();
|
var iosocket = io.connect();
|
||||||
|
|
||||||
var tbdLable = 'To be determined',
|
var tbdLabel = "To be determined",
|
||||||
noTeam = 'Kein Team';
|
noTeam = "Kein Team";
|
||||||
|
|
||||||
// setup all my handlers
|
// setup all my handlers
|
||||||
iosocket.on('clientrefresh', function(){
|
iosocket.on("clientrefresh", function() {
|
||||||
location.reload();
|
location.reload();
|
||||||
});
|
});
|
||||||
|
|
||||||
iosocket.on('stateChange', function(state){
|
iosocket.on("stateChange", function(state) {
|
||||||
console.log(state);
|
console.log(state);
|
||||||
// basically the server tracks the state since it is the same for al clients
|
// basically the server tracks the state since it is the same for al clients
|
||||||
// So we know that we HAVE to update at this point
|
// So we know that we HAVE to update at this point
|
||||||
$('#team-container').bracket({
|
$("#team-container").bracket({
|
||||||
init: state,
|
init: state,
|
||||||
decorator: {
|
decorator: {
|
||||||
edit: function(){},
|
edit: function() {},
|
||||||
render: render_fn
|
render: render_fn
|
||||||
},
|
},
|
||||||
teamWidth: 130,
|
teamWidth: 130,
|
||||||
@ -30,26 +30,25 @@ iosocket.on('stateChange', function(state){
|
|||||||
function render_fn(container, data, score, state) {
|
function render_fn(container, data, score, state) {
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case "empty-bye":
|
case "empty-bye":
|
||||||
container.append(noTeam)
|
container.append(noTeam);
|
||||||
return;
|
return;
|
||||||
case "empty-tbd":
|
case "empty-tbd":
|
||||||
container.append(tbdLable)
|
container.append(tbdLabel);
|
||||||
return;
|
return;
|
||||||
case "entry-no-score":
|
case "entry-no-score":
|
||||||
console.log('no score');// no return
|
console.log("no score"); // no return
|
||||||
case "entry-default-win":
|
case "entry-default-win":
|
||||||
console.log('default win');// no return
|
console.log("default win"); // no return
|
||||||
case "entry-complete":
|
case "entry-complete":
|
||||||
container.append(data);
|
container.append(data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
$( document ).ready(function() {
|
tbdLabel = $("#TBD").val();
|
||||||
tbdLable = $('#TBD').val();
|
noTeam = $("#NoT").val();
|
||||||
noTeam = $('#NoT').val();
|
|
||||||
// get my state
|
// get my state
|
||||||
var context = 'main';
|
var context = "main";
|
||||||
iosocket.emit('loadState',context);
|
iosocket.emit("loadState", context);
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
|
||||||
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>Admin Interface</title>
|
<title>Admin Interface</title>
|
||||||
<link rel='stylesheet' href='/css/bootstrap.min.css' />
|
<link rel='stylesheet' href='/css/bootstrap.min.css' />
|
||||||
@ -13,8 +14,9 @@
|
|||||||
<script type='text/javascript' src='/socket.io/socket.io.js'></script>
|
<script type='text/javascript' src='/socket.io/socket.io.js'></script>
|
||||||
|
|
||||||
<script type='text/javascript' src='/js/back_client.js'></script>
|
<script type='text/javascript' src='/js/back_client.js'></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
|
||||||
|
<body>
|
||||||
|
|
||||||
<h1>{{mainHeader}}</h1>
|
<h1>{{mainHeader}}</h1>
|
||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
@ -23,12 +25,15 @@
|
|||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<button id="refresh" class="btn btn-warning"> Refresh Clients!</button>
|
<br> <br> <br> <br>
|
||||||
|
<button id="refresh" class="btn btn-warning"> Refresh Clients!</button><br><br>
|
||||||
|
<button id="randomize" class="btn btn-warning"> Randomize Teams!</button><br>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<input id="TBD" type="hidden" value="{{TBD}}">
|
<input id="TBD" type="hidden" value="{{TBD}}">
|
||||||
<input id="NoT" type="hidden" value="{{NoTeam}}">
|
<input id="NoT" type="hidden" value="{{NoTeam}}">
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user