Added a scoreboard

This commit is contained in:
Charles Truluck 2015-12-26 01:36:55 -05:00
parent 6f84bf7aa1
commit 18be30194b
8 changed files with 57 additions and 20 deletions

3
.gitignore vendored
View file

@ -1,5 +1,6 @@
.vagrant .vagrant
.secret_key .secret_key
.bundle/config
# Object files # Object files
*.o *.o
@ -42,4 +43,4 @@ ehthumbs.db
a.out a.out
*.project *.project
*.class *.class
*.pyc *.pyc

View file

@ -13,7 +13,7 @@ server {
# } # }
# Put all the pages here so Angular doesn't fail. # Put all the pages here so Angular doesn't fail.
location ~^/(about|login|register)$ { location ~^/(about|login|register|scoreboard)$ {
default_type text/html; default_type text/html;
try_files /index.html /index.html; try_files /index.html /index.html;
} }
@ -25,4 +25,4 @@ server {
proxy_pass http://localhost:8000; proxy_pass http://localhost:8000;
proxy_redirect off; proxy_redirect off;
} }
} }

View file

@ -6,15 +6,15 @@ h1 {
} }
:-moz-placeholder { /* Firefox 18- */ :-moz-placeholder { /* Firefox 18- */
color: #999999; color: #999999;
} }
::-moz-placeholder { /* Firefox 19+ */ ::-moz-placeholder { /* Firefox 19+ */
color: #999999; color: #999999;
} }
:-ms-input-placeholder { :-ms-input-placeholder {
color: #999999; color: #999999;
} }
.intro { .intro {
text-align: center; text-align: center;
@ -38,4 +38,19 @@ body {
.ui.footer.segment { .ui.footer.segment {
margin: 5em 0em 0em; margin: 5em 0em 0em;
padding: 5em 0em; padding: 5em 0em;
} }
h1 {
color: #F38630;
}
li {
transition-duration: 0.5s;
}
li:hover {
background-color: #96c5c5;
}
tr {
transition-duration: 0.5s;
}
tr:hover {
background-color: #DDDDDD;
}

View file

@ -5,18 +5,10 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link type="text/css" rel="stylesheet" href="css/style.css"> <link type="text/css" rel="stylesheet" href="css/style.css">
<base href="/"> <base href="/">
<style>
h1 {
color: #69D2E7;
}
input {
margin-bottom: 1em !important;
}
</style>
</head> </head>
<body ng-controller="mainController"> <body ng-controller="mainController">
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid" style="background-color: #A7DBDB; margin: -0.1em;">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
@ -30,6 +22,7 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-fixed"> <ul class="nav navbar-nav navbar-fixed">
<li><a href="/about">About</a></li> <li><a href="/about">About</a></li>
<li><a href="/scoreboard">Scoreboard</a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="/login">Login</a></li> <li><a href="/login">Login</a></li>

View file

@ -15,9 +15,13 @@ app.config(function($routeProvider, $locationProvider) {
.when("/login", { .when("/login", {
templateUrl: "pages/login.html", templateUrl: "pages/login.html",
controller: "mainController" controller: "mainController"
})
.when("/scoreboard", {
templateUrl: "pages/scoreboard.html",
controller: "mainController"
}); });
$locationProvider.html5Mode(true); $locationProvider.html5Mode(true);
}); });
app.controller("mainController", function($scope) { app.controller("mainController", function($scope) {
}); });

View file

@ -1,2 +1,4 @@
<h1>About</h1> <center>
<h2>(insert stuff here)</h2> <h1>About</h1>
<h2>(insert stuff here)</h2>
</center>

View file

@ -1 +1,4 @@
<h1>EasyCTF</h1> <center>
<h1>EasyCTF 3</h1>
<h3 style="color: #FFBB60;"> Coming 2016 </h3>
</center>

19
web/pages/scoreboard.html Normal file
View file

@ -0,0 +1,19 @@
<center>
<h1>Scoreboard</h1>
<table class="table">
<thead>
<tr>
<th>#</th>
<th>Team Name</th>
<th>School</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>Charles Is The Best</td>
<td>pg</td>
</tr>
</tbody>
</table>
</center>