고다경 / Open_Source_project

Go to a project
Toggle navigation Toggle navigation pinning
고다경
e17d259c 1 parent 8ccc0a3e

글자위치랑 백그라운드 수정

Inline Side-by-side
Showing 6 changed files with 17 additions and 5 deletions
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 <p style="text-decoration-line: underline; font-weight:bold;">오늘 먹은 것들을 적어주세요!</p> 11 <p style="text-decoration-line: underline; font-weight:bold;">오늘 먹은 것들을 적어주세요!</p>
12 12
13 - <input type="text" name="name" style="width:30%; height:130px;" placeholder="ex) coffee and croissant"> 13 + <input type="text" name="name" style="width:30%; height:130px;" placeholder="ex) 1 apple and 2 banana / coffee and croissant">
14 <br><br><br><br> 14 <br><br><br><br>
15 15
16 <input id="go" type="submit" value="Go!" style=" width:100px; height:80px; font-weight: bold; color:white; font-size: 25px; background-color: rgb(104, 211, 104); border-radius: 2em;"> 16 <input id="go" type="submit" value="Go!" style=" width:100px; height:80px; font-weight: bold; color:white; font-size: 25px; background-color: rgb(104, 211, 104); border-radius: 2em;">
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 62
63 <p style="text-decoration-line: underline; font-weight:bold;">오늘 먹은 것들을 적어주세요!</p> 63 <p style="text-decoration-line: underline; font-weight:bold;">오늘 먹은 것들을 적어주세요!</p>
64 64
65 - <input type="text" style="width:30%; height:130px;" placeholder="ex) coffee and croissant"> 65 + <input type="text" style="width:30%; height:130px;" placeholder="ex) 1 apple and 2 banana / coffee and croissant">
66 <br><br><br><br> 66 <br><br><br><br>
67 67
68 <input id="go" type="button" value="Go!" style=" width:100px; height:80px; font-weight: bold; color:white; font-size: 25px; background-color: rgb(104, 211, 104); border-radius: 2em;"> 68 <input id="go" type="button" value="Go!" style=" width:100px; height:80px; font-weight: bold; color:white; font-size: 25px; background-color: rgb(104, 211, 104); border-radius: 2em;">
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
74 #container1{ 74 #container1{
75 float: left; 75 float: left;
76 border: 1px solid white; 76 border: 1px solid white;
77 + background-color: orange;
77 width: 100%; 78 width: 100%;
78 height: 120%; 79 height: 120%;
79 } 80 }
...@@ -83,14 +84,16 @@ ...@@ -83,14 +84,16 @@
83 background-color: rgb(102, 219, 180); 84 background-color: rgb(102, 219, 180);
84 font-weight: bold; 85 font-weight: bold;
85 width: 100%; 86 width: 100%;
86 - height: 120%; 87 + height: 100%;
87 } 88 }
88 #container3{ 89 #container3{
89 float: right; 90 float: right;
90 border: 1px solid white; 91 border: 1px solid white;
92 + background-color: gainsboro;
91 margin-right:5%; 93 margin-right:5%;
92 width: 40%; 94 width: 40%;
93 height: 200%; 95 height: 200%;
96 +
94 97
95 } 98 }
96 99
......
...@@ -7,6 +7,14 @@ ...@@ -7,6 +7,14 @@
7 "gender": "male", 7 "gender": "male",
8 "height": "1", 8 "height": "1",
9 "weight": "1" 9 "weight": "1"
10 + },
11 + {
12 + "ID": "harry",
13 + "password": "1234",
14 + "age": "20",
15 + "gender": "male",
16 + "height": "160",
17 + "weight": "60"
10 } 18 }
11 ] 19 ]
12 } 20 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -174,14 +174,14 @@ helper.getCurrentWeatherByCityName("Seoul", (err, currentWeather) => { ...@@ -174,14 +174,14 @@ helper.getCurrentWeatherByCityName("Seoul", (err, currentWeather) => {
174 var cal = jresult.calories; 174 var cal = jresult.calories;
175 var user = db.get('users').find({ID:sID}).value(); 175 var user = db.get('users').find({ID:sID}).value();
176 var bmi = user.weight/(user.height*user.height/100/100); 176 var bmi = user.weight/(user.height*user.height/100/100);
177 - var ccc = container.L(`<h2>칼로리 : ${cal}kcal`,`<p style="margin-left: 10%">"Weather NOW"</p> 177 + var ccc = container.L(`<h2 style="margin-left: 10%">칼로리 : ${cal}kcal`,`<p style="margin-left: 10%">"Weather NOW"</p>
178 <p id="w1" style="margin-left: 10%">도시 = ${city}</p> 178 <p id="w1" style="margin-left: 10%">도시 = ${city}</p>
179 <p id="w3" style="margin-left: 10%">현재온도 = ${temper}(+" ℃")</p> 179 <p id="w3" style="margin-left: 10%">현재온도 = ${temper}(+" ℃")</p>
180 <span id="w2" style="margin-left: 10%">현재날씨 = ${weather}</span> 180 <span id="w2" style="margin-left: 10%">현재날씨 = ${weather}</span>
181 <span id="w4" style="margin-left: 10%">날씨상세 = ${detweather}</span> 181 <span id="w4" style="margin-left: 10%">날씨상세 = ${detweather}</span>
182 <br><br> 182 <br><br>
183 <span id="w5" style="margin-left: 10%">바람 = ${wind}(+"m/s")</span> 183 <span id="w5" style="margin-left: 10%">바람 = ${wind}(+"m/s")</span>
184 - <span id="w6" style="margin-left: 10%">구름 = ${cloud} (+"%")</span>`,`<h2>bmi: ${bmi}</h2>`) 184 + <span id="w6" style="margin-left: 10%">구름 = ${cloud} (+"%")</span>`,`<h2 style="margin-left: 10%">bmi: ${bmi}</h2>`)
185 var html = template.HTML(title,ch,``,body,`#logout{ 185 var html = template.HTML(title,ch,``,body,`#logout{
186 position:absolute; 186 position:absolute;
187 right: 20ch; 187 right: 20ch;
......
1 +{"cookie":{"originalMaxAge":null,"expires":null,"httpOnly":true,"path":"/"},"__lastAccess":1559837072152,"is_logined":true,"ID":"harry"}
...\ No newline at end of file ...\ No newline at end of file