강현태

toggle_toon 추가

...@@ -2,14 +2,10 @@ ...@@ -2,14 +2,10 @@
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" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
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" />
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/index.js" afterPath="$PROJECT_DIR$/routes/index.js" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/index.js" afterPath="$PROJECT_DIR$/routes/index.js" />
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/mytoons.js" afterPath="$PROJECT_DIR$/routes/mytoons.js" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/mytoons.js" afterPath="$PROJECT_DIR$/routes/mytoons.js" />
8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/setting.js" afterPath="$PROJECT_DIR$/routes/setting.js" />
13 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/index.ejs" afterPath="$PROJECT_DIR$/views/index.ejs" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/index.ejs" afterPath="$PROJECT_DIR$/views/index.ejs" />
14 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/mytoons.ejs" afterPath="$PROJECT_DIR$/views/mytoons.ejs" /> 10 <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" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/setting.ejs" afterPath="$PROJECT_DIR$/views/setting.ejs" />
...@@ -66,8 +62,8 @@ ...@@ -66,8 +62,8 @@
66 <file leaf-file-name="mytoons.js" pinned="false" current-in-tab="false"> 62 <file leaf-file-name="mytoons.js" pinned="false" current-in-tab="false">
67 <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 63 <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
68 <provider selected="true" editor-type-id="text-editor"> 64 <provider selected="true" editor-type-id="text-editor">
69 - <state relative-caret-position="359"> 65 + <state relative-caret-position="-210">
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" /> 66 + <caret line="34" column="76" lean-forward="false" selection-start-line="34" selection-start-column="76" selection-end-line="34" selection-end-column="76" />
71 <folding /> 67 <folding />
72 </state> 68 </state>
73 </provider> 69 </provider>
...@@ -76,9 +72,24 @@ ...@@ -76,9 +72,24 @@
76 <file leaf-file-name="index.js" pinned="false" current-in-tab="false"> 72 <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
77 <entry file="file://$PROJECT_DIR$/routes/index.js"> 73 <entry file="file://$PROJECT_DIR$/routes/index.js">
78 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
79 - <state relative-caret-position="182"> 75 + <state relative-caret-position="267">
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" /> 76 + <caret line="149" column="0" lean-forward="false" selection-start-line="149" selection-start-column="0" selection-end-line="149" selection-end-column="0" />
81 - <folding /> 77 + <folding>
78 + <element signature="n#!!block;n#getLatestToon#0" expanded="false" />
79 + <element signature="n#!!block;n#getAllToons#0" expanded="false" />
80 + </folding>
81 + </state>
82 + </provider>
83 + </entry>
84 + </file>
85 + <file leaf-file-name="index.ejs" pinned="false" current-in-tab="false">
86 + <entry file="file://$PROJECT_DIR$/views/index.ejs">
87 + <provider selected="true" editor-type-id="text-editor">
88 + <state relative-caret-position="-161">
89 + <caret line="0" column="15" lean-forward="true" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
90 + <folding>
91 + <marker date="1512610222312" expanded="true" signature="211:1032" ph="..." />
92 + </folding>
82 </state> 93 </state>
83 </provider> 94 </provider>
84 </entry> 95 </entry>
...@@ -86,13 +97,46 @@ ...@@ -86,13 +97,46 @@
86 <file leaf-file-name="mytoons.ejs" pinned="false" current-in-tab="true"> 97 <file leaf-file-name="mytoons.ejs" pinned="false" current-in-tab="true">
87 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 98 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
88 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
89 - <state relative-caret-position="165"> 100 + <state relative-caret-position="330">
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" /> 101 + <caret line="22" column="11" lean-forward="true" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
102 + <folding />
103 + </state>
104 + </provider>
105 + </entry>
106 + </file>
107 + <file leaf-file-name="setting.ejs" pinned="false" current-in-tab="false">
108 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
109 + <provider selected="true" editor-type-id="text-editor">
110 + <state relative-caret-position="-8">
111 + <caret line="24" column="12" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
91 <folding /> 112 <folding />
92 </state> 113 </state>
93 </provider> 114 </provider>
94 </entry> 115 </entry>
95 </file> 116 </file>
117 + <file leaf-file-name="setting.js" pinned="false" current-in-tab="false">
118 + <entry file="file://$PROJECT_DIR$/routes/setting.js">
119 + <provider selected="true" editor-type-id="text-editor">
120 + <state relative-caret-position="90">
121 + <caret line="6" column="49" lean-forward="false" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="49" />
122 + <folding />
123 + </state>
124 + </provider>
125 + </entry>
126 + </file>
127 + <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
128 + <entry file="file://$PROJECT_DIR$/app.js">
129 + <provider selected="true" editor-type-id="text-editor">
130 + <state relative-caret-position="570">
131 + <caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
132 + <folding>
133 + <element signature="e#1750#1822#0" expanded="false" />
134 + <element signature="e#1881#2127#0" expanded="false" />
135 + </folding>
136 + </state>
137 + </provider>
138 + </entry>
139 + </file>
96 </leaf> 140 </leaf>
97 </component> 141 </component>
98 <component name="FileTemplateManagerImpl"> 142 <component name="FileTemplateManagerImpl">
...@@ -117,6 +161,10 @@ ...@@ -117,6 +161,10 @@
117 <find>quer</find> 161 <find>quer</find>
118 <find>connection</find> 162 <find>connection</find>
119 <find>user</find> 163 <find>user</find>
164 + <find>노블레스</find>
165 + <find>패밀리</find>
166 + <find>console</find>
167 + <find>query</find>
120 </findStrings> 168 </findStrings>
121 <dirStrings> 169 <dirStrings>
122 <dir>$PROJECT_DIR$/views</dir> 170 <dir>$PROJECT_DIR$/views</dir>
...@@ -146,16 +194,16 @@ ...@@ -146,16 +194,16 @@
146 <option value="$PROJECT_DIR$/views/login.html" /> 194 <option value="$PROJECT_DIR$/views/login.html" />
147 <option value="$PROJECT_DIR$/public/javascripts/kakao.js" /> 195 <option value="$PROJECT_DIR$/public/javascripts/kakao.js" />
148 <option value="$PROJECT_DIR$/views/setting.html" /> 196 <option value="$PROJECT_DIR$/views/setting.html" />
149 - <option value="$PROJECT_DIR$/routes/setting.js" />
150 <option value="$PROJECT_DIR$/config/passport.js" /> 197 <option value="$PROJECT_DIR$/config/passport.js" />
151 <option value="$PROJECT_DIR$/models/user.js" /> 198 <option value="$PROJECT_DIR$/models/user.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" /> 199 <option value="$PROJECT_DIR$/package.json" />
157 <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" /> 200 <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" />
201 + <option value="$PROJECT_DIR$/views/index.ejs" />
202 + <option value="$PROJECT_DIR$/app.js" />
203 + <option value="$PROJECT_DIR$/routes/index.js" />
204 + <option value="$PROJECT_DIR$/views/setting.ejs" />
158 <option value="$PROJECT_DIR$/routes/mytoons.js" /> 205 <option value="$PROJECT_DIR$/routes/mytoons.js" />
206 + <option value="$PROJECT_DIR$/routes/setting.js" />
159 <option value="$PROJECT_DIR$/views/mytoons.ejs" /> 207 <option value="$PROJECT_DIR$/views/mytoons.ejs" />
160 </list> 208 </list>
161 </option> 209 </option>
...@@ -171,7 +219,7 @@ ...@@ -171,7 +219,7 @@
171 <component name="NodeModulesDirectoryManager"> 219 <component name="NodeModulesDirectoryManager">
172 <handled-path value="$PROJECT_DIR$/node_modules" /> 220 <handled-path value="$PROJECT_DIR$/node_modules" />
173 </component> 221 </component>
174 - <component name="ProjectFrameBounds" extendedState="6" fullScreen="true"> 222 + <component name="ProjectFrameBounds" fullScreen="true">
175 <option name="width" value="718" /> 223 <option name="width" value="718" />
176 <option name="height" value="900" /> 224 <option name="height" value="900" />
177 </component> 225 </component>
...@@ -191,6 +239,7 @@ ...@@ -191,6 +239,7 @@
191 <foldersAlwaysOnTop value="true" /> 239 <foldersAlwaysOnTop value="true" />
192 </navigator> 240 </navigator>
193 <panes> 241 <panes>
242 + <pane id="Scratches" />
194 <pane id="ProjectPane"> 243 <pane id="ProjectPane">
195 <subPane> 244 <subPane>
196 <expand> 245 <expand>
...@@ -212,7 +261,6 @@ ...@@ -212,7 +261,6 @@
212 <select /> 261 <select />
213 </subPane> 262 </subPane>
214 </pane> 263 </pane>
215 - <pane id="Scratches" />
216 <pane id="AndroidView" /> 264 <pane id="AndroidView" />
217 <pane id="Scope" /> 265 <pane id="Scope" />
218 <pane id="PackagesPane" /> 266 <pane id="PackagesPane" />
...@@ -338,7 +386,8 @@ ...@@ -338,7 +386,8 @@
338 <option name="presentableId" value="Default" /> 386 <option name="presentableId" value="Default" />
339 <updated>1512173581551</updated> 387 <updated>1512173581551</updated>
340 <workItem from="1512173589576" duration="1873000" /> 388 <workItem from="1512173589576" duration="1873000" />
341 - <workItem from="1512179289398" duration="112128000" /> 389 + <workItem from="1512179289398" duration="128771000" />
390 + <workItem from="1512609885662" duration="20679000" />
342 </task> 391 </task>
343 <task id="LOCAL-00001" summary="초기 commit by intellij"> 392 <task id="LOCAL-00001" summary="초기 commit by intellij">
344 <created>1512174269218</created> 393 <created>1512174269218</created>
...@@ -358,29 +407,36 @@ ...@@ -358,29 +407,36 @@
358 <servers /> 407 <servers />
359 </component> 408 </component>
360 <component name="TimeTrackingManager"> 409 <component name="TimeTrackingManager">
361 - <option name="totallyTimeSpent" value="114001000" /> 410 + <option name="totallyTimeSpent" value="151323000" />
411 + </component>
412 + <component name="TodoView">
413 + <todo-panel id="selected-file">
414 + <is-autoscroll-to-source value="true" />
415 + </todo-panel>
416 + <todo-panel id="all">
417 + <are-packages-shown value="true" />
418 + <is-autoscroll-to-source value="true" />
419 + </todo-panel>
362 </component> 420 </component>
363 <component name="ToolWindowManager"> 421 <component name="ToolWindowManager">
364 - <frame x="0" y="0" width="1440" height="900" extended-state="6" /> 422 + <frame x="0" y="0" width="1440" height="900" extended-state="0" />
365 <editor active="true" /> 423 <editor active="true" />
366 <layout> 424 <layout>
367 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 425 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
368 - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 426 + <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
369 <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 427 <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
370 <window_info id="Image Layers" 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" /> 428 <window_info id="Image Layers" 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" />
371 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 429 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
372 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5028612" order="7" side_tool="true" content_ui="tabs" /> 430 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5028612" order="7" side_tool="true" content_ui="tabs" />
373 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 431 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
374 - <window_info id="Version Control" 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="8" side_tool="false" content_ui="tabs" />
375 <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16523606" sideWeight="0.51119405" order="2" side_tool="true" content_ui="tabs" /> 432 <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16523606" sideWeight="0.51119405" order="2" side_tool="true" content_ui="tabs" />
433 + <window_info id="Version Control" 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="8" side_tool="false" content_ui="tabs" />
376 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" /> 434 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" />
377 <window_info id="Terminal" 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="9" side_tool="false" content_ui="tabs" /> 435 <window_info id="Terminal" 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="9" side_tool="false" content_ui="tabs" />
378 <window_info id="Capture Tool" 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" /> 436 <window_info id="Capture Tool" 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" />
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" />
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" /> 437 <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" />
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" /> 438 <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" />
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" /> 439 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29613733" sideWeight="0.5" order="3" 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" />
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" /> 440 <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" />
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" /> 441 <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" />
386 <window_info id="UI 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" /> 442 <window_info id="UI 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" />
...@@ -392,6 +448,8 @@ ...@@ -392,6 +448,8 @@
392 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 448 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
393 <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" /> 449 <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" />
394 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 450 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
451 + <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="10" side_tool="false" content_ui="tabs" />
452 + <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" />
395 </layout> 453 </layout>
396 <layout-to-restore> 454 <layout-to-restore>
397 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 455 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -463,11 +521,30 @@ ...@@ -463,11 +521,30 @@
463 </component> 521 </component>
464 <component name="XDebuggerManager"> 522 <component name="XDebuggerManager">
465 <breakpoint-manager> 523 <breakpoint-manager>
466 - <option name="time" value="138" /> 524 + <option name="time" value="211" />
467 </breakpoint-manager> 525 </breakpoint-manager>
468 <watches-manager /> 526 <watches-manager />
469 </component> 527 </component>
470 <component name="editorHistoryManager"> 528 <component name="editorHistoryManager">
529 + <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
530 + <provider selected="true" editor-type-id="text-editor">
531 + <state relative-caret-position="345">
532 + <caret line="23" column="12" lean-forward="false" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="30" />
533 + <folding />
534 + </state>
535 + </provider>
536 + </entry>
537 + <entry file="file://$PROJECT_DIR$/routes/index.js">
538 + <provider selected="true" editor-type-id="text-editor">
539 + <state relative-caret-position="885">
540 + <caret line="59" column="92" lean-forward="false" selection-start-line="59" selection-start-column="92" selection-end-line="59" selection-end-column="92" />
541 + <folding>
542 + <element signature="n#!!block;n#getLatestToon#0" expanded="false" />
543 + <element signature="n#!!block;n#getAllToons#0" expanded="false" />
544 + </folding>
545 + </state>
546 + </provider>
547 + </entry>
471 <entry file="file://$PROJECT_DIR$/bin/www"> 548 <entry file="file://$PROJECT_DIR$/bin/www">
472 <provider selected="true" editor-type-id="text-editor"> 549 <provider selected="true" editor-type-id="text-editor">
473 <state relative-caret-position="0"> 550 <state relative-caret-position="0">
...@@ -489,7 +566,7 @@ ...@@ -489,7 +566,7 @@
489 <state relative-caret-position="0"> 566 <state relative-caret-position="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" /> 567 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
491 <folding> 568 <folding>
492 - <marker date="1512528857495" expanded="true" signature="211:995" ph="..." /> 569 + <marker date="1512610222312" expanded="true" signature="211:1032" ph="..." />
493 </folding> 570 </folding>
494 </state> 571 </state>
495 </provider> 572 </provider>
...@@ -502,67 +579,35 @@ ...@@ -502,67 +579,35 @@
502 </state> 579 </state>
503 </provider> 580 </provider>
504 </entry> 581 </entry>
505 - <entry file="file://$PROJECT_DIR$/controllers/webtoon_crawler.js"> 582 + <entry file="file://$PROJECT_DIR$/controllers/webtoon_crawler.js" />
506 - <provider selected="true" editor-type-id="text-editor">
507 - <state relative-caret-position="150">
508 - <caret line="71" column="5" lean-forward="false" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
509 - <folding />
510 - </state>
511 - </provider>
512 - </entry>
513 <entry file="file://$PROJECT_DIR$/node_modules/request/index.js"> 583 <entry file="file://$PROJECT_DIR$/node_modules/request/index.js">
514 <provider selected="true" editor-type-id="text-editor"> 584 <provider selected="true" editor-type-id="text-editor">
515 <state relative-caret-position="212"> 585 <state relative-caret-position="212">
516 <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" /> 586 <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
517 - <folding />
518 - </state>
519 - </provider>
520 - </entry>
521 - <entry file="file://$PROJECT_DIR$/views/helloWorld.html">
522 - <provider selected="true" editor-type-id="text-editor">
523 - <state relative-caret-position="60">
524 - <caret line="4" column="16" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="16" />
525 - <folding />
526 </state> 587 </state>
527 </provider> 588 </provider>
528 </entry> 589 </entry>
590 + <entry file="file://$PROJECT_DIR$/views/helloWorld.html" />
529 <entry file="file://$APPLICATION_CONFIG_DIR$/javascript/nodejs/6.11.4/core-modules/vm.js"> 591 <entry file="file://$APPLICATION_CONFIG_DIR$/javascript/nodejs/6.11.4/core-modules/vm.js">
530 <provider selected="true" editor-type-id="text-editor"> 592 <provider selected="true" editor-type-id="text-editor">
531 <state relative-caret-position="171"> 593 <state relative-caret-position="171">
532 <caret line="55" column="9" lean-forward="false" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" /> 594 <caret line="55" column="9" lean-forward="false" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" />
533 - <folding />
534 - </state>
535 - </provider>
536 - </entry>
537 - <entry file="file://$PROJECT_DIR$/views/login.ejs">
538 - <provider selected="true" editor-type-id="text-editor">
539 - <state relative-caret-position="60">
540 - <caret line="4" column="16" lean-forward="false" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="16" />
541 - <folding />
542 </state> 595 </state>
543 </provider> 596 </provider>
544 </entry> 597 </entry>
598 + <entry file="file://$PROJECT_DIR$/views/login.ejs" />
545 <entry file="file://$APPLICATION_CONFIG_DIR$/javascript/nodejs/6.11.4/core-modules/module.js"> 599 <entry file="file://$APPLICATION_CONFIG_DIR$/javascript/nodejs/6.11.4/core-modules/module.js">
546 <provider selected="true" editor-type-id="text-editor"> 600 <provider selected="true" editor-type-id="text-editor">
547 <state relative-caret-position="171"> 601 <state relative-caret-position="171">
548 <caret line="468" column="14" lean-forward="false" selection-start-line="468" selection-start-column="14" selection-end-line="468" selection-end-column="14" /> 602 <caret line="468" column="14" lean-forward="false" selection-start-line="468" selection-start-column="14" selection-end-line="468" selection-end-column="14" />
549 - <folding />
550 - </state>
551 - </provider>
552 - </entry>
553 - <entry file="file://$PROJECT_DIR$/public/javascripts/kakao.js">
554 - <provider selected="true" editor-type-id="text-editor">
555 - <state relative-caret-position="-40">
556 - <caret line="1" column="65" lean-forward="false" selection-start-line="1" selection-start-column="65" selection-end-line="1" selection-end-column="65" />
557 - <folding />
558 </state> 603 </state>
559 </provider> 604 </provider>
560 </entry> 605 </entry>
606 + <entry file="file://$PROJECT_DIR$/public/javascripts/kakao.js" />
561 <entry file="file://$PROJECT_DIR$/node_modules/passport-kakao/lib/strategy.js"> 607 <entry file="file://$PROJECT_DIR$/node_modules/passport-kakao/lib/strategy.js">
562 <provider selected="true" editor-type-id="text-editor"> 608 <provider selected="true" editor-type-id="text-editor">
563 <state relative-caret-position="300"> 609 <state relative-caret-position="300">
564 <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> 610 <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
565 - <folding />
566 </state> 611 </state>
567 </provider> 612 </provider>
568 </entry> 613 </entry>
...@@ -578,7 +623,6 @@ ...@@ -578,7 +623,6 @@
578 <provider selected="true" editor-type-id="text-editor"> 623 <provider selected="true" editor-type-id="text-editor">
579 <state relative-caret-position="171"> 624 <state relative-caret-position="171">
580 <caret line="129" column="17" lean-forward="false" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" /> 625 <caret line="129" column="17" lean-forward="false" selection-start-line="129" selection-start-column="17" selection-end-line="129" selection-end-column="17" />
581 - <folding />
582 </state> 626 </state>
583 </provider> 627 </provider>
584 </entry> 628 </entry>
...@@ -586,86 +630,104 @@ ...@@ -586,86 +630,104 @@
586 <provider selected="true" editor-type-id="text-editor"> 630 <provider selected="true" editor-type-id="text-editor">
587 <state relative-caret-position="0"> 631 <state relative-caret-position="0">
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" /> 632 <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 />
590 </state> 633 </state>
591 </provider> 634 </provider>
592 </entry> 635 </entry>
593 - <entry file="file://$PROJECT_DIR$/config/passport.js"> 636 + <entry file="file://$PROJECT_DIR$/config/passport.js" />
637 + <entry file="file://$PROJECT_DIR$/models/user.js" />
638 + <entry file="file://$PROJECT_DIR$/routes/users.js">
594 <provider selected="true" editor-type-id="text-editor"> 639 <provider selected="true" editor-type-id="text-editor">
595 - <state relative-caret-position="150"> 640 + <state relative-caret-position="90">
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" /> 641 + <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
597 <folding /> 642 <folding />
598 </state> 643 </state>
599 </provider> 644 </provider>
600 </entry> 645 </entry>
601 - <entry file="file://$PROJECT_DIR$/models/user.js"> 646 + <entry file="file://$PROJECT_DIR$/package.json">
602 <provider selected="true" editor-type-id="text-editor"> 647 <provider selected="true" editor-type-id="text-editor">
603 - <state relative-caret-position="75"> 648 + <state relative-caret-position="420">
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" /> 649 + <caret line="28" column="28" lean-forward="false" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
605 <folding /> 650 <folding />
606 </state> 651 </state>
607 </provider> 652 </provider>
608 </entry> 653 </entry>
609 - <entry file="file://$PROJECT_DIR$/routes/users.js"> 654 + <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql">
610 <provider selected="true" editor-type-id="text-editor"> 655 <provider selected="true" editor-type-id="text-editor">
611 - <state relative-caret-position="90"> 656 + <state relative-caret-position="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" /> 657 + <caret line="0" column="161" lean-forward="false" selection-start-line="0" selection-start-column="161" selection-end-line="0" selection-end-column="161" />
613 <folding /> 658 <folding />
614 </state> 659 </state>
615 </provider> 660 </provider>
616 </entry> 661 </entry>
617 - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> 662 + <entry file="file://$PROJECT_DIR$/node_modules/async/dist/async.js">
618 <provider selected="true" editor-type-id="text-editor"> 663 <provider selected="true" editor-type-id="text-editor">
619 - <state relative-caret-position="207"> 664 + <state relative-caret-position="171">
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" /> 665 + <caret line="954" column="0" lean-forward="false" selection-start-line="954" selection-start-column="0" selection-end-line="954" selection-end-column="0" />
621 - <folding />
622 </state> 666 </state>
623 </provider> 667 </provider>
624 </entry> 668 </entry>
625 - <entry file="file://$PROJECT_DIR$/routes/setting.js"> 669 + <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user">
670 + <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
671 + <state>
672 + <filtering enabled="true" />
673 + </state>
674 + </provider>
675 + </entry>
676 + <entry file="file://$PROJECT_DIR$/node_modules/mysql/lib/protocol/Parser.js">
626 <provider selected="true" editor-type-id="text-editor"> 677 <provider selected="true" editor-type-id="text-editor">
627 - <state relative-caret-position="105"> 678 + <state relative-caret-position="194">
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" /> 679 + <caret line="79" column="0" lean-forward="false" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
629 <folding /> 680 <folding />
630 </state> 681 </state>
631 </provider> 682 </provider>
632 </entry> 683 </entry>
633 - <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user_toon_relation"> 684 + <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.toon">
634 <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider"> 685 <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
635 <state> 686 <state>
636 <filtering enabled="true" /> 687 <filtering enabled="true" />
637 </state> 688 </state>
638 </provider> 689 </provider>
639 </entry> 690 </entry>
640 - <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.toon"> 691 + <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user_toon_relation">
641 <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider"> 692 <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
642 <state> 693 <state>
643 <filtering enabled="true" /> 694 <filtering enabled="true" />
644 </state> 695 </state>
645 </provider> 696 </provider>
646 </entry> 697 </entry>
698 + <entry file="file://$PROJECT_DIR$/routes/index.js">
699 + <provider selected="true" editor-type-id="text-editor">
700 + <state relative-caret-position="267">
701 + <caret line="149" column="0" lean-forward="false" selection-start-line="149" selection-start-column="0" selection-end-line="149" selection-end-column="0" />
702 + <folding>
703 + <element signature="n#!!block;n#getLatestToon#0" expanded="false" />
704 + <element signature="n#!!block;n#getAllToons#0" expanded="false" />
705 + </folding>
706 + </state>
707 + </provider>
708 + </entry>
647 <entry file="file://$PROJECT_DIR$/views/index.ejs"> 709 <entry file="file://$PROJECT_DIR$/views/index.ejs">
648 <provider selected="true" editor-type-id="text-editor"> 710 <provider selected="true" editor-type-id="text-editor">
649 - <state relative-caret-position="400"> 711 + <state relative-caret-position="-161">
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" /> 712 + <caret line="0" column="15" lean-forward="true" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
651 <folding> 713 <folding>
652 - <marker date="1512528857495" expanded="true" signature="211:995" ph="..." /> 714 + <marker date="1512610222312" expanded="true" signature="211:1032" ph="..." />
653 </folding> 715 </folding>
654 </state> 716 </state>
655 </provider> 717 </provider>
656 </entry> 718 </entry>
657 - <entry file="file://$PROJECT_DIR$/package.json"> 719 + <entry file="file://$PROJECT_DIR$/views/setting.ejs">
658 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
659 - <state relative-caret-position="420"> 721 + <state relative-caret-position="-8">
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" /> 722 + <caret line="24" column="12" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
661 <folding /> 723 <folding />
662 </state> 724 </state>
663 </provider> 725 </provider>
664 </entry> 726 </entry>
665 <entry file="file://$PROJECT_DIR$/app.js"> 727 <entry file="file://$PROJECT_DIR$/app.js">
666 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
667 - <state relative-caret-position="-206"> 729 + <state relative-caret-position="570">
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" /> 730 + <caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
669 <folding> 731 <folding>
670 <element signature="e#1750#1822#0" expanded="false" /> 732 <element signature="e#1750#1822#0" expanded="false" />
671 <element signature="e#1881#2127#0" expanded="false" /> 733 <element signature="e#1881#2127#0" expanded="false" />
...@@ -673,49 +735,26 @@ ...@@ -673,49 +735,26 @@
673 </state> 735 </state>
674 </provider> 736 </provider>
675 </entry> 737 </entry>
676 - <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql"> 738 + <entry file="file://$PROJECT_DIR$/routes/setting.js">
677 - <provider selected="true" editor-type-id="text-editor">
678 - <state relative-caret-position="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" />
680 - <folding />
681 - </state>
682 - </provider>
683 - </entry>
684 - <entry file="file://$PROJECT_DIR$/node_modules/async/dist/async.js">
685 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
686 - <state relative-caret-position="171"> 740 + <state relative-caret-position="90">
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" /> 741 + <caret line="6" column="49" lean-forward="false" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="49" />
688 <folding /> 742 <folding />
689 </state> 743 </state>
690 </provider> 744 </provider>
691 </entry> 745 </entry>
692 - <entry file="das://table:/9e6ed7fb/01265fc0-37d6-481f-ac14-42262cda0ac3/YTMT.user">
693 - <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
694 - <state>
695 - <filtering enabled="true" />
696 - </state>
697 - </provider>
698 - </entry>
699 <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> 746 <entry file="file://$PROJECT_DIR$/routes/mytoons.js">
700 <provider selected="true" editor-type-id="text-editor"> 747 <provider selected="true" editor-type-id="text-editor">
701 - <state relative-caret-position="359"> 748 + <state relative-caret-position="-210">
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" /> 749 + <caret line="34" column="76" lean-forward="false" selection-start-line="34" selection-start-column="76" selection-end-line="34" selection-end-column="76" />
703 - <folding />
704 - </state>
705 - </provider>
706 - </entry>
707 - <entry file="file://$PROJECT_DIR$/routes/index.js">
708 - <provider selected="true" editor-type-id="text-editor">
709 - <state relative-caret-position="182">
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" />
711 <folding /> 750 <folding />
712 </state> 751 </state>
713 </provider> 752 </provider>
714 </entry> 753 </entry>
715 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> 754 <entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
716 <provider selected="true" editor-type-id="text-editor"> 755 <provider selected="true" editor-type-id="text-editor">
717 - <state relative-caret-position="165"> 756 + <state relative-caret-position="330">
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" /> 757 + <caret line="22" column="11" lean-forward="true" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
719 <folding /> 758 <folding />
720 </state> 759 </state>
721 </provider> 760 </provider>
...@@ -723,6 +762,30 @@ ...@@ -723,6 +762,30 @@
723 </component> 762 </component>
724 <component name="masterDetails"> 763 <component name="masterDetails">
725 <states> 764 <states>
765 + <state key="ArtifactsStructureConfigurable.UI">
766 + <settings>
767 + <artifact-editor />
768 + <splitter-proportions>
769 + <option name="proportions">
770 + <list>
771 + <option value="0.2" />
772 + </list>
773 + </option>
774 + </splitter-proportions>
775 + </settings>
776 + </state>
777 + <state key="FacetStructureConfigurable.UI">
778 + <settings>
779 + <last-edited>No facets are configured</last-edited>
780 + <splitter-proportions>
781 + <option name="proportions">
782 + <list>
783 + <option value="0.2" />
784 + </list>
785 + </option>
786 + </splitter-proportions>
787 + </settings>
788 + </state>
726 <state key="GlobalLibrariesConfigurable.UI"> 789 <state key="GlobalLibrariesConfigurable.UI">
727 <settings> 790 <settings>
728 <splitter-proportions> 791 <splitter-proportions>
...@@ -746,6 +809,19 @@ ...@@ -746,6 +809,19 @@
746 </splitter-proportions> 809 </splitter-proportions>
747 </settings> 810 </settings>
748 </state> 811 </state>
812 + <state key="ModuleStructureConfigurable.UI">
813 + <settings>
814 + <last-edited>YTMT</last-edited>
815 + <splitter-proportions>
816 + <option name="proportions">
817 + <list>
818 + <option value="0.2" />
819 + <option value="0.6" />
820 + </list>
821 + </option>
822 + </splitter-proportions>
823 + </settings>
824 + </state>
749 <state key="ProjectJDKs.UI"> 825 <state key="ProjectJDKs.UI">
750 <settings> 826 <settings>
751 <last-edited>1.8</last-edited> 827 <last-edited>1.8</last-edited>
......
...@@ -54,16 +54,49 @@ router.get('/auth/logout/kakao',function (req,res) { ...@@ -54,16 +54,49 @@ router.get('/auth/logout/kakao',function (req,res) {
54 res.redirect('/'); 54 res.redirect('/');
55 }) 55 })
56 56
57 -var allWebtoons; 57 +allWebtoons = new Array();
58 +
59 +function getLatestToon(titleid, day ,cb) {
60 + var url = "http://comic.naver.com/webtoon/list.nhn?titleId=" + titleid+ "&weekday="+day;
61 + console.log(url);
62 + request(url, function (err, res, html) {
63 + if (!err) {
64 + var $ = cheerio.load(html);
65 + var latestLink = 'http://comic.naver.com';
66 + var latest;
67 + var t = $('#content > table > tbody > tr > td.title > a').first().each(function () {
68 + latestLink += $(this).attr('href');
69 + setTimeout(function () {},100);
70 + latest = latestLink.split('?')[1].split('&')[1].split('=')[1];
71 + });
72 +
73 + var latestImage;
74 + $('#content > table > tbody > tr > td > a > img').first().each(function () {
75 + latestImage = $(this).attr('src');
76 + setTimeout(function () {},100);
77 + });
78 +
79 + cb({
80 + latest: latest,
81 + latestLink: latestLink,
82 + latestImage: latestImage
83 + });
84 +
85 + } else {
86 + console.log("최신화 못가져왔습니다.");
87 + //throw err;
88 + }
89 + });
90 +}
58 91
59 function getAllToons() { 92 function getAllToons() {
60 var allWeeklyToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn"; 93 var allWeeklyToonsUrl = "http://comic.naver.com/webtoon/weekday.nhn";
61 - //connection.connect(); 94 + allWebtoonList = new Array();
62 - allWebtoonJSONList = new Array();
63 request(allWeeklyToonsUrl,function (err, res, html) { 95 request(allWeeklyToonsUrl,function (err, res, html) {
64 if(!err){ 96 if(!err){
65 var $ = cheerio.load(html); 97 var $ = cheerio.load(html);
66 - $(".thumb").each(function (i) { 98 + var p = Promise.resolve();
99 + var eachs = $(".thumb").each(function (i) {
67 var week = $(this).parent().parent().prev().attr('class'); 100 var week = $(this).parent().parent().prev().attr('class');
68 var webtoon_link = "http://comic.naver.com" + $(this).children().first().attr('href'); 101 var webtoon_link = "http://comic.naver.com" + $(this).children().first().attr('href');
69 var thumb_link = $(this).children().first().children().first().attr('src'); 102 var thumb_link = $(this).children().first().children().first().attr('src');
...@@ -75,25 +108,37 @@ function getAllToons() { ...@@ -75,25 +108,37 @@ function getAllToons() {
75 name : name, 108 name : name,
76 thum_link : thumb_link, 109 thum_link : thumb_link,
77 webtoon_link : webtoon_link, 110 webtoon_link : webtoon_link,
78 - week : week 111 + week : week,
112 + latest : 0
79 }; 113 };
80 - webtoon_string = JSON.stringify(webtoon);
81 -
82 - connection.query("INSERT INTO toon SET ? ON DUPLICATE KEY UPDATE toon_index=toon_index",
83 - webtoon);
84 114
85 - //JSON으로 만든당. 115 + allWebtoonList.push(webtoon);
86 - allWebtoonJSONList.push(webtoon_string); 116 + });
87 - }) 117 + p.then(function() {
118 + i = 0;
119 + allWebtoonList.forEach(function (webtoon) {
120 + getLatestToon(webtoon.toon_index, webtoon.week, function (latest_toon) {
121 + webtoon.latest = latest_toon.latest;
122 + console.log(i + " = " + webtoon.name + " : " + webtoon.latest)
123 + i++;
124 + connection.query("INSERT INTO toon SET ? ON DUPLICATE KEY UPDATE latest=?",
125 + [webtoon,webtoon.latest], function () {
126 + if(err){
127 + console.log("웹툰 갱신중 에러!");
128 + }
129 + });
130 + });
131 + })
132 + });
88 } 133 }
89 - //connection.end();
90 }); 134 });
91 - allWebtoons = allWebtoonJSONList; 135 + allWebtoons = allWebtoonList;
92 } 136 }
93 137
94 getAllToons(); 138 getAllToons();
95 -setInterval(getAllToons,5000); 139 +//처음 한번 수행
96 -//5초에 한번 수행 140 +setInterval(getAllToons,5*60*1000);
141 +//5분에 한번 수행
97 142
98 /* GET home page. */ 143 /* GET home page. */
99 router.get('/', 144 router.get('/',
......
...@@ -7,6 +7,7 @@ var router = express.Router(); ...@@ -7,6 +7,7 @@ var router = express.Router();
7 function getUpdatedToons(cb){ 7 function getUpdatedToons(cb){
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 +
10 request(allToonsUrl, function(err, res, html){ 11 request(allToonsUrl, function(err, res, html){
11 if(!err){ 12 if(!err){
12 var $ = cheerio.load(html); 13 var $ = cheerio.load(html);
...@@ -18,7 +19,6 @@ function getUpdatedToons(cb){ ...@@ -18,7 +19,6 @@ function getUpdatedToons(cb){
18 var toonHref = link.attr('href'); 19 var toonHref = link.attr('href');
19 20
20 allToons[toonName] = toonHref; 21 allToons[toonName] = toonHref;
21 - //connection.query("");
22 }); 22 });
23 }); 23 });
24 p.then(function(){ 24 p.then(function(){
...@@ -32,8 +32,8 @@ function getUpdatedToons(cb){ ...@@ -32,8 +32,8 @@ function getUpdatedToons(cb){
32 } 32 }
33 33
34 function getMyToons(id,cb){ 34 function getMyToons(id,cb){
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;'; 35 + var sqlquery = 'SELECT name, thum_link, webtoon_link, week, last, latest FROM user u, user_toon_relation ur, toon t WHERE u.id=? && u.id=ur.user_id && t.toon_index=ur.toon_index;';
36 - var mylist; 36 + var mylist = new Array();
37 connection.query(sqlquery,id,function(err,rows,result){ 37 connection.query(sqlquery,id,function(err,rows,result){
38 if(!err){ 38 if(!err){
39 mylist=rows; 39 mylist=rows;
...@@ -48,32 +48,24 @@ function getMyToons(id,cb){ ...@@ -48,32 +48,24 @@ function getMyToons(id,cb){
48 48
49 /* GET home page. */ 49 /* GET home page. */
50 router.get('/', function(req, res, next) { 50 router.get('/', function(req, res, next) {
51 - async.series( 51 + if(!req.isAuthenticated()){
52 - [ 52 + res.redirect('/');
53 - function(callback){ 53 + }else{
54 - getMyToons(req.user.user_id, function (mytoon_list) { 54 + async.series(
55 - callback(null,mytoon_list); 55 + [
56 - }); 56 + function(callback){
57 - }, 57 + getMyToons(req.user.user_id, function (mytoon_list) {
58 - function(callback){ 58 + callback(null,mytoon_list);
59 - getUpdatedToons(function (updated_list) { 59 + });
60 - callback(null,updated_list); 60 + }
61 - }); 61 + ],
62 - } 62 + function(err, results){
63 - ], 63 + res.render('mytoons', {
64 - function(err, results){ 64 + mytoons: results[0]
65 - console.log(results); 65 + });
66 - res.render('mytoons', { 66 + }
67 - mytoons: results[0], 67 + );
68 - updatedtoons: results[1] 68 + }
69 - });
70 - }
71 - );
72 -
73 -
74 -
75 -
76 -
77 }); 69 });
78 70
79 module.exports = router; 71 module.exports = router;
...\ No newline at end of file ...\ No newline at end of file
......
1 var express = require('express'); 1 var express = require('express');
2 var router = express.Router(); 2 var router = express.Router();
3 -require('../routes/mytoons');
4 3
5 4
6 -router.get('/', function(req, res, next) { 5 +function addMyToons(id,index,cb){
7 - res.render('setting',{ 6 + connection.query("INSERT INTO user_toon_relation SET ?;",
8 - list : updatedToons 7 + {user_id : id,toon_index : index, last : 1},function (err) {
8 + if(err) {
9 + throw err;
10 + console.log("내 웹툰 추가중 에러!")
11 + } else{
12 + //alert("추가되었습니다.")
13 + cb();
14 + }
15 + });
16 +}
17 +
18 +router.post('/toggle_toon',function(req,res,next){
19 + var index = req.body.toon_index;
20 + var id = req.user.user_id;
21 +
22 + connection.query("SELECT COUNT(*) FROM user_toon_relation WHERE user_id=? && toon_index=?",
23 + [id,index], function (err, rows,result) {
24 + if(err){
25 + console.log("내웹툰 등록중 에러!");
26 + }else{
27 + var count = rows[0]["COUNT(*)"];
28 + if(count>0){//이미 등록되어 있는 것이라면,
29 + connection.query("DELETE FROM user_toon_relation WHERE user_id=? && toon_index=?;",
30 + [id, index],function (err, rows, result) {
31 + if(err) {
32 + console.log("내 웹툰 제거중 에러!");
33 + throw err;
34 + }else{
35 + //alert("제거되었습니다.")
36 + res.redirect('/setting');
37 + }
38 + });
39 + }else{
40 + addMyToons(id,index,function(){
41 + res.redirect('/setting');
42 + });
43 + }
44 + }
45 + });
46 +});
47 +
48 +function getMyToons(id,cb){
49 + 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;';
50 + var mylist = new Array();
51 + connection.query(sqlquery,id,function(err,rows,result){
52 + if(!err){
53 + mylist=rows;
54 + cb(mylist);
55 + }else{
56 + console.log("내 웹툰 리스트 가져오는데 실패했습니다!");
57 + //throw err;
58 + }
9 }); 59 });
60 +}
61 +
62 +router.get('/', function(req, res, next) {
63 + getMyToons(req.user.user_id,function (mytoons) {
64 + res.render('setting',{
65 + alltoons : allWebtoons,
66 + mytoons : mytoons
67 + });
68 + })
10 }); 69 });
11 70
12 module.exports = router; 71 module.exports = router;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,25 +14,24 @@ ...@@ -14,25 +14,24 @@
14 <table> 14 <table>
15 <% 15 <%
16 var current = ""; 16 var current = "";
17 - for(jsonString in list){ 17 + for(webtoon in list){
18 - var A=JSON.parse(list[jsonString]); 18 + if(current!=list[webtoon].week){
19 - if(current!=A.week){
20 if(current!=""){ 19 if(current!=""){
21 %> 20 %>
22 </tr> 21 </tr>
23 <% } %> 22 <% } %>
24 <tr> 23 <tr>
25 - <th><%= A.week %></th> 24 + <th><%= list[webtoon].week %></th>
26 <% } %> 25 <% } %>
27 <td> 26 <td>
28 - <a href="<%= A.webtoon_link %>"> 27 + <a href="<%= list[webtoon].webtoon_link %>">
29 - <img alt="img" width="83" height="90" src="<%= A.thum_link %>"/> 28 + <img alt="img" width="83" height="90" src="<%= list[webtoon].thum_link %>"/>
30 </a> 29 </a>
31 - <%= A.name %> 30 + <%= list[webtoon].name %>
32 </td> 31 </td>
33 <% 32 <%
34 - if(current!=A.week) { 33 + if(current!=list[webtoon].week) {
35 - current = A.week; 34 + current = list[webtoon].week;
36 %> 35 %>
37 36
38 <% 37 <%
......
...@@ -3,8 +3,27 @@ ...@@ -3,8 +3,27 @@
3 <head> 3 <head>
4 <title>내툰</title> 4 <title>내툰</title>
5 <link rel='stylesheet' href='/stylesheets/style.css' /> 5 <link rel='stylesheet' href='/stylesheets/style.css' />
6 - <script src="http://developers.kakao.com/sdk/js/kakao.min.js"></script> 6 + <style>
7 - 7 + .toon_latest,.toon_next,.toon_last,.toon_name,.toon_thumbnail{
8 + width:10%;
9 + }
10 +
11 + td{
12 + vertical-align: middle;
13 + border-bottom: 1px solid #bcbcbc;
14 + border-left: 1px solid #bcbcbc;
15 + border-right: 1px solid #bcbcbc;
16 + margin:0;
17 + Text-align:center;
18 + }
19 + table{
20 + border-collapse:collapse;
21 + border: 2px solid #474747;
22 + }
23 + th{
24 + border-bottom:2px solid #474747;
25 + }
26 + </style>
8 </head> 27 </head>
9 <h1>내툰</h1> 28 <h1>내툰</h1>
10 <p>추가한 리스트</p> 29 <p>추가한 리스트</p>
...@@ -14,15 +33,23 @@ ...@@ -14,15 +33,23 @@
14 </br> 33 </br>
15 34
16 <table> 35 <table>
17 - 36 + <tr>
18 - <% 37 + <th>썸네일</th>
19 - 38 + <th>웹툰명</th>
39 + <th>최근에 본 화</th>
40 + <th>다음화</th>
41 + <th>최신화</th>
42 + </tr><%
20 for(i=0;i<mytoons.length; i++){ 43 for(i=0;i<mytoons.length; i++){
21 - %> 44 + %><tr>
22 - <%= mytoons[i].name + " : " + mytoons[i].week %><br> 45 + <td class="toon_thumbnail"><image src="<%= mytoons[i].thum_link%>"/></td>
23 - <% 46 + <td class="toon_name"><%= mytoons[i].name %></td>
24 - } 47 + <td class="toon_last"><%= mytoons[i].last %>화</td>
25 - %> 48 + <td class="toon_next"><%= mytoons[i].last +1 %>화</td>
49 + <td class="toon_latest"><%= mytoons[i].latest %>화</td>
50 + </tr>
51 + <br>
52 + <% } %>
26 </table> 53 </table>
27 54
28 </br> 55 </br>
......
...@@ -3,23 +3,54 @@ ...@@ -3,23 +3,54 @@
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 <title>설정</title> 5 <title>설정</title>
6 + <style>
7 + .registered{
8 + background-color: #AAAAAA;
9 + }
10 + </style>
6 </head> 11 </head>
7 <h1>내툰</h1> 12 <h1>내툰</h1>
8 -<p>추가하거나 제거할 웹툰을 눌러주세요.</p> 13 +<p>추가하거나 제거할 웹툰을 선택해주세요.</p>
9 14
10 <table> 15 <table>
11 -
12 <% 16 <%
13 var current = ""; 17 var current = "";
14 - for(toonName in mytoons) { 18 + for(webtoon in alltoons){
15 - var A = mytoons[toonName]; 19 + if(current!=alltoons[webtoon].week){
20 + if(current!=""){
21 + %>
22 + </tr>
23 + <% } %>
24 + <tr>
25 + <th><%= alltoons[webtoon].week %></th>
26 + <% } %>
27 + <td class="<%
28 + for(i=0;i<mytoons.length;i++){
29 + if(mytoons[i].name == alltoons[webtoon].name){
30 + %>registered<%
31 + break;
32 + }
33 + }
34 + %>">
35 + <form method="post" action="/setting/toggle_toon">
36 + <input type="hidden" name="toon_index" value="<%= alltoons[webtoon].toon_index %>">
37 + <input TYPE="IMAGE" src="<%= alltoons[webtoon].thum_link %>" name="Submit" value="Submit" align="absmiddle">
38 + </form>
39 + <%= alltoons[webtoon].name; %>
40 + </td>
41 + <%
42 + if(current!=alltoons[webtoon].week) {
43 + current = alltoons[webtoon].week;
16 %> 44 %>
17 - <%= A %></br> 45 +
18 - <% 46 + <%
19 - } 47 + }
48 + }
20 %> 49 %>
50 + </tr>
21 51
22 </table> 52 </table>
53 +</form>
23 </br> 54 </br>
24 55
25 <body> 56 <body>
......