Added multi team function to config, added colors for administration, fixed annoying slide down animation on reload
This commit is contained in:
@@ -4,14 +4,30 @@ const config = require('./config.json');
|
|||||||
|
|
||||||
console.log(colors.cyan(config.about.logo.join('\n')));
|
console.log(colors.cyan(config.about.logo.join('\n')));
|
||||||
|
|
||||||
process.stdout.write("--Importing Modules--");
|
process.stdout.write(colors.yellow("[*] Importing Modules "));
|
||||||
//IMPORTS GO HERE
|
//IMPORTS GO HERE
|
||||||
process.stdout.write("\r--Modules Imported--\n");
|
process.stdout.write(colors.green("\r[+] Modules Imported \n"));
|
||||||
|
|
||||||
var webserv = require('./services/webservers.js');
|
var webserv = require('./services/webservers.js');
|
||||||
|
|
||||||
|
//Figure out which team is active
|
||||||
|
var team = 0;
|
||||||
|
var numActive = 0;
|
||||||
|
for(var i = 0; i < config.teamcfg.teams.length; i++){
|
||||||
|
if(config.teamcfg.teams[i].active == "1"){
|
||||||
|
numActive++;
|
||||||
|
team = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(numActive != 1){
|
||||||
|
console.log(colors.red("* Fix Active Team Settings in config!"));
|
||||||
|
process.exit();
|
||||||
|
} else{
|
||||||
|
console.log(colors.yellow("[*] Using Active team " + colors.cyan(config.teamcfg.teams[team].name)));
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(colors.yellow("[*] Loaded " + config.flags.length + " flags!"));
|
||||||
|
|
||||||
// Mark Starting Time for Team
|
// Mark Starting Time for Team
|
||||||
fs.appendFileSync('correctlog.txt', "(" + config.teamcfg.name + ")" + " Start (" + Date.now() + ')\n');
|
fs.appendFileSync('correctlog.txt', "(" + config.teamcfg.name + ")" + " Start (" + Date.now() + ')\n');
|
||||||
|
webserv.rundashserver(config.servercfg.dashboard.bindaddr, config.servercfg.dashboard.bindport,config.flags,config.teamcfg.teams[team].name);
|
||||||
//console.log(config.flags.length);
|
|
||||||
webserv.rundashserver(config.servercfg.dashboard.bindaddr, config.servercfg.dashboard.bindport,config.flags,config.teamcfg.name);
|
|
||||||
+5
-1
@@ -20,7 +20,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"teamcfg" : {
|
"teamcfg" : {
|
||||||
"name" : "cyber123"
|
"teams" : [
|
||||||
|
{"name":"cyber1", "active":"1"},
|
||||||
|
{"name":"cyber2", "active":"0"},
|
||||||
|
{"name":"cyber3", "active":"0"}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"flags" : [
|
"flags" : [
|
||||||
{"flag":"cyber1", "value":"1"},
|
{"flag":"cyber1", "value":"1"},
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
(cyber123) Start (1575342565506)
|
|
||||||
(cyber123) Got flag: cyber1 (1575342572438)
|
|
||||||
(cyber123) Got flag: cyber2 (1575342577464)
|
|
||||||
(cyber123) Start (1575342601020)
|
|
||||||
(cyber123) Got flag: cyber1 (1575342605576)
|
|
||||||
(cyber123) Got flag: cyber1 (1575342607951)
|
|
||||||
(cyber123) Start (1575344060035)
|
|
||||||
(cyber123) Start (1575344124316)
|
|
||||||
|
|||||||
@@ -200,10 +200,16 @@ th {
|
|||||||
.box-menu { margin:0 auto; background-color:#FFFFFF; border-radius: 25px 10px 25px 10px; box-shadow: 2px 5px 25px #000000; }
|
.box-menu { margin:0 auto; background-color:#FFFFFF; border-radius: 25px 10px 25px 10px; box-shadow: 2px 5px 25px #000000; }
|
||||||
|
|
||||||
.slide-bottom {
|
.slide-bottom {
|
||||||
-webkit-animation: slide-bottom 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
|
position: absolute;
|
||||||
animation: slide-bottom 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
-moz-transform: translateX(-50%) translateY(-50%);
|
||||||
|
-webkit-transform: translateX(-50%) translateY(-50%);
|
||||||
|
transform: translateX(-50%) translateY(-50%);
|
||||||
|
/*-webkit-animation: slide-bottom 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
|
||||||
|
animation: slide-bottom 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;*/
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
@-webkit-keyframes slide-bottom {
|
@-webkit-keyframes slide-bottom {
|
||||||
0% {
|
0% {
|
||||||
-webkit-transform: translateY(0);
|
-webkit-transform: translateY(0);
|
||||||
@@ -223,7 +229,7 @@ th {
|
|||||||
-webkit-transform: translateY(50%);
|
-webkit-transform: translateY(50%);
|
||||||
transform: translateY(50%);
|
transform: translateY(50%);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
|
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
|
||||||
|
|||||||
Reference in New Issue
Block a user