윤혜원

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

...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment=""> 4 <list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment="">
5 - <change afterPath="$PROJECT_DIR$/routes/yourtoons.js" afterDir="false" />
6 - <change afterPath="$PROJECT_DIR$/views/yourtoons.ejs" afterDir="false" />
7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
9 <change beforePath="$PROJECT_DIR$/routes/mytoons.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/mytoons.js" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/routes/mytoons.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/mytoons.js" afterDir="false" />
10 - <change beforePath="$PROJECT_DIR$/views/index.html" beforeDir="false" /> 8 + <change beforePath="$PROJECT_DIR$/routes/toonviewer.js" beforeDir="false" />
9 + <change beforePath="$PROJECT_DIR$/routes/yourtoons.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/yourtoons.js" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" /> 10 <change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" />
12 - <change beforePath="$PROJECT_DIR$/views/setting.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/setting.ejs" afterDir="false" /> 11 + <change beforePath="$PROJECT_DIR$/views/toonviewer.ejs" beforeDir="false" />
12 + <change beforePath="$PROJECT_DIR$/views/yourtoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/yourtoons.ejs" afterDir="false" />
13 </list> 13 </list>
14 <ignored path="$PROJECT_DIR$/out/" /> 14 <ignored path="$PROJECT_DIR$/out/" />
15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -111,38 +111,39 @@ ...@@ -111,38 +111,39 @@
111 <session id="-66201460"> 111 <session id="-66201460">
112 <usages-collector id="statistics.lifecycle.project"> 112 <usages-collector id="statistics.lifecycle.project">
113 <counts> 113 <counts>
114 - <entry key="project.closed" value="3" /> 114 + <entry key="project.closed" value="5" />
115 <entry key="project.open.time.10" value="1" /> 115 <entry key="project.open.time.10" value="1" />
116 + <entry key="project.open.time.11" value="1" />
116 <entry key="project.open.time.13" value="1" /> 117 <entry key="project.open.time.13" value="1" />
117 <entry key="project.open.time.2" value="1" /> 118 <entry key="project.open.time.2" value="1" />
118 - <entry key="project.opened" value="4" /> 119 + <entry key="project.opened" value="5" />
119 </counts> 120 </counts>
120 </usages-collector> 121 </usages-collector>
121 <usages-collector id="statistics.file.extensions.open"> 122 <usages-collector id="statistics.file.extensions.open">
122 <counts> 123 <counts>
123 - <entry key="css" value="2" /> 124 + <entry key="css" value="4" />
124 - <entry key="ejs" value="10" /> 125 + <entry key="ejs" value="14" />
125 <entry key="html" value="1" /> 126 <entry key="html" value="1" />
126 - <entry key="js" value="12" /> 127 + <entry key="js" value="14" />
127 </counts> 128 </counts>
128 </usages-collector> 129 </usages-collector>
129 <usages-collector id="statistics.file.types.open"> 130 <usages-collector id="statistics.file.types.open">
130 <counts> 131 <counts>
131 - <entry key="CSS" value="2" /> 132 + <entry key="CSS" value="4" />
132 - <entry key="EJS" value="10" /> 133 + <entry key="EJS" value="14" />
133 <entry key="HTML" value="1" /> 134 <entry key="HTML" value="1" />
134 - <entry key="JavaScript" value="12" /> 135 + <entry key="JavaScript" value="14" />
135 </counts> 136 </counts>
136 </usages-collector> 137 </usages-collector>
137 <usages-collector id="statistics.file.extensions.edit"> 138 <usages-collector id="statistics.file.extensions.edit">
138 <counts> 139 <counts>
139 - <entry key="ejs" value="899" /> 140 + <entry key="ejs" value="1001" />
140 <entry key="js" value="1578" /> 141 <entry key="js" value="1578" />
141 </counts> 142 </counts>
142 </usages-collector> 143 </usages-collector>
143 <usages-collector id="statistics.file.types.edit"> 144 <usages-collector id="statistics.file.types.edit">
144 <counts> 145 <counts>
145 - <entry key="EJS" value="899" /> 146 + <entry key="EJS" value="1001" />
146 <entry key="JavaScript" value="1578" /> 147 <entry key="JavaScript" value="1578" />
147 </counts> 148 </counts>
148 </usages-collector> 149 </usages-collector>
...@@ -150,47 +151,29 @@ ...@@ -150,47 +151,29 @@
150 </component> 151 </component>
151 <component name="FileEditorManager"> 152 <component name="FileEditorManager">
152 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 153 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
153 - <file pinned="false" current-in-tab="true">
154 - <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
155 - <provider selected="true" editor-type-id="text-editor">
156 - <state relative-caret-position="247">
157 - <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
158 - </state>
159 - </provider>
160 - </entry>
161 - </file>
162 <file pinned="false" current-in-tab="false"> 154 <file pinned="false" current-in-tab="false">
163 - <entry file="file://$PROJECT_DIR$/app.js"> 155 + <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
164 - <provider selected="true" editor-type-id="text-editor">
165 - <state relative-caret-position="285">
166 - <caret line="69" column="12" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="12" />
167 - </state>
168 - </provider>
169 - </entry>
170 - </file>
171 - <file pinned="false" current-in-tab="false">
172 - <entry file="file://$PROJECT_DIR$/routes/yourtoons.js">
173 <provider selected="true" editor-type-id="text-editor"> 156 <provider selected="true" editor-type-id="text-editor">
174 - <state relative-caret-position="336"> 157 + <state relative-caret-position="160">
175 - <caret line="31" column="53" lean-forward="true" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" /> 158 + <caret line="60" column="39" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
176 </state> 159 </state>
177 </provider> 160 </provider>
178 </entry> 161 </entry>
179 </file> 162 </file>
180 <file pinned="false" current-in-tab="false"> 163 <file pinned="false" current-in-tab="false">
181 - <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs"> 164 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
182 <provider selected="true" editor-type-id="text-editor"> 165 <provider selected="true" editor-type-id="text-editor">
183 - <state relative-caret-position="274"> 166 + <state relative-caret-position="502">
184 - <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" /> 167 + <caret line="82" lean-forward="true" selection-start-line="71" selection-end-line="82" />
185 </state> 168 </state>
186 </provider> 169 </provider>
187 </entry> 170 </entry>
188 </file> 171 </file>
189 - <file pinned="false" current-in-tab="false"> 172 + <file pinned="false" current-in-tab="true">
190 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 173 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
191 <provider selected="true" editor-type-id="text-editor"> 174 <provider selected="true" editor-type-id="text-editor">
192 - <state relative-caret-position="-2633"> 175 + <state relative-caret-position="335">
193 - <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" /> 176 + <caret line="68" column="6" lean-forward="true" selection-start-line="68" selection-start-column="6" selection-end-line="68" selection-end-column="6" />
194 </state> 177 </state>
195 </provider> 178 </provider>
196 </entry> 179 </entry>
...@@ -281,11 +264,11 @@ ...@@ -281,11 +264,11 @@
281 <option value="$PROJECT_DIR$/routes/index.js" /> 264 <option value="$PROJECT_DIR$/routes/index.js" />
282 <option value="$PROJECT_DIR$/views/index.ejs" /> 265 <option value="$PROJECT_DIR$/views/index.ejs" />
283 <option value="$PROJECT_DIR$/views/setting.ejs" /> 266 <option value="$PROJECT_DIR$/views/setting.ejs" />
284 - <option value="$PROJECT_DIR$/routes/mytoons.js" />
285 - <option value="$PROJECT_DIR$/app.js" />
286 - <option value="$PROJECT_DIR$/views/mytoons.ejs" />
287 <option value="$PROJECT_DIR$/routes/yourtoons.js" /> 267 <option value="$PROJECT_DIR$/routes/yourtoons.js" />
268 + <option value="$PROJECT_DIR$/app.js" />
269 + <option value="$PROJECT_DIR$/routes/mytoons.js" />
288 <option value="$PROJECT_DIR$/views/yourtoons.ejs" /> 270 <option value="$PROJECT_DIR$/views/yourtoons.ejs" />
271 + <option value="$PROJECT_DIR$/views/mytoons.ejs" />
289 </list> 272 </list>
290 </option> 273 </option>
291 </component> 274 </component>
...@@ -316,7 +299,6 @@ ...@@ -316,7 +299,6 @@
316 <foldersAlwaysOnTop value="true" /> 299 <foldersAlwaysOnTop value="true" />
317 </navigator> 300 </navigator>
318 <panes> 301 <panes>
319 - <pane id="Scope" />
320 <pane id="ProjectPane"> 302 <pane id="ProjectPane">
321 <subPane> 303 <subPane>
322 <expand> 304 <expand>
...@@ -354,6 +336,7 @@ ...@@ -354,6 +336,7 @@
354 <select /> 336 <select />
355 </subPane> 337 </subPane>
356 </pane> 338 </pane>
339 + <pane id="Scope" />
357 <pane id="AndroidView" /> 340 <pane id="AndroidView" />
358 <pane id="PackagesPane" /> 341 <pane id="PackagesPane" />
359 </panes> 342 </panes>
...@@ -515,7 +498,8 @@ ...@@ -515,7 +498,8 @@
515 <workItem from="1543588884449" duration="7362000" /> 498 <workItem from="1543588884449" duration="7362000" />
516 <workItem from="1543625351688" duration="5520000" /> 499 <workItem from="1543625351688" duration="5520000" />
517 <workItem from="1543732778568" duration="2000" /> 500 <workItem from="1543732778568" duration="2000" />
518 - <workItem from="1543986114264" duration="8173000" /> 501 + <workItem from="1543986114264" duration="8718000" />
502 + <workItem from="1543996630649" duration="329000" />
519 </task> 503 </task>
520 <task id="LOCAL-00001" summary="초기 commit by intellij"> 504 <task id="LOCAL-00001" summary="초기 commit by intellij">
521 <created>1512174269218</created> 505 <created>1512174269218</created>
...@@ -535,7 +519,7 @@ ...@@ -535,7 +519,7 @@
535 <servers /> 519 <servers />
536 </component> 520 </component>
537 <component name="TimeTrackingManager"> 521 <component name="TimeTrackingManager">
538 - <option name="totallyTimeSpent" value="240334000" /> 522 + <option name="totallyTimeSpent" value="241208000" />
539 </component> 523 </component>
540 <component name="TodoView"> 524 <component name="TodoView">
541 <todo-panel id="selected-file"> 525 <todo-panel id="selected-file">
...@@ -548,7 +532,6 @@ ...@@ -548,7 +532,6 @@
548 </component> 532 </component>
549 <component name="ToolWindowManager"> 533 <component name="ToolWindowManager">
550 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 534 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
551 - <editor active="true" />
552 <layout> 535 <layout>
553 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48880598" visible="true" weight="0.16523464" /> 536 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48880598" visible="true" weight="0.16523464" />
554 <window_info id="Structure" order="1" weight="0.24964234" /> 537 <window_info id="Structure" order="1" weight="0.24964234" />
...@@ -695,13 +678,6 @@ ...@@ -695,13 +678,6 @@
695 </state> 678 </state>
696 </provider> 679 </provider>
697 </entry> 680 </entry>
698 - <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
699 - <provider selected="true" editor-type-id="text-editor">
700 - <state relative-caret-position="152">
701 - <caret line="8" selection-start-line="8" selection-end-line="8" />
702 - </state>
703 - </provider>
704 - </entry>
705 <entry file="file://$PROJECT_DIR$/package.json"> 681 <entry file="file://$PROJECT_DIR$/package.json">
706 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
707 <state relative-caret-position="380"> 683 <state relative-caret-position="380">
...@@ -727,20 +703,6 @@ ...@@ -727,20 +703,6 @@
727 </provider> 703 </provider>
728 </entry> 704 </entry>
729 <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" /> 705 <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" />
730 - <entry file="file://$PROJECT_DIR$/routes/setting.js">
731 - <provider selected="true" editor-type-id="text-editor">
732 - <state relative-caret-position="1007">
733 - <caret line="53" column="14" selection-start-line="53" selection-start-column="14" selection-end-line="53" selection-end-column="14" />
734 - </state>
735 - </provider>
736 - </entry>
737 - <entry file="file://$PROJECT_DIR$/routes/toonviewer.js">
738 - <provider selected="true" editor-type-id="text-editor">
739 - <state relative-caret-position="198">
740 - <caret line="26" column="7" lean-forward="true" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
741 - </state>
742 - </provider>
743 - </entry>
744 <entry file="file://$PROJECT_DIR$/routes/index.js"> 706 <entry file="file://$PROJECT_DIR$/routes/index.js">
745 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
746 <state relative-caret-position="207"> 708 <state relative-caret-position="207">
...@@ -752,15 +714,9 @@ ...@@ -752,15 +714,9 @@
752 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
753 <state relative-caret-position="190"> 715 <state relative-caret-position="190">
754 <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" /> 716 <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
755 - <folding>
756 - <element signature="n#!!doc" expanded="true" />
757 - </folding>
758 </state> 717 </state>
759 </provider> 718 </provider>
760 </entry> 719 </entry>
761 - <entry file="file://$PROJECT_DIR$/public/stylesheets/style2.css">
762 - <provider selected="true" editor-type-id="text-editor" />
763 - </entry>
764 <entry file="file://$PROJECT_DIR$/public/stylesheets/bootstrap.css"> 720 <entry file="file://$PROJECT_DIR$/public/stylesheets/bootstrap.css">
765 <provider selected="true" editor-type-id="text-editor"> 721 <provider selected="true" editor-type-id="text-editor">
766 <state relative-caret-position="209"> 722 <state relative-caret-position="209">
...@@ -768,75 +724,72 @@ ...@@ -768,75 +724,72 @@
768 </state> 724 </state>
769 </provider> 725 </provider>
770 </entry> 726 </entry>
771 - <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs"> 727 + <entry file="file://$PROJECT_DIR$/views/index.html" />
728 + <entry file="file://$PROJECT_DIR$/routes/toonviewer.js" />
729 + <entry file="file://$PROJECT_DIR$/public/stylesheets/style2.css">
730 + <provider selected="true" editor-type-id="text-editor" />
731 + </entry>
732 + <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs" />
733 + <entry file="file://$PROJECT_DIR$/public/stylesheets/style.css">
772 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
773 - <state relative-caret-position="304"> 735 + <state relative-caret-position="-209">
774 - <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" /> 736 + <caret line="61" column="15" lean-forward="true" selection-start-line="61" selection-start-column="15" selection-end-line="61" selection-end-column="15" />
775 </state> 737 </state>
776 </provider> 738 </provider>
777 </entry> 739 </entry>
778 - <entry file="file://$PROJECT_DIR$/views/index.html"> 740 + <entry file="file://$PROJECT_DIR$/routes/yourtoons.js">
779 <provider selected="true" editor-type-id="text-editor"> 741 <provider selected="true" editor-type-id="text-editor">
780 - <state relative-caret-position="152"> 742 + <state relative-caret-position="-44">
781 - <caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" /> 743 + <caret line="12" column="34" lean-forward="true" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
782 </state> 744 </state>
783 </provider> 745 </provider>
784 </entry> 746 </entry>
785 <entry file="file://$PROJECT_DIR$/views/index.ejs"> 747 <entry file="file://$PROJECT_DIR$/views/index.ejs">
786 <provider selected="true" editor-type-id="text-editor"> 748 <provider selected="true" editor-type-id="text-editor">
787 - <state relative-caret-position="304"> 749 + <state relative-caret-position="285">
788 - <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" /> 750 + <caret line="48" column="80" lean-forward="true" selection-start-line="48" selection-start-column="80" selection-end-line="48" selection-end-column="80" />
789 - <folding>
790 - <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" />
791 - <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" />
792 - <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" />
793 - <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" />
794 - </folding>
795 </state> 751 </state>
796 </provider> 752 </provider>
797 </entry> 753 </entry>
798 - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> 754 + <entry file="file://$PROJECT_DIR$/routes/setting.js">
799 <provider selected="true" editor-type-id="text-editor"> 755 <provider selected="true" editor-type-id="text-editor">
800 - <state relative-caret-position="190"> 756 + <state relative-caret-position="76">
801 - <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" /> 757 + <caret line="4" column="44" lean-forward="true" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
802 - <folding>
803 - <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" />
804 - </folding>
805 </state> 758 </state>
806 </provider> 759 </provider>
807 </entry> 760 </entry>
808 - <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 761 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
809 <provider selected="true" editor-type-id="text-editor"> 762 <provider selected="true" editor-type-id="text-editor">
810 - <state relative-caret-position="-2633"> 763 + <state relative-caret-position="502">
811 - <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" /> 764 + <caret line="82" lean-forward="true" selection-start-line="71" selection-end-line="82" />
812 </state> 765 </state>
813 </provider> 766 </provider>
814 </entry> 767 </entry>
815 - <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs"> 768 + <entry file="file://$PROJECT_DIR$/app.js">
816 <provider selected="true" editor-type-id="text-editor"> 769 <provider selected="true" editor-type-id="text-editor">
817 - <state relative-caret-position="274"> 770 + <state relative-caret-position="332">
818 - <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" /> 771 + <caret line="75" column="35" lean-forward="true" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
819 </state> 772 </state>
820 </provider> 773 </provider>
821 </entry> 774 </entry>
822 - <entry file="file://$PROJECT_DIR$/routes/yourtoons.js"> 775 + <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
823 <provider selected="true" editor-type-id="text-editor"> 776 <provider selected="true" editor-type-id="text-editor">
824 - <state relative-caret-position="336"> 777 + <state relative-caret-position="190">
825 - <caret line="31" column="53" lean-forward="true" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" /> 778 + <caret line="19" selection-start-line="19" selection-end-line="19" />
826 </state> 779 </state>
827 </provider> 780 </provider>
828 </entry> 781 </entry>
829 - <entry file="file://$PROJECT_DIR$/app.js"> 782 + <entry file="file://$PROJECT_DIR$/views/yourtoons.ejs">
830 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
831 - <state relative-caret-position="285"> 784 + <state relative-caret-position="160">
832 - <caret line="69" column="12" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="12" /> 785 + <caret line="60" column="39" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="39" />
833 </state> 786 </state>
834 </provider> 787 </provider>
835 </entry> 788 </entry>
836 - <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 789 + <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
837 <provider selected="true" editor-type-id="text-editor"> 790 <provider selected="true" editor-type-id="text-editor">
838 - <state relative-caret-position="247"> 791 + <state relative-caret-position="335">
839 - <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> 792 + <caret line="68" column="6" lean-forward="true" selection-start-line="68" selection-start-column="6" selection-end-line="68" selection-end-column="6" />
840 </state> 793 </state>
841 </provider> 794 </provider>
842 </entry> 795 </entry>
......
...@@ -14,7 +14,7 @@ var yourtoons=require('./routes/yourtoons'); ...@@ -14,7 +14,7 @@ var yourtoons=require('./routes/yourtoons');
14 var passport = require('passport'); 14 var passport = require('passport');
15 var setting = require('./routes/setting'); 15 var setting = require('./routes/setting');
16 var session = require('express-session'); 16 var session = require('express-session');
17 -var toonviewer = require('./routes/toonviewer'); 17 +
18 18
19 //port 19 //port
20 passport.serializeUser(function(user, done) { 20 passport.serializeUser(function(user, done) {
......
1 var express = require('express'); 1 var express = require('express');
2 -var cheerio = require('cheerio');
3 -var request = require('request');
4 var async = require('async'); 2 var async = require('async');
5 var router = express.Router(); 3 var router = express.Router();
6 4
...@@ -20,7 +18,6 @@ function getMyToons(id,cb){ ...@@ -20,7 +18,6 @@ function getMyToons(id,cb){
20 }); 18 });
21 } 19 }
22 20
23 -
24 /* GET home page. */ 21 /* GET home page. */
25 router.get('/', function(req, res, next) { 22 router.get('/', function(req, res, next) {
26 if(!req.isAuthenticated()){ 23 if(!req.isAuthenticated()){
......
1 -var express = require('express');
2 -var router = express.Router();
3 -var request = require('request');
4 -var cheerio = require('cheerio');
5 -var async = require('async');
6 -
7 -function getToonImages(toon_index, num, cb){
8 - var imageList = [];
9 - var toonUrl = "http://comic.naver.com/webtoon/detail.nhn?titleId=" + toon_index + "&no=" + num;
10 -
11 - request(toonUrl, function(err, res, html){
12 - if(!err){
13 - var $ = cheerio.load(html);
14 - var p = Promise.resolve();
15 - var eachs = $("div.wt_viewer > img").each(function(index, element) {
16 - p = p.then(function() {
17 - var toonHref = $(element).attr('src');
18 - imageList.push(toonHref);
19 - });
20 - });
21 - p.then(function(){
22 - cb(imageList);
23 - });
24 - }else{
25 - console.log("웹툰 이미지 못가져왔습니다.");
26 - }
27 - });
28 -}
29 -
30 -router.get('/:toon_index/:num',function(req,res){
31 - if(!req.isAuthenticated()){
32 - res.redirect('/');
33 - return;
34 - }
35 - getToonImages(req.params.toon_index, req.params.num, function(imageList){
36 - res.render('toonviewer',{
37 - title: "zzz",
38 - images: imageList
39 - });
40 - });
41 -
42 - // })
43 -});
44 -
45 -module.exports = router;
...\ No newline at end of file ...\ No newline at end of file
1 var express = require('express'); 1 var express = require('express');
2 -var cheerio = require('cheerio');
3 -var request = require('request');
4 var async = require('async'); 2 var async = require('async');
5 var router = express.Router(); 3 var router = express.Router();
6 4
......
...@@ -67,7 +67,17 @@ ...@@ -67,7 +67,17 @@
67 <!-- /.navbar-collapse --> 67 <!-- /.navbar-collapse -->
68 </div> 68 </div>
69 </nav> 69 </nav>
70 - 70 +<div id="mylist">
71 + <div class="section-title text-center center">
72 + <div class="overlay">
73 + <h2>내툰</h2>
74 + <hr>
75 + <p>웹툰 담기를 통해 담은 웹툰들의 리스트입니다</p>
76 + </div>
77 + </div>
78 + <div class="container">
79 + <div class="row">
80 + <div class="categories">
71 <table> 81 <table>
72 <tr> 82 <tr>
73 <th>썸네일</th> 83 <th>썸네일</th>
...@@ -168,8 +178,10 @@ ...@@ -168,8 +178,10 @@
168 </table> 178 </table>
169 179
170 </br> 180 </br>
171 - 181 + </div>
172 - 182 + </div>
183 + </div>
184 +</div>
173 </body> 185 </body>
174 186
175 </html> 187 </html>
......
1 -<!DOCTYPE html>
2 -<html lang="en">
3 -<head>
4 - <meta charset="UTF-8">
5 - <title><%= title %></title>
6 -</head>
7 -<body>
8 -<%
9 -for(image in images){
10 -%>
11 -<img src="<%= images[image] %>" alt=""/>
12 -<%
13 -}
14 - %>
15 -
16 -</body>
17 -</html>
...\ No newline at end of file ...\ No newline at end of file
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 <!-- Collect the nav links, forms, and other content for toggling --> 58 <!-- Collect the nav links, forms, and other content for toggling -->
59 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> 59 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
60 <ul class="nav navbar-nav navbar-right"> 60 <ul class="nav navbar-nav navbar-right">
61 - <li><a href="#mylist" class="page-scroll">OtherList</a></li> 61 + <li><a href="#otherlist" class="page-scroll">OtherList</a></li>
62 <li><a href="/mytoons" class="page-scroll">MyList</a></li> 62 <li><a href="/mytoons" class="page-scroll">MyList</a></li>
63 <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li> 63 <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
64 </ul> 64 </ul>
...@@ -66,9 +66,21 @@ ...@@ -66,9 +66,21 @@
66 <!-- /.navbar-collapse --> 66 <!-- /.navbar-collapse -->
67 </div> 67 </div>
68 </nav> 68 </nav>
69 +<div id="otherlist">
70 + <div class="section-title text-center center">
71 + <div class="overlay">
72 + <h2>니툰</h2>
73 + <hr>
74 + <p>다른 사용자들의 내툰 리스트입니다</p>
75 + </div>
76 + </div>
77 + <div class="container">
78 + <div class="row">
79 + <div class="categories">
69 80
70 <table> 81 <table>
71 <tr> 82 <tr>
83 + <th>KakaoID</th>
72 <th>썸네일</th> 84 <th>썸네일</th>
73 <th>웹툰명</th> 85 <th>웹툰명</th>
74 <th>요일</th> 86 <th>요일</th>
...@@ -97,8 +109,10 @@ ...@@ -97,8 +109,10 @@
97 </table> 109 </table>
98 110
99 </br> 111 </br>
100 - 112 + </div>
101 - 113 + </div>
114 + </div>
115 +</div>
102 </body> 116 </body>
103 117
104 </html> 118 </html>
......