Skip to content

Commit

Permalink
Merge pull request SoftwareDefinedBuildings#40 from rajasriramoju/30-…
Browse files Browse the repository at this point in the history 
…additions-phase2

30 additions phase2
  • Loading branch information
@ChrisJDecastro
ChrisJDecastro authored May 26, 2019
2 parents 7234735 + c7a197e commit 915019c
Show file tree
Hide file tree
Showing 10 changed files with 264 additions and 112 deletions.
9 changes: 9 additions & 0 deletions dashboards/solarplus-ui/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from json import dumps



AWS_ACCESS_KEY = config.aws_access_key
AWS_SECRET_KEY = config.aws_secret_key

Expand Down Expand Up @@ -187,6 +188,14 @@ def contact():
"""
return render_template("contact.html")

@app.route("/profile")
@oidc.require_login
def profile():
"""
Render the intelligence page.
"""
return render_template("profile.html")

@app.errorhandler(404)
def page_not_found(e):
# note that we set the 404 status explicitly
Expand Down
1 change: 0 additions & 1 deletion dashboards/solarplus-ui/static/assets/css/materialize.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2837,7 +2837,6 @@ a {
}

#intelligence-control-on-off{

color: white;
/*font-family: sans-serif;*/
}
Expand Down
3 changes: 3 additions & 0 deletions dashboards/solarplus-ui/static/assets/js/navbar.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
$(document).ready(function () {
$('.sidenav').sidenav();
$(".dropdown-trigger").dropdown();
$(".dropdown-trigger2").dropdown();
$('.collapsible').collapsible();
var intelligenceText = sessionStorage.getItem('text');
var intelligenceColor = sessionStorage.getItem('color');
console.log(intelligenceColor);
Expand Down
41 changes: 35 additions & 6 deletions dashboards/solarplus-ui/templates/analysis.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,70 @@
</div>
<div id="particles-js"></div>
<div class="">
<ul id="dropdown1" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<ul id="dropdown2" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<a href="/dashboard" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<a id="intelligence-control-on-off">Intelligent Control off</a>
<span id="intelligence-control-on-off"> Intelligent Control off</span>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li class="active"><a href="#">Analysis</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger" href="#!" data-target="dropdown1"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
<ul class="sidenav" id="mobile-demo">

<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger2" href="#!" data-target="dropdown2"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
</div>
</nav>
</div>

<div class="chart-container" ; id="predictionChart">
<div class="row card-margin" style="margin-top:5%">
<div class="col s10 offset-s1">
<div class="card">
<div class="card-content">
<span class="card-title">Prediction Chart</span>

<div class="chart-container" ; id="predictionChart">
</div>
</div>
</div>
</div>

</div>


</body>


Expand Down
71 changes: 44 additions & 27 deletions dashboards/solarplus-ui/templates/contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,53 @@
</div>
<div id="particles-js"></div>
<div class="">
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<a id="intelligence-control-on-off">Intelligent Control off</a>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li class="active"><a href="#">Contact</a></li>
<ul id="dropdown1" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<ul class="sidenav" id="mobile-demo">
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<ul id="dropdown2" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
</div>
</nav>
</ul>
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/dashboard" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<span id="intelligence-control-on-off"> Intelligent Control off</span>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a class="dropdown-trigger" href="#!" data-target="dropdown1"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
<ul class="sidenav" id="mobile-demo">

<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a class="dropdown-trigger2" href="#!" data-target="dropdown2"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
</div>
</nav>
</div>


Expand Down
29 changes: 22 additions & 7 deletions dashboards/solarplus-ui/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,37 @@
</div>
<div id="particles-js"></div>
<div class="">
<ul id="dropdown1" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<ul id="dropdown2" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<a href="/dashboard" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<a id="intelligence-control-on-off">Intelligent Control off</a>
<span id="intelligence-control-on-off"> Intelligent Control off</span>
</li>
<li class="active"><a href="#">Dashboard</a></li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger" href="#!" data-target="dropdown1"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
<ul class="sidenav" id="mobile-demo">

Expand All @@ -53,10 +66,12 @@
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger2" href="#!" data-target="dropdown2"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
</div>

</nav>
</div>

Expand All @@ -83,7 +98,7 @@
<div class="card-content">
<span class="card-title">HVAC Power Consumption</span>
    <div class="chart-container" ; id="chart2">
    </div>
    </div>
</div>
</div>
</div>
Expand Down
26 changes: 21 additions & 5 deletions dashboards/solarplus-ui/templates/intelligence.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,37 @@
</div>
<div id="particles-js"></div>
<div class="">
<ul id="dropdown1" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<ul id="dropdown2" class="dropdown-content">
<li><a href="/profile">Profile</a></li>
<li class="divider"></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
</ul>
<nav>
<div class="nav-wrapper dashe-blue">
<a href="/index" class="brand-logo">SolarPlus</a>
<a href="/dashboard" class="brand-logo">SolarPlus</a>
<a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li>
<div id="intelligent-control"></div>
</li>
<li>
<a id="intelligence-control-on-off">Intelligent Control off</a>
<span id="intelligence-control-on-off"> Intelligent Control off</span>
</li>
<li><a href="/dashboard">Dashboard</a></li>
<li><a href="/setpoints">Setpoints</a></li>
<li><a href="/weather">Weather</a></li>
<li><a href="/analysis">Analysis</a></li>
<li class="active"><a href="#">Intelligence</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger" href="#!" data-target="dropdown1"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
<ul class="sidenav" id="mobile-demo">

Expand All @@ -51,7 +64,10 @@
<li><a href="/analysis">Analysis</a></li>
<li><a href="/intelligence">Intelligence</a></li>
<li><a href="/contact">Contact</a></li>
<li><a id="logout-button" href="/logout">Logout</a></li>
<li><a class="dropdown-trigger2" href="#!" data-target="dropdown2"><span>
Hi, {{g.user.profile.firstName}}
</span>
<i class="material-icons right">arrow_drop_down</i></a></li>
</ul>
</div>
</nav>
Expand Down
Loading

0 comments on commit 915019c

Please sign in to comment.