웹툰 담기 front 수정완료

윤혜원
Commit 8d1ecb1e8f63be1a1cb88efd51db497b9d745354 8d1ecb1e 1 parent 6e83121e
Showing 4 changed files with 115 additions and 36 deletions
.idea/workspace.xml
views/index.ejs
views/mytoons.ejs
views/setting.ejs
--- a/.idea/workspace.xml
View file @8d1ecb1
+++ b/.idea/workspace.xml
View file @8d1ecb1
--- a/views/index.ejs
View file @8d1ecb1
+++ b/views/index.ejs
View file @8d1ecb1
@@ -20,13 +20,19 @@
       function daum_click()
       {
           if(Daum_webtoons.display == "none")
-            Daum_webtoons.display == "block"
+            Daum_webtoons.display == "block";
             if(Daum_webtoons.display = "block")
-            Daum_webtoons.display == "none"
+            Daum_webtoons.display == "none";
+      }
+      function naver_click()
+      {
+          if(Naver_webtoons.display == "none")
+              Naver_webtoons.display == "block";
+          if(Naver_webtoons.display = "block")
+              Naver_webtoons.display == "none";
       }
         </script>
   </head>
-
   <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
   <!-- Navigation
       ==========================================-->
@@ -102,7 +108,6 @@
       다음 웹툰
   </font>
-
   <a onclick="Daum_webtoons.style.display=(Daum_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
       <img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" />
   </a>
--- a/views/mytoons.ejs
View file @8d1ecb1
+++ b/views/mytoons.ejs
View file @8d1ecb1
@@ -3,31 +3,19 @@
 <head>
     <title>내툰</title>
     <link rel='stylesheet' href='/stylesheets/style2.css' />
-    <meta charset="utf-8">
+    <<!-- Bootstrap -->
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" type="text/css"  href="/stylesheets/bootstrap.css">
-    <title>Touché</title>
+    <link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Favicons
-        ================================================== -->
-    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-    <link rel="apple-touch-icon" href="img/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
-
-    <!-- Bootstrap -->
-    <link rel="stylesheet" type="text/css"  href="css/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="fonts/font-awesome/css/font-awesome.css">
     <!-- Stylesheet
         ================================================== -->
-    <link rel="stylesheet" type="text/css"  href="css/style.css">
+    <link rel="stylesheet" type="text/css"  href="/stylesheets/style.css">
-    <link rel="stylesheet" type="text/css" href="css/nivo-lightbox/nivo-lightbox.css">
+    <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css">
-    <link rel="stylesheet" type="text/css" href="css/nivo-lightbox/default.css">
+    <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css">
     <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Gugi&amp;subset=korean" rel="stylesheet">
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -58,11 +46,27 @@
     </style>
 </head>
-<h1>내툰</h1>
+<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
-<p>추가한 리스트</p>
+<!-- Navigation
-<a href="/auth/logout/kakao">로그아웃</a>
+    ==========================================-->
-<br>
+<nav id="menu" class="navbar navbar-default navbar-fixed-top">
-<a href="/setting/"><img src = "/images/basket.png" height="50" witdh="50">웹툰 담기</a>
+    <div class="container">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+            <a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">내툰</a> </div>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="#mylist" class="page-scroll">MyList</a></li>
+                <li><a href="/setting/"><!--<img src = "/images/basket.png" height="50" witdh="50">-->웹툰 담기</a>
+                <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
+            </ul>
+        </div>
+        <!-- /.navbar-collapse -->
+    </div>
+</nav>
+
 <table>
     <tr>
         <th>썸네일</th>
--- a/views/setting.ejs
View file @8d1ecb1
+++ b/views/setting.ejs
View file @8d1ecb1
@@ -2,16 +2,85 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>설정</title>
+    <title>웹툰 담기</title>
+    <link rel='stylesheet' href='/stylesheets/style2.css' />
+    <<!-- Bootstrap -->
+    <link rel="stylesheet" type="text/css"  href="/stylesheets/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css">
+
+    <!-- Stylesheet
+        ================================================== -->
+    <link rel="stylesheet" type="text/css"  href="/stylesheets/style.css">
+    <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css">
+    <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css">
+    <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Gugi&amp;subset=korean" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
     <style>
         .registered{
             background-color: #AAAAAA;
         }
+        .toon_name,.toon_thumbnail{
+            width:10%;
+        }
+
+        td{
+            vertical-align: middle;
+            border-bottom: 1px solid #bcbcbc;
+            border-left: 1px solid #bcbcbc;
+            border-right: 1px solid #bcbcbc;
+            margin:0;
+            Text-align:center;
+        }
+        table{
+            border-collapse:collapse;
+            border: 2px solid #474747;
+        }
+        th{
+            border-bottom:2px solid #474747;
+        }
     </style>
 </head>
-<h1>내툰</h1>
+<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
-<p>추가하거나 제거할 웹툰을 선택해주세요.</p>
+<!-- Navigation
-<a href="/mytoons">뒤로</a>
+    ==========================================-->
+<nav id="menu" class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
+            <a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">웹툰담기</a> </div>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="/mytoons" class="page-scroll">MyList</a></li>
+                <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
+            </ul>
+        </div>
+        <!-- /.navbar-collapse -->
+    </div>
+</nav>
+
+<div id="portfolio">
+    <div class="section-title text-center center">
+        <div class="overlay">
+            <h2>웹툰담기</h2>
+            <hr>
+            <p>추가하거나 제거할 웹툰을 선택해주세요</p>
+        </div>
+    </div>
+    <div class="container">
+        <div class="row">
+            <div class="categories">
+
 <br>
     <a onclick="daumtoons.style.display=(daumtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
@@ -63,9 +132,7 @@
 </table>
 </form>
 </div>
-</br>
+
-<br>
-<br>
   <a onclick="navertoons.style.display=(navertoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
   <img src ='/images/navericon.png' width="83" height="90"/>
@@ -116,7 +183,10 @@
 </table>
 </form>
 </div>
-<body>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 </html>