김윤지 / Probability Death

Go to a project
Toggle navigation Toggle navigation pinning
김윤지
7e537c45 2 parents ea17df59 b8042ec6

Merge branch 'master' into 'master' 

데이터 전송 안되는것 수정, 그래프 추가

데이터 전송 안되는것 수정, 그래프 추가

See merge request !8
Expand all
Inline Side-by-side
Showing 8 changed files with 103 additions and 108 deletions
...@@ -39,6 +39,7 @@ build/Release ...@@ -39,6 +39,7 @@ build/Release
39 # Dependency directories 39 # Dependency directories
40 node_modules/ 40 node_modules/
41 jspm_packages/ 41 jspm_packages/
42 +keys/
42 # TypeScript v1 declaration files 43 # TypeScript v1 declaration files
43 typings/ 44 typings/
44 45
......
1 -module.exports = {
2 - key: "aaaa"
3 -}
4 -//개인 Server Key 받아서 사용해야함, Browser key 안됨
...\ No newline at end of file ...\ No newline at end of file
1 -module.exports = {
2 - key: "aaaa"
3 -}
1 -module.exports = {
2 - host: 'localhost',
3 - user: 'root',
4 - password: 'Serrmica0!',
5 - database: 'db_option_total'
6 -}
...\ No newline at end of file ...\ No newline at end of file
This diff is collapsed. Click to expand it.
...@@ -4,8 +4,8 @@ var db = require('../lib/db_total'); ...@@ -4,8 +4,8 @@ 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
...@@ -23,10 +23,10 @@ router.get('/name/:name/birth/:birth', (req, res) => { ...@@ -23,10 +23,10 @@ router.get('/name/:name/birth/:birth', (req, res) => {
23 const birth = req.params.birth; 23 const birth = req.params.birth;
24 //const address = req.params.address; 24 //const address = req.params.address;
25 //////////////////////////////////////// 25 ////////////////////////////////////////
26 - var deathArr = new Array(); 26 + var tdeathArr = new Array(); //사망자수
27 - var mhurtArr = new Array(); 27 + var mhurtArr = new Array(); //중상자수
28 - var lhurtArr = new Array(); 28 + var lhurtArr = new Array(); //경상자수
29 - var occurArr = new Array(); 29 + var occurArr = new Array(); //총 발생수
30 //////////////////////////////////////// 30 ////////////////////////////////////////
31 31
32 32
...@@ -48,7 +48,7 @@ router.get('/name/:name/birth/:birth', (req, res) => { ...@@ -48,7 +48,7 @@ router.get('/name/:name/birth/:birth', (req, res) => {
48 wsArr.unshift(rows[i].wind); 48 wsArr.unshift(rows[i].wind);
49 rainArr.unshift(rows[i].rain); 49 rainArr.unshift(rows[i].rain);
50 //// 50 ////
51 - deathArr.unshift(rows[i].tdeath); 51 + tdeathArr.unshift(rows[i].tdeath);
52 mhurtArr.unshift(rows[i].mhurt); 52 mhurtArr.unshift(rows[i].mhurt);
53 lhurtArr.unshift(rows[i].lhurt); 53 lhurtArr.unshift(rows[i].lhurt);
54 occurArr.unshift(rows[i].occurence); 54 occurArr.unshift(rows[i].occurence);
...@@ -71,7 +71,7 @@ router.get('/name/:name/birth/:birth', (req, res) => { ...@@ -71,7 +71,7 @@ router.get('/name/:name/birth/:birth', (req, res) => {
71 dataLen, 71 dataLen,
72 name, 72 name,
73 birth, 73 birth,
74 - deathArr, 74 + tdeathArr,
75 mhurtArr, 75 mhurtArr,
76 lhurtArr, 76 lhurtArr,
77 occurArr 77 occurArr
......
This diff is collapsed. Click to expand it.
1 -<!DOCTYPE <!DOCTYPE html> 1 +<!DOCTYPE
2 +
3 +<!DOCTYPE html>
2 <html> 4 <html>
3 5
4 -<head> 6 + <head>
5 <meta charset="utf-8" /> 7 <meta charset="utf-8" />
6 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 8 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 - <title>Page Title</title> 9 + <title>Page Title</title>
8 - 10 +
9 - <!-- font --> 11 + <!-- font -->
10 - <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet"> 12 + <link href="https://fonts.googleapis.com/css?family=Nanum+Brush+Script&amp;subset=korean" rel="stylesheet">
11 - <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet"> 13 + <link href="https://fonts.googleapis.com/css?family=Yeon+Sung&amp;subset=korean" rel="stylesheet">
12 - 14 + <link href="https://fonts.googleapis.com/css?family=Do+Hyeon&display=swap" rel="stylesheet">
13 - <meta name="viewport" content="width=device-width, initial-scale=1"> 15 + <meta name="viewport" content="width=device-width, initial-scale=1">
14 - <link rel="stylesheet" type="text/css" media="screen" href="main.css" /> 16 + <link rel="stylesheet" type="text/css" media="screen" href="main.css" />
15 - <script src="main.js"></script> 17 + <script src="main.js"></script>
16 - 18 +
17 - <!-- 합쳐지고 최소화된 최신 CSS --> 19 + <!-- 합쳐지고 최소화된 최신 CSS -->
18 - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> 20 + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
19 - 21 +
20 - <!-- 부가적인 테마 --> 22 + <!-- 부가적인 테마 -->
21 - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css"> 23 + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
22 - 24 +
23 - <!-- 합쳐지고 최소화된 최신 자바스크립트 --> 25 + <!-- 합쳐지고 최소화된 최신 자바스크립트 -->
24 - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script> 26 + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
25 - 27 +
26 - <style type="text/css"> 28 + <style type="text/css">
27 - html, 29 + html,
28 - { 30 + {
29 - margin: 0; 31 + margin: 0;
30 - padding: 0; 32 + padding: 0;
31 - } 33 + }
32 - 34 +
33 - body { 35 + body {
34 - margin: 0; 36 + margin: 0;
35 - padding: 0; 37 + padding: 0;
36 - 38 +
37 - /* background-image: url('newbackground.png'); 39 + /* background-image: url('newbackground.png');
38 - background-repeat: no-repeat; 40 + background-repeat: no-repeat;
39 - background-size: cover; */ 41 + background-size: cover; */
40 - /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */ 42 + /* background: linear-gradient( to bottom, #fbc2eb, #a6c1ee ); */
41 - } 43 + }
42 - 44 +
43 - h1 { 45 + h1 {
44 - color: white; 46 + color: white;
45 - font-family: 'Nanum Brush Script', cursive; 47 + font-family: 'Do Hyeon', sans-serif;
46 - } 48 + //font-family: 'Nanum Brush Script', cursive;
47 - 49 + }
48 - label { 50 +
49 - color: white; 51 + label {
50 - font-size: 20px; 52 + color: white;
51 - font-family: 'Yeon Sung', cursive; 53 + font-size: 20px;
52 - } 54 + font-family: 'Do Hyeon', sans-serif;
53 - 55 + }
54 - #banner { 56 +
55 - position: absolute; 57 + #banner {
56 - top: 0; 58 + position: absolute;
57 - width: 100%; 59 + top: 0;
58 - } 60 + width: 100%;
59 - 61 + }
60 - #footer { 62 +
61 - position: absolute; 63 + #footer {
62 - bottom: 0; 64 + position: absolute;
63 - width: 100%; 65 + bottom: 0;
64 - height: 50px; 66 + width: 100%;
65 - text-align: center; 67 + height: 50px;
66 - font-family: 'Yeon Sung', cursive; 68 + text-align: center;
67 - color: white; 69 + font-family: 'Do Hyeon', sans-serif;
68 - } 70 + color: white;
69 - </style> 71 + }
70 - 72 + </style>
71 -</head> 73 +
72 - 74 + </head>
73 -<body> 75 +
74 - <img src="images/background.jpg" alt="" style="z-index:-1; min-width: 100%; min-height: 100%"> 76 + <body>
75 - <div id="banner"> 77 + <img src="images/newbackground.png" alt="" style="z-index:-1; min-width: 100%; min-height: 100%">
78 + <div id="banner">
76 <div style="width:100%; text-align: center; padding-top:170px;"> 79 <div style="width:100%; text-align: center; padding-top:170px;">
77 - <h1 style="font-size:90px;">당신이 지금 죽을 확률은?</h1> 80 + <h1 style="font-size:90px;">당신이 지금 죽을 확률은?</h1>
78 </div> 81 </div>
79 - <br><br><br> 82 + <br>
80 - <div style="width:100%; text-align: center;"> 83 + <br>
81 - <form action="/starting" method="post"> 84 + <br>
82 - <div class="form-inline"> 85 + <div style="width:100%; text-align: center;">
86 + <form action="/starting" method="post">
87 + <div class="form-inline">
83 <label>이름</label> 88 <label>이름</label>
84 - <input type="text" name="name" class="form-control" placeholder="김철수" style="width:200px;"> 89 + <input type="text" name="name" class="form-control" placeholder="조인화" style="width:200px;">
85 - &nbsp &nbsp&nbsp&nbsp 90 + &nbsp &nbsp&nbsp&nbsp
86 - <label>생년월일</label> 91 + <label>생년월일</label>
87 - <input type="text" name="birth" class="form-control" placeholder="971009" style="width:200px;"> 92 + <input type="text" name="birth" class="form-control" placeholder="991025" style="width:200px;">
88 - <br><br><br> 93 + <br>
89 - <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Yeon Sung', cursive; width:100px;font-weight: bold; font-size: 18px; background-color: white;"> 94 + <br>
95 + <br>
96 + <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Do Hyeon', sans-serif; width:100px;font-weight: bold; font-size: 18px; background-color: white;">
90 </div> 97 </div>
91 - </form> 98 + </form>
92 - </div> 99 + </div>
93 100
94 - </div> 101 + </div>
95 102
96 - <div id="footer">오픈소스SW개발 조민지 강환석 배희수</div> 103 + <div id="footer">오픈소스SW개발 김주희 김윤지 조인화</div>
97 -</body> 104 + </body>
98 105
99 </html> 106 </html>
...\ No newline at end of file ...\ No newline at end of file
......