김동진 / HealthProtector

Go to a project
Toggle navigation Toggle navigation pinning
김동진
d1a81e0c 2 parents f9523422 693c0c1c

Apply .gitignore

Expand all
Inline Side-by-side
Showing 8 changed files with 27 additions and 18 deletions
......@@ -118,6 +118,6 @@ dist
package-lock.json
# db
lib.db.js
lib.appkey.js
lib/db.js
lib/appkey.js
food.sql
\ No newline at end of file
......
This diff could not be displayed because it is too large.
var key = {
kakaomapKey : "900b1f5dd2fee32f1ee91d18266bbfe4"};
module.exports = key; //key을 바깥에서 사용할 수 있도록 exports한다.
var mysql = require('mysql');
var db = mysql.createConnection({
host: "myfooddb.czvswclxcy8d.us-east-1.rds.amazonaws.com",
user: "user",
password: "user1234",
port: 3306,
database : 'food'
});
db.connect();
module.exports = db;
\ No newline at end of file
......@@ -10,6 +10,12 @@ module.exports = {
<meta charset="utf-8" />
</head>
<body>
<<<<<<< HEAD
=======
>>>>>>> origin/master
<style type="text/css">
div{
@import url('https://fonts.googleapis.com/css2?family=Jua&family=Noto+Sans+KR&display=swap');
......@@ -40,23 +46,35 @@ module.exports = {
<br>
<div style= width:31%;"font-family:'Jua',sans-serif";float:left;padding:5px;>
<h2 style="font-family: 'Jua', sans-serif;"><a href="/countKcal"><font color="black">칼로리 계산</a></h2>
<h4 style="font-family: 'Jua', sans-serif;"><font color="gray">자신에게 맞는 일일 권장 섭취량(kcal)를 계산해보세요!</h4>
<h4 style="font-family: 'Jua', sans-serif;"><font color="gray">나에게 맞는 일일 권장 섭취량(kcal)을 계산해보세요!</h4>
</div>
<<<<<<< HEAD
<div style= width:36%;float:right;padding:0px;>
=======
<div style= width:36%;float:left;padding:0px;>
>>>>>>> origin/master
<h2 style="font-family: 'Jua', sans-serif;"><a href="/foodInfo"><font color="black">음식별 영양정보</a></h2>
<h4 style="font-family: 'Jua', sans-serif;"><font color="gray">음식별 식품 영양정보에 대해 알려드립니다!</h4>
</div>
<div style= width:31%;float:right;padding:0px;>
<<<<<<< HEAD
<h2 style="font-family: 'Jua', sans-serif;"><a href="/searchGym"><font color="black">헬스장 찾기</a></h2>
<h4 style="font-family: 'Jua', sans-serif;"><font color="gray">위치를 입력하면 그 주위의 헬스장을 찾아드립니다!</h4>
=======
<h2 style="font-family: 'Jua', sans-serif;"><a href="/foodInfo"><font color="black">헬스장 찾기</a></h2>
<h4 style="font-family: 'Jua', sans-serif;"><font color="gray">원하는 위치에 있는 헬스장을 알려드립니다.</h4>
>>>>>>> origin/master
</div>
<br><br><br><br><br>
<<<<<<< HEAD
=======
>>>>>>> origin/master
${body}
<div style= width:100%;font-size:10px;position:fixed;bottom:0;float:left;padding:0px;background-color:#0B610B;>
......
var http = require('http');
<<<<<<< HEAD
=======
var db = require('./lib/db.js')
>>>>>>> origin/master
var url = require('url');
var home = require('./lib/home.js');
......
This diff is collapsed. Click to expand it.
{
"name": "healthprotector",
"version": "1.0.0",
"description": "",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
......@@ -14,6 +15,7 @@
"type": "git",
"url": "http://khuhub.khu.ac.kr/2019102154/HealthProtector.git"
},
"dependencies": {
"mysql": "^2.18.1",
"pm2": "^4.5.0",
......