Showing
3 changed files
with
32 additions
and
11 deletions
... | @@ -6,7 +6,7 @@ var bodyParser = require("body-parser"); | ... | @@ -6,7 +6,7 @@ var bodyParser = require("body-parser"); |
6 | var { OAuth2Client } = require("google-auth-library"); | 6 | var { OAuth2Client } = require("google-auth-library"); |
7 | 7 | ||
8 | const CLIENT_ID = | 8 | const CLIENT_ID = |
9 | - "발급받은 ClientID"; | 9 | + "94679084723-s5f0686p2porp9mkakrp1p89a48n24nj.apps.googleusercontent.com"; |
10 | var client = new OAuth2Client(CLIENT_ID); | 10 | var client = new OAuth2Client(CLIENT_ID); |
11 | var mysql = require("mysql"); | 11 | var mysql = require("mysql"); |
12 | const session = require("express-session"); | 12 | const session = require("express-session"); |
... | @@ -16,7 +16,7 @@ router.use(bodyParser.urlencoded({ extended: false })); //url인코딩 x | ... | @@ -16,7 +16,7 @@ router.use(bodyParser.urlencoded({ extended: false })); //url인코딩 x |
16 | router.use(bodyParser.json()); //json방식으로 파싱 | 16 | router.use(bodyParser.json()); //json방식으로 파싱 |
17 | router.use( | 17 | router.use( |
18 | session({ | 18 | session({ |
19 | - secret: "원하는 암호", // 암호화 | 19 | + secret: "원하는암호", // 암호화 |
20 | resave: false, | 20 | resave: false, |
21 | saveUninitialized: true, | 21 | saveUninitialized: true, |
22 | store: new FileStore(), | 22 | store: new FileStore(), |
... | @@ -77,7 +77,7 @@ router.get("/login", checkAuthenticated, (req, res) => { | ... | @@ -77,7 +77,7 @@ router.get("/login", checkAuthenticated, (req, res) => { |
77 | req.session.user.nickname = row[0].NICKNAME; | 77 | req.session.user.nickname = row[0].NICKNAME; |
78 | req.session.user.age = row[0].AGE; | 78 | req.session.user.age = row[0].AGE; |
79 | req.session.user.gender = row[0].GENDER; | 79 | req.session.user.gender = row[0].GENDER; |
80 | - return res.render("map", { user: req.session.user }); | 80 | + res.redirect("/map"); |
81 | } else { | 81 | } else { |
82 | return res.render("login", { user: req.session.user, message: "none" }); | 82 | return res.render("login", { user: req.session.user, message: "none" }); |
83 | } | 83 | } |
... | @@ -164,7 +164,7 @@ router.post("/login", (req, res) => { | ... | @@ -164,7 +164,7 @@ router.post("/login", (req, res) => { |
164 | connection.query(sql2, parameter2, function (err) { | 164 | connection.query(sql2, parameter2, function (err) { |
165 | if (err) { | 165 | if (err) { |
166 | console.log(err); | 166 | console.log(err); |
167 | - return res.render("/",{ | 167 | + return res.render("/", { |
168 | client_id: CLIENT_ID, | 168 | client_id: CLIENT_ID, |
169 | }); | 169 | }); |
170 | } else { | 170 | } else { |
... | @@ -172,7 +172,7 @@ router.post("/login", (req, res) => { | ... | @@ -172,7 +172,7 @@ router.post("/login", (req, res) => { |
172 | } | 172 | } |
173 | }); | 173 | }); |
174 | 174 | ||
175 | - return res.render("map", { user: req.session.user }); | 175 | + res.redirect("/map"); |
176 | } | 176 | } |
177 | }); | 177 | }); |
178 | }); | 178 | }); |
... | @@ -209,11 +209,22 @@ router.get("/logout", function (req, res) { | ... | @@ -209,11 +209,22 @@ router.get("/logout", function (req, res) { |
209 | router.get("/map", function (req, res, next) { | 209 | router.get("/map", function (req, res, next) { |
210 | // 로그인된 사용자 존재 | 210 | // 로그인된 사용자 존재 |
211 | if (req.session.user) { | 211 | if (req.session.user) { |
212 | - res.render("map", { user: req.session.user }); | 212 | + console.log(req.session.user); |
213 | + | ||
214 | + var sql = "SELECT * FROM USER WHERE EMAIL=?"; | ||
215 | + var parameter = [req.session.user.email]; | ||
216 | + | ||
217 | + connection.query(sql, parameter, function (err, row) { | ||
218 | + if (err) { | ||
219 | + console.log(err); | ||
213 | } else { | 220 | } else { |
214 | - res.render("/",{ | 221 | + req.session.user.nickname = row[0].nickname; |
215 | - client_id: CLIENT_ID, | 222 | + req.session.user.age = row[0].age; |
223 | + req.session.user.gender = row[0].gender; | ||
224 | + } | ||
216 | }); | 225 | }); |
226 | + | ||
227 | + res.render("map", { user: req.session.user }); | ||
217 | } | 228 | } |
218 | }); | 229 | }); |
219 | 230 | ... | ... |
1 | +{"cookie":{"originalMaxAge":null,"expires":null,"httpOnly":true,"path":"/"},"__lastAccess":1623004615027,"user":{"email":"kdc9619@khu.ac.kr","picture":"https://lh3.googleusercontent.com/a/AATXAJyP14ipRboJZ8T5-oNS3sRp4CG8wKCEwVABQ5G_=s96-c","nickname":"dckat","age":26,"gender":"male"}} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -107,7 +107,9 @@ | ... | @@ -107,7 +107,9 @@ |
107 | <span class="navbar-toggler-icon"></span> | 107 | <span class="navbar-toggler-icon"></span> |
108 | </button> | 108 | </button> |
109 | <div class="collapse navbar-collapse" id="navbarSupportedContent"> | 109 | <div class="collapse navbar-collapse" id="navbarSupportedContent"> |
110 | - <a class="navbar-brand" href="/" style="margin-left: 10px"><strong>Home</strong></a> | 110 | + <a class="navbar-brand" href="/" style="margin-left: 10px" |
111 | + ><strong>Home</strong></a | ||
112 | + > | ||
111 | <ul class="navbar-nav mr-auto mt-2 mt-lg-0"> | 113 | <ul class="navbar-nav mr-auto mt-2 mt-lg-0"> |
112 | <li class="nav-item active"> | 114 | <li class="nav-item active"> |
113 | <a | 115 | <a |
... | @@ -131,7 +133,11 @@ | ... | @@ -131,7 +133,11 @@ |
131 | > | 133 | > |
132 | </li> | 134 | </li> |
133 | <li class="nav-item active"> | 135 | <li class="nav-item active"> |
134 | - <a class="nav-link" style="color: #ffffff" href="javascript:void(0);" onclick="recommend();" | 136 | + <a |
137 | + class="nav-link" | ||
138 | + style="color: #ffffff" | ||
139 | + href="javascript:void(0);" | ||
140 | + onclick="recommend();" | ||
135 | >Recommend | 141 | >Recommend |
136 | <span class="sr-only">(current)</span> | 142 | <span class="sr-only">(current)</span> |
137 | </a> | 143 | </a> |
... | @@ -163,7 +169,10 @@ | ... | @@ -163,7 +169,10 @@ |
163 | <p id="recommend"></p> | 169 | <p id="recommend"></p> |
164 | </section> | 170 | </section> |
165 | 171 | ||
166 | - <script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=발급받은API키&libraries=services"></script> | 172 | + <script |
173 | + type="text/javascript" | ||
174 | + src="//dapi.kakao.com/v2/maps/sdk.js?appkey=발급받은API키&libraries=services" | ||
175 | + ></script> | ||
167 | <script> | 176 | <script> |
168 | var lat = ""; | 177 | var lat = ""; |
169 | var lon = ""; | 178 | var lon = ""; | ... | ... |
-
Please register or login to post a comment