Added multiple pages and changed look/feel

This commit is contained in:
Charles Truluck 2015-12-26 13:06:17 -05:00
parent c55d196eae
commit 5b1c46e63c
11 changed files with 84 additions and 15 deletions

View file

@ -32,17 +32,18 @@ Main Pages:
- <b>login.html</b>
- <b>register.html</b>
- <b>about.html</b>
- scoreboard.html
- problems.html
- <b>scoreboard.html</b>
- <b>problems.html</b>
- account.html
- programming.html
- chat.html
- <b>programming.html</b>
- <b>chat.html</b>
- forgot_password.html
- logout.html
- rules.html
- team.html
- shell.html
- updates.html
- <b>shell.html</b>
- <b>updates.html</b>
- resetpassword.html
Color Scheme: &#35;69D2E7 | &#35;A7DBDB | &#35;E0E4CC | &#35;F38630 | &#35;FA6900
<del>Color Scheme: &#35;69D2E7 | &#35;A7DBDB | &#35;E0E4CC | &#35;F38630 | &#35;FA6900</del>
(undecided.)

View file

@ -13,7 +13,7 @@ server {
# }
# Put all the pages here so Angular doesn't fail.
location ~^/(about|login|register|scoreboard|chat|updates)$ {
location ~^/(about|login|register|scoreboard|chat|updates|problems|programming|shell)$ {
default_type text/html;
try_files /index.html /index.html;
}

View file

@ -40,13 +40,13 @@ body {
padding: 5em 0em;
}
h1 {
color: #F38630;
color: #ee953b;
}
li {
transition-duration: 0.5s;
}
li:hover {
background-color: #96c5c5;
background-color: #32bcd0;
}
tr {
transition-duration: 0.5s;
@ -54,3 +54,14 @@ tr {
tr:hover {
background-color: #DDDDDD;
}
li a, .navbar-brand {
color: white !important;
}
table {
color: #29d257;
}
textarea:focus, input:focus, input[type]:focus, .uneditable-input:focus {
border-color: #29d257;
box-shadow: 0 1px 1px rgba(229, 103, 23, 0.075) inset, 0 0 8px #29d257;
outline: 0 none;
}

View file

@ -7,8 +7,8 @@
<base href="/">
</head>
<body ng-controller="mainController">
<nav class="navbar navbar-default">
<div class="container-fluid" style="background-color: #A7DBDB; margin: -0.1em;">
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid" style="background-color: #5954dd; margin: -0.1em;">
<div class="navbar-header">
<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>
@ -27,12 +27,16 @@
<li><a href="/scoreboard">Scoreboard</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="/programming">Programming</a></li>
<li><a href="/shell">Shell</a></li>
<li><a href="/problems">Problems</a></li>
<li><a href="/login">Login</a></li>
<li><a href="/register">Register</a></li>
</ul>
</div>
</div>
</nav>
<br><br>
<div id="mainContent" class="ui container">
<div ng-view></div>
</div>

View file

@ -24,6 +24,18 @@ app.config(function($routeProvider, $locationProvider) {
templateUrl: "pages/updates.html",
controller: "mainController"
})
.when("/problems", {
templateUrl: "pages/problems.html",
controller: "mainController"
})
.when("/programming", {
templateUrl: "pages/programming.html",
controller: "mainController"
})
.when("/shell", {
templateUrl: "pages/shell.html",
controller: "mainController"
})
.when("/scoreboard", {
templateUrl: "pages/scoreboard.html",
controller: "mainController"

View file

@ -1,4 +1,6 @@
<center>
<h1>EasyCTF 3</h1>
<h3 style="color: #FFBB60;"> Coming 2016 </h3>
<br>
<a class="twitter-timeline" href="https://twitter.com/easyctf" data-widget-id="680792667001884672">Tweets by @easyctf</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</center>

View file

@ -2,8 +2,8 @@
<h1>Log-in</h1>
<div class="input-group">
<form id="login-form">
<input type="text" class="form-control" placeholder="Email" id="email">
<input type="password" id="password" name="password" placeholder="Password" class="form-control">
<input type="text" class="form-control" placeholder="Email" id="email" style="margin-bottom:1em;">
<input type="password" id="password" name="password" placeholder="Password" class="form-control" style="margin-bottom:1em;">
<input type="submit" class="btn btn-lg btn-success" value="Login">
</form>
</div>

17
web/pages/problems.html Normal file
View file

@ -0,0 +1,17 @@
<center>
<h1>Problems</h1>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">Silly Caesar | Cryptography</h3>
</div>
<div class="panel-body">
<h3>Do we even need this problem, just take the flag. <code>easyctf{no}</code></h3>
<div class="input-group" style="margin-left:10em;margin-right:10em;">
<input type="text" class="form-control" placeholder="EasyCTF{...}">
<span class="input-group-btn">
<button class="btn btn-success" type="button">Check!</button>
</span>
</div>
</div>
</div>
</center>

View file

@ -0,0 +1,11 @@
<center>
<h1>Programming</h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Problems Avalible: NaN?</h3>
</div>
<div class="panel-body">
<h3>Insert Programming Client Here</h3>
</div>
</div>
</center>

11
web/pages/shell.html Normal file
View file

@ -0,0 +1,11 @@
<center>
<h1>Shell</h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Username: (insert username) | Password: (insert password)</h3>
</div>
<div class="panel-body">
<h3>Insert Shell Here</h3>
</div>
</div>
</center>

View file

@ -1,4 +1,4 @@
<center>
<h1>News / Updates</h1>
<iframe id="twitter-widget-0" scrolling="no" frameborder="0" allowtransparency="true" allowfullscreen="true" class="twitter-timeline twitter-timeline-rendered" data-widget-id="661431758655782912" data-user-id="3239603087" title="Twitter Timeline" style="position: static; visibility: visible; display: inline-block; width: 100%; height: 600px; padding: 0px; border: none; max-width: 520px; min-width: 180px; margin-top: 0px; margin-bottom: 0px; min-height: 200px;"></iframe>
<a class="twitter-timeline" href="https://twitter.com/easyctf" data-widget-id="680792667001884672">Tweets by @easyctf</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</center>