Hyunjong Lee / YTMT

Go to a project
Toggle navigation Toggle navigation pinning
Akhidjon
41eeade6 1 parent 2d0d7490

Kakao modified and login works

Expand all
Inline Side-by-side
Showing 4 changed files with 8 additions and 7 deletions
...@@ -16,13 +16,12 @@ ...@@ -16,13 +16,12 @@
16 "fetchSpec": "0.0.5" 16 "fetchSpec": "0.0.5"
17 }, 17 },
18 "_requiredBy": [ 18 "_requiredBy": [
19 - "#USER",
20 "/" 19 "/"
21 ], 20 ],
22 "_resolved": "https://registry.npmjs.org/passport-kakao/-/passport-kakao-0.0.5.tgz", 21 "_resolved": "https://registry.npmjs.org/passport-kakao/-/passport-kakao-0.0.5.tgz",
23 "_shasum": "dcaab68800793af95566a15e7fef2dcabd3adc2d", 22 "_shasum": "dcaab68800793af95566a15e7fef2dcabd3adc2d",
24 "_spec": "passport-kakao@0.0.5", 23 "_spec": "passport-kakao@0.0.5",
25 - "_where": "C:\\Users\\LEEHYUNJONG\\Desktop\\오픈소스SW\\YTMT", 24 + "_where": "D:\\OSS project\\YTMT",
26 "author": { 25 "author": {
27 "name": "rotoshine@gmail.com" 26 "name": "rotoshine@gmail.com"
28 }, 27 },
......
This diff is collapsed. Click to expand it.
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
17 "ejs": "^2.5.9", 17 "ejs": "^2.5.9",
18 "express": "^4.15.5", 18 "express": "^4.15.5",
19 "express-session": "^1.15.6", 19 "express-session": "^1.15.6",
20 - "js-sha256": "^0.9.0",
21 "mongoose": "^4.13.6", 20 "mongoose": "^4.13.6",
22 "morgan": "^1.9.0", 21 "morgan": "^1.9.0",
23 "mysql": "^2.16.0", 22 "mysql": "^2.16.0",
23 + "node-iframe-replacement": "^1.0.0",
24 "passport": "^0.4.0", 24 "passport": "^0.4.0",
25 "passport-kakao": "0.0.5", 25 "passport-kakao": "0.0.5",
26 "passport-local": "^1.0.0", 26 "passport-local": "^1.0.0",
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 <ul class="nav navbar-nav navbar-right"> 47 <ul class="nav navbar-nav navbar-right">
48 <li><a href="#about" class="page-scroll">About</a></li> 48 <li><a href="#about" class="page-scroll">About</a></li>
49 <li><a href="#portfolio" class="page-scroll">Webtoons</a></li> 49 <li><a href="#portfolio" class="page-scroll">Webtoons</a></li>
50 - <li><a href="/api/auth/kakao" class="page-scroll">로그인2</a></li> 50 + <li><a href="/auth/login/kakao" class="page-scroll">Login</a></li>
51 </ul> 51 </ul>
52 </div> 52 </div>
53 <!-- /.navbar-collapse --> 53 <!-- /.navbar-collapse -->
...@@ -203,20 +203,22 @@ ...@@ -203,20 +203,22 @@
203 </br> 203 </br>
204 204
205 </div> 205 </div>
206 +
207 +
206 <font size = 30> 208 <font size = 30>
207 투믹스 웹툰 209 투믹스 웹툰
208 </font> 210 </font>
209 <a onclick="Naver_webtoons.style.display=(Naver_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> 211 <a onclick="Naver_webtoons.style.display=(Naver_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
210 <img src ='https://is4-ssl.mzstatic.com/image/thumb/Purple128/v4/d9/c7/99/d9c79934-4e9a-4926-fa53-b4863bae52b4/source/512x512bb.jpg' width="83" height="90"/> 212 <img src ='https://is4-ssl.mzstatic.com/image/thumb/Purple128/v4/d9/c7/99/d9c79934-4e9a-4926-fa53-b4863bae52b4/source/512x512bb.jpg' width="83" height="90"/>
211 </a> 213 </a>
212 -<div id="Toomics_webtoons" style = "display:none"> 214 +<div id="toomiks" style = "display:none">
213 215
214 <table> 216 <table>
215 <% 217 <%
216 var current = ""; 218 var current = "";
217 for(webtoon in list){ 219 for(webtoon in list){
218 220
219 - if(current!=list[webtoon].week && list[webtoon].site == 'toomics'){ 221 + if(current!=list[webtoon].week && list[webtoon].site == 'toomiks'){
220 if(current!=""){ 222 if(current!=""){
221 %> 223 %>
222 </tr> 224 </tr>
...@@ -225,7 +227,7 @@ ...@@ -225,7 +227,7 @@
225 <th><%= list[webtoon].week %></th> 227 <th><%= list[webtoon].week %></th>
226 <% } %> 228 <% } %>
227 <% 229 <%
228 - if(list[webtoon].site == 'toomics') 230 + if(list[webtoon].site == 'toomiks')
229 { 231 {
230 %> 232 %>
231 <td> 233 <td>
......