니툰 기능 확인완료 + 니툰,내툰 페이지 scroll up 기능 수정

윤혜원
Commit d3b5fb1d4be01dfd8154c296e27a353198bf84f5 d3b5fb1d 1 parent 6d7dca34
Showing 8 changed files with 96 additions and 184 deletions
.idea/workspace.xml
app.js
routes/mytoons.js
routes/toonviewer.js
routes/yourtoons.js
views/mytoons.ejs
views/toonviewer.ejs
views/yourtoons.ejs
--- a/.idea/workspace.xml
View file @d3b5fb1
+++ b/.idea/workspace.xml
View file @d3b5fb1
@@ -2,14 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/routes/yourtoons.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/views/yourtoons.ejs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routes/mytoons.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/mytoons.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/index.html" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/routes/toonviewer.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/routes/yourtoons.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/yourtoons.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/setting.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/setting.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/toonviewer.ejs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/yourtoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/yourtoons.ejs" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -111,38 +111,39 @@
     <session id="-66201460">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="3" />
+          <entry key="project.closed" value="5" />
           <entry key="project.open.time.10" value="1" />
+          <entry key="project.open.time.11" value="1" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.2" value="1" />
-          <entry key="project.opened" value="4" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="css" value="2" />
+          <entry key="css" value="4" />
-          <entry key="ejs" value="10" />
+          <entry key="ejs" value="14" />
           <entry key="html" value="1" />
-          <entry key="js" value="12" />
+          <entry key="js" value="14" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CSS" value="2" />
+          <entry key="CSS" value="4" />
-          <entry key="EJS" value="10" />
+          <entry key="EJS" value="14" />
           <entry key="HTML" value="1" />
-          <entry key="JavaScript" value="12" />
+          <entry key="JavaScript" value="14" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="ejs" value="899" />
+          <entry key="ejs" value="1001" />
           <entry key="js" value="1578" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="EJS" value="899" />
+          <entry key="EJS" value="1001" />
           <entry key="JavaScript" value="1578" />
         </counts>
       </usages-collector>
@@ -150,47 +151,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app.js">
+        <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="69" column="12" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/routes/yourtoons.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
+            <state relative-caret-position="160">
-              <caret line="31" column="53" lean-forward="true" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" />
+              <caret line="60" column="39" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
+        <entry file="file://$PROJECT_DIR$/views/setting.ejs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="274">
+            <state relative-caret-position="502">
-              <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+              <caret line="82" lean-forward="true" selection-start-line="71" selection-end-line="82" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2633">
+            <state relative-caret-position="335">
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <caret line="68" column="6" lean-forward="true" selection-start-line="68" selection-start-column="6" selection-end-line="68" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -281,11 +264,11 @@
         <option value="$PROJECT_DIR$/routes/index.js" />
         <option value="$PROJECT_DIR$/views/index.ejs" />
         <option value="$PROJECT_DIR$/views/setting.ejs" />
-        <option value="$PROJECT_DIR$/routes/mytoons.js" />
-        <option value="$PROJECT_DIR$/app.js" />
-        <option value="$PROJECT_DIR$/views/mytoons.ejs" />
         <option value="$PROJECT_DIR$/routes/yourtoons.js" />
+        <option value="$PROJECT_DIR$/app.js" />
+        <option value="$PROJECT_DIR$/routes/mytoons.js" />
         <option value="$PROJECT_DIR$/views/yourtoons.ejs" />
+        <option value="$PROJECT_DIR$/views/mytoons.ejs" />
       </list>
     </option>
   </component>
@@ -316,7 +299,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -354,6 +336,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="AndroidView" />
       <pane id="PackagesPane" />
     </panes>
@@ -515,7 +498,8 @@
       <workItem from="1543588884449" duration="7362000" />
       <workItem from="1543625351688" duration="5520000" />
       <workItem from="1543732778568" duration="2000" />
-      <workItem from="1543986114264" duration="8173000" />
+      <workItem from="1543986114264" duration="8718000" />
+      <workItem from="1543996630649" duration="329000" />
     </task>
     <task id="LOCAL-00001" summary="초기 commit by intellij">
       <created>1512174269218</created>
@@ -535,7 +519,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="240334000" />
+    <option name="totallyTimeSpent" value="241208000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -548,7 +532,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48880598" visible="true" weight="0.16523464" />
       <window_info id="Structure" order="1" weight="0.24964234" />
@@ -695,13 +678,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -727,20 +703,6 @@
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" />
-    <entry file="file://$PROJECT_DIR$/routes/setting.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1007">
-          <caret line="53" column="14" selection-start-line="53" selection-start-column="14" selection-end-line="53" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/routes/toonviewer.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="26" column="7" lean-forward="true" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/routes/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="207">
@@ -752,15 +714,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="190">
           <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/stylesheets/style2.css">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/stylesheets/bootstrap.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
@@ -768,75 +724,72 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs">
+    <entry file="file://$PROJECT_DIR$/views/index.html" />
+    <entry file="file://$PROJECT_DIR$/routes/toonviewer.js" />
+    <entry file="file://$PROJECT_DIR$/public/stylesheets/style2.css">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs" />
+    <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
+        <state relative-caret-position="-209">
-          <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+          <caret line="61" column="15" lean-forward="true" selection-start-line="61" selection-start-column="15" selection-end-line="61" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/views/index.html">
+    <entry file="file://$PROJECT_DIR$/routes/yourtoons.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
+        <state relative-caret-position="-44">
-          <caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
+          <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/views/index.ejs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
+        <state relative-caret-position="285">
-          <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+          <caret line="48" column="80" lean-forward="true" selection-start-line="48" selection-start-column="80" selection-end-line="48" selection-end-column="80" />
-          <folding>
-            <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/views/setting.ejs">
+    <entry file="file://$PROJECT_DIR$/routes/setting.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
+        <state relative-caret-position="76">
-          <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+          <caret line="4" column="44" lean-forward="true" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
-          <folding>
-            <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
+    <entry file="file://$PROJECT_DIR$/views/setting.ejs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2633">
+        <state relative-caret-position="502">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <caret line="82" lean-forward="true" selection-start-line="71" selection-end-line="82" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
+    <entry file="file://$PROJECT_DIR$/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
+        <state relative-caret-position="332">
-          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <caret line="75" column="35" lean-forward="true" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routes/yourtoons.js">
+    <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
+        <state relative-caret-position="190">
-          <caret line="31" column="53" lean-forward="true" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" />
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app.js">
+    <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
+        <state relative-caret-position="160">
-          <caret line="69" column="12" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="12" />
+          <caret line="60" column="39" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
+    <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
+        <state relative-caret-position="335">
-          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+          <caret line="68" column="6" lean-forward="true" selection-start-line="68" selection-start-column="6" selection-end-line="68" selection-end-column="6" />
         </state>
       </provider>
     </entry>
--- a/app.js
View file @d3b5fb1
+++ b/app.js
View file @d3b5fb1
@@ -14,7 +14,7 @@ var yourtoons=require('./routes/yourtoons');
 var passport = require('passport');
 var setting = require('./routes/setting');
 var session = require('express-session');
-var toonviewer = require('./routes/toonviewer');
+
 //port
 passport.serializeUser(function(user, done) {
--- a/routes/mytoons.js
View file @d3b5fb1
+++ b/routes/mytoons.js
View file @d3b5fb1
 var express = require('express');
-var cheerio = require('cheerio');
-var request = require('request');
 var async = require('async');
 var router = express.Router();
@@ -20,7 +18,6 @@ function getMyToons(id,cb){
     });
 }
-
 /* GET home page. */
 router.get('/', function(req, res, next) {
     if(!req.isAuthenticated()){
--- a/routes/toonviewer.js deleted 100644 → 0
View file @6d7dca3
+++ b/routes/toonviewer.js deleted 100644 → 0
View file @6d7dca3
-var express = require('express');
-var router = express.Router();
-var request = require('request');
-var cheerio = require('cheerio');
-var async = require('async');
-
-function getToonImages(toon_index, num, cb){
-    var imageList = [];
-    var toonUrl = "http://comic.naver.com/webtoon/detail.nhn?titleId=" + toon_index + "&no=" + num;
-
-    request(toonUrl, function(err, res, html){
-        if(!err){
-            var $ = cheerio.load(html);
-            var p = Promise.resolve();
-            var eachs = $("div.wt_viewer > img").each(function(index, element) {
-                p = p.then(function() {
-                    var toonHref = $(element).attr('src');
-                    imageList.push(toonHref);
-                });
-            });
-            p.then(function(){
-                cb(imageList);
-            });
-        }else{
-            console.log("웹툰 이미지 못가져왔습니다.");
-        }
-    });
-}
-
-router.get('/:toon_index/:num',function(req,res){
-    if(!req.isAuthenticated()){
-        res.redirect('/');
-        return;
-    }
-        getToonImages(req.params.toon_index, req.params.num, function(imageList){
-            res.render('toonviewer',{
-                title: "zzz",
-                images: imageList
-            });
-        });
-
-  //  })
-});
-
-module.exports = router;
\ No newline at end of file
--- a/routes/yourtoons.js
View file @d3b5fb1
+++ b/routes/yourtoons.js
View file @d3b5fb1
 var express = require('express');
-var cheerio = require('cheerio');
-var request = require('request');
 var async = require('async');
 var router = express.Router();
--- a/views/mytoons.ejs
View file @d3b5fb1
+++ b/views/mytoons.ejs
View file @d3b5fb1
@@ -67,7 +67,17 @@
         <!-- /.navbar-collapse -->
     </div>
 </nav>
-
+<div id="mylist">
+    <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">
 <table>
     <tr>
         <th>썸네일</th>
@@ -168,8 +178,10 @@
 </table>
 </br>
-
+            </div>
-
+        </div>
+    </div>
+</div>
 </body>
 </html>
--- a/views/toonviewer.ejs deleted 100644 → 0
View file @6d7dca3
+++ b/views/toonviewer.ejs deleted 100644 → 0
View file @6d7dca3
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title><%= title %></title>
-</head>
-<body>
-<%
-for(image in images){
-%>
-<img src="<%= images[image] %>" alt=""/>
-<%
-}
- %>
-
-</body>
-</html>
\ No newline at end of file
--- a/views/yourtoons.ejs
View file @d3b5fb1
+++ b/views/yourtoons.ejs
View file @d3b5fb1
@@ -58,7 +58,7 @@
         <!-- 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">OtherList</a></li>
+                <li><a href="#otherlist" class="page-scroll">OtherList</a></li>
                 <li><a href="/mytoons" class="page-scroll">MyList</a></li>
                 <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
             </ul>
@@ -66,9 +66,21 @@
         <!-- /.navbar-collapse -->
     </div>
 </nav>
+<div id="otherlist">
+    <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">
 <table>
     <tr>
+        <th>KakaoID</th>
         <th>썸네일</th>
         <th>웹툰명</th>
         <th>요일</th>
@@ -97,8 +109,10 @@
 </table>
 </br>
-
+            </div>
-
+        </div>
+    </div>
+</div>
 </body>
 </html>