Kcalmsg 알고리즘 수정, 모든 세부 페이지 css 1차 구현, api이미지 삽입!

양효빈
Commit 2b22d890dcf99657fa24866f8da3ff327f753999 2b22d890 1 parent bc340e5a
Showing 6 changed files with 71 additions and 20 deletions
lib/countKcal.js
lib/foodInfo.js
lib/home.js
lib/searchGym.js
lib/template.html
lib/template.js
--- a/lib/countKcal.js
View file @2b22d89
+++ b/lib/countKcal.js
View file @2b22d89
@@ -3,28 +3,72 @@ var template = require('./template.js');
 var db = require('./db.js');
 exports.countKcal = function(request, response){
     var title = '칼로리 계산';
-    var description = '바디 칼로리와 음식 칼로리가 있습니다.';
+    var description = '맞춤 권장 칼로리와 섭취 음식 칼로리 중 하나를 선택해 주세요.';
+    var url = "./"
+    
     var html = template.html(title,`
-    <h2>${title}</h2>
+    
-    <p>${description}</p>
+    <head>
-    <a href="/countKcal_body">바디 칼로리 계산</a><br>
+        <style type="text/css">
-    <a href="/countKcal_food">음식 칼로리 계산</a>
+            a:link {color: black; text-decoration: none;}
+            a:visited { color: black; text-decoration: none;}
+            a:hover { color: black;text-decoration: none;}
+        </style>
+    </head>
+
+
+
+    <br><br><br><br><br>
+
+    <style type="text/css">
+        div{
+
+            text-align:center;
+            border:1px solid none;
+            margin:0px 0px 0px 0px;
+            padding:0px;      
+
+        }
+        
+        
+        a { text-decoration:none } 
+        }
+
+    </style>
+
+
+    <div style= "font-size:25px;">
+        
+        <h2><font color="black">${title}<div style= "font-size:10px;"><br></div><div style= "font-size:20px;">${description}</font></div></h2>
+    </div>
+    <div style=border-radius: 30px;>
+        <a href="/countKcal_body">
+            <img src="https://source.unsplash.com/mQVWb7kUoOE" style="border-radius:20%" alt="no image..." width="300" height="300">
+        </a>
+        &emsp;&emsp;&emsp;&emsp;
+        <a href="/countKcal_food">
+            <img src="https://source.unsplash.com/HlNcigvUi4Q" style="border-radius:20%" alt="My Image" width="300" height="300">
+        </a>
+    </div>
+    <br>
+    <div style= "font-size:22px">
+        <a href="/countKcal_body" text-decoration:none>맞춤 권장 칼로리 계산</a>
+        &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;
+        <a href="/countKcal_food">섭취 음식 칼로리 계산</a>
+    </div>
     ` );
     response.writeHead(200);
     response.end(html);
 }
 exports.countKcal_body = function(request, response){
     var title = '칼로리 계산';
-    var description = '성별, 나이, 키, 몸무게, 활동량을 입력하시면 일일 권장 섭취량(kcal)를 알려드립니다!';
+    var description = '개인의 신체 정보에 맞는 일일 권장 섭취량(kcal)를 알려드립니다!';
     var html = template.html(title,`
-    <style>
-        @import url('https://fonts.googleapis.com/css2?family=Do+Hyeon&display=swap');
-    </style>
     <br><br><br>
-    <div style= "font-family: 'Do Hyeon', sans-serif;">
+    <div style= "font-size:20px;">
-        <h2>${title}</h2>
+        
-        <p>${description}</p>
+        <h2><font color="black">${title}<br><div style= "font-size:20px;"><br>${description}</font></div></h2>
         <form action="/countKcal_body_process" method="post" >
             성별 :<br />
             <select name="gender">
@@ -45,7 +89,7 @@ exports.countKcal_body = function(request, response){
                 <option value="high">많은 활동(매일 2시간동안 수영을 함)</option>
                 </select
             ><br /><br>
-            <input type="submit" value="계산하기" />
+            <input type="submit" value="계산하기" style="font-size:20px;" />
     </div>
     <br><br><br><br>
     </form>` );
@@ -154,6 +198,10 @@ exports.countKcal_body_process = function(request, response){
             foodKcal = (totalKcal/targetDay).toFixed(1);
             kcalMsg += `다이어트 칼로리 : ${(TDEE - foodKcal).toFixed(1)}kcal`;
         }
+        else if(weight == targetWeight) {
+            
+            kcalMsg ="";
+        }
         else if(weight < targetWeight) {
             totalKcal = (targetWeight-weight)*7700; //쩌야할 총 칼로리/벌크업
             foodKcal = (totalKcal/targetDay).toFixed(1);
--- a/lib/foodInfo.js
View file @2b22d89
+++ b/lib/foodInfo.js
View file @2b22d89
@@ -5,6 +5,7 @@ exports.foodInfo = function(request, response){
     var title = '음식 영양정보';
     var description = '음식을 검색하면 음식의 칼로리, 탄수화물, 단백질, 지방, 나트륨의 정보를 알려드립니다!';
     var html = template.html(title,`
+    <br><br><br>
         <h2>${title}</h2>
         <p>${description}</p>
         <form action="/foodInfo_search" method="post">
@@ -40,6 +41,7 @@ exports.foodInfo_search = function(request, response){
                 }
             }
             var html = template.html(title,`
+            <br><br><br>
                 <h2>${title}</h2>
                 <p>${description}</p>
                 <form action="/foodInfo_search" method="post">
--- a/lib/home.js
View file @2b22d89
+++ b/lib/home.js
View file @2b22d89
@@ -34,7 +34,7 @@ exports.home = function(request, response){
             </div>
             </style>
-    <div style= font-size:40px;background-image:url("https://source.unsplash.com/featured/?food,health");padding:50px;>
+    <div style= font-size:40px;background-image:url("https://source.unsplash.com/jFCViYFYcus");padding:50px;>
         <h1 style=font-family: 'Do Hyeon', sans-serif;><a href="/"><font color="white">HealthProtector</font></a></h1>
--- a/lib/searchGym.js
View file @2b22d89
+++ b/lib/searchGym.js
View file @2b22d89
@@ -10,12 +10,12 @@ exports.searchGym = function(request, response){
         <style>
             @import url('https://fonts.googleapis.com/css2?family=Do+Hyeon&display=swap');
         </style>
-
+        <br><br>
-        <br><br><br><br>
+        <div style= "font-size:25px; background-color:#ffffff">
-        <div style= "font-size:15px;font-family: 'Do Hyeon', sans-serif;">
+        
-            <h2>${title}</h2>
+            <h2><font color="black">${title}<br><div style= "font-size:20px;font-family: 'Do Hyeon', sans-serif;">${description}</font></div></h2>
-            <p>${description}</p>
         </div>
+        
         <style>
         .map_wrap, .map_wrap * {margin:0;padding:0;font-family:'Malgun Gothic',dotum,'돋움',sans-serif;font-size:12px;}
         .map_wrap a, .map_wrap a:hover, .map_wrap a:active{color:#000;text-decoration: none;}
--- a/lib/template.html
View file @2b22d89
+++ b/lib/template.html
View file @2b22d89
@@ -31,7 +31,7 @@
     <br><br><br><br>  
     ${body}
-    <div style= width:100%;font-size:9px;position:fixed;bottom:0;float:left;padding:0px;background-color:#cffdcf;>
+    <div style= width:100%;font-size:9px;position:fixed;bottom:0;float:left;padding:0px;background-color:#ffffff;>
         <h4><font color="white">Copyright(C) HealThProtector 2020</h4>
     </div>
     </body>
--- a/lib/template.js
View file @2b22d89
+++ b/lib/template.js
View file @2b22d89
@@ -29,6 +29,7 @@ module.exports = {
             </div>
             </style>
+
             <div style="font-family: 'Do Hyeon', sans-serif;";>
                 <h3 style=width:180px;float:left;><a href="/"><font color="black">HealthProtector</font></a></h3>
                 <h3 style=width:120px;float:left;><a href="/countKcal"><font color="black">칼로리 계산</font></a></h3>