구희연 / Food_recipe_info

Go to a project
Toggle navigation Toggle navigation pinning
구희연
8d71a398 1 parent 41dac5fe

Revert "Making files to show various foreign foods videos and Modifying intro page" 

This reverts commit 41dac5fe
Inline Side-by-side
Showing 3 changed files with 1 additions and 87 deletions
......@@ -38,11 +38,7 @@ passport.deserializeUser(function(id, done) { //읽기
//첫 페이지
app.get('/',(req,res)=>{
<<<<<<< HEAD
let page = getFirstPage(' 오늘뭐먹지','아직도 먹는게<br>고민된다면..?',authInfo(req));
=======
let page = getFirstPage('Welcome!','Food Recipe',authInfo(req));
>>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6
res.send(page);
});
......@@ -399,7 +395,6 @@ const getLoginButton = (auth) =>{
//첫 페이지 화면
const getFirstPage =(title, content, auth) =>{
<<<<<<< HEAD
return `
<!DOCTYPE html>
<html lang="en">
......@@ -544,77 +539,4 @@ const getFirstPage =(title, content, auth) =>{
</body>
</html>
`;
}
=======
return `
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Passport Example</title>
<style>
body{
height: 100vh;
background-image: url('https://images.unsplash.com/photo-1614548539924-5c1f205b3747?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80');
background-position: center;
background-repeat: no-repeat;
background-size: cover;
background-attachment: scroll;
}
h1 {
position: absolute;
left: 50%;
top: 30%;
transform: translate(-50%, -30%);
text-align: center;
font-size: 5em;
font-family: cursive;;
}
p {
position: relative;
left: 50%;
top: 47%;
transform: translate(-50%, -47%);
font-size: 3em;
text-align: center;
}
div {
position: relative;
font-size: 1.3em;
text-align: center;
}
.box1{
position: relative;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
.box2{
position: relative;
left: 50%;
top: 54%;
transform: translate(-50%, -54%);
}
</style>
</head>
<body>
<h1>${title}</h1>
<p>${content}</p>
<div class="box1">
${auth}
</div>
<div class="box2">
<input type="button" value="레시피 보러가기" onClick="movepage()"/>
</div>
<script type="text/javascript">
function movepage(){
location.href="main";
}</script>
</body>
</html>
`;
}
>>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6
}
\ No newline at end of file
......
......@@ -73,8 +73,4 @@ section{
}
=======
}
<<<<<<< HEAD
>>>>>>> feature/youtube
=======
>>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6
>>>>>>> feature/youtube
......
......@@ -34,8 +34,4 @@
</html>
=======
</html>
<<<<<<< HEAD
>>>>>>> feature/youtube
=======
>>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6
>>>>>>> feature/youtube
......