Revert "Making files to show various foreign foods videos and Modifying intro page"
This reverts commit 41dac5fe
Showing
3 changed files
with
0 additions
and
86 deletions
| ... | @@ -38,11 +38,7 @@ passport.deserializeUser(function(id, done) { //읽기 | ... | @@ -38,11 +38,7 @@ passport.deserializeUser(function(id, done) { //읽기 |
| 38 | 38 | ||
| 39 | //첫 페이지 | 39 | //첫 페이지 |
| 40 | app.get('/',(req,res)=>{ | 40 | app.get('/',(req,res)=>{ |
| 41 | -<<<<<<< HEAD | ||
| 42 | let page = getFirstPage(' 오늘뭐먹지','아직도 먹는게<br>고민된다면..?',authInfo(req)); | 41 | let page = getFirstPage(' 오늘뭐먹지','아직도 먹는게<br>고민된다면..?',authInfo(req)); |
| 43 | -======= | ||
| 44 | - let page = getFirstPage('Welcome!','Food Recipe',authInfo(req)); | ||
| 45 | ->>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6 | ||
| 46 | res.send(page); | 42 | res.send(page); |
| 47 | }); | 43 | }); |
| 48 | 44 | ||
| ... | @@ -399,7 +395,6 @@ const getLoginButton = (auth) =>{ | ... | @@ -399,7 +395,6 @@ const getLoginButton = (auth) =>{ |
| 399 | 395 | ||
| 400 | //첫 페이지 화면 | 396 | //첫 페이지 화면 |
| 401 | const getFirstPage =(title, content, auth) =>{ | 397 | const getFirstPage =(title, content, auth) =>{ |
| 402 | -<<<<<<< HEAD | ||
| 403 | return ` | 398 | return ` |
| 404 | <!DOCTYPE html> | 399 | <!DOCTYPE html> |
| 405 | <html lang="en"> | 400 | <html lang="en"> |
| ... | @@ -545,76 +540,3 @@ const getFirstPage =(title, content, auth) =>{ | ... | @@ -545,76 +540,3 @@ const getFirstPage =(title, content, auth) =>{ |
| 545 | </html> | 540 | </html> |
| 546 | `; | 541 | `; |
| 547 | } | 542 | } |
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 548 | -======= | ||
| 549 | - return ` | ||
| 550 | - <!DOCTYPE html> | ||
| 551 | - <html lang="en"> | ||
| 552 | - <head> | ||
| 553 | - <meta charset="UTF-8"> | ||
| 554 | - <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| 555 | - <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| 556 | - <title>Passport Example</title> | ||
| 557 | - <style> | ||
| 558 | - body{ | ||
| 559 | - height: 100vh; | ||
| 560 | - 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'); | ||
| 561 | - background-position: center; | ||
| 562 | - background-repeat: no-repeat; | ||
| 563 | - background-size: cover; | ||
| 564 | - background-attachment: scroll; | ||
| 565 | - } | ||
| 566 | - h1 { | ||
| 567 | - position: absolute; | ||
| 568 | - left: 50%; | ||
| 569 | - top: 30%; | ||
| 570 | - transform: translate(-50%, -30%); | ||
| 571 | - text-align: center; | ||
| 572 | - font-size: 5em; | ||
| 573 | - font-family: cursive;; | ||
| 574 | - } | ||
| 575 | - p { | ||
| 576 | - position: relative; | ||
| 577 | - left: 50%; | ||
| 578 | - top: 47%; | ||
| 579 | - transform: translate(-50%, -47%); | ||
| 580 | - font-size: 3em; | ||
| 581 | - text-align: center; | ||
| 582 | - } | ||
| 583 | - div { | ||
| 584 | - position: relative; | ||
| 585 | - font-size: 1.3em; | ||
| 586 | - text-align: center; | ||
| 587 | - } | ||
| 588 | - .box1{ | ||
| 589 | - position: relative; | ||
| 590 | - left: 50%; | ||
| 591 | - top: 50%; | ||
| 592 | - transform: translate(-50%, -50%); | ||
| 593 | - } | ||
| 594 | - .box2{ | ||
| 595 | - position: relative; | ||
| 596 | - left: 50%; | ||
| 597 | - top: 54%; | ||
| 598 | - transform: translate(-50%, -54%); | ||
| 599 | - } | ||
| 600 | - </style> | ||
| 601 | - </head> | ||
| 602 | - <body> | ||
| 603 | - <h1>${title}</h1> | ||
| 604 | - <p>${content}</p> | ||
| 605 | - <div class="box1"> | ||
| 606 | - ${auth} | ||
| 607 | - </div> | ||
| 608 | - <div class="box2"> | ||
| 609 | - <input type="button" value="레시피 보러가기" onClick="movepage()"/> | ||
| 610 | - </div> | ||
| 611 | - <script type="text/javascript"> | ||
| 612 | - function movepage(){ | ||
| 613 | - location.href="main"; | ||
| 614 | - }</script> | ||
| 615 | - </body> | ||
| 616 | - </html> | ||
| 617 | - `; | ||
| 618 | - | ||
| 619 | -} | ||
| 620 | ->>>>>>> fdaabc0a001fe31ed43809b64f9073ff18fd1db6 | ... | ... |
-
Please register or login to post a comment