김윤지 / Probability Death

Go to a project
Toggle navigation Toggle navigation pinning
김주희
48701787 2 parents c689c33f 2c194c4d

Merge branch 'design' to 'master'

Expand all
Inline Side-by-side
Showing 9 changed files with 35 additions and 24 deletions
1 var express = require('express'); 1 var express = require('express');
2 var router = express.Router(); 2 var router = express.Router();
3 -var db = require('../lib/db'); 3 +var db = require('../lib/db_total');
4 4
5 /* GET home page. */ 5 /* GET home page. */
6 6
7 router.post('/starting' , (req,res) => { 7 router.post('/starting' , (req,res) => {
8 res.redirect(`/name/${req.body.name}/birth/${req.body.birth}`); 8 res.redirect(`/name/${req.body.name}/birth/${req.body.birth}`);
9 }) 9 })
10 -router.get('/name/:name/birth/:birth', (req,res) => { 10 +router.get('/name/:name/birth/:birth', (req, res) => {
11 11
12 // 렌더링 변수 12 // 렌더링 변수
13 var time = new Array(); // 타임스탬프 13 var time = new Array(); // 타임스탬프
...@@ -21,32 +21,40 @@ router.get('/name/:name/birth/:birth', (req,res) => { ...@@ -21,32 +21,40 @@ router.get('/name/:name/birth/:birth', (req,res) => {
21 var count = 0; 21 var count = 0;
22 const name = req.params.name; 22 const name = req.params.name;
23 const birth = req.params.birth; 23 const birth = req.params.birth;
24 + //const address = req.params.address;
25 + ////////////////////////////////////////
26 + var deathArr = new Array();
27 + var mhurtArr = new Array();
28 + var lhurtArr = new Array();
29 + var occurArr = new Array();
30 + ////////////////////////////////////////
31 +
24 32
25 // 이전 10분간 데이터 찾기 33 // 이전 10분간 데이터 찾기
26 - sql = "SELECT * FROM weatherInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')"; 34 + sql = "SELECT * FROM apisInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
27 - db.query(sql, function(err, rows, fields){ 35 + db.query(sql, function (err, rows, fields) {
28 - if(err) 36 + if (err) {
29 - {
30 console.log(err); 37 console.log(err);
31 } 38 }
32 - else 39 + else {
33 - { 40 + if (rows.length == 0) {
34 - if (rows.length == 0)
35 - {
36 empty = 1; 41 empty = 1;
37 } 42 }
38 - else 43 + else {
39 - { 44 + for (var i = rows.length - 1; i >= 0; i--) {
40 - for(var i = rows.length - 1; i >= 0; i--)
41 - {
42 probArr.unshift(rows[i].prob); 45 probArr.unshift(rows[i].prob);
43 time.unshift(rows[i].time); 46 time.unshift(rows[i].time);
44 ptArr.unshift(rows[i].temperature); 47 ptArr.unshift(rows[i].temperature);
45 wsArr.unshift(rows[i].wind); 48 wsArr.unshift(rows[i].wind);
46 rainArr.unshift(rows[i].rain); 49 rainArr.unshift(rows[i].rain);
50 + ////
51 + deathArr.unshift(rows[i].tdeath);
52 + mhurtArr.unshift(rows[i].mhurt);
53 + lhurtArr.unshift(rows[i].lhurt);
54 + occurArr.unshift(rows[i].occurence);
47 count = count + 1; 55 count = count + 1;
48 56
49 - if (count == 10){ 57 + if (count == 10) {
50 break; 58 break;
51 } 59 }
52 } 60 }
...@@ -62,13 +70,17 @@ router.get('/name/:name/birth/:birth', (req,res) => { ...@@ -62,13 +70,17 @@ router.get('/name/:name/birth/:birth', (req,res) => {
62 probArr, 70 probArr,
63 dataLen, 71 dataLen,
64 name, 72 name,
65 - birth 73 + birth,
74 + deathArr,
75 + mhurtArr,
76 + lhurtArr,
77 + occurArr
66 }); 78 });
67 } 79 }
68 }); 80 });
69 -} ) 81 +})
70 -router.get('/', function(req, res, next) { 82 +router.get('/', function (req, res, next) {
71 - res.render( 'main' ); 83 + res.render('main');
72 }); 84 });
73 85
74 module.exports = router; 86 module.exports = router;
......
This diff is collapsed. Click to expand it.
1 <!-- <!DOCTYPE html> 1 <!-- <!DOCTYPE html>
2 <html> 2 <html>
3 -
4 <head> 3 <head>
5 <!-- font --> 4 <!-- font -->
6 <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet" /> 5 <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet" />
...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
39 <script src="modules/exporting.js"></script> 38 <script src="modules/exporting.js"></script>
40 <script src="modules/export-data.js"></script> 39 <script src="modules/export-data.js"></script>
41 40
42 - <img src="images/background.jpg" alt="" style="z-index:-1; min-width: 100%; min-height: 100%"> 41 + <img src="images/newbackground.png" alt="" style="z-index:-1; min-width: 100%; min-height: 100%">
43 42
44 <div id="banner"> 43 <div id="banner">
45 <div id="container1" style="width:1260px; height: 400px; margin: 0 auto;"></div> 44 <div id="container1" style="width:1260px; height: 400px; margin: 0 auto;"></div>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 margin: 0; 34 margin: 0;
35 padding: 0; 35 padding: 0;
36 36
37 - /* background-image: url('background.jpg'); 37 + /* background-image: url('newbackground.png');
38 background-repeat: no-repeat; 38 background-repeat: no-repeat;
39 background-size: cover; */ 39 background-size: cover; */
40 /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */ 40 /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 21
22 /* background: linear-gradient( to bottom, #65799B, rgb(38, 14, 41) ); */ 22 /* background: linear-gradient( to bottom, #65799B, rgb(38, 14, 41) ); */
23 /* background-color:#65799B; */ 23 /* background-color:#65799B; */
24 - /* background-image: url("2.jpg"); 24 + /* background-image: url("newbackground.png");
25 background-repeat: no-repeat; 25 background-repeat: no-repeat;
26 background-size: cover; */ 26 background-size: cover; */
27 } 27 }
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <script src="highcharts.js"></script> 38 <script src="highcharts.js"></script>
39 <script src="modules/exporting.js"></script> 39 <script src="modules/exporting.js"></script>
40 <script src="modules/export-data.js"></script> 40 <script src="modules/export-data.js"></script>
41 - <img src="images/background.jpg" alt="" style="z-index:-1; min-width: 100%; min-height: 100%"> 41 + <img src="images/newbackground.png" alt="" style="z-index:-1; min-width: 100%; min-height: 100%">
42 42
43 <div id="banner"> 43 <div id="banner">
44 <div id="container1" style="width:1260px; height: 400px; margin: 0 auto"></div> 44 <div id="container1" style="width:1260px; height: 400px; margin: 0 auto"></div>
......