From 585997ac32f1515ebc6eb0f57b8b73262ae4b50e Mon Sep 17 00:00:00 2001
From: Sabhariesh <cb.en.u4cse14238@cb.students.amrita.edu>
Date: Tue, 31 Oct 2017 01:41:31 +0530
Subject: [PATCH] Modified Dashboard UI
---
css/la.css | 4 -
css/style.css | 31 ++++++--
dashboard.html | 105 +++++++++++++++++++++++++--
home.html | 43 +++++++++--
img/hodor-logo5.png | Bin 0 -> 3124 bytes
land.html | 3 +-
piechartdata.js | 39 ++++++++++
chartdata.js => timelinechartdata.js | 6 +-
8 files changed, 202 insertions(+), 29 deletions(-)
create mode 100644 img/hodor-logo5.png
create mode 100644 piechartdata.js
rename chartdata.js => timelinechartdata.js (93%)
diff --git a/css/la.css b/css/la.css
index 78dbb6a..7196c31 100644
--- a/css/la.css
+++ b/css/la.css
@@ -67,10 +67,6 @@ body :-ms-input-placeholder {
transition-timing-function: ease-in-out;
font-weight: 200;
}
-.modal-header h2{
- color: black;
- align-self: center;
-}
.loginform {
padding: 20px 0;
position: relative;
diff --git a/css/style.css b/css/style.css
index 8ed8ab0..bc8d749 100644
--- a/css/style.css
+++ b/css/style.css
@@ -9,11 +9,11 @@ html {
#hodor-logo {
position: absolute;
top: 5px;
- left: 43%;
+ left: 45%;
background-color: #000000;
opacity: 0.5;
height:auto;
- width: 250px;
+ width: 15%;
}
#sidenavbar a {
@@ -58,6 +58,7 @@ html {
#sidenavbar a:hover {
left: 0;
background-color: grey;
+ z-index: 99 !important;
}
#sidenavbar a:hover i {
@@ -114,12 +115,28 @@ html {
}
<!------------------------------Dashboard------------------------------------ -->
-#chartdiv {
- width: 96%;
- height: 475px;
- margin-left: auto;
- margin-right: auto;
+
+.level-label, .progress, .questionbuttons{
+ position: relative;
+ clear: both;
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 15px;
+ padding-top: 5px;
+ padding-right: 5px;
+ padding-bottom: 5px;
+ padding-left: 5px;
+}
+
+#timelinechartdata, #piechartdata {
+ margin-left: 5px;
+ margin-right: 5px;
margin-top: 15px;
+ clear: both;
+ padding-top: 5px;
+ padding-right: 5px;
+ padding-bottom: 5px;
+ padding-left: 5px;
}
.amcharts-graph-g1 .amcharts-graph-fill {
diff --git a/dashboard.html b/dashboard.html
index 2e7aa49..e1eccc9 100644
--- a/dashboard.html
+++ b/dashboard.html
@@ -10,28 +10,121 @@
<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 type="text/javascript" src="https://www.amcharts.com/lib/3/pie.js"></script>
+ <script type="text/javascript" src="https://www.amcharts.com/lib/3/themes/black.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>
+ <script src="timelinechartdata.js"></script>
+ <script src="piechartdata.js"></script>
<title>HODOR | Dashboard</title>
</head>
<body>
<div class="container-fluid">
- <img src="img/hodor-logo4.png" id="hodor-logo">
+ <img src="img/hodor-logo5.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="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>
+ <a href="#" id="logout" data-toggle="modal" data-target="#logout-modal">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 class="dashboard">
+ <div id="timelinechart" style="width: 40%; height: 40%; background-color: black; position: absolute; left: 10%; top: 15%;">
+ </div>
+ <div id="piechart" style="width: 30%; height: 40%; background-color: black; position:absolute; right: 10%; top: 15%;">
+ </div><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+ <div class="level-label" style="position:relative; left:10%">
+ <h2 style="position:absolute; left:35%;">Level <span class="label label-primary">Padawan</span></h2><br><br><br><br>
+ <div class="progress" style="position:absolute; width:80%; left:40">
+ <div class="progress-bar" role="progressbar" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width:70% ">
+ 70%
+ </div>
+ </div>
+ </div>
+ <br><br><br>
+ <div class="questionbuttons" style="position:absolute; left:40%;">
+ <button type="button" class="btn btn-info btn-lg">Previous Question</button>
+ <button type="button" class="btn btn-info btn-lg">Next Question</button>
</div>
+ </div>
+ <div id="profile-modal" class="modal fade" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ <div class="modalhead" style="text-align: center">
+ <img src="img/img_avatar.png" alt="Avatar" style="border-radius: 50%;width: 75px;"> Name</div>
+ </div>
+ <div class="modal-body">
+ <ul class="nav nav-pills nav-justified">
+ <li class="active"><a data-toggle="pill" href="#home">View Profile</a></li>
+ <li><a data-toggle="pill" href="#menu2">Edit Profile</a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="home" class="tab-pane fade in active">
+ <h3>Name</h3>
+ <p>Sabhariesh</p>
+ <h3>Username</h3>
+ <p>frozenfire</p>
+ <h3>Email-ID</h3>
+ <p>sabbhy1996@gmail.com</p>
+ <h3>Github</h3>
+ <p>@shariharasudan</p>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+ </div>
+ <div id="menu2" class="tab-pane fade">
+ <form>
+ <div class="form-group">
+ <label for="name">Name</label>
+ <input type="text" class="form-control" id="name">
+ </div>
+ <div class="form-group">
+ <label for="uname">Username</label>
+ <input type="text" class="form-control" id="uname">
+ </div> <div class="form-group">
+ <label for="email">Email address:</label>
+ <input type="email" class="form-control" id="email">
+ </div>
+ <div class="form-group">
+ <label for="pwd">Current Password:</label>
+ <input type="password" class="form-control" id="pwd">
+ <label for="pwd">New Password:</label>
+ <input type="password" class="form-control" id="npwd">
+ <label for="rnpwd"> Re-enter new Password:</label>
+ <input type="password" class="form-control" id="rnpwd">
+ </div>
+ <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>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="modal fade" id="logout-modal" role="dialog">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ <h4 class="modal-title">Modal Header</h4>
+ </div>
+ <div class="modal-body">
+ <p>Are you sure you want to logout?</p>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-success" data-dismiss="modal">Yes</button>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">No</button>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/home.html b/home.html
index b71959b..c42a06e 100644
--- a/home.html
+++ b/home.html
@@ -8,19 +8,28 @@
<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 | Home</title>
+ <script src="https://www.amcharts.com/lib/3/amcharts.js"></script>
+ <script src="https://www.amcharts.com/lib/3/serial.js"></script>
+ <script type="text/javascript" src="https://www.amcharts.com/lib/3/pie.js"></script>
+ <script type="text/javascript" src="https://www.amcharts.com/lib/3/themes/black.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="timelinechartdata.js"></script>
+ <script src="piechartdata.js"></script>
+ <title>HODOR</title>
</head>
<body>
<div class="container-fluid">
-<img src="img/hodor-logo4.png" id="hodor-logo">
+<img src="img/hodor-logo5.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="dashboard.html" id="dashboard" onclick="loadDashboard()">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>
+ <a href="#" id="logout" data-toggle="modal" data-target="#logout-modal">Logout<i style="color:#d9534f !important;" class="fa fa-power-off fa-lg"></i></a>
</div>
<div id="profile-modal" class="modal fade" role="dialog">
<div class="modal-dialog">
@@ -28,6 +37,7 @@
<div class="modal-header">
<div class="modalhead" style="text-align: center">
<img src="img/img_avatar.png" alt="Avatar" style="border-radius: 50%;width: 75px;"> Name</div>
+ <button type="button" class="close" data-dismiss="modal">×</button>
</div>
<div class="modal-body">
<ul class="nav nav-pills nav-justified">
@@ -61,10 +71,12 @@
<input type="email" class="form-control" id="email">
</div>
<div class="form-group">
- <label for="pwd">Password:</label>
+ <label for="pwd">Current Password:</label>
<input type="password" class="form-control" id="pwd">
- <label for="rpwd"> Re-enter Password:</label>
- <input type="password" class="form-control" id="rpwd">
+ <label for="pwd">New Password:</label>
+ <input type="password" class="form-control" id="npwd">
+ <label for="rnpwd"> Re-enter new Password:</label>
+ <input type="password" class="form-control" id="rnpwd">
</div>
<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>
@@ -75,6 +87,23 @@
</div>
</div>
</div>
+<div class="modal fade" id="logout-modal" role="dialog">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ <h4 class="modal-title">Modal Header</h4>
+ </div>
+ <div class="modal-body">
+ <p>Are you sure you want to logout?</p>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-success" data-dismiss="modal">Yes</button>
+ <button type="button" class="btn btn-danger" data-dismiss="modal">No</button>
+ </div>
+ </div>
+ </div>
+</div>
</div>
</body>
</html>
diff --git a/img/hodor-logo5.png b/img/hodor-logo5.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a755e601eac0f945dca7bc9c01d01d4c3e31e1c
GIT binary patch
literal 3124
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
literal 0
HcmV?d00001
diff --git a/land.html b/land.html
index 9e70eb2..ee2299b 100644
--- a/land.html
+++ b/land.html
@@ -43,7 +43,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <h2>Login</h2>
+ <button type="button" class="close" data-dismiss="modal">×</button>
</div>
<div class="modal-body">
<form class="form1">
@@ -75,7 +75,6 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <!--<h2>Register</h2>-->
</div>
<div class="modal-body">
<form class="form2">
diff --git a/piechartdata.js b/piechartdata.js
new file mode 100644
index 0000000..7e93e50
--- /dev/null
+++ b/piechartdata.js
@@ -0,0 +1,39 @@
+AmCharts.makeChart("piechart",
+ {
+ "type": "pie",
+ "balloonText": "[[title]]<br><span style='font-size:14px'><b>[[value]]</b> ([[percents]]%)</span>",
+ "titleField": "category",
+ "valueField": "column-1",
+ "allLabels": [],
+ "balloon": {},
+ "theme": "black",
+ "legend": {
+ "enabled": true,
+ "align": "center",
+ "markerType": "circle"
+ },
+ "titles": [],
+ "dataProvider": [
+ {
+ "category": "Web",
+ "column-1": 8
+ },
+ {
+ "category": "Forensics",
+ "column-1": "3"
+ },
+ {
+ "category": "Steg",
+ "column-1": 2
+ },
+ {
+ "category": "Cryptography",
+ "column-1": "6"
+ },
+ {
+ "category": "Misc.",
+ "column-1": "2"
+ }
+ ]
+ }
+);
diff --git a/chartdata.js b/timelinechartdata.js
similarity index 93%
rename from chartdata.js
rename to timelinechartdata.js
index b90a1a8..81ddc10 100644
--- a/chartdata.js
+++ b/timelinechartdata.js
@@ -1,4 +1,4 @@
-AmCharts.makeChart("chartdiv",
+AmCharts.makeChart("timelinechart",
{
"type": "serial",
"categoryField": "Month",
@@ -10,10 +10,10 @@ AmCharts.makeChart("chartdiv",
"trendLines": [],
"graphs": [
{
- "balloonText": "[[title]] of [[Month]]:[[value]]",
+ "balloonText": "[[title]] in [[Month]]:[[value]]",
"bullet": "round",
"id": "AmGraph-1",
- "title": "graph 1",
+ "title": "Challenges Solved",
"valueField": "Solved"
}
],
--
GitLab