Merge branch 'detail'

김대철
Commit b2c920f09c7162ad13e0dd78834958e930c189f6 b2c920f0 2 parents 3fd39321 e893491a
Showing 4 changed files with 123 additions and 58 deletions
views/index.ejs
views/login.ejs
views/map.ejs
views/review.ejs
--- a/views/index.ejs
View file @b2c920f
+++ b/views/index.ejs
View file @b2c920f
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
     <script src="https://apis.google.com/js/platform.js" async defer></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Cafe Map</title>
     <meta name="google-signin-client_id" content=<%=client_id%>>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Cafe Map</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" integrity="undefined" crossorigin="anonymous">
-    <link rel="stylesheet" href="stylesheets/bootstrap.css">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@700&display=swap" rel="stylesheet">
     <style>
-        img{
+      img {
-            max-width: 100%;
+        max-width: 100%;
-            height: 100% !important;
+        height: 100% !important;
-        }
+      }
-        h1{font-family: 'Noto Sans KR', sans-serif;}
+      h1 {
-        h4{font-family: 'Noto Sans KR', sans-serif;}
+        font-family: "Noto Sans KR", sans-serif;
-        h2{font-family: 'Noto Sans KR', sans-serif;}
+      }
-        h3{font-family: 'Noto Sans KR', sans-serif;}
+      h4 {
-        h5{font-family: 'Noto Sans KR', sans-serif;}
+        font-family: "Noto Sans KR", sans-serif;
-        .center{
+      }
-            background-color: #848484;
+      h2 {
-            margin-right: 20%;
+        font-family: "Noto Sans KR", sans-serif;
-            margin-left: 20%;
+      }
-            margin-top: 5%;
+      h3 {
-            text-align:center;
+        font-family: "Noto Sans KR", sans-serif;
-        }
+      }
-        .g-signin2{
+      h5 {
-            width: 100%;
+        font-family: "Noto Sans KR", sans-serif;
-        }
+      }
+      .center {
+        background-color: #848484;
+        margin-right: 20%;
+        margin-left: 20%;
+        margin-top: 5%;
+        text-align: center;
+      }
+      .g-signin2 {
+        width: 100%;
+      }
-        .g-signin2 > div{
+      .g-signin2 > div {
-            margin: 0 auto;
+        margin: 0 auto;
-        }
+      }
     </style>
+  </head>
+  <body>
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+      <button
+        class="navbar-toggler"
+        type="button"
+        data-toggle="collapse"
+        data-target="#navbarSupportedContent"
+        aria-controls="navbarSupportedContent"
+        aria-expanded="false"
+        aria-label="Toggle navigation"
+      >
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <a class="navbar-brand" href="/"><strong>Home</strong></a>
+        <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
+          <li class="nav-item active">
+            <a
+              class="nav-link"
+              style="color: #ffffff"
+              href="/"
+              onclick="signOut();"
+              >Logout<span class="sr-only">(current)</span></a
+            >
+          </li>
+        </ul>
+      </div>
+    </nav>
+    <br /><br />
+    <div class="center">
+      <br />
+      <h5 class="display-5 font-weight-bold" style="color: white">
+        Cafe Recommend
+      </h5>
+      <br /><br />
+      <div
+        class="g-signin2"
+        data-onsuccess="onSignIn"
+        -theme="light"
+        data-width="300"
+        data-height="50"
+        data-longtitle="true"
+      >
+        button
+      </div>
+      <br /><br />
 </head>
 <body>
@@ -46,42 +104,35 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a>
     </div>
-</nav>
+  </body>
-<br><br>
-    <div class ="center" >
-        <br>
-        <h5 class="display-5 font-weight-bold" style="color: white">Cafe Recommend</h5>
-        <br><br>
-        <div class="g-signin2" data-onsuccess="onSignIn" -theme="light" data-width="300" data-height="50" data-longtitle="true">button</div>
-        <br><br>
-    </div>
-</body>
+  <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+  <script
+    src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.min.js"
+    integrity="undefined"
+    crossorigin="anonymous"
+  ></script>
-<script>
+  <script>
     function onSignIn(googleUser) {
-        var id_token = googleUser.getAuthResponse().id_token;
+      var id_token = googleUser.getAuthResponse().id_token;
-        var xhr = new XMLHttpRequest();
+      var xhr = new XMLHttpRequest();
-        xhr.open('POST', '/index');
+      xhr.open("POST", "/index");
-        xhr.setRequestHeader('Content-Type', 'application/json');
+      xhr.setRequestHeader("Content-Type", "application/json");
-        xhr.onload = function() {
+      xhr.onload = function () {
-            console.log('Signed in as: ' + xhr.responseText);
+        console.log("Signed in as: " + xhr.responseText);
-            if(xhr.responseText == 'success'){
+        if (xhr.responseText == "success") {
-                signOut();
+          signOut();
-                location.assign('/login');
+          location.assign("/login");
-            }
+        }
-        };
+      };
-        xhr.send(JSON.stringify({token : id_token}));
+      xhr.send(JSON.stringify({ token: id_token }));
     }
-
     function signOut() {
         var auth2 = gapi.auth2.getAuthInstance();
         auth2.signOut().then(function () {
             console.log("User signed out.");
         });
     }
-</script>
+    </script>
-<script src="javascripts/bootstrap.js"></script>
-<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 </html>
-
--- a/views/login.ejs
View file @b2c920f
+++ b/views/login.ejs
View file @b2c920f
--- a/views/map.ejs
View file @b2c920f
+++ b/views/map.ejs
View file @b2c920f
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="stylesheets/bootstrap.css" />
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
+      integrity="undefined"
+      crossorigin="anonymous"
+    />
     <title>Cafe Map</title>
     <style>
       .btn-primary {
@@ -379,8 +384,12 @@
         placeOverlay.setMap(map);
       }
     </script>
-    <script src="javascripts/bootstrap.js"></script>
     <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+    <script
+      src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"
+      integrity="undefined"
+      crossorigin="anonymous"
+    ></script>
     <!-- 모달 바디 -->
     <div
--- a/views/review.ejs
View file @b2c920f
+++ b/views/review.ejs
View file @b2c920f
@@ -5,7 +5,12 @@
     <title>Enroll Review</title>
-    <link rel="stylesheet" href="/stylesheets/bootstrap.css">
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
+      integrity="undefined"
+      crossorigin="anonymous"
+    />
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@700&display=swap" rel="stylesheet">
     <style>
@@ -117,6 +122,6 @@
     </div>
 </section>
 </body>
-<script src="/javascripts/bootstrap.js"></script>
 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.min.js" integrity="undefined" crossorigin="anonymous"></script>
 </html>
\ No newline at end of file