윤혜원

내툰리스트 추가하기,삭제하기 성공!

...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
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 beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
6 <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" />
7 - <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/routes/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/index.js" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/routes/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/index.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" />
8 + <change beforePath="$PROJECT_DIR$/routes/setting.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/setting.js" afterDir="false" />
9 + <change beforePath="$PROJECT_DIR$/routes/toonviewer.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/toonviewer.js" afterDir="false" />
10 + <change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" />
10 </list> 11 </list>
11 <ignored path="$PROJECT_DIR$/out/" /> 12 <ignored path="$PROJECT_DIR$/out/" />
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -108,29 +109,34 @@ ...@@ -108,29 +109,34 @@
108 <session id="-66201460"> 109 <session id="-66201460">
109 <usages-collector id="statistics.lifecycle.project"> 110 <usages-collector id="statistics.lifecycle.project">
110 <counts> 111 <counts>
111 - <entry key="project.closed" value="1" /> 112 + <entry key="project.closed" value="2" />
112 <entry key="project.open.time.10" value="1" /> 113 <entry key="project.open.time.10" value="1" />
113 - <entry key="project.opened" value="1" /> 114 + <entry key="project.open.time.13" value="1" />
115 + <entry key="project.opened" value="2" />
114 </counts> 116 </counts>
115 </usages-collector> 117 </usages-collector>
116 <usages-collector id="statistics.file.extensions.open"> 118 <usages-collector id="statistics.file.extensions.open">
117 <counts> 119 <counts>
120 + <entry key="ejs" value="4" />
118 <entry key="js" value="2" /> 121 <entry key="js" value="2" />
119 </counts> 122 </counts>
120 </usages-collector> 123 </usages-collector>
121 <usages-collector id="statistics.file.types.open"> 124 <usages-collector id="statistics.file.types.open">
122 <counts> 125 <counts>
126 + <entry key="EJS" value="4" />
123 <entry key="JavaScript" value="2" /> 127 <entry key="JavaScript" value="2" />
124 </counts> 128 </counts>
125 </usages-collector> 129 </usages-collector>
126 <usages-collector id="statistics.file.extensions.edit"> 130 <usages-collector id="statistics.file.extensions.edit">
127 <counts> 131 <counts>
128 - <entry key="js" value="868" /> 132 + <entry key="ejs" value="358" />
133 + <entry key="js" value="1290" />
129 </counts> 134 </counts>
130 </usages-collector> 135 </usages-collector>
131 <usages-collector id="statistics.file.types.edit"> 136 <usages-collector id="statistics.file.types.edit">
132 <counts> 137 <counts>
133 - <entry key="JavaScript" value="868" /> 138 + <entry key="EJS" value="358" />
139 + <entry key="JavaScript" value="1290" />
134 </counts> 140 </counts>
135 </usages-collector> 141 </usages-collector>
136 </session> 142 </session>
...@@ -140,8 +146,8 @@ ...@@ -140,8 +146,8 @@
140 <file pinned="false" current-in-tab="false"> 146 <file pinned="false" current-in-tab="false">
141 <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 147 <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
142 <provider selected="true" editor-type-id="text-editor"> 148 <provider selected="true" editor-type-id="text-editor">
143 - <state relative-caret-position="141"> 149 + <state relative-caret-position="171">
144 - <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" /> 150 + <caret line="9" column="27" lean-forward="true" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
145 </state> 151 </state>
146 </provider> 152 </provider>
147 </entry> 153 </entry>
...@@ -149,8 +155,8 @@ ...@@ -149,8 +155,8 @@
149 <file pinned="false" current-in-tab="false"> 155 <file pinned="false" current-in-tab="false">
150 <entry file="file://$PROJECT_DIR$/routes/toonviewer.js"> 156 <entry file="file://$PROJECT_DIR$/routes/toonviewer.js">
151 <provider selected="true" editor-type-id="text-editor"> 157 <provider selected="true" editor-type-id="text-editor">
152 - <state> 158 + <state relative-caret-position="133">
153 - <caret lean-forward="true" /> 159 + <caret line="7" column="23" lean-forward="true" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
154 </state> 160 </state>
155 </provider> 161 </provider>
156 </entry> 162 </entry>
...@@ -158,26 +164,53 @@ ...@@ -158,26 +164,53 @@
158 <file pinned="false" current-in-tab="false"> 164 <file pinned="false" current-in-tab="false">
159 <entry file="file://$PROJECT_DIR$/routes/setting.js"> 165 <entry file="file://$PROJECT_DIR$/routes/setting.js">
160 <provider selected="true" editor-type-id="text-editor"> 166 <provider selected="true" editor-type-id="text-editor">
161 - <state> 167 + <state relative-caret-position="312">
162 - <caret lean-forward="true" /> 168 + <caret line="53" column="14" lean-forward="true" selection-start-line="53" selection-start-column="14" selection-end-line="53" selection-end-column="14" />
163 </state> 169 </state>
164 </provider> 170 </provider>
165 </entry> 171 </entry>
166 </file> 172 </file>
167 <file pinned="false" current-in-tab="true"> 173 <file pinned="false" current-in-tab="true">
168 - <entry file="file://$PROJECT_DIR$/routes/index.js"> 174 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
169 <provider selected="true" editor-type-id="text-editor"> 175 <provider selected="true" editor-type-id="text-editor">
170 - <state relative-caret-position="583"> 176 + <state relative-caret-position="65">
171 - <caret line="336" lean-forward="true" selection-start-line="336" selection-end-line="336" /> 177 + <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
172 </state> 178 </state>
173 </provider> 179 </provider>
174 </entry> 180 </entry>
175 </file> 181 </file>
176 <file pinned="false" current-in-tab="false"> 182 <file pinned="false" current-in-tab="false">
177 - <entry file="file://$PROJECT_DIR$/app.js"> 183 + <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs">
184 + <provider selected="true" editor-type-id="text-editor">
185 + <state relative-caret-position="152">
186 + <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
187 + </state>
188 + </provider>
189 + </entry>
190 + </file>
191 + <file pinned="false" current-in-tab="false">
192 + <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
178 <provider selected="true" editor-type-id="text-editor"> 193 <provider selected="true" editor-type-id="text-editor">
179 - <state relative-caret-position="397"> 194 + <state relative-caret-position="19">
180 - <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> 195 + <caret line="25" column="12" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
196 + </state>
197 + </provider>
198 + </entry>
199 + </file>
200 + <file pinned="false" current-in-tab="false">
201 + <entry file="file://$PROJECT_DIR$/views/index.ejs">
202 + <provider selected="true" editor-type-id="text-editor">
203 + <state relative-caret-position="141">
204 + <caret line="99" column="14" lean-forward="true" selection-start-line="99" selection-start-column="14" selection-end-line="99" selection-end-column="14" />
205 + </state>
206 + </provider>
207 + </entry>
208 + </file>
209 + <file pinned="false" current-in-tab="false">
210 + <entry file="file://$PROJECT_DIR$/routes/index.js">
211 + <provider selected="true" editor-type-id="text-editor">
212 + <state relative-caret-position="152">
213 + <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
181 </state> 214 </state>
182 </provider> 215 </provider>
183 </entry> 216 </entry>
...@@ -194,7 +227,6 @@ ...@@ -194,7 +227,6 @@
194 </component> 227 </component>
195 <component name="FindInProjectRecents"> 228 <component name="FindInProjectRecents">
196 <findStrings> 229 <findStrings>
197 - <find>authen</find>
198 <find>connection.</find> 230 <find>connection.</find>
199 <find>connection.end</find> 231 <find>connection.end</find>
200 <find>connection.connect()</find> 232 <find>connection.connect()</find>
...@@ -224,6 +256,7 @@ ...@@ -224,6 +256,7 @@
224 <find>de</find> 256 <find>de</find>
225 <find>로그인</find> 257 <find>로그인</find>
226 <find>console.log(</find> 258 <find>console.log(</find>
259 + <find>des</find>
227 </findStrings> 260 </findStrings>
228 <dirStrings> 261 <dirStrings>
229 <dir>$PROJECT_DIR$/views</dir> 262 <dir>$PROJECT_DIR$/views</dir>
...@@ -261,16 +294,16 @@ ...@@ -261,16 +294,16 @@
261 <option value="$PROJECT_DIR$/views/toonviewer.html" /> 294 <option value="$PROJECT_DIR$/views/toonviewer.html" />
262 <option value="$PROJECT_DIR$/views/toonviewer.ejs" /> 295 <option value="$PROJECT_DIR$/views/toonviewer.ejs" />
263 <option value="$PROJECT_DIR$/node_modules/phantomjs/lib/phantom/examples/module.js" /> 296 <option value="$PROJECT_DIR$/node_modules/phantomjs/lib/phantom/examples/module.js" />
264 - <option value="$PROJECT_DIR$/routes/setting.js" />
265 - <option value="$PROJECT_DIR$/routes/toonviewer.js" />
266 - <option value="$PROJECT_DIR$/views/mytoons.ejs" />
267 <option value="$PROJECT_DIR$/views/daum" /> 297 <option value="$PROJECT_DIR$/views/daum" />
268 <option value="$PROJECT_DIR$/views/daum.ejs" /> 298 <option value="$PROJECT_DIR$/views/daum.ejs" />
269 <option value="$PROJECT_DIR$/views/index.ejs" /> 299 <option value="$PROJECT_DIR$/views/index.ejs" />
270 <option value="$PROJECT_DIR$/routes/daum.js" /> 300 <option value="$PROJECT_DIR$/routes/daum.js" />
271 <option value="$PROJECT_DIR$/app.js" /> 301 <option value="$PROJECT_DIR$/app.js" />
272 - <option value="$PROJECT_DIR$/routes/mytoons.js" />
273 <option value="$PROJECT_DIR$/routes/index.js" /> 302 <option value="$PROJECT_DIR$/routes/index.js" />
303 + <option value="$PROJECT_DIR$/routes/mytoons.js" />
304 + <option value="$PROJECT_DIR$/routes/toonviewer.js" />
305 + <option value="$PROJECT_DIR$/routes/setting.js" />
306 + <option value="$PROJECT_DIR$/views/mytoons.ejs" />
274 </list> 307 </list>
275 </option> 308 </option>
276 </component> 309 </component>
...@@ -301,7 +334,6 @@ ...@@ -301,7 +334,6 @@
301 <foldersAlwaysOnTop value="true" /> 334 <foldersAlwaysOnTop value="true" />
302 </navigator> 335 </navigator>
303 <panes> 336 <panes>
304 - <pane id="Scope" />
305 <pane id="ProjectPane"> 337 <pane id="ProjectPane">
306 <subPane> 338 <subPane>
307 <expand> 339 <expand>
...@@ -328,6 +360,7 @@ ...@@ -328,6 +360,7 @@
328 <select /> 360 <select />
329 </subPane> 361 </subPane>
330 </pane> 362 </pane>
363 + <pane id="Scope" />
331 <pane id="AndroidView" /> 364 <pane id="AndroidView" />
332 <pane id="PackagesPane" /> 365 <pane id="PackagesPane" />
333 </panes> 366 </panes>
...@@ -487,6 +520,7 @@ ...@@ -487,6 +520,7 @@
487 <workItem from="1543489136305" duration="5743000" /> 520 <workItem from="1543489136305" duration="5743000" />
488 <workItem from="1543495038044" duration="387000" /> 521 <workItem from="1543495038044" duration="387000" />
489 <workItem from="1543588884449" duration="7362000" /> 522 <workItem from="1543588884449" duration="7362000" />
523 + <workItem from="1543625351688" duration="5520000" />
490 </task> 524 </task>
491 <task id="LOCAL-00001" summary="초기 commit by intellij"> 525 <task id="LOCAL-00001" summary="초기 commit by intellij">
492 <created>1512174269218</created> 526 <created>1512174269218</created>
...@@ -506,7 +540,7 @@ ...@@ -506,7 +540,7 @@
506 <servers /> 540 <servers />
507 </component> 541 </component>
508 <component name="TimeTrackingManager"> 542 <component name="TimeTrackingManager">
509 - <option name="totallyTimeSpent" value="226639000" /> 543 + <option name="totallyTimeSpent" value="232159000" />
510 </component> 544 </component>
511 <component name="TodoView"> 545 <component name="TodoView">
512 <todo-panel id="selected-file"> 546 <todo-panel id="selected-file">
...@@ -560,7 +594,7 @@ ...@@ -560,7 +594,7 @@
560 <window_info id="Capture Tool" order="6" /> 594 <window_info id="Capture Tool" order="6" />
561 <window_info id="Favorites" order="7" side_tool="true" /> 595 <window_info id="Favorites" order="7" side_tool="true" />
562 <window_info anchor="bottom" id="Message" order="0" /> 596 <window_info anchor="bottom" id="Message" order="0" />
563 - <window_info anchor="bottom" id="Find" order="1" weight="0.329602" /> 597 + <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
564 <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49713877" weight="0.3693182" /> 598 <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49713877" weight="0.3693182" />
565 <window_info anchor="bottom" id="Debug" order="3" weight="0.39925373" /> 599 <window_info anchor="bottom" id="Debug" order="3" weight="0.39925373" />
566 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 600 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
...@@ -689,80 +723,80 @@ ...@@ -689,80 +723,80 @@
689 </entry> 723 </entry>
690 <entry file="file://$PROJECT_DIR$/views/daum.ejs" /> 724 <entry file="file://$PROJECT_DIR$/views/daum.ejs" />
691 <entry file="file://$PROJECT_DIR$/routes/daum.js" /> 725 <entry file="file://$PROJECT_DIR$/routes/daum.js" />
692 - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> 726 + <entry file="file://$PROJECT_DIR$/views/error.ejs">
693 <provider selected="true" editor-type-id="text-editor"> 727 <provider selected="true" editor-type-id="text-editor">
694 - <state> 728 + <state relative-caret-position="57">
695 - <caret lean-forward="true" /> 729 + <caret line="3" selection-start-line="3" selection-end-line="3" />
696 </state> 730 </state>
697 </provider> 731 </provider>
698 </entry> 732 </entry>
699 - <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs"> 733 + <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js">
700 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
701 - <state relative-caret-position="247"> 735 + <state>
702 - <caret line="13" column="3" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" /> 736 + <caret lean-forward="true" />
703 </state> 737 </state>
704 </provider> 738 </provider>
705 </entry> 739 </entry>
706 - <entry file="file://$PROJECT_DIR$/views/index.ejs"> 740 + <entry file="file://$PROJECT_DIR$/app.js">
707 <provider selected="true" editor-type-id="text-editor"> 741 <provider selected="true" editor-type-id="text-editor">
708 - <state relative-caret-position="399"> 742 + <state relative-caret-position="146">
709 - <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" /> 743 + <caret line="62" column="35" lean-forward="true" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
710 </state> 744 </state>
711 </provider> 745 </provider>
712 </entry> 746 </entry>
713 - <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 747 + <entry file="file://$PROJECT_DIR$/routes/toonviewer.js">
714 <provider selected="true" editor-type-id="text-editor"> 748 <provider selected="true" editor-type-id="text-editor">
715 - <state relative-caret-position="616"> 749 + <state relative-caret-position="133">
716 - <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" /> 750 + <caret line="7" column="23" lean-forward="true" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
717 </state> 751 </state>
718 </provider> 752 </provider>
719 </entry> 753 </entry>
720 - <entry file="file://$PROJECT_DIR$/views/error.ejs"> 754 + <entry file="file://$PROJECT_DIR$/routes/setting.js">
721 <provider selected="true" editor-type-id="text-editor"> 755 <provider selected="true" editor-type-id="text-editor">
722 - <state relative-caret-position="57"> 756 + <state relative-caret-position="312">
723 - <caret line="3" selection-start-line="3" selection-end-line="3" /> 757 + <caret line="53" column="14" lean-forward="true" selection-start-line="53" selection-start-column="14" selection-end-line="53" selection-end-column="14" />
724 </state> 758 </state>
725 </provider> 759 </provider>
726 </entry> 760 </entry>
727 - <entry file="file://$PROJECT_DIR$/routes/toonviewer.js"> 761 + <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs">
728 <provider selected="true" editor-type-id="text-editor"> 762 <provider selected="true" editor-type-id="text-editor">
729 - <state> 763 + <state relative-caret-position="152">
730 - <caret lean-forward="true" /> 764 + <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
731 </state> 765 </state>
732 </provider> 766 </provider>
733 </entry> 767 </entry>
734 - <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js"> 768 + <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
735 <provider selected="true" editor-type-id="text-editor"> 769 <provider selected="true" editor-type-id="text-editor">
736 - <state> 770 + <state relative-caret-position="19">
737 - <caret lean-forward="true" /> 771 + <caret line="25" column="12" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
738 </state> 772 </state>
739 </provider> 773 </provider>
740 </entry> 774 </entry>
741 <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 775 <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
742 <provider selected="true" editor-type-id="text-editor"> 776 <provider selected="true" editor-type-id="text-editor">
743 - <state relative-caret-position="141"> 777 + <state relative-caret-position="171">
744 - <caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" /> 778 + <caret line="9" column="27" lean-forward="true" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
745 </state> 779 </state>
746 </provider> 780 </provider>
747 </entry> 781 </entry>
748 - <entry file="file://$PROJECT_DIR$/app.js"> 782 + <entry file="file://$PROJECT_DIR$/routes/index.js">
749 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
750 - <state relative-caret-position="397"> 784 + <state relative-caret-position="152">
751 - <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> 785 + <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
752 </state> 786 </state>
753 </provider> 787 </provider>
754 </entry> 788 </entry>
755 - <entry file="file://$PROJECT_DIR$/routes/setting.js"> 789 + <entry file="file://$PROJECT_DIR$/views/index.ejs">
756 <provider selected="true" editor-type-id="text-editor"> 790 <provider selected="true" editor-type-id="text-editor">
757 - <state> 791 + <state relative-caret-position="141">
758 - <caret lean-forward="true" /> 792 + <caret line="99" column="14" lean-forward="true" selection-start-line="99" selection-start-column="14" selection-end-line="99" selection-end-column="14" />
759 </state> 793 </state>
760 </provider> 794 </provider>
761 </entry> 795 </entry>
762 - <entry file="file://$PROJECT_DIR$/routes/index.js"> 796 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
763 <provider selected="true" editor-type-id="text-editor"> 797 <provider selected="true" editor-type-id="text-editor">
764 - <state relative-caret-position="583"> 798 + <state relative-caret-position="65">
765 - <caret line="336" lean-forward="true" selection-start-line="336" selection-end-line="336" /> 799 + <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
766 </state> 800 </state>
767 </provider> 801 </provider>
768 </entry> 802 </entry>
......
...@@ -62,36 +62,6 @@ router.get('/auth/logout/kakao',function (req,res) { ...@@ -62,36 +62,6 @@ router.get('/auth/logout/kakao',function (req,res) {
62 allWebtoons = new Array(); 62 allWebtoons = new Array();
63 63
64 function getLatestToon(titleid, day ,cb) { 64 function getLatestToon(titleid, day ,cb) {
65 - /*var url = "http://comic.naver.com/webtoon/list.nhn?titleId=" + titleid+ "&weekday="+day;
66 - console.log(url);
67 - request(url, function (err, res, html) {
68 - if (!err) {
69 - var $ = cheerio.load(html);
70 - var latestLink = 'http://comic.naver.com';
71 - var latest;
72 - var t = $('#content > table > tbody > tr > td.title > a').first().each(function () {
73 - latestLink += $(this).attr('href');
74 - setTimeout(function () {},100);
75 - latest = latestLink.split('?')[1].split('&')[1].split('=')[1];
76 - });
77 -
78 - var latestImage;
79 - $('#content > table > tbody > tr > td > a > img').first().each(function () {
80 - latestImage = $(this).attr('src');
81 - setTimeout(function () {},100);
82 - });
83 -
84 - cb({
85 - latest: latest,
86 - latestLink: latestLink,
87 - latestImage: latestImage
88 - });
89 -
90 - } else {
91 - console.log("최신화 못가져왔습니다.");
92 - //throw err;
93 - }
94 - });*/
95 } 65 }
96 66
97 function getAllToons() { 67 function getAllToons() {
...@@ -287,10 +257,6 @@ function getAllToons() { ...@@ -287,10 +257,6 @@ function getAllToons() {
287 p.then(function() { 257 p.then(function() {
288 i = 0; 258 i = 0;
289 allWebtoonList.forEach(function (webtoon) { 259 allWebtoonList.forEach(function (webtoon) {
290 - // getLatestToon(webtoon.toon_index, webtoon.week, function (latest_toon) {
291 - // webtoon.latest = latest_toon.latest;
292 - //i++;
293 - //console.log(i + " = " + webtoon.name + " : " + webtoon.latest);
294 var sql= "INSERT INTO `toon` (toon_index, name, thum_link, webtoon_link, week, site, latest) VALUES(?) ON DUPLICATE KEY UPDATE latest=latest"; 260 var sql= "INSERT INTO `toon` (toon_index, name, thum_link, webtoon_link, week, site, latest) VALUES(?) ON DUPLICATE KEY UPDATE latest=latest";
295 var values=[webtoon.toon_index, webtoon.name, webtoon.thum_link, webtoon.webtoon_link,webtoon.week, webtoon.site, webtoon.latest]; 261 var values=[webtoon.toon_index, webtoon.name, webtoon.thum_link, webtoon.webtoon_link,webtoon.week, webtoon.site, webtoon.latest];
296 connection.query(sql,[values],function(err,result){ 262 connection.query(sql,[values],function(err,result){
...@@ -299,11 +265,6 @@ function getAllToons() { ...@@ -299,11 +265,6 @@ function getAllToons() {
299 } else { 265 } else {
300 console.log("웹툰 DB처리 완료!"); 266 console.log("웹툰 DB처리 완료!");
301 } 267 }
302 - //[webtoon,webtoon.latest], function () {
303 - // if (err) {
304 - // console.log("웹툰 갱신중 에러!");
305 - //}
306 - // }
307 }); 268 });
308 //}); 269 //});
309 }) 270 })
......
1 var express = require('express'); 1 var express = require('express');
2 var cheerio = require('cheerio'); 2 var cheerio = require('cheerio');
3 -
4 var request = require('request'); 3 var request = require('request');
5 var async = require('async'); 4 var async = require('async');
6 var router = express.Router(); 5 var router = express.Router();
7 6
8 function getUpdatedToons(cb){ 7 function getUpdatedToons(cb){
9 - var allToons = new Array();
10 - var allToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn";
11 -
12 - request(allToonsUrl, function(err, res, html){
13 - if(!err){
14 - var $ = cheerio.load(html);
15 - var p = Promise.resolve();
16 - var eachs = $(".thumb").has('.ico_updt').next().each(function() {
17 - p = p.then(function() {
18 - var link = $(this);
19 - var toonName = link.text();
20 - var toonHref = link.attr('href');
21 -
22 - allToons[toonName] = toonHref;
23 - });
24 - });
25 - p.then(function(){
26 - cb(allToons);
27 - });
28 - }else{
29 - console.log("업데이트 웹툰 못가져왔습니다.");
30 - throw err;
31 - }
32 - });
33 } 8 }
34 9
35 function getMyToons(id,cb){ 10 function getMyToons(id,cb){
36 - //var sql = "INSERT INTO `user` (id) VALUES (?)"; 11 + //id 값을 가진 user가 저장한 웹툰들 가져오기
37 - //var kid=[profile._json.id]; 12 + var sqlquery = "SELECT t.toon_index, t.name, t.thum_link, t.webtoon_link, t.week, t.site FROM user u, user_toon_relation ur, toon t WHERE u.id = '"+id+"' && u.id=ur.user_id && t.toon_index=ur.toon_index;";
38 - //connection.query(sql,kid,function(err,result){
39 - var sqlquery = "SELECT name, thum_link, webtoon_link, week, last, t.toon_index AS toon_index FROM user u, user_toon_relation ur, toon t WHERE u.id=? && u.id=ur.user_id && t.toon_index=ur.toon_index;";
40 - //var sqlquery = "SELECT name, thum_link, webtoon_link, week, last, latest, t.toon_index AS toon_index FROM user u, user_toon_relation ur, toon t WHERE u.id=? && u.id=ur.user_id && t.toon_index=ur.toon_index;";
41 var mylist = new Array(); 13 var mylist = new Array();
42 connection.query(sqlquery,id,function(err,rows,result){ 14 connection.query(sqlquery,id,function(err,rows,result){
43 if(!err){ 15 if(!err){
44 mylist=rows; 16 mylist=rows;
45 cb(mylist); 17 cb(mylist);
18 + console.log(mylist);
46 }else{ 19 }else{
47 console.log("내 웹툰 리스트 가져오는데 실패했습니다!"); 20 console.log("내 웹툰 리스트 가져오는데 실패했습니다!");
48 //throw err; 21 //throw err;
......
...@@ -3,35 +3,34 @@ var router = express.Router(); ...@@ -3,35 +3,34 @@ var router = express.Router();
3 3
4 function addMyToons(id,index,cb){ 4 function addMyToons(id,index,cb){
5 connection.query("INSERT INTO user_toon_relation SET ?;", 5 connection.query("INSERT INTO user_toon_relation SET ?;",
6 - {user_id : id,toon_index : index, last : 1},function (err) { 6 + {user_id : id,toon_index : index},function (err) {
7 if(err) { 7 if(err) {
8 throw err; 8 throw err;
9 console.log("내 웹툰 추가중 에러!") 9 console.log("내 웹툰 추가중 에러!")
10 } else{ 10 } else{
11 - //alert("추가되었습니다.") 11 + // alert("추가되었습니다.")
12 cb(); 12 cb();
13 } 13 }
14 }); 14 });
15 } 15 }
16 - 16 +//내툰 수정하기
17 router.post('/toggle_toon',function(req,res,next){ 17 router.post('/toggle_toon',function(req,res,next){
18 var index = req.body.toon_index; 18 var index = req.body.toon_index;
19 var id = req.user.user_id; 19 var id = req.user.user_id;
20 - 20 + connection.query("SELECT COUNT(*) FROM user_toon_relation WHERE user_id='"+id+"' && toon_index='"+index+"'",
21 - connection.query("SELECT COUNT(*) FROM user_toon_relation WHERE user_id=? && toon_index=?",
22 [id,index], function (err, rows,result) { 21 [id,index], function (err, rows,result) {
23 if(err){ 22 if(err){
24 console.log("내웹툰 등록중 에러!"); 23 console.log("내웹툰 등록중 에러!");
25 }else{ 24 }else{
26 var count = rows[0]["COUNT(*)"]; 25 var count = rows[0]["COUNT(*)"];
27 if(count>0){//이미 등록되어 있는 것이라면, 26 if(count>0){//이미 등록되어 있는 것이라면,
28 - connection.query("DELETE FROM user_toon_relation WHERE user_id=? && toon_index=?;", 27 + connection.query("DELETE FROM user_toon_relation WHERE user_id='"+id+"' && toon_index='"+index+"';",
29 [id, index],function (err, rows, result) { 28 [id, index],function (err, rows, result) {
30 if(err) { 29 if(err) {
31 console.log("내 웹툰 제거중 에러!"); 30 console.log("내 웹툰 제거중 에러!");
32 throw err; 31 throw err;
33 }else{ 32 }else{
34 - //alert("제거되었습니다.") 33 + // alert("제거되었습니다.")
35 res.redirect('/setting'); 34 res.redirect('/setting');
36 } 35 }
37 }); 36 });
...@@ -45,13 +44,15 @@ router.post('/toggle_toon',function(req,res,next){ ...@@ -45,13 +44,15 @@ router.post('/toggle_toon',function(req,res,next){
45 }); 44 });
46 45
47 function getMyToons(id,cb){ 46 function getMyToons(id,cb){
48 - var sqlquery = 'SELECT name, thum_link, webtoon_link, week, last FROM user u, user_toon_relation ur, toon t WHERE u.id=? && u.id=ur.user_id && t.toon_index=ur.toon_index;'; 47 + //mysql5.7 syntax에 맞게 수정 => 로그인한 유저의
48 + var sqlquery = "SELECT t.toon_index, t.name, t.thum_link, t.webtoon_link, t.week, t.site FROM user u, user_toon_relation ur, toon t WHERE u.id = '"+id+"' && u.id=ur.user_id && t.toon_index=ur.toon_index;";
49 var mylist = new Array(); 49 var mylist = new Array();
50 connection.query(sqlquery,id,function(err,rows,result){ 50 connection.query(sqlquery,id,function(err,rows,result){
51 if(!err){ 51 if(!err){
52 mylist=rows; 52 mylist=rows;
53 cb(mylist); 53 cb(mylist);
54 }else{ 54 }else{
55 + router.get('/')
55 console.log("내 웹툰 리스트 가져오는데 실패했습니다!"); 56 console.log("내 웹툰 리스트 가져오는데 실패했습니다!");
56 //throw err; 57 //throw err;
57 } 58 }
......
...@@ -4,15 +4,6 @@ var request = require('request'); ...@@ -4,15 +4,6 @@ var request = require('request');
4 var cheerio = require('cheerio'); 4 var cheerio = require('cheerio');
5 var async = require('async'); 5 var async = require('async');
6 6
7 -function updateLastWebtoon(toon_index, user_id, num,cb){
8 - var sql_query = "UPDATE user_toon_relation SET last=? WHERE user_id=? && toon_index=?";
9 - connection.query(sql_query,[num, user_id,toon_index],function(err){
10 - if(!err){
11 - cb();
12 - }
13 - });
14 -}
15 -
16 function getToonImages(toon_index, num, cb){ 7 function getToonImages(toon_index, num, cb){
17 var imageList = []; 8 var imageList = [];
18 var toonUrl = "http://comic.naver.com/webtoon/detail.nhn?titleId=" + toon_index + "&no=" + num; 9 var toonUrl = "http://comic.naver.com/webtoon/detail.nhn?titleId=" + toon_index + "&no=" + num;
...@@ -41,10 +32,6 @@ router.get('/:toon_index/:num',function(req,res){ ...@@ -41,10 +32,6 @@ router.get('/:toon_index/:num',function(req,res){
41 res.redirect('/'); 32 res.redirect('/');
42 return; 33 return;
43 } 34 }
44 - updateLastWebtoon(req.params.toon_index, req.user.user_id, req.params.num, function(){
45 - var toonUrl = "http://comic.naver.com/webtoon/detail.nhn?titleId=" + req.params.toon_index + "&no=" + req.params.num;
46 - res.redirect(toonUrl);
47 -
48 getToonImages(req.params.toon_index, req.params.num, function(imageList){ 35 getToonImages(req.params.toon_index, req.params.num, function(imageList){
49 res.render('toonviewer',{ 36 res.render('toonviewer',{
50 title: "zzz", 37 title: "zzz",
...@@ -52,7 +39,7 @@ router.get('/:toon_index/:num',function(req,res){ ...@@ -52,7 +39,7 @@ router.get('/:toon_index/:num',function(req,res){
52 }); 39 });
53 }); 40 });
54 41
55 - }) 42 + // })
56 }); 43 });
57 44
58 module.exports = router; 45 module.exports = router;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <title>내툰</title> 4 <title>내툰</title>
5 <link rel='stylesheet' href='/stylesheets/style.css' /> 5 <link rel='stylesheet' href='/stylesheets/style.css' />
6 <style> 6 <style>
7 - .toon_latest,.toon_next,.toon_last,.toon_name,.toon_thumbnail{ 7 + .toon_name,.toon_thumbnail{
8 width:10%; 8 width:10%;
9 } 9 }
10 10
...@@ -28,24 +28,30 @@ ...@@ -28,24 +28,30 @@
28 <h1>내툰</h1> 28 <h1>내툰</h1>
29 <p>추가한 리스트</p> 29 <p>추가한 리스트</p>
30 <a href="/auth/logout/kakao">로그아웃</a> 30 <a href="/auth/logout/kakao">로그아웃</a>
31 -<a href="/setting/">세팅</a> 31 +<a href="/setting/">수정하기</a>
32 <table> 32 <table>
33 <tr> 33 <tr>
34 <th>썸네일</th> 34 <th>썸네일</th>
35 <th>웹툰명</th> 35 <th>웹툰명</th>
36 - <th>최근에 본 화</th> 36 + <th>요일</th>
37 - <th>다음화</th> 37 + <th>사이트</th>
38 - <th>최신화</th> 38 + <th>바로가기</th>
39 </tr> 39 </tr>
40 + <!--로그인한 회원이 내툰에 웹툰이 없을시-->
41 + <%if (mytoons.length==0){
42 + %>
43 + <th>내툰리스트에 웹툰이 없습니다! 수정하기 버튼을 눌러서 추가하세요!</th>
44 + <%}%>
40 <% for(i=0;i<mytoons.length; i++){ 45 <% for(i=0;i<mytoons.length; i++){
41 %><tr> 46 %><tr>
42 <td class="toon_thumbnail"><image src="<%= mytoons[i].thum_link%>"/></td> 47 <td class="toon_thumbnail"><image src="<%= mytoons[i].thum_link%>"/></td>
43 <td class="toon_name"><%= mytoons[i].name %></td> 48 <td class="toon_name"><%= mytoons[i].name %></td>
44 - <td class="toon_last"><a href="/toonviewer/<%= mytoons[i].toon_index %>/<%= mytoons[i].last %>"><%= mytoons[i].last %>화</a></td> 49 + <td class="week"><%= mytoons[i].week.toLowerCase() %></td>
45 - <td class="toon_next"><% if(mytoons[i].last+1 <= mytoons[i].latest){ %> <a href="/toonviewer/<%= mytoons[i].toon_index %>/<%= mytoons[i].last+1 %>"><%= mytoons[i].last +1 %>화</a><% } %></td> 50 + <td class="site"><%= mytoons[i].site %></td>
46 - <td class="toon_latest"><a href="/toonviewer/<%= mytoons[i].toon_index %>/<%= mytoons[i].latest %>"><%= mytoons[i].latest %>화</a></td> 51 + <td class="webtoon_link"><a href="<%=mytoons[i].webtoon_link%>">바로가기</a></td>
47 </tr> 52 </tr>
48 <% } %> 53 <% } %>
54 +
49 </table> 55 </table>
50 56
51 </br> 57 </br>
......