#54 버튼 형식 변경

HiAlcohol · Jan 23, 2022 · f0d349c · f0d349c
1 parent 3a29367
commit f0d349c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 67 deletions.
diff --git a/routes/mbtiRouter.js b/routes/mbtiRouter.js
@@ -17,8 +17,6 @@ const rData = JSON.parse(rfile);
 // console.log(qData);
 // console.log(rData);
 
-
-
 router.get('/', function(request, response){
 
     const body = mbti_start.HOME();

diff --git a/template/mbti_result.js b/template/mbti_result.js
@@ -11,9 +11,6 @@ module.exports = {
     HOME: function(data, des) {
        return `
        <script>
-       $("#restart").click(function() {
-       location.href = "test_start.html";
-   });
    
    $('.copy').click(function(){	
    var link= $('#link');
@@ -22,24 +19,23 @@ module.exports = {
    alert('결과 링크가 복사되었습니다.');	
    return false;
    });
-   
-   // // 카카오 공유를 위한 임시코드
-   // Kakao.init('b305a1173710e4ff765e09b5a62e314c'); 
-   // function link_kakao() {
-   //   var sh_title = "나와 어울리는 칵테일은?";
-   //   var sh_desc = "당신에게 어울리는 칵테일을 찾아보세요.\nHi Alcohol"; 
-   //   Kakao.Link.sendDefault({ 
-   //     objectType: 'feed', 
-   //     content: {
-   //      title: sh_title, description: sh_desc, 
-   //      imageUrl: "../img/cocktail.png", 
-   //      link: { mobileWebUrl: "모바일 링크 url", 
-   //      webUrl: "PC 링크 url" 
-   //     } 
-   //   }, 
-   // }); 
-   // }
-   
+
+      // // 카카오 공유를 위한 임시코드
+    // Kakao.init('b305a1173710e4ff765e09b5a62e314c'); 
+    // function link_kakao() {
+    //   var sh_title = "나와 어울리는 칵테일은?";
+    //   var sh_desc = "당신에게 어울리는 칵테일을 찾아보세요.\nHi Alcohol"; 
+    //   Kakao.Link.sendDefault({ 
+    //     objectType: 'feed', 
+    //     content: {
+    //      title: sh_title, description: sh_desc, 
+    //      imageUrl: "../img/cocktail.png", 
+    //      link: { mobileWebUrl: "모바일 링크 url", 
+    //      webUrl: "PC 링크 url" 
+    //     } 
+    //   }, 
+    // }); 
+    // }
    
    </script>
    
@@ -67,7 +63,7 @@ module.exports = {
          </div>
        
          <main>
-           <div class="button"><button id="restart" class="btn"> 처음으로</button></div><br>
+           <div class="button"><button id="restart" class="btn" onClick="location.href='../mbti' "> 처음으로</button></div><br>
            
            <div class="copy"><button id="copy" class="btn">링크 복사</button></div>
            <div class="share"><img src="/public/img/bt_kakao.png"><br>공유하기</div>
@@ -84,11 +80,11 @@ module.exports = {
        <!DOCTYPE html>
        <html lang="en">
        <head>
-           <meta charset="UTF-8">
-           <title>Hi MBTI Result</title>
-	        <link rel="stylesheet" href="/public/css/test_result.css" />
-         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-         <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity_no="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        <meta charset="UTF-8">
+        <title>Hi MBTI Result</title>
+	      <link rel="stylesheet" href="/public/css/test_result.css" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity_no="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
        
        </head>
    

diff --git a/template/mbti_start.js b/template/mbti_start.js
@@ -9,39 +9,29 @@ module.exports = {
        `
     },
     HOME: function( ) {
-       return `
-       <script>
-       $("#start").click(function() {
-       location.href = "/mbti/test";
-     });
-     </script>
-     
+       return `     
      <body>
        <header>
          <a>당신에게 어울리는 <span style="color:#0BF3BC ">술</span>테스트</a>
        </header>
        <main>
          
-         <div class="button"><button id="start" class="btn">테스트 시작</button></div>
+         <div class="button"><button id="start" class="btn"  onClick="location.href='mbti/test'">테스트 시작</button></div>
        </main>
-     
     `
     },
     HEAD: function() {
-       return `
-       <!DOCTYPE html>
-       <html lang="en">
+      return `
+      <!DOCTYPE html>
+      <html lang="en">
         
-       <head>
-           <meta charset="UTF-8">
-           <title>Hi MBTI Start</title>
-           <meta name="viewport" content="width=device-width, initial-scale=1.0">
-           <link rel="stylesheet" href="/public/css/test_start.css" />
-           <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-       
-       </head>
-       
-    
+      <head>
+         <meta charset="UTF-8">
+         <title>Hi MBTI Start</title>
+         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+         <link rel="stylesheet" href="/public/css/test_start.css" />
+      </head>
+
        `;
     },
     TAIL: function() {

diff --git a/template/mbti_test.js b/template/mbti_test.js
@@ -10,14 +10,6 @@ module.exports = {
     },
     HOME: function( ) {
        return `
-       <script>
-       
-       
-       $(".btn").click(function() {
-       location.href = "test.html";
-     });
-     
-     </script>
        <body>
        <header>
        
@@ -28,9 +20,9 @@ module.exports = {
            <div class="qna">
                <p id="q">Q1. 술집에서 멍하니 있는 당신의 머리속은?</p><br><br>
              
-               <div class="button"><button id="brn_1" class="btn"> 무한한 상상의 나래 속으로</button></div>
+               <div class="button"><button id="brn_1" class="btn" onClick="location.href='test'"> 무한한 상상의 나래 속으로</button></div>
                <br>
-               <div class="button"><button id="btn_2" class="btn"> 집.. 어떻게 가지?</button></div>
+               <div class="button"><button id="btn_2" class="btn" onClick="location.href='test'"> 집.. 어떻게 가지?</button></div>
            </div>
            <br><br>
            <div class="move">
@@ -53,14 +45,8 @@ module.exports = {
            <title>Hi MBTI</title>
            <meta name="viewport" content="width=device-width, initial-scale=1.0">
            <link rel="stylesheet" href="/public/css/test.css" />
-       
-           <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-       
        </head>
-      
    
-       
-    
        `;
     },
     TAIL: function() {