Showing
2 changed files
with
79 additions
and
92 deletions
... | @@ -3,10 +3,7 @@ | ... | @@ -3,10 +3,7 @@ |
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/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" /> |
6 | - <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" /> | ||
7 | - <change beforePath="$PROJECT_DIR$/routes/daum.js" beforeDir="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$/views/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/index.ejs" afterDir="false" /> | ||
10 | </list> | 7 | </list> |
11 | <ignored path="$PROJECT_DIR$/out/" /> | 8 | <ignored path="$PROJECT_DIR$/out/" /> |
12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
... | @@ -58,24 +55,26 @@ | ... | @@ -58,24 +55,26 @@ |
58 | <session id="872999261"> | 55 | <session id="872999261"> |
59 | <usages-collector id="statistics.lifecycle.project"> | 56 | <usages-collector id="statistics.lifecycle.project"> |
60 | <counts> | 57 | <counts> |
61 | - <entry key="project.closed" value="10" /> | 58 | + <entry key="project.closed" value="11" /> |
62 | <entry key="project.open.time.10" value="1" /> | 59 | <entry key="project.open.time.10" value="1" /> |
63 | - <entry key="project.open.time.11" value="2" /> | 60 | + <entry key="project.open.time.11" value="3" /> |
64 | <entry key="project.open.time.15" value="2" /> | 61 | <entry key="project.open.time.15" value="2" /> |
65 | <entry key="project.open.time.16" value="2" /> | 62 | <entry key="project.open.time.16" value="2" /> |
66 | <entry key="project.open.time.17" value="1" /> | 63 | <entry key="project.open.time.17" value="1" /> |
67 | <entry key="project.open.time.2" value="1" /> | 64 | <entry key="project.open.time.2" value="1" /> |
68 | <entry key="project.open.time.6" value="1" /> | 65 | <entry key="project.open.time.6" value="1" /> |
69 | - <entry key="project.opened" value="10" /> | 66 | + <entry key="project.open.time.8" value="1" /> |
67 | + <entry key="project.open.time.9" value="1" /> | ||
68 | + <entry key="project.opened" value="13" /> | ||
70 | </counts> | 69 | </counts> |
71 | </usages-collector> | 70 | </usages-collector> |
72 | <usages-collector id="statistics.file.extensions.open"> | 71 | <usages-collector id="statistics.file.extensions.open"> |
73 | <counts> | 72 | <counts> |
74 | <entry key="css" value="3" /> | 73 | <entry key="css" value="3" /> |
75 | <entry key="daum" value="3" /> | 74 | <entry key="daum" value="3" /> |
76 | - <entry key="ejs" value="32" /> | 75 | + <entry key="ejs" value="33" /> |
77 | <entry key="iml" value="2" /> | 76 | <entry key="iml" value="2" /> |
78 | - <entry key="js" value="33" /> | 77 | + <entry key="js" value="34" /> |
79 | <entry key="json" value="2" /> | 78 | <entry key="json" value="2" /> |
80 | <entry key="www" value="1" /> | 79 | <entry key="www" value="1" /> |
81 | </counts> | 80 | </counts> |
... | @@ -83,23 +82,23 @@ | ... | @@ -83,23 +82,23 @@ |
83 | <usages-collector id="statistics.file.types.open"> | 82 | <usages-collector id="statistics.file.types.open"> |
84 | <counts> | 83 | <counts> |
85 | <entry key="CSS" value="3" /> | 84 | <entry key="CSS" value="3" /> |
86 | - <entry key="EJS" value="35" /> | 85 | + <entry key="EJS" value="36" /> |
87 | <entry key="IDEA_MODULE" value="2" /> | 86 | <entry key="IDEA_MODULE" value="2" /> |
88 | <entry key="JSON" value="2" /> | 87 | <entry key="JSON" value="2" /> |
89 | - <entry key="JavaScript" value="34" /> | 88 | + <entry key="JavaScript" value="35" /> |
90 | </counts> | 89 | </counts> |
91 | </usages-collector> | 90 | </usages-collector> |
92 | <usages-collector id="statistics.file.extensions.edit"> | 91 | <usages-collector id="statistics.file.extensions.edit"> |
93 | <counts> | 92 | <counts> |
94 | <entry key="daum" value="1" /> | 93 | <entry key="daum" value="1" /> |
95 | <entry key="ejs" value="117" /> | 94 | <entry key="ejs" value="117" /> |
96 | - <entry key="js" value="2392" /> | 95 | + <entry key="js" value="4039" /> |
97 | </counts> | 96 | </counts> |
98 | </usages-collector> | 97 | </usages-collector> |
99 | <usages-collector id="statistics.file.types.edit"> | 98 | <usages-collector id="statistics.file.types.edit"> |
100 | <counts> | 99 | <counts> |
101 | <entry key="EJS" value="118" /> | 100 | <entry key="EJS" value="118" /> |
102 | - <entry key="JavaScript" value="2392" /> | 101 | + <entry key="JavaScript" value="4039" /> |
103 | </counts> | 102 | </counts> |
104 | </usages-collector> | 103 | </usages-collector> |
105 | </session> | 104 | </session> |
... | @@ -109,8 +108,8 @@ | ... | @@ -109,8 +108,8 @@ |
109 | <file pinned="false" current-in-tab="false"> | 108 | <file pinned="false" current-in-tab="false"> |
110 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> | 109 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> |
111 | <provider selected="true" editor-type-id="text-editor"> | 110 | <provider selected="true" editor-type-id="text-editor"> |
112 | - <state relative-caret-position="190"> | 111 | + <state relative-caret-position="1349"> |
113 | - <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" /> | 112 | + <caret line="71" column="24" selection-start-line="71" selection-start-column="24" selection-end-line="71" selection-end-column="24" /> |
114 | </state> | 113 | </state> |
115 | </provider> | 114 | </provider> |
116 | </entry> | 115 | </entry> |
... | @@ -118,8 +117,8 @@ | ... | @@ -118,8 +117,8 @@ |
118 | <file pinned="false" current-in-tab="false"> | 117 | <file pinned="false" current-in-tab="false"> |
119 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> | 118 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> |
120 | <provider selected="true" editor-type-id="text-editor"> | 119 | <provider selected="true" editor-type-id="text-editor"> |
121 | - <state relative-caret-position="190"> | 120 | + <state relative-caret-position="247"> |
122 | - <caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" /> | 121 | + <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" /> |
123 | </state> | 122 | </state> |
124 | </provider> | 123 | </provider> |
125 | </entry> | 124 | </entry> |
... | @@ -127,8 +126,17 @@ | ... | @@ -127,8 +126,17 @@ |
127 | <file pinned="false" current-in-tab="true"> | 126 | <file pinned="false" current-in-tab="true"> |
128 | <entry file="file://$PROJECT_DIR$/routes/index.js"> | 127 | <entry file="file://$PROJECT_DIR$/routes/index.js"> |
129 | <provider selected="true" editor-type-id="text-editor"> | 128 | <provider selected="true" editor-type-id="text-editor"> |
130 | - <state relative-caret-position="171"> | 129 | + <state relative-caret-position="19"> |
131 | - <caret line="153" column="41" lean-forward="true" selection-start-line="153" selection-start-column="41" selection-end-line="153" selection-end-column="41" /> | 130 | + <caret line="188" lean-forward="true" selection-start-line="188" selection-end-line="188" /> |
131 | + </state> | ||
132 | + </provider> | ||
133 | + </entry> | ||
134 | + </file> | ||
135 | + <file pinned="false" current-in-tab="false"> | ||
136 | + <entry file="file://$PROJECT_DIR$/views/index.ejs"> | ||
137 | + <provider selected="true" editor-type-id="text-editor"> | ||
138 | + <state relative-caret-position="399"> | ||
139 | + <caret line="21" column="15" lean-forward="true" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" /> | ||
132 | </state> | 140 | </state> |
133 | </provider> | 141 | </provider> |
134 | </entry> | 142 | </entry> |
... | @@ -136,8 +144,8 @@ | ... | @@ -136,8 +144,8 @@ |
136 | <file pinned="false" current-in-tab="false"> | 144 | <file pinned="false" current-in-tab="false"> |
137 | <entry file="file://$PROJECT_DIR$/app.js"> | 145 | <entry file="file://$PROJECT_DIR$/app.js"> |
138 | <provider selected="true" editor-type-id="text-editor"> | 146 | <provider selected="true" editor-type-id="text-editor"> |
139 | - <state relative-caret-position="293"> | 147 | + <state relative-caret-position="1425"> |
140 | - <caret line="76" column="39" lean-forward="true" selection-start-line="76" selection-start-column="39" selection-end-line="76" selection-end-column="39" /> | 148 | + <caret line="75" column="16" lean-forward="true" selection-start-line="75" selection-start-column="16" selection-end-line="75" selection-end-column="16" /> |
141 | </state> | 149 | </state> |
142 | </provider> | 150 | </provider> |
143 | </entry> | 151 | </entry> |
... | @@ -226,8 +234,8 @@ | ... | @@ -226,8 +234,8 @@ |
226 | <option value="$PROJECT_DIR$/views/daum" /> | 234 | <option value="$PROJECT_DIR$/views/daum" /> |
227 | <option value="$PROJECT_DIR$/views/daum.ejs" /> | 235 | <option value="$PROJECT_DIR$/views/daum.ejs" /> |
228 | <option value="$PROJECT_DIR$/views/index.ejs" /> | 236 | <option value="$PROJECT_DIR$/views/index.ejs" /> |
229 | - <option value="$PROJECT_DIR$/routes/daum.js" /> | ||
230 | <option value="$PROJECT_DIR$/app.js" /> | 237 | <option value="$PROJECT_DIR$/app.js" /> |
238 | + <option value="$PROJECT_DIR$/routes/daum.js" /> | ||
231 | <option value="$PROJECT_DIR$/routes/index.js" /> | 239 | <option value="$PROJECT_DIR$/routes/index.js" /> |
232 | </list> | 240 | </list> |
233 | </option> | 241 | </option> |
... | @@ -249,9 +257,9 @@ | ... | @@ -249,9 +257,9 @@ |
249 | </packageJsonPaths> | 257 | </packageJsonPaths> |
250 | </component> | 258 | </component> |
251 | <component name="ProjectFrameBounds" extendedState="6"> | 259 | <component name="ProjectFrameBounds" extendedState="6"> |
252 | - <option name="x" value="-8" /> | 260 | + <option name="x" value="-9" /> |
253 | - <option name="width" value="977" /> | 261 | + <option name="width" value="978" /> |
254 | - <option name="height" value="1038" /> | 262 | + <option name="height" value="1039" /> |
255 | </component> | 263 | </component> |
256 | <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> | 264 | <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> |
257 | <component name="ProjectView"> | 265 | <component name="ProjectView"> |
... | @@ -259,7 +267,6 @@ | ... | @@ -259,7 +267,6 @@ |
259 | <foldersAlwaysOnTop value="true" /> | 267 | <foldersAlwaysOnTop value="true" /> |
260 | </navigator> | 268 | </navigator> |
261 | <panes> | 269 | <panes> |
262 | - <pane id="Scope" /> | ||
263 | <pane id="ProjectPane"> | 270 | <pane id="ProjectPane"> |
264 | <subPane> | 271 | <subPane> |
265 | <expand> | 272 | <expand> |
... | @@ -297,6 +304,7 @@ | ... | @@ -297,6 +304,7 @@ |
297 | <select /> | 304 | <select /> |
298 | </subPane> | 305 | </subPane> |
299 | </pane> | 306 | </pane> |
307 | + <pane id="Scope" /> | ||
300 | <pane id="AndroidView" /> | 308 | <pane id="AndroidView" /> |
301 | <pane id="PackagesPane" /> | 309 | <pane id="PackagesPane" /> |
302 | </panes> | 310 | </panes> |
... | @@ -452,6 +460,9 @@ | ... | @@ -452,6 +460,9 @@ |
452 | <workItem from="1543299644956" duration="10319000" /> | 460 | <workItem from="1543299644956" duration="10319000" /> |
453 | <workItem from="1543393354798" duration="25000" /> | 461 | <workItem from="1543393354798" duration="25000" /> |
454 | <workItem from="1543459526992" duration="19576000" /> | 462 | <workItem from="1543459526992" duration="19576000" /> |
463 | + <workItem from="1543487409434" duration="1283000" /> | ||
464 | + <workItem from="1543489136305" duration="5743000" /> | ||
465 | + <workItem from="1543495038044" duration="387000" /> | ||
455 | </task> | 466 | </task> |
456 | <task id="LOCAL-00001" summary="초기 commit by intellij"> | 467 | <task id="LOCAL-00001" summary="초기 commit by intellij"> |
457 | <created>1512174269218</created> | 468 | <created>1512174269218</created> |
... | @@ -471,7 +482,7 @@ | ... | @@ -471,7 +482,7 @@ |
471 | <servers /> | 482 | <servers /> |
472 | </component> | 483 | </component> |
473 | <component name="TimeTrackingManager"> | 484 | <component name="TimeTrackingManager"> |
474 | - <option name="totallyTimeSpent" value="211864000" /> | 485 | + <option name="totallyTimeSpent" value="219277000" /> |
475 | </component> | 486 | </component> |
476 | <component name="TodoView"> | 487 | <component name="TodoView"> |
477 | <todo-panel id="selected-file"> | 488 | <todo-panel id="selected-file"> |
... | @@ -484,8 +495,9 @@ | ... | @@ -484,8 +495,9 @@ |
484 | </component> | 495 | </component> |
485 | <component name="ToolWindowManager"> | 496 | <component name="ToolWindowManager"> |
486 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | 497 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
498 | + <editor active="true" /> | ||
487 | <layout> | 499 | <layout> |
488 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.48880598" visible="true" weight="0.16523464" /> | 500 | + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48880598" visible="true" weight="0.16523464" /> |
489 | <window_info id="Structure" order="1" weight="0.24964234" /> | 501 | <window_info id="Structure" order="1" weight="0.24964234" /> |
490 | <window_info id="npm" order="2" sideWeight="0.51119405" side_tool="true" weight="0.16523606" /> | 502 | <window_info id="npm" order="2" sideWeight="0.51119405" side_tool="true" weight="0.16523606" /> |
491 | <window_info id="Image Layers" order="3" /> | 503 | <window_info id="Image Layers" order="3" /> |
... | @@ -679,13 +691,7 @@ | ... | @@ -679,13 +691,7 @@ |
679 | </state> | 691 | </state> |
680 | </provider> | 692 | </provider> |
681 | </entry> | 693 | </entry> |
682 | - <entry file="file://$PROJECT_DIR$/views/daum"> | 694 | + <entry file="file://$PROJECT_DIR$/views/daum" /> |
683 | - <provider selected="true" editor-type-id="text-editor"> | ||
684 | - <state relative-caret-position="171"> | ||
685 | - <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" /> | ||
686 | - </state> | ||
687 | - </provider> | ||
688 | - </entry> | ||
689 | <entry file="file://$PROJECT_DIR$/routes/users.js"> | 695 | <entry file="file://$PROJECT_DIR$/routes/users.js"> |
690 | <provider selected="true" editor-type-id="text-editor"> | 696 | <provider selected="true" editor-type-id="text-editor"> |
691 | <state relative-caret-position="133"> | 697 | <state relative-caret-position="133"> |
... | @@ -693,52 +699,40 @@ | ... | @@ -693,52 +699,40 @@ |
693 | </state> | 699 | </state> |
694 | </provider> | 700 | </provider> |
695 | </entry> | 701 | </entry> |
702 | + <entry file="file://$PROJECT_DIR$/views/daum.ejs" /> | ||
703 | + <entry file="file://$PROJECT_DIR$/routes/daum.js" /> | ||
696 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> | 704 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> |
697 | <provider selected="true" editor-type-id="text-editor"> | 705 | <provider selected="true" editor-type-id="text-editor"> |
698 | - <state relative-caret-position="190"> | 706 | + <state relative-caret-position="1349"> |
699 | - <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" /> | 707 | + <caret line="71" column="24" selection-start-line="71" selection-start-column="24" selection-end-line="71" selection-end-column="24" /> |
700 | - </state> | ||
701 | - </provider> | ||
702 | - </entry> | ||
703 | - <entry file="file://$PROJECT_DIR$/views/index.ejs"> | ||
704 | - <provider selected="true" editor-type-id="text-editor"> | ||
705 | - <state relative-caret-position="171"> | ||
706 | - <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" /> | ||
707 | - </state> | ||
708 | - </provider> | ||
709 | - </entry> | ||
710 | - <entry file="file://$PROJECT_DIR$/views/daum.ejs"> | ||
711 | - <provider selected="true" editor-type-id="text-editor"> | ||
712 | - <state relative-caret-position="350"> | ||
713 | - <caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" /> | ||
714 | </state> | 708 | </state> |
715 | </provider> | 709 | </provider> |
716 | </entry> | 710 | </entry> |
717 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> | 711 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> |
718 | <provider selected="true" editor-type-id="text-editor"> | 712 | <provider selected="true" editor-type-id="text-editor"> |
719 | - <state relative-caret-position="190"> | 713 | + <state relative-caret-position="247"> |
720 | - <caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" /> | 714 | + <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" /> |
721 | </state> | 715 | </state> |
722 | </provider> | 716 | </provider> |
723 | </entry> | 717 | </entry> |
724 | - <entry file="file://$PROJECT_DIR$/routes/daum.js"> | 718 | + <entry file="file://$PROJECT_DIR$/views/index.ejs"> |
725 | <provider selected="true" editor-type-id="text-editor"> | 719 | <provider selected="true" editor-type-id="text-editor"> |
726 | - <state relative-caret-position="-790"> | 720 | + <state relative-caret-position="399"> |
727 | - <caret line="107" column="27" lean-forward="true" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" /> | 721 | + <caret line="21" column="15" lean-forward="true" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" /> |
728 | </state> | 722 | </state> |
729 | </provider> | 723 | </provider> |
730 | </entry> | 724 | </entry> |
731 | <entry file="file://$PROJECT_DIR$/app.js"> | 725 | <entry file="file://$PROJECT_DIR$/app.js"> |
732 | <provider selected="true" editor-type-id="text-editor"> | 726 | <provider selected="true" editor-type-id="text-editor"> |
733 | - <state relative-caret-position="293"> | 727 | + <state relative-caret-position="1425"> |
734 | - <caret line="76" column="39" lean-forward="true" selection-start-line="76" selection-start-column="39" selection-end-line="76" selection-end-column="39" /> | 728 | + <caret line="75" column="16" lean-forward="true" selection-start-line="75" selection-start-column="16" selection-end-line="75" selection-end-column="16" /> |
735 | </state> | 729 | </state> |
736 | </provider> | 730 | </provider> |
737 | </entry> | 731 | </entry> |
738 | <entry file="file://$PROJECT_DIR$/routes/index.js"> | 732 | <entry file="file://$PROJECT_DIR$/routes/index.js"> |
739 | <provider selected="true" editor-type-id="text-editor"> | 733 | <provider selected="true" editor-type-id="text-editor"> |
740 | - <state relative-caret-position="171"> | 734 | + <state relative-caret-position="19"> |
741 | - <caret line="153" column="41" lean-forward="true" selection-start-line="153" selection-start-column="41" selection-end-line="153" selection-end-column="41" /> | 735 | + <caret line="188" lean-forward="true" selection-start-line="188" selection-end-line="188" /> |
742 | </state> | 736 | </state> |
743 | </provider> | 737 | </provider> |
744 | </entry> | 738 | </entry> | ... | ... |
... | @@ -95,48 +95,46 @@ function getAllToons() { | ... | @@ -95,48 +95,46 @@ function getAllToons() { |
95 | allWebtoonList = new Array(); | 95 | allWebtoonList = new Array(); |
96 | //월요일 다음 웹툰 | 96 | //월요일 다음 웹툰 |
97 | var mon='mon'; | 97 | var mon='mon'; |
98 | - var daum = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${mon}?timeStamp=1515819276574`; | ||
99 | - var site='daum'; | ||
100 | var mon_name='MON'; | 98 | var mon_name='MON'; |
99 | + var daum = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${mon}?timeStamp=1515819276574`; | ||
100 | + var site = 'daum'; | ||
101 | client.fetch(daum, {}, function (err, $, res, body) { | 101 | client.fetch(daum, {}, function (err, $, res, body) { |
102 | var data = JSON.parse(body); | 102 | var data = JSON.parse(body); |
103 | var list = data["data"]; | 103 | var list = data["data"]; |
104 | - console.log(list); | 104 | + list.forEach(function (item, idx) { |
105 | - list.forEach(function(item, idx){ | 105 | + var webtoon_link = 'http://webtoon.daum.net/webtoon/view/' + item.nickname.toString(); |
106 | - var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); | 106 | + var webtoon = { |
107 | - var webtoon= { | ||
108 | toon_index: item.id, | 107 | toon_index: item.id, |
109 | - name : item.title, | 108 | + name: item.title, |
110 | - thum_link : webtoon_link, | 109 | + thum_link: item.pcThumbnailImage.url, |
111 | - webtoon_link : webtoon_link, | 110 | + webtoon_link: webtoon_link, |
112 | - week : mon_name, | 111 | + week :mon_name, |
113 | - site : site, | 112 | + site: site, |
114 | - latest : 0 | 113 | + latest: 0 |
115 | }; | 114 | }; |
116 | allWebtoonList.push(webtoon); | 115 | allWebtoonList.push(webtoon); |
117 | }); | 116 | }); |
117 | + | ||
118 | }); | 118 | }); |
119 | + | ||
119 | //화요일 다음 웹툰 | 120 | //화요일 다음 웹툰 |
120 | var tue='tue'; | 121 | var tue='tue'; |
121 | var tue_name='TUE'; | 122 | var tue_name='TUE'; |
122 | var daum1 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${tue}?timeStamp=1515819276574`; | 123 | var daum1 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${tue}?timeStamp=1515819276574`; |
123 | - | ||
124 | client.fetch(daum1, {}, function (err, $, res, body) { | 124 | client.fetch(daum1, {}, function (err, $, res, body) { |
125 | var data = JSON.parse(body); | 125 | var data = JSON.parse(body); |
126 | var list = data["data"]; | 126 | var list = data["data"]; |
127 | - | ||
128 | list.forEach(function(item, idx){ | 127 | list.forEach(function(item, idx){ |
129 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); | 128 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); |
130 | var webtoon= { | 129 | var webtoon= { |
131 | toon_index: item.id, | 130 | toon_index: item.id, |
132 | name : item.title, | 131 | name : item.title, |
133 | - thum_link : webtoon_link, | 132 | + thum_link : item.pcThumbnailImage.url, |
134 | webtoon_link : webtoon_link, | 133 | webtoon_link : webtoon_link, |
135 | week : tue_name, | 134 | week : tue_name, |
136 | site : site, | 135 | site : site, |
137 | latest : 0 | 136 | latest : 0 |
138 | }; | 137 | }; |
139 | - | ||
140 | allWebtoonList.push(webtoon); | 138 | allWebtoonList.push(webtoon); |
141 | }); | 139 | }); |
142 | 140 | ||
... | @@ -157,7 +155,7 @@ function getAllToons() { | ... | @@ -157,7 +155,7 @@ function getAllToons() { |
157 | var webtoon= { | 155 | var webtoon= { |
158 | toon_index: item.id, | 156 | toon_index: item.id, |
159 | name : item.title, | 157 | name : item.title, |
160 | - thum_link : webtoon_link, | 158 | + thum_link : item.pcThumbnailImage.url, |
161 | webtoon_link : webtoon_link, | 159 | webtoon_link : webtoon_link, |
162 | week : wed_name, | 160 | week : wed_name, |
163 | site : site, | 161 | site : site, |
... | @@ -170,7 +168,7 @@ function getAllToons() { | ... | @@ -170,7 +168,7 @@ function getAllToons() { |
170 | 168 | ||
171 | //목요일 다음 웹툰 | 169 | //목요일 다음 웹툰 |
172 | var thu='thu'; | 170 | var thu='thu'; |
173 | - var daum3 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${thu}?timeStamp=1515819276574`; | 171 | + var daum3 =`http://webtoon.daum.net/data/pc/webtoon/list_serialized/${thu}?timeStamp=1515819276574`; |
174 | var thu_name='THU'; | 172 | var thu_name='THU'; |
175 | client.fetch(daum3, {}, function (err, $, res, body) { | 173 | client.fetch(daum3, {}, function (err, $, res, body) { |
176 | var data = JSON.parse(body); | 174 | var data = JSON.parse(body); |
... | @@ -180,7 +178,7 @@ function getAllToons() { | ... | @@ -180,7 +178,7 @@ function getAllToons() { |
180 | var webtoon= { | 178 | var webtoon= { |
181 | toon_index: item.id, | 179 | toon_index: item.id, |
182 | name : item.title, | 180 | name : item.title, |
183 | - thum_link : webtoon_link, | 181 | + thum_link : item.pcThumbnailImage.url, |
184 | webtoon_link : webtoon_link, | 182 | webtoon_link : webtoon_link, |
185 | week : thu_name, | 183 | week : thu_name, |
186 | site : site, | 184 | site : site, |
... | @@ -193,18 +191,17 @@ function getAllToons() { | ... | @@ -193,18 +191,17 @@ function getAllToons() { |
193 | 191 | ||
194 | //금요일 다음 웹툰 | 192 | //금요일 다음 웹툰 |
195 | var fri='fri'; | 193 | var fri='fri'; |
196 | - var daum4 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${fri}?timeStamp=1515819276574`; | 194 | + var daum4 =`http://webtoon.daum.net/data/pc/webtoon/list_serialized/${fri}?timeStamp=1515819276574`; |
197 | var fri_name='FRI'; | 195 | var fri_name='FRI'; |
198 | client.fetch(daum4, {}, function (err, $, res, body) { | 196 | client.fetch(daum4, {}, function (err, $, res, body) { |
199 | var data = JSON.parse(body); | 197 | var data = JSON.parse(body); |
200 | - var list1 = data["data"]; | 198 | + var list = data["data"]; |
201 | - | 199 | + list.forEach(function(item, idx){ |
202 | - list1.forEach(function(item, idx){ | ||
203 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); | 200 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); |
204 | var webtoon= { | 201 | var webtoon= { |
205 | toon_index: item.id, | 202 | toon_index: item.id, |
206 | name : item.title, | 203 | name : item.title, |
207 | - thum_link : webtoon_link, | 204 | + thum_link : item.pcThumbnailImage.url, |
208 | webtoon_link : webtoon_link, | 205 | webtoon_link : webtoon_link, |
209 | week : fri_name, | 206 | week : fri_name, |
210 | site : site, | 207 | site : site, |
... | @@ -217,19 +214,17 @@ function getAllToons() { | ... | @@ -217,19 +214,17 @@ function getAllToons() { |
217 | 214 | ||
218 | //토요일 다음 웹툰 | 215 | //토요일 다음 웹툰 |
219 | var sat='sat'; | 216 | var sat='sat'; |
220 | - var daum5 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${sat}?timeStamp=1515819276574`; | 217 | + var daum5 =`http://webtoon.daum.net/data/pc/webtoon/list_serialized/${sat}?timeStamp=1515819276574`; |
221 | var sat_name='SAT'; | 218 | var sat_name='SAT'; |
222 | client.fetch(daum5, {}, function (err, $, res, body) { | 219 | client.fetch(daum5, {}, function (err, $, res, body) { |
223 | var data = JSON.parse(body); | 220 | var data = JSON.parse(body); |
224 | var list = data["data"]; | 221 | var list = data["data"]; |
225 | - | ||
226 | list.forEach(function(item, idx){ | 222 | list.forEach(function(item, idx){ |
227 | - //다음 웹툰 아이디, 제목, 요일 | ||
228 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); | 223 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); |
229 | var webtoon= { | 224 | var webtoon= { |
230 | toon_index: item.id, | 225 | toon_index: item.id, |
231 | name : item.title, | 226 | name : item.title, |
232 | - thum_link : webtoon_link, | 227 | + thum_link : item.pcThumbnailImage.url, |
233 | webtoon_link : webtoon_link, | 228 | webtoon_link : webtoon_link, |
234 | week : sat_name, | 229 | week : sat_name, |
235 | site : site, | 230 | site : site, |
... | @@ -243,18 +238,17 @@ function getAllToons() { | ... | @@ -243,18 +238,17 @@ function getAllToons() { |
243 | //일요일 다음 웹툰 | 238 | //일요일 다음 웹툰 |
244 | var sun='sun'; | 239 | var sun='sun'; |
245 | var daum6 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${sun}?timeStamp=1515819276574`; | 240 | var daum6 = `http://webtoon.daum.net/data/pc/webtoon/list_serialized/${sun}?timeStamp=1515819276574`; |
246 | - var sun_name='SUN' | 241 | + var sun_name='SUN'; |
247 | client.fetch(daum6, {}, function (err, $, res, body) { | 242 | client.fetch(daum6, {}, function (err, $, res, body) { |
248 | var data = JSON.parse(body); | 243 | var data = JSON.parse(body); |
249 | var list = data["data"]; | 244 | var list = data["data"]; |
250 | - | ||
251 | list.forEach(function(item, idx){ | 245 | list.forEach(function(item, idx){ |
252 | //다음 웹툰 아이디, 제목, 요일 | 246 | //다음 웹툰 아이디, 제목, 요일 |
253 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); | 247 | var webtoon_link='http://webtoon.daum.net/webtoon/view/'+item.nickname.toString(); |
254 | var webtoon= { | 248 | var webtoon= { |
255 | toon_index: item.id, | 249 | toon_index: item.id, |
256 | name : item.title, | 250 | name : item.title, |
257 | - thum_link : webtoon_link, | 251 | + thum_link : item.pcThumbnailImage.url, |
258 | webtoon_link : webtoon_link, | 252 | webtoon_link : webtoon_link, |
259 | week : sun_name, | 253 | week : sun_name, |
260 | site : site, | 254 | site : site, |
... | @@ -262,7 +256,6 @@ function getAllToons() { | ... | @@ -262,7 +256,6 @@ function getAllToons() { |
262 | }; | 256 | }; |
263 | allWebtoonList.push(webtoon); | 257 | allWebtoonList.push(webtoon); |
264 | }); | 258 | }); |
265 | - | ||
266 | }); | 259 | }); |
267 | 260 | ||
268 | var allWeeklyToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn"; | 261 | var allWeeklyToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn"; |
... | @@ -276,7 +269,7 @@ function getAllToons() { | ... | @@ -276,7 +269,7 @@ function getAllToons() { |
276 | var thumb_link = $(this).children().first().children().first().attr('src'); | 269 | var thumb_link = $(this).children().first().children().first().attr('src'); |
277 | var name = $(this).next().text(); | 270 | var name = $(this).next().text(); |
278 | var titleid = webtoon_link.split('?')[1].split('&')[0].split('=')[1]; | 271 | var titleid = webtoon_link.split('?')[1].split('&')[0].split('=')[1]; |
279 | - var site = 'naver' | 272 | + var site = 'naver'; |
280 | var webtoon= { | 273 | var webtoon= { |
281 | toon_index: titleid, | 274 | toon_index: titleid, |
282 | name : name, | 275 | name : name, | ... | ... |
-
Please register or login to post a comment