mirror of
https://github.com/mgerb/mywebsite
synced 2026-01-11 10:22:53 +00:00
testing loading screen for graphs
This commit is contained in:
2
bin/www
2
bin/www
@@ -12,7 +12,7 @@ var http = require('http');
|
||||
* Get port from environment and store in Express.
|
||||
*/
|
||||
|
||||
var port = normalizePort(process.env.PORT || '80');
|
||||
var port = normalizePort(process.env.PORT || '3000');
|
||||
app.set('port', port);
|
||||
|
||||
/**
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "forever ./bin/www"
|
||||
"start": "forever -w ./bin/www"
|
||||
},
|
||||
"dependencies": {
|
||||
"body-parser": "~1.12.4",
|
||||
|
||||
@@ -56,54 +56,68 @@ function displayChart(chart_id, chart_legend_id, year, month){
|
||||
console.log("api 2");
|
||||
}
|
||||
|
||||
$.get(api_url, function(request){
|
||||
|
||||
var json = request;
|
||||
var data = {labels : [], datasets : []};
|
||||
console.log(json);
|
||||
|
||||
data.datasets.push({
|
||||
label: "Max Temperature",
|
||||
fillColor: "rgba(220,220,220,0.2)",
|
||||
strokeColor: "rgba(220,220,220,1)",
|
||||
pointColor: "rgba(220,220,220,1)",
|
||||
pointStrokeColor: "#fff",
|
||||
pointHighlightFill: "#fff",
|
||||
pointHighlightStroke: "rgba(220,220,220,1)",
|
||||
data: []
|
||||
$.ajax(
|
||||
{
|
||||
type: 'GET',
|
||||
url: api_url,
|
||||
data: {},
|
||||
beforeSend: function(){
|
||||
$('body').addClass("loading");
|
||||
},
|
||||
{
|
||||
label: "Min Temperature",
|
||||
fillColor: "rgba(151,187,205,0.2)",
|
||||
strokeColor: "rgba(151,187,205,1)",
|
||||
pointColor: "rgba(151,187,205,1)",
|
||||
pointStrokeColor: "#fff",
|
||||
pointHighlightFill: "#fff",
|
||||
pointHighlightStroke: "rgba(151,187,205,1)",
|
||||
data: []
|
||||
});
|
||||
success: function(data){
|
||||
|
||||
for (var i in json){
|
||||
$('body').removeClass("loading");
|
||||
|
||||
if (month == null){
|
||||
data.labels.push(json[i]._id.month + "/" + json[i]._id.day);
|
||||
}
|
||||
else {
|
||||
data.labels.push(json[i]._id.day);
|
||||
}
|
||||
var request = data;
|
||||
|
||||
data.datasets[0].data.push(json[i].max);
|
||||
data.datasets[1].data.push(json[i].min);
|
||||
}
|
||||
var json = request;
|
||||
var data = {labels : [], datasets : []};
|
||||
console.log(json);
|
||||
|
||||
// Get context with jQuery - using jQuery's .get() method.
|
||||
var ctx = $("#" + chart_id).get(0).getContext("2d");
|
||||
// This will get the first returned node in the jQuery collection.
|
||||
var myLineChart = new Chart(ctx).Line(data);
|
||||
data.datasets.push({
|
||||
label: "Max Temperature",
|
||||
fillColor: "rgba(220,220,220,0.2)",
|
||||
strokeColor: "rgba(220,220,220,1)",
|
||||
pointColor: "rgba(220,220,220,1)",
|
||||
pointStrokeColor: "#fff",
|
||||
pointHighlightFill: "#fff",
|
||||
pointHighlightStroke: "rgba(220,220,220,1)",
|
||||
data: []
|
||||
},
|
||||
{
|
||||
label: "Min Temperature",
|
||||
fillColor: "rgba(151,187,205,0.2)",
|
||||
strokeColor: "rgba(151,187,205,1)",
|
||||
pointColor: "rgba(151,187,205,1)",
|
||||
pointStrokeColor: "#fff",
|
||||
pointHighlightFill: "#fff",
|
||||
pointHighlightStroke: "rgba(151,187,205,1)",
|
||||
data: []
|
||||
});
|
||||
|
||||
$("#" + chart_legend_id).html(myLineChart.generateLegend());
|
||||
for (var i in json){
|
||||
|
||||
});
|
||||
if (month == null){
|
||||
data.labels.push(json[i]._id.month + "/" + json[i]._id.day);
|
||||
}
|
||||
else {
|
||||
data.labels.push(json[i]._id.day);
|
||||
}
|
||||
|
||||
data.datasets[0].data.push(json[i].max);
|
||||
data.datasets[1].data.push(json[i].min);
|
||||
}
|
||||
|
||||
// Get context with jQuery - using jQuery's .get() method.
|
||||
var ctx = $("#" + chart_id).get(0).getContext("2d");
|
||||
// This will get the first returned node in the jQuery collection.
|
||||
var myLineChart = new Chart(ctx).Line(data);
|
||||
|
||||
$("#" + chart_legend_id).html(myLineChart.generateLegend());
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -256,3 +256,29 @@ a {
|
||||
height: 12px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.modal {
|
||||
display: none;
|
||||
position: fixed;
|
||||
z-index: 1000;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
background: rgba( 255, 255, 255, .8 )
|
||||
url('http://i.stack.imgur.com/FhHRx.gif')
|
||||
50% 50%
|
||||
no-repeat;
|
||||
}
|
||||
|
||||
/* When the body has the loading class, we turn
|
||||
the scrollbar off with overflow:hidden */
|
||||
body.loading {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Anytime the body has the loading class, our
|
||||
modal element will be visible */
|
||||
body.loading .modal {
|
||||
display: block;
|
||||
}
|
||||
@@ -68,6 +68,8 @@
|
||||
<br>
|
||||
<br>
|
||||
|
||||
<div class="modal"><!-- Place at bottom of page --></div>
|
||||
|
||||
<footer class="blog-footer">
|
||||
<p>Site created and managed by Mitchell Gerber</p>
|
||||
<span>©2015</span>
|
||||
|
||||
Reference in New Issue
Block a user