Fix conflict

Yuncheol Kwak
Commit a6f670294131b262c7b6f1b79c86fbf9dbf88bc7 a6f67029 2 parents d272bda6 f2bf782c
Showing 1 changed file with 4 additions and 13 deletions
CommentLoadingTest.js
--- a/CommentLoadingTest.js
View file @a6f6702
+++ b/CommentLoadingTest.js
View file @a6f6702
@@ -36,10 +36,10 @@ function showcomment(response, VideoNum){
                     <link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
                 </head>
                 <body style="margin:5%">
-                    <h1 style="font-family: 'Permanent Marker', cursive; text-align:center; padding-bottom:1%;">Youtube Comment Seperator</h1>
+                    <h1 style="font-family: 'Permanent Marker', cursive; text-align:center; padding-bottom:1%;"><a href="${serverIP}" style="text-decoration:none; color:inherit;">Youtube Comment Seperator</a></h1>
                     <form action="${serverIP}/search" method="get">
                         <div class="form-group" style="font-family: 'Ubuntu', sans-serif;">
-                            <input type="text" name="videourl" placeholder="Type in video ID" class="form-control" style="margin-bottom:10px;">
+                            <input type="text" name="videourl" placeholder="Type in video Url" class="form-control" style="margin-bottom:10px;">
                             <label for="language-select">Choose a language:</label>
                             <select class="form-control" name="languages" id="language-select" style="display:inline-flex;">
                                 <option value="all" selected>--Please choose an option--</option>
@@ -133,10 +133,10 @@ var app = http.createServer(function(request,response){ // request는 브라우
             <link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet">
         </head>
         <body style="margin:5%">
-            <h1 style="font-family: 'Permanent Marker', cursive; text-align:center; padding-bottom:1%;">Youtube Comment Seperator</h1>
+            <h1 style="font-family: 'Permanent Marker', cursive; text-align:center; padding-bottom:1%;"><a href="${serverIP}" style="text-decoration:none; color:inherit;">Youtube Comment Seperator</a></h1>
             <form action="${serverIP}/search" method="get">
                 <div class="form-group" style="font-family: 'Ubuntu', sans-serif;">
-                    <input type="text" name="videourl" placeholder="Type in video ID" class="form-control" style="margin-bottom:10px;">
+                    <input type="text" name="videourl" placeholder="Type in video Url" class="form-control" style="margin-bottom:10px;">
                     <label for="language-select">Choose a language:</label>
                     <select class="form-control" name="languages" id="language-select" style="display:inline-flex;">
                         <option value="all" selected>--Please choose an option--</option>
@@ -153,15 +153,6 @@ var app = http.createServer(function(request,response){ // request는 브라우
                     </p>
                 </div>
             </form>
-            <br>
-            <br>
-            <div class="embed-responsive embed-responsive-16by9" style="text-align:center;">
-                <iframe class="embed-responsive-item" width="560" height="315" src="https://www.youtube.com/embed/${VideoNum}" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-            </div>
-            <br>
-            <a class="btn btn-dark" href="${serverIP}/search?videourl=${VideoNum}&nextpage=${savednpt}" role="button">Show more comments</a>
-            <br>
-            ${commentDisplay}
         </body>
         </html>    
         `;