2019-1-OpenSourceSW / YTMT

Go to a project
Toggle navigation Toggle navigation pinning
강현태
ff070f77 1 parent f0f442f4

DB 동기화 완료

Inline Side-by-side
Showing 11 changed files with 204 additions and 290 deletions
...@@ -35,49 +35,56 @@ ...@@ -35,49 +35,56 @@
35 <DataType>text|0</DataType> 35 <DataType>text|0</DataType>
36 <NotNull>1</NotNull> 36 <NotNull>1</NotNull>
37 </column> 37 </column>
38 - <key id="12" parent="4" name="PRIMARY"> 38 + <column id="12" parent="4" name="latest">
39 + <Position>6</Position>
40 + <DataType>int(11)|0</DataType>
41 + <NotNull>1</NotNull>
42 + <DefaultExpression>&apos;0&apos;</DefaultExpression>
43 + </column>
44 + <key id="13" parent="4" name="PRIMARY">
39 <NameSurrogate>1</NameSurrogate> 45 <NameSurrogate>1</NameSurrogate>
40 <ColNames>toon_index</ColNames> 46 <ColNames>toon_index</ColNames>
41 <Primary>1</Primary> 47 <Primary>1</Primary>
42 </key> 48 </key>
43 - <column id="13" parent="5" name="id"> 49 + <column id="14" parent="5" name="id">
44 <Position>1</Position> 50 <Position>1</Position>
45 <DataType>bigint(20)|0</DataType> 51 <DataType>bigint(20)|0</DataType>
46 <NotNull>1</NotNull> 52 <NotNull>1</NotNull>
47 </column> 53 </column>
48 - <key id="14" parent="5" name="PRIMARY"> 54 + <key id="15" parent="5" name="PRIMARY">
49 <NameSurrogate>1</NameSurrogate> 55 <NameSurrogate>1</NameSurrogate>
50 <ColNames>id</ColNames> 56 <ColNames>id</ColNames>
51 <Primary>1</Primary> 57 <Primary>1</Primary>
52 </key> 58 </key>
53 - <column id="15" parent="6" name="user_id"> 59 + <column id="16" parent="6" name="user_id">
54 <Position>1</Position> 60 <Position>1</Position>
55 <DataType>bigint(20)|0</DataType> 61 <DataType>bigint(20)|0</DataType>
56 <NotNull>1</NotNull> 62 <NotNull>1</NotNull>
57 </column> 63 </column>
58 - <column id="16" parent="6" name="toon_index"> 64 + <column id="17" parent="6" name="toon_index">
59 <Position>2</Position> 65 <Position>2</Position>
60 <DataType>int(11)|0</DataType> 66 <DataType>int(11)|0</DataType>
61 <NotNull>1</NotNull> 67 <NotNull>1</NotNull>
62 </column> 68 </column>
63 - <column id="17" parent="6" name="recent"> 69 + <column id="18" parent="6" name="last">
64 <Position>3</Position> 70 <Position>3</Position>
65 - <DataType>text|0</DataType> 71 + <DataType>int(11)|0</DataType>
66 <NotNull>1</NotNull> 72 <NotNull>1</NotNull>
73 + <DefaultExpression>&apos;0&apos;</DefaultExpression>
67 </column> 74 </column>
68 - <index id="18" parent="6" name="toon_index"> 75 + <index id="19" parent="6" name="toon_index">
69 <ColNames>toon_index</ColNames> 76 <ColNames>toon_index</ColNames>
70 </index> 77 </index>
71 - <index id="19" parent="6" name="user_id"> 78 + <index id="20" parent="6" name="user_id">
72 <ColNames>user_id</ColNames> 79 <ColNames>user_id</ColNames>
73 </index> 80 </index>
74 - <foreign-key id="20" parent="6" name="user_toon_relation_ibfk_1"> 81 + <foreign-key id="21" parent="6" name="user_toon_relation_ibfk_1">
75 <ColNames>user_id</ColNames> 82 <ColNames>user_id</ColNames>
76 <RefSchemaName>YTMT</RefSchemaName> 83 <RefSchemaName>YTMT</RefSchemaName>
77 <RefTableName>user</RefTableName> 84 <RefTableName>user</RefTableName>
78 <RefColNames>id</RefColNames> 85 <RefColNames>id</RefColNames>
79 </foreign-key> 86 </foreign-key>
80 - <foreign-key id="21" parent="6" name="user_toon_relation_ibfk_2"> 87 + <foreign-key id="22" parent="6" name="user_toon_relation_ibfk_2">
81 <ColNames>toon_index</ColNames> 88 <ColNames>toon_index</ColNames>
82 <RefSchemaName>YTMT</RefSchemaName> 89 <RefSchemaName>YTMT</RefSchemaName>
83 <RefTableName>toon</RefTableName> 90 <RefTableName>toon</RefTableName>
......
...@@ -2,13 +2,17 @@ ...@@ -2,13 +2,17 @@
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 type="DELETED" beforePath="$PROJECT_DIR$/npm-debug.log" afterPath="" />
6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/01265fc0-37d6-481f-ac14-42262cda0ac3.xml" afterPath="$PROJECT_DIR$/.idea/dataSources/01265fc0-37d6-481f-ac14-42262cda0ac3.xml" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app.js" afterPath="$PROJECT_DIR$/app.js" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app.js" afterPath="$PROJECT_DIR$/app.js" />
9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/async/package.json" afterPath="$PROJECT_DIR$/node_modules/async/package.json" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/index.js" afterPath="$PROJECT_DIR$/routes/index.js" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/index.js" afterPath="$PROJECT_DIR$/routes/index.js" />
9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/mytoons.js" afterPath="$PROJECT_DIR$/routes/mytoons.js" /> 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/mytoons.js" afterPath="$PROJECT_DIR$/routes/mytoons.js" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/index.ejs" afterPath="$PROJECT_DIR$/views/index.ejs" /> 13 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/index.ejs" afterPath="$PROJECT_DIR$/views/index.ejs" />
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/mytoons.ejs" afterPath="$PROJECT_DIR$/views/mytoons.ejs" /> 14 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/mytoons.ejs" afterPath="$PROJECT_DIR$/views/mytoons.ejs" />
15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/setting.ejs" afterPath="$PROJECT_DIR$/views/setting.ejs" />
12 </list> 16 </list>
13 <ignored path="$PROJECT_DIR$/out/" /> 17 <ignored path="$PROJECT_DIR$/out/" />
14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 18 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -59,77 +63,31 @@ ...@@ -59,77 +63,31 @@
59 </component> 63 </component>
60 <component name="FileEditorManager"> 64 <component name="FileEditorManager">
61 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 65 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
62 - <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
63 - <entry file="file://$PROJECT_DIR$/routes/index.js">
64 - <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="473">
66 - <caret line="100" column="29" lean-forward="false" selection-start-line="100" selection-start-column="29" selection-end-line="100" selection-end-column="29" />
67 - <folding>
68 - <element signature="e#1630#1674#0" expanded="false" />
69 - <element signature="n#!!block;n#getAllToons#0" expanded="false" />
70 - </folding>
71 - </state>
72 - </provider>
73 - </entry>
74 - </file>
75 - <file leaf-file-name="users.js" pinned="false" current-in-tab="false">
76 - <entry file="file://$PROJECT_DIR$/routes/users.js">
77 - <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="90">
79 - <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
80 - <folding />
81 - </state>
82 - </provider>
83 - </entry>
84 - </file>
85 - <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
86 - <entry file="file://$PROJECT_DIR$/package.json">
87 - <provider selected="true" editor-type-id="text-editor">
88 - <state relative-caret-position="180">
89 - <caret line="12" column="29" lean-forward="false" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
90 - <folding />
91 - </state>
92 - </provider>
93 - </entry>
94 - </file>
95 - <file leaf-file-name="app.js" pinned="false" current-in-tab="true">
96 - <entry file="file://$PROJECT_DIR$/app.js">
97 - <provider selected="true" editor-type-id="text-editor">
98 - <state relative-caret-position="455">
99 - <caret line="49" column="26" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="27" />
100 - <folding>
101 - <element signature="e#1746#1818#0" expanded="false" />
102 - <element signature="e#1877#2123#0" expanded="false" />
103 - </folding>
104 - </state>
105 - </provider>
106 - </entry>
107 - </file>
108 <file leaf-file-name="mytoons.js" pinned="false" current-in-tab="false"> 66 <file leaf-file-name="mytoons.js" pinned="false" current-in-tab="false">
109 <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 67 <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
110 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
111 - <state relative-caret-position="480"> 69 + <state relative-caret-position="359">
112 - <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> 70 + <caret line="25" column="15" lean-forward="false" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
113 <folding /> 71 <folding />
114 </state> 72 </state>
115 </provider> 73 </provider>
116 </entry> 74 </entry>
117 </file> 75 </file>
118 - <file leaf-file-name="setting.js" pinned="false" current-in-tab="false"> 76 + <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
119 - <entry file="file://$PROJECT_DIR$/routes/setting.js"> 77 + <entry file="file://$PROJECT_DIR$/routes/index.js">
120 <provider selected="true" editor-type-id="text-editor"> 78 <provider selected="true" editor-type-id="text-editor">
121 - <state relative-caret-position="45"> 79 + <state relative-caret-position="182">
122 - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 80 + <caret line="19" column="17" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="17" />
123 <folding /> 81 <folding />
124 </state> 82 </state>
125 </provider> 83 </provider>
126 </entry> 84 </entry>
127 </file> 85 </file>
128 - <file leaf-file-name="setting.ejs" pinned="false" current-in-tab="false"> 86 + <file leaf-file-name="mytoons.ejs" pinned="false" current-in-tab="true">
129 - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> 87 + <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
130 <provider selected="true" editor-type-id="text-editor"> 88 <provider selected="true" editor-type-id="text-editor">
131 - <state relative-caret-position="240"> 89 + <state relative-caret-position="165">
132 - <caret line="16" column="4" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> 90 + <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
133 <folding /> 91 <folding />
134 </state> 92 </state>
135 </provider> 93 </provider>
...@@ -149,12 +107,16 @@ ...@@ -149,12 +107,16 @@
149 <findStrings> 107 <findStrings>
150 <find>mytoon</find> 108 <find>mytoon</find>
151 <find>list</find> 109 <find>list</find>
152 - <find>connection</find>
153 <find>authen</find> 110 <find>authen</find>
154 <find>connection.</find> 111 <find>connection.</find>
155 <find>connection.end</find> 112 <find>connection.end</find>
156 <find>connection.connect()</find> 113 <find>connection.connect()</find>
157 <find>login</find> 114 <find>login</find>
115 + <find>done(</find>
116 + <find>user_id</find>
117 + <find>quer</find>
118 + <find>connection</find>
119 + <find>user</find>
158 </findStrings> 120 </findStrings>
159 <dirStrings> 121 <dirStrings>
160 <dir>$PROJECT_DIR$/views</dir> 122 <dir>$PROJECT_DIR$/views</dir>
...@@ -183,18 +145,18 @@ ...@@ -183,18 +145,18 @@
183 <option value="$PROJECT_DIR$/routes/users.js" /> 145 <option value="$PROJECT_DIR$/routes/users.js" />
184 <option value="$PROJECT_DIR$/views/login.html" /> 146 <option value="$PROJECT_DIR$/views/login.html" />
185 <option value="$PROJECT_DIR$/public/javascripts/kakao.js" /> 147 <option value="$PROJECT_DIR$/public/javascripts/kakao.js" />
186 - <option value="$PROJECT_DIR$/package.json" />
187 - <option value="$PROJECT_DIR$/views/index.ejs" />
188 - <option value="$PROJECT_DIR$/views/mytoons.ejs" />
189 <option value="$PROJECT_DIR$/views/setting.html" /> 148 <option value="$PROJECT_DIR$/views/setting.html" />
190 - <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" />
191 - <option value="$PROJECT_DIR$/views/setting.ejs" />
192 <option value="$PROJECT_DIR$/routes/setting.js" /> 149 <option value="$PROJECT_DIR$/routes/setting.js" />
193 <option value="$PROJECT_DIR$/config/passport.js" /> 150 <option value="$PROJECT_DIR$/config/passport.js" />
194 <option value="$PROJECT_DIR$/models/user.js" /> 151 <option value="$PROJECT_DIR$/models/user.js" />
195 - <option value="$PROJECT_DIR$/routes/mytoons.js" />
196 - <option value="$PROJECT_DIR$/routes/index.js" />
197 <option value="$PROJECT_DIR$/app.js" /> 152 <option value="$PROJECT_DIR$/app.js" />
153 + <option value="$PROJECT_DIR$/views/setting.ejs" />
154 + <option value="$PROJECT_DIR$/views/index.ejs" />
155 + <option value="$PROJECT_DIR$/routes/index.js" />
156 + <option value="$PROJECT_DIR$/package.json" />
157 + <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" />
158 + <option value="$PROJECT_DIR$/routes/mytoons.js" />
159 + <option value="$PROJECT_DIR$/views/mytoons.ejs" />
198 </list> 160 </list>
199 </option> 161 </option>
200 </component> 162 </component>
...@@ -376,7 +338,7 @@ ...@@ -376,7 +338,7 @@
376 <option name="presentableId" value="Default" /> 338 <option name="presentableId" value="Default" />
377 <updated>1512173581551</updated> 339 <updated>1512173581551</updated>
378 <workItem from="1512173589576" duration="1873000" /> 340 <workItem from="1512173589576" duration="1873000" />
379 - <workItem from="1512179289398" duration="93162000" /> 341 + <workItem from="1512179289398" duration="112128000" />
380 </task> 342 </task>
381 <task id="LOCAL-00001" summary="초기 commit by intellij"> 343 <task id="LOCAL-00001" summary="초기 commit by intellij">
382 <created>1512174269218</created> 344 <created>1512174269218</created>
...@@ -396,7 +358,7 @@ ...@@ -396,7 +358,7 @@
396 <servers /> 358 <servers />
397 </component> 359 </component>
398 <component name="TimeTrackingManager"> 360 <component name="TimeTrackingManager">
399 - <option name="totallyTimeSpent" value="95035000" /> 361 + <option name="totallyTimeSpent" value="114001000" />
400 </component> 362 </component>
401 <component name="ToolWindowManager"> 363 <component name="ToolWindowManager">
402 <frame x="0" y="0" width="1440" height="900" extended-state="6" /> 364 <frame x="0" y="0" width="1440" height="900" extended-state="6" />
...@@ -417,7 +379,7 @@ ...@@ -417,7 +379,7 @@
417 <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> 379 <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
418 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 380 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
419 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16523606" sideWeight="0.48880598" order="0" side_tool="false" content_ui="combo" /> 381 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16523606" sideWeight="0.48880598" order="0" side_tool="false" content_ui="combo" />
420 - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 382 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
421 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 383 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
422 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 384 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
423 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 385 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
...@@ -501,7 +463,7 @@ ...@@ -501,7 +463,7 @@
501 </component> 463 </component>
502 <component name="XDebuggerManager"> 464 <component name="XDebuggerManager">
503 <breakpoint-manager> 465 <breakpoint-manager>
504 - <option name="time" value="55" /> 466 + <option name="time" value="138" />
505 </breakpoint-manager> 467 </breakpoint-manager>
506 <watches-manager /> 468 <watches-manager />
507 </component> 469 </component>
...@@ -527,7 +489,7 @@ ...@@ -527,7 +489,7 @@
527 <state relative-caret-position="0"> 489 <state relative-caret-position="0">
528 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 490 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
529 <folding> 491 <folding>
530 - <marker date="1512410780745" expanded="true" signature="211:962" ph="..." /> 492 + <marker date="1512528857495" expanded="true" signature="211:995" ph="..." />
531 </folding> 493 </folding>
532 </state> 494 </state>
533 </provider> 495 </provider>
...@@ -620,44 +582,58 @@ ...@@ -620,44 +582,58 @@
620 </state> 582 </state>
621 </provider> 583 </provider>
622 </entry> 584 </entry>
623 - <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user"> 585 + <entry file="file://$PROJECT_DIR$/views/error.ejs">
624 - <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider"> 586 + <provider selected="true" editor-type-id="text-editor">
625 - <state> 587 + <state relative-caret-position="0">
626 - <filtering enabled="true" /> 588 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
589 + <folding />
627 </state> 590 </state>
628 </provider> 591 </provider>
629 </entry> 592 </entry>
630 - <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql"> 593 + <entry file="file://$PROJECT_DIR$/config/passport.js">
631 <provider selected="true" editor-type-id="text-editor"> 594 <provider selected="true" editor-type-id="text-editor">
632 - <state relative-caret-position="0"> 595 + <state relative-caret-position="150">
633 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="73" /> 596 + <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
634 <folding /> 597 <folding />
635 </state> 598 </state>
636 </provider> 599 </provider>
637 </entry> 600 </entry>
638 - <entry file="file://$PROJECT_DIR$/views/error.ejs"> 601 + <entry file="file://$PROJECT_DIR$/models/user.js">
639 <provider selected="true" editor-type-id="text-editor"> 602 <provider selected="true" editor-type-id="text-editor">
640 - <state relative-caret-position="0"> 603 + <state relative-caret-position="75">
641 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 604 + <caret line="5" column="20" lean-forward="false" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
642 <folding /> 605 <folding />
643 </state> 606 </state>
644 </provider> 607 </provider>
645 </entry> 608 </entry>
646 - <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 609 + <entry file="file://$PROJECT_DIR$/routes/users.js">
647 <provider selected="true" editor-type-id="text-editor"> 610 <provider selected="true" editor-type-id="text-editor">
648 - <state relative-caret-position="120"> 611 + <state relative-caret-position="90">
649 - <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> 612 + <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
650 <folding /> 613 <folding />
651 </state> 614 </state>
652 </provider> 615 </provider>
653 </entry> 616 </entry>
654 - <entry file="file://$PROJECT_DIR$/views/index.ejs"> 617 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
655 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
656 - <state relative-caret-position="645"> 619 + <state relative-caret-position="207">
657 - <caret line="43" column="9" lean-forward="false" selection-start-line="43" selection-start-column="9" selection-end-line="43" selection-end-column="9" /> 620 + <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
658 - <folding> 621 + <folding />
659 - <marker date="1512410780745" expanded="true" signature="211:962" ph="..." /> 622 + </state>
660 - </folding> 623 + </provider>
624 + </entry>
625 + <entry file="file://$PROJECT_DIR$/routes/setting.js">
626 + <provider selected="true" editor-type-id="text-editor">
627 + <state relative-caret-position="105">
628 + <caret line="7" column="8" lean-forward="false" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
629 + <folding />
630 + </state>
631 + </provider>
632 + </entry>
633 + <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user_toon_relation">
634 + <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
635 + <state>
636 + <filtering enabled="true" />
661 </state> 637 </state>
662 </provider> 638 </provider>
663 </entry> 639 </entry>
...@@ -668,81 +644,79 @@ ...@@ -668,81 +644,79 @@
668 </state> 644 </state>
669 </provider> 645 </provider>
670 </entry> 646 </entry>
671 - <entry file="file://$PROJECT_DIR$/config/passport.js"> 647 + <entry file="file://$PROJECT_DIR$/views/index.ejs">
672 <provider selected="true" editor-type-id="text-editor"> 648 <provider selected="true" editor-type-id="text-editor">
673 - <state relative-caret-position="150"> 649 + <state relative-caret-position="400">
674 - <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> 650 + <caret line="28" column="42" lean-forward="false" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
675 - <folding /> 651 + <folding>
652 + <marker date="1512528857495" expanded="true" signature="211:995" ph="..." />
653 + </folding>
676 </state> 654 </state>
677 </provider> 655 </provider>
678 </entry> 656 </entry>
679 - <entry file="file://$PROJECT_DIR$/models/user.js"> 657 + <entry file="file://$PROJECT_DIR$/package.json">
680 <provider selected="true" editor-type-id="text-editor"> 658 <provider selected="true" editor-type-id="text-editor">
681 - <state relative-caret-position="75"> 659 + <state relative-caret-position="420">
682 - <caret line="5" column="20" lean-forward="false" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" /> 660 + <caret line="28" column="28" lean-forward="false" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
683 <folding /> 661 <folding />
684 </state> 662 </state>
685 </provider> 663 </provider>
686 </entry> 664 </entry>
687 - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> 665 + <entry file="file://$PROJECT_DIR$/app.js">
688 <provider selected="true" editor-type-id="text-editor"> 666 <provider selected="true" editor-type-id="text-editor">
689 - <state relative-caret-position="240"> 667 + <state relative-caret-position="-206">
690 - <caret line="16" column="4" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> 668 + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
691 - <folding /> 669 + <folding>
670 + <element signature="e#1750#1822#0" expanded="false" />
671 + <element signature="e#1881#2127#0" expanded="false" />
672 + </folding>
692 </state> 673 </state>
693 </provider> 674 </provider>
694 </entry> 675 </entry>
695 - <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 676 + <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql">
696 <provider selected="true" editor-type-id="text-editor"> 677 <provider selected="true" editor-type-id="text-editor">
697 - <state relative-caret-position="480"> 678 + <state relative-caret-position="0">
698 - <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> 679 + <caret line="0" column="161" lean-forward="false" selection-start-line="0" selection-start-column="161" selection-end-line="0" selection-end-column="161" />
699 <folding /> 680 <folding />
700 </state> 681 </state>
701 </provider> 682 </provider>
702 </entry> 683 </entry>
703 - <entry file="file://$PROJECT_DIR$/routes/setting.js"> 684 + <entry file="file://$PROJECT_DIR$/node_modules/async/dist/async.js">
704 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
705 - <state relative-caret-position="45"> 686 + <state relative-caret-position="171">
706 - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 687 + <caret line="954" column="0" lean-forward="false" selection-start-line="954" selection-start-column="0" selection-end-line="954" selection-end-column="0" />
707 <folding /> 688 <folding />
708 </state> 689 </state>
709 </provider> 690 </provider>
710 </entry> 691 </entry>
711 - <entry file="file://$PROJECT_DIR$/routes/users.js"> 692 + <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user">
712 - <provider selected="true" editor-type-id="text-editor"> 693 + <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
713 - <state relative-caret-position="90"> 694 + <state>
714 - <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" /> 695 + <filtering enabled="true" />
715 - <folding />
716 </state> 696 </state>
717 </provider> 697 </provider>
718 </entry> 698 </entry>
719 - <entry file="file://$PROJECT_DIR$/package.json"> 699 + <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
720 <provider selected="true" editor-type-id="text-editor"> 700 <provider selected="true" editor-type-id="text-editor">
721 - <state relative-caret-position="180"> 701 + <state relative-caret-position="359">
722 - <caret line="12" column="29" lean-forward="false" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" /> 702 + <caret line="25" column="15" lean-forward="false" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
723 <folding /> 703 <folding />
724 </state> 704 </state>
725 </provider> 705 </provider>
726 </entry> 706 </entry>
727 <entry file="file://$PROJECT_DIR$/routes/index.js"> 707 <entry file="file://$PROJECT_DIR$/routes/index.js">
728 <provider selected="true" editor-type-id="text-editor"> 708 <provider selected="true" editor-type-id="text-editor">
729 - <state relative-caret-position="473"> 709 + <state relative-caret-position="182">
730 - <caret line="100" column="29" lean-forward="false" selection-start-line="100" selection-start-column="29" selection-end-line="100" selection-end-column="29" /> 710 + <caret line="19" column="17" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="17" />
731 - <folding> 711 + <folding />
732 - <element signature="e#1630#1674#0" expanded="false" />
733 - <element signature="n#!!block;n#getAllToons#0" expanded="false" />
734 - </folding>
735 </state> 712 </state>
736 </provider> 713 </provider>
737 </entry> 714 </entry>
738 - <entry file="file://$PROJECT_DIR$/app.js"> 715 + <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
739 <provider selected="true" editor-type-id="text-editor"> 716 <provider selected="true" editor-type-id="text-editor">
740 - <state relative-caret-position="455"> 717 + <state relative-caret-position="165">
741 - <caret line="49" column="26" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="27" /> 718 + <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
742 - <folding> 719 + <folding />
743 - <element signature="e#1746#1818#0" expanded="false" />
744 - <element signature="e#1877#2123#0" expanded="false" />
745 - </folding>
746 </state> 720 </state>
747 </provider> 721 </provider>
748 </entry> 722 </entry>
......
...@@ -16,12 +16,12 @@ var setting = require('./routes/setting'); ...@@ -16,12 +16,12 @@ var setting = require('./routes/setting');
16 var session = require('express-session'); 16 var session = require('express-session');
17 17
18 passport.serializeUser(function(user, done) { 18 passport.serializeUser(function(user, done) {
19 - console.log('serialize'); 19 + console.log('serialized');
20 done(null, user); 20 done(null, user);
21 }); 21 });
22 -passport.deserializeUser(function(obj, done) { 22 +passport.deserializeUser(function(user, done) {
23 - console.log('deserialize'); 23 + console.log('deserialized');
24 - done(null, obj); 24 + done(null, user);
25 }); 25 });
26 26
27 var app = express(); 27 var app = express();
......
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
2 "_args": [ 2 "_args": [
3 [ 3 [
4 { 4 {
5 - "raw": "async@^2.0.1", 5 + "raw": "async",
6 "scope": null, 6 "scope": null,
7 "escapedName": "async", 7 "escapedName": "async",
8 "name": "async", 8 "name": "async",
9 - "rawSpec": "^2.0.1", 9 + "rawSpec": "",
10 - "spec": ">=2.0.1 <3.0.0", 10 + "spec": "latest",
11 - "type": "range" 11 + "type": "tag"
12 }, 12 },
13 - "/Users/kanghyeontae/IdeaProjects/YTMT/node_modules/form-data" 13 + "/Users/kanghyeontae/IdeaProjects/YTMT"
14 ] 14 ]
15 ], 15 ],
16 - "_from": "async@>=2.0.1 <3.0.0", 16 + "_from": "async@latest",
17 "_id": "async@2.6.0", 17 "_id": "async@2.6.0",
18 "_inCache": true, 18 "_inCache": true,
19 "_location": "/async", 19 "_location": "/async",
...@@ -29,22 +29,24 @@ ...@@ -29,22 +29,24 @@
29 "_npmVersion": "5.5.1", 29 "_npmVersion": "5.5.1",
30 "_phantomChildren": {}, 30 "_phantomChildren": {},
31 "_requested": { 31 "_requested": {
32 - "raw": "async@^2.0.1", 32 + "raw": "async",
33 "scope": null, 33 "scope": null,
34 "escapedName": "async", 34 "escapedName": "async",
35 "name": "async", 35 "name": "async",
36 - "rawSpec": "^2.0.1", 36 + "rawSpec": "",
37 - "spec": ">=2.0.1 <3.0.0", 37 + "spec": "latest",
38 - "type": "range" 38 + "type": "tag"
39 }, 39 },
40 "_requiredBy": [ 40 "_requiredBy": [
41 - "/form-data" 41 + "#USER",
42 + "/",
43 + "/phantomjs/form-data"
42 ], 44 ],
43 "_resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", 45 "_resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
44 "_shasum": "61a29abb6fcc026fea77e56d1c6ec53a795951f4", 46 "_shasum": "61a29abb6fcc026fea77e56d1c6ec53a795951f4",
45 "_shrinkwrap": null, 47 "_shrinkwrap": null,
46 - "_spec": "async@^2.0.1", 48 + "_spec": "async",
47 - "_where": "/Users/kanghyeontae/IdeaProjects/YTMT/node_modules/form-data", 49 + "_where": "/Users/kanghyeontae/IdeaProjects/YTMT",
48 "author": { 50 "author": {
49 "name": "Caolan McMahon" 51 "name": "Caolan McMahon"
50 }, 52 },
......
1 -0 info it worked if it ends with ok
2 -1 verbose cli [ '/usr/local/bin/node',
3 -1 verbose cli '/usr/local/bin/npm',
4 -1 verbose cli 'install',
5 -1 verbose cli 'cookieSession',
6 -1 verbose cli '--save' ]
7 -2 info using npm@3.10.10
8 -3 info using node@v6.11.4
9 -4 silly loadCurrentTree Starting
10 -5 silly install loadCurrentTree
11 -6 silly install readLocalPackageData
12 -7 silly fetchPackageMetaData cookieSession
13 -8 silly fetchNamedPackageData cookieSession
14 -9 silly mapToRegistry name cookieSession
15 -10 silly mapToRegistry using default registry
16 -11 silly mapToRegistry registry https://registry.npmjs.org/
17 -12 silly mapToRegistry data Result {
18 -12 silly mapToRegistry raw: 'cookieSession',
19 -12 silly mapToRegistry scope: null,
20 -12 silly mapToRegistry escapedName: 'cookieSession',
21 -12 silly mapToRegistry name: 'cookieSession',
22 -12 silly mapToRegistry rawSpec: '',
23 -12 silly mapToRegistry spec: 'latest',
24 -12 silly mapToRegistry type: 'tag' }
25 -13 silly mapToRegistry uri https://registry.npmjs.org/cookieSession
26 -14 verbose request uri https://registry.npmjs.org/cookieSession
27 -15 verbose request no auth needed
28 -16 info attempt registry request try #1 at 10:46:34 PM
29 -17 verbose request id 6a301e79ad3ee39e
30 -18 http request GET https://registry.npmjs.org/cookieSession
31 -19 http 404 https://registry.npmjs.org/cookieSession
32 -20 verbose headers { 'content-type': 'application/json',
33 -20 verbose headers 'cache-control': 'max-age=0',
34 -20 verbose headers 'content-length': '2',
35 -20 verbose headers 'accept-ranges': 'bytes',
36 -20 verbose headers date: 'Tue, 05 Dec 2017 13:46:36 GMT',
37 -20 verbose headers via: '1.1 varnish',
38 -20 verbose headers connection: 'keep-alive',
39 -20 verbose headers 'x-served-by': 'cache-nrt6151-NRT',
40 -20 verbose headers 'x-cache': 'MISS',
41 -20 verbose headers 'x-cache-hits': '0',
42 -20 verbose headers 'x-timer': 'S1512481595.892739,VS0,VE1380',
43 -20 verbose headers vary: 'Accept-Encoding' }
44 -21 silly get cb [ 404,
45 -21 silly get { 'content-type': 'application/json',
46 -21 silly get 'cache-control': 'max-age=0',
47 -21 silly get 'content-length': '2',
48 -21 silly get 'accept-ranges': 'bytes',
49 -21 silly get date: 'Tue, 05 Dec 2017 13:46:36 GMT',
50 -21 silly get via: '1.1 varnish',
51 -21 silly get connection: 'keep-alive',
52 -21 silly get 'x-served-by': 'cache-nrt6151-NRT',
53 -21 silly get 'x-cache': 'MISS',
54 -21 silly get 'x-cache-hits': '0',
55 -21 silly get 'x-timer': 'S1512481595.892739,VS0,VE1380',
56 -21 silly get vary: 'Accept-Encoding' } ]
57 -22 silly fetchPackageMetaData Error: Registry returned 404 for GET on https://registry.npmjs.org/cookieSession
58 -22 silly fetchPackageMetaData at makeError (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:302:12)
59 -22 silly fetchPackageMetaData at CachingRegistryClient.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:280:14)
60 -22 silly fetchPackageMetaData at Request._callback (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:210:14)
61 -22 silly fetchPackageMetaData at Request.self.callback (/usr/local/lib/node_modules/npm/node_modules/request/request.js:187:22)
62 -22 silly fetchPackageMetaData at emitTwo (events.js:106:13)
63 -22 silly fetchPackageMetaData at Request.emit (events.js:191:7)
64 -22 silly fetchPackageMetaData at Request.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:1048:10)
65 -22 silly fetchPackageMetaData at emitOne (events.js:96:13)
66 -22 silly fetchPackageMetaData at Request.emit (events.js:188:7)
67 -22 silly fetchPackageMetaData at IncomingMessage.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:969:12)
68 -22 silly fetchPackageMetaData error for cookieSession { Error: Registry returned 404 for GET on https://registry.npmjs.org/cookieSession
69 -22 silly fetchPackageMetaData at makeError (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:302:12)
70 -22 silly fetchPackageMetaData at CachingRegistryClient.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:280:14)
71 -22 silly fetchPackageMetaData at Request._callback (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:210:14)
72 -22 silly fetchPackageMetaData at Request.self.callback (/usr/local/lib/node_modules/npm/node_modules/request/request.js:187:22)
73 -22 silly fetchPackageMetaData at emitTwo (events.js:106:13)
74 -22 silly fetchPackageMetaData at Request.emit (events.js:191:7)
75 -22 silly fetchPackageMetaData at Request.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:1048:10)
76 -22 silly fetchPackageMetaData at emitOne (events.js:96:13)
77 -22 silly fetchPackageMetaData at Request.emit (events.js:188:7)
78 -22 silly fetchPackageMetaData at IncomingMessage.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:969:12) pkgid: 'cookieSession', statusCode: 404, code: 'E404' }
79 -23 silly rollbackFailedOptional Starting
80 -24 silly rollbackFailedOptional Finishing
81 -25 silly runTopLevelLifecycles Finishing
82 -26 silly install printInstalled
83 -27 verbose stack Error: Registry returned 404 for GET on https://registry.npmjs.org/cookieSession
84 -27 verbose stack at makeError (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:302:12)
85 -27 verbose stack at CachingRegistryClient.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:280:14)
86 -27 verbose stack at Request._callback (/usr/local/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js:210:14)
87 -27 verbose stack at Request.self.callback (/usr/local/lib/node_modules/npm/node_modules/request/request.js:187:22)
88 -27 verbose stack at emitTwo (events.js:106:13)
89 -27 verbose stack at Request.emit (events.js:191:7)
90 -27 verbose stack at Request.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:1048:10)
91 -27 verbose stack at emitOne (events.js:96:13)
92 -27 verbose stack at Request.emit (events.js:188:7)
93 -27 verbose stack at IncomingMessage.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/request/request.js:969:12)
94 -28 verbose statusCode 404
95 -29 verbose pkgid cookieSession
96 -30 verbose cwd /Users/kanghyeontae/IdeaProjects/YTMT
97 -31 error Darwin 17.2.0
98 -32 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "install" "cookieSession" "--save"
99 -33 error node v6.11.4
100 -34 error npm v3.10.10
101 -35 error code E404
102 -36 error 404 Registry returned 404 for GET on https://registry.npmjs.org/cookieSession
103 -37 error 404
104 -38 error 404 'cookieSession' is not in the npm registry.
105 -39 error 404 Your package name is not valid, because
106 -40 error 404 1. name can no longer contain capital letters
107 -41 error 404 Note that you can also install from a
108 -42 error 404 tarball, folder, http url, or git url.
109 -43 verbose exit [ 1, true ]
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 "start": "node ./bin/www" 6 "start": "node ./bin/www"
7 }, 7 },
8 "dependencies": { 8 "dependencies": {
9 + "async": "^2.6.0",
9 "bcrypt-nodejs": "0.0.3", 10 "bcrypt-nodejs": "0.0.3",
10 "body-parser": "~1.18.2", 11 "body-parser": "~1.18.2",
11 "casperjs": "^1.1.4", 12 "casperjs": "^1.1.4",
......
...@@ -17,8 +17,8 @@ passport.use(new KakaoStrategy({ ...@@ -17,8 +17,8 @@ passport.use(new KakaoStrategy({
17 17
18 console.log("(!)로그인 : " + profile._json.id+"("+profile._json.properties.nickname +")"); 18 console.log("(!)로그인 : " + profile._json.id+"("+profile._json.properties.nickname +")");
19 return done(null, { 19 return done(null, {
20 - 'user_id': profile.auth_id, 20 + 'user_id': profile._json.id,
21 - 'nickname': profile.auth_name 21 + 'nickname': profile._json.properties.nickname
22 }); 22 });
23 } 23 }
24 )); 24 ));
......
1 var express = require('express'); 1 var express = require('express');
2 var cheerio = require('cheerio'); 2 var cheerio = require('cheerio');
3 var request = require('request'); 3 var request = require('request');
4 +var async = require('async');
4 var router = express.Router(); 5 var router = express.Router();
5 6
6 -updatedToons = getUpdatedToons(); 7 +function getUpdatedToons(cb){
7 -function getUpdatedToons(){
8 var allToons = new Array(); 8 var allToons = new Array();
9 var allToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn"; 9 var allToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn";
10 request(allToonsUrl, function(err, res, html){ 10 request(allToonsUrl, function(err, res, html){
11 if(!err){ 11 if(!err){
12 var $ = cheerio.load(html); 12 var $ = cheerio.load(html);
13 + var p = Promise.resolve();
14 + var eachs = $(".thumb").has('.ico_updt').next().each(function() {
15 + p = p.then(function() {
16 + var link = $(this);
17 + var toonName = link.text();
18 + var toonHref = link.attr('href');
13 19
14 - $(".thumb").has('.ico_updt').next().each(function() { 20 + allToons[toonName] = toonHref;
15 - var link = $(this); 21 + //connection.query("");
16 - var toonName = link.text(); 22 + });
17 - var toonHref = link.attr('href'); 23 + });
18 - 24 + p.then(function(){
19 - allToons[toonName]=toonHref; 25 + cb(allToons);
20 - //connection.query("");
21 -
22 }); 26 });
27 + }else{
28 + console.log("업데이트 웹툰 못가져왔습니다.");
29 + throw err;
23 } 30 }
24 }); 31 });
25 - return allToons;
26 } 32 }
27 33
28 -function getMyToons(id){ 34 +function getMyToons(id,cb){
29 - var sql = ""; 35 + 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;';
30 - connection.query('SELECT * FROM user u, user_toon_relation ur WHERE u.id=ur.user_id && id=?;'); 36 + var mylist;
31 - 37 + connection.query(sqlquery,id,function(err,rows,result){
38 + if(!err){
39 + mylist=rows;
40 + cb(mylist);
41 + }else{
42 + console.log("내 웹툰 리스트 가져오는데 실패했습니다!");
43 + throw err;
44 + }
45 + });
32 } 46 }
33 47
48 +
34 /* GET home page. */ 49 /* GET home page. */
35 router.get('/', function(req, res, next) { 50 router.get('/', function(req, res, next) {
36 - res.render('mytoons',{ 51 + async.series(
37 - list : updatedToons 52 + [
38 - }); 53 + function(callback){
54 + getMyToons(req.user.user_id, function (mytoon_list) {
55 + callback(null,mytoon_list);
56 + });
57 + },
58 + function(callback){
59 + getUpdatedToons(function (updated_list) {
60 + callback(null,updated_list);
61 + });
62 + }
63 + ],
64 + function(err, results){
65 + console.log(results);
66 + res.render('mytoons', {
67 + mytoons: results[0],
68 + updatedtoons: results[1]
69 + });
70 + }
71 + );
72 +
73 +
74 +
75 +
76 +
39 }); 77 });
40 78
41 module.exports = router; 79 module.exports = router;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <% } %> 26 <% } %>
27 <td> 27 <td>
28 <a href="<%= A.webtoon_link %>"> 28 <a href="<%= A.webtoon_link %>">
29 - <img src="<%= A.thum_link %>"/> 29 + <img alt="img" width="83" height="90" src="<%= A.thum_link %>"/>
30 </a> 30 </a>
31 <%= A.name %> 31 <%= A.name %>
32 </td> 32 </td>
......
...@@ -10,15 +10,16 @@ ...@@ -10,15 +10,16 @@
10 <p>추가한 리스트</p> 10 <p>추가한 리스트</p>
11 11
12 <a href="/auth/logout/kakao">로그아웃</a> 12 <a href="/auth/logout/kakao">로그아웃</a>
13 -<a href="/setting">세팅</a> 13 +<a href="/setting/">세팅</a>
14 </br> 14 </br>
15 15
16 <table> 16 <table>
17 +
17 <% 18 <%
18 - var current = ""; 19 +
19 - for(updated in list){ 20 + for(i=0;i<mytoons.length; i++){
20 %> 21 %>
21 - <%= updated + " : " + list[updated] %><br> 22 + <%= mytoons[i].name + " : " + mytoons[i].week %><br>
22 <% 23 <%
23 } 24 }
24 %> 25 %>
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
11 11
12 <% 12 <%
13 var current = ""; 13 var current = "";
14 - for(toonName in list) { 14 + for(toonName in mytoons) {
15 - var A = list[toonName]; 15 + var A = mytoons[toonName];
16 %> 16 %>
17 <%= A %></br> 17 <%= A %></br>
18 <% 18 <%
......