diff --git a/chartdata.js b/chartdata.js
new file mode 100644
index 0000000000000000000000000000000000000000..b90a1a8ef10171d7f45d45883b0207604f44420b
--- /dev/null
+++ b/chartdata.js
@@ -0,0 +1,91 @@
+AmCharts.makeChart("chartdiv",
+ {
+ "type": "serial",
+ "categoryField": "Month",
+ "startDuration": 1,
+ "theme": "black",
+ "categoryAxis": {
+ "gridPosition": "start"
+ },
+ "trendLines": [],
+ "graphs": [
+ {
+ "balloonText": "[[title]] of [[Month]]:[[value]]",
+ "bullet": "round",
+ "id": "AmGraph-1",
+ "title": "graph 1",
+ "valueField": "Solved"
+ }
+ ],
+ "guides": [],
+ "valueAxes": [
+ {
+ "id": "ValueAxis-1",
+ "title": "Solves"
+ }
+ ],
+ "allLabels": [],
+ "balloon": {},
+ "legend": {
+ "enabled": true,
+ "useGraphSettings": true
+ },
+ "titles": [
+ {
+ "id": "Title-1",
+ "size": 15,
+ "text": "No. of Challenges Solved"
+ }
+ ],
+ "dataProvider": [
+ {
+ "Month": "Jan",
+ "Solved": 8
+ },
+ {
+ "Month": "Feb",
+ "Solved": 6
+ },
+ {
+ "Month": "Mar",
+ "Solved": 2
+ },
+ {
+ "Month": "Apr",
+ "Solved": 1
+ },
+ {
+ "Month": "May",
+ "Solved": 2
+ },
+ {
+ "Month": "Jun",
+ "Solved": 3
+ },
+ {
+ "Month": "Jul",
+ "Solved": 6
+ },
+ {
+ "Month": "Aug",
+ "Solved": 2
+ },
+ {
+ "Month": "Sep",
+ "Solved": 3
+ },
+ {
+ "Month": "Oct",
+ "Solved": 4
+ },
+ {
+ "Month": "Nov",
+ "Solved": null
+ },
+ {
+ "Month": "Dec",
+ "Solved": null
+ }
+ ]
+ }
+);
diff --git a/css/style.css b/css/style.css
index 8da9f054a4e0287380ec645d0eed49a3264d4fc4..aeca063d65b1a8d98c3ccc174aff3170cd867ed8 100644
--- a/css/style.css
+++ b/css/style.css
@@ -113,4 +113,27 @@ html {
font-size: 15px;
}
-<!------------------------------------------------------------------ -->
+<!------------------------------Dashboard------------------------------------ -->
+#chartdiv {
+ width: 96%;
+ height: 475px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 15px;
+}
+
+.amcharts-graph-g1 .amcharts-graph-fill {
+ filter: url(#blur);
+}
+
+.amcharts-graph-g2 .amcharts-graph-fill {
+ filter: url(#blur);
+}
+
+.amcharts-cursor-fill {
+ filter: url(#shadow);
+}
+
+.solves-chart{
+ position: absolute;
+}
diff --git a/dashboard.html b/dashboard.html
new file mode 100644
index 0000000000000000000000000000000000000000..2e7aa49d6015198f493ce106c966fe7fea4f8a0e
--- /dev/null
+++ b/dashboard.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta charset="utf-8">
+ <link rel="stylesheet" type="text/css" href="css/style.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
+ <script src="https://www.amcharts.com/lib/3/amcharts.js"></script>
+ <script src="https://www.amcharts.com/lib/3/serial.js"></script>
+ <script src="https://www.amcharts.com/lib/3/plugins/export/export.min.js"></script>
+ <link rel="stylesheet" href="https://www.amcharts.com/lib/3/plugins/export/export.css" type="text/css" media="all" />
+ <script src="https://www.amcharts.com/lib/3/themes/light.js"></script>
+ <script src="chartdata.js"></script>
+ <title>HODOR | Dashboard</title>
+</head>
+<body>
+<div class="container-fluid">
+ <img src="img/hodor-logo4.png" id="hodor-logo">
+ <div id="sidenavbar" class="sidenavbar">
+ <a href="#" id="profile" data-toggle="modal" data-target="#profile-modal"><img src="img/img_avatar.png" alt="Avatar"><br>Sabhariesh<i class="fa fa-user fa-lg"></i></a><br><br>
+ <a href="dashboard.html" id="dashboard">Dashboard<i class="fa fa-home fa-lg"></i></a>
+ <a href="#" id="learn">Learn<i class="fa fa-laptop fa-lg"></i></a>
+ <a href="#" id="leaderboard">Leaderboard<i class="fa fa-bar-chart fa-lg"></i></a>
+ <a href="#" id="ctf">Capture the Flag<i class="fa fa-flag fa-lg"></i></a>
+ <a href="#" id="docs">Documentation & help <i class="fa fa-info fa-lg"></i></a><br>
+ <a href="#" id="logout">Logout<i style="color:#d9534f !important;" class="fa fa-power-off fa-lg"></i></a>
+ </div>
+ <div id="chartdiv" style="width: 50%; height: 300px; background-color: #FFFFFF; position: absolute; left: 10%; top: 15%;">
+ </div>
+
+
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/home.html b/home.html
index 5d4066ed447ea76b5459281f2f79714779f66d22..b12f2d3635456490c23083e0266b72e2e4c9dcaa 100644
--- a/home.html
+++ b/home.html
@@ -8,13 +8,14 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="font-awesome-4.7.0/css/font-awesome.min.css">
+ <title>HODOR</title>
</head>
<body>
<div class="container-fluid">
-<img src="img/hodor-logo2.png" id="hodor-logo">
+<img src="img/hodor-logo4.png" id="hodor-logo">
<div id="sidenavbar" class="sidenavbar">
<a href="#" id="profile" data-toggle="modal" data-target="#profile-modal"><img src="img/img_avatar.png" alt="Avatar"><br>Sabhariesh<i class="fa fa-user fa-lg"></i></a><br><br>
- <a href="#" id="dashboard">Dashboard<i class="fa fa-home fa-lg"></i></a>
+ <a href="dashboard.html" id="dashboard">Dashboard<i class="fa fa-home fa-lg"></i></a>
<a href="#" id="learn">Learn<i class="fa fa-laptop fa-lg"></i></a>
<a href="#" id="leaderboard">Leaderboard<i class="fa fa-bar-chart fa-lg"></i></a>
<a href="#" id="ctf">Capture the Flag<i class="fa fa-flag fa-lg"></i></a>
diff --git a/img/hodor-logo4.png b/img/hodor-logo4.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7dc2c119477e597e45893c675ba619805ffe4ed
Binary files /dev/null and b/img/hodor-logo4.png differ
diff --git a/land.html b/land.html
index d86770ee71e2c3b02c6f19f2c3b65eb9305f76b9..54d292d382984d60cd408dab8a8dfc3a0c8c1311 100644
--- a/land.html
+++ b/land.html
@@ -19,7 +19,7 @@
<div class="loginform">
<form class="login">
<button type="button" id="login-button" data-toggle="modal" data-target="#login-modal">Log in</button>
- <button type="button" id="signup-button" data-toggle="modal" data-target="#login-modal">Register</button>
+ <button type="button" id="signup-button" data-toggle="modal" data-target="#register-modal">Register</button>
</form>
</div>
@@ -42,62 +42,76 @@
<div id="login-modal" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
- <div class="modal-header">
- <ul class="nav nav-pills nav-justified">
- <li class="active"><a data-toggle="pill" href="#login">Login</a></li>
- <li><a data-toggle="pill" href="#register">Register</a></li>
- </ul>
- </div>
- <div class="modal-body">
- <div id="login" class="tab-pane fade">
- <form class="form1">
- <div class="form-group1">
- <label for="usrname">Username</label>
- <input type="text" class="form-control" id="usrname"> </br>
- </div>
- <div class="form-group1">
- <label for="pword">Password</label>
- <input type="password" class="form-control" id="pword"> </br>
- </div>
- <!--<div class="modal-footer">
- <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
- <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
- </div> -->
- </form>
+ <div class="modal-header">
+ </div>
+ <div class="modal-body">
+ <form class="form1">
+ <div class="form-group1">
+ <label for="usrname">Username</label>
+ <input type="text" class="form-control" id="usrname"> </br>
+ </div>
+ <div class="form-group1">
+ <label for="pword">Password</label>
+ <input type="password" class="form-control" id="pword"> </br>
</div>
+ <!--<div class="modal-footer">
+ <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+ </div> -->
+ </form>
+ </div>
+ <div class="modal-footer">
+ <a href="home.html">
+ <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
+ </a>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="register-modal" class="modal fade" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ </div>
+ <div class="modal-body">
+ <form class="form2">
+ <div class="form-group2">
+ <label for="name">Name</label>
+ <input type="text" class="form-control" id="name"> </br>
- <div id="register" class="tab-pane fade">
- <form class="form2">
- <div class="form-group2">
- <label for="name">Name</label>
- <input type="text" class="form-control" id="name"> </br>
-
- <label for="uname">Username</label>
- <input type="text" class="form-control" id="uname"> </br>
-
- <label for="email">Email address</label>
- <input type="email" class="form-control" id="email"> </br>
-
- <label for="pwd">Password</label>
- <input type="password" class="form-control" id="pwd"> </br>
+ <label for="uname">Username</label>
+ <input type="text" class="form-control" id="uname"> </br>
- <label for="rpwd"> Re-enter Password</label>
- <input type="password" class="form-control" id="rpwd"> </br>
- </div>
+ <label for="email">Email address</label>
+ <input type="email" class="form-control" id="email"> </br>
+ <label for="pwd">Password</label>
+ <input type="password" class="form-control" id="pwd"> </br>
- <!--<div class="modal-footer">
- <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
- <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
- </div> -->
+ <label for="rpwd"> Re-enter Password</label>
+ <input type="password" class="form-control" id="rpwd"> </br>
+ </div>
- </form>
- <!-- </div> -->
- </div>
- <div class="modal-footer">
- <button type="submit" class="btn btn-success">Submit</button>
+
+ <!--<div class="modal-footer">
+ <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+ </div> -->
+
+ </form>
+ </div>
+ <div class="modal-footer">
+ <a href="home.html">
+ <button type="submit" class="btn btn-success" style="align-self: center">Submit</button>
+ </a>
<button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
- </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
</div>