Merge branch 'map_api' into 'master'
Map api kakao open source map api updated See merge request !2
Showing
6 changed files
with
17 additions
and
1 deletions
... | @@ -11,6 +11,7 @@ var signupRouter = require('./routes/signup') | ... | @@ -11,6 +11,7 @@ var signupRouter = require('./routes/signup') |
11 | var lpgRouter = require('./routes/lpg') | 11 | var lpgRouter = require('./routes/lpg') |
12 | var weatherRouter = require('./routes/weather') | 12 | var weatherRouter = require('./routes/weather') |
13 | var menuRouter = require('./routes/menu') | 13 | var menuRouter = require('./routes/menu') |
14 | +var csvRouter = require('./routes/csv') | ||
14 | var app = express(); | 15 | var app = express(); |
15 | var router = express.Router(); | 16 | var router = express.Router(); |
16 | 17 | ||
... | @@ -36,6 +37,7 @@ app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css')); | ... | @@ -36,6 +37,7 @@ app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css')); |
36 | 37 | ||
37 | 38 | ||
38 | // | 39 | // |
40 | +app.use('/csv',csvRouter) | ||
39 | app.use('/menu',menuRouter) | 41 | app.use('/menu',menuRouter) |
40 | app.use('/login',loginRouter); // login page route | 42 | app.use('/login',loginRouter); // login page route |
41 | app.use('/weather',weatherRouter) | 43 | app.use('/weather',weatherRouter) |
... | @@ -48,7 +50,7 @@ app.use('/', indexRouter); // main page route | ... | @@ -48,7 +50,7 @@ app.use('/', indexRouter); // main page route |
48 | //모든 router 처리가 끝난 후 404 오류 페이지 처리 | 50 | //모든 router 처리가 끝난 후 404 오류 페이지 처리 |
49 | var errorHandler = expressErrorHandler({ | 51 | var errorHandler = expressErrorHandler({ |
50 | static: { | 52 | static: { |
51 | - '404': './app/public/404.html' | 53 | + '404': './rest_stop_list/app/public/404.html' |
52 | } | 54 | } |
53 | }); | 55 | }); |
54 | app.use(expressErrorHandler.httpError(404)); | 56 | app.use(expressErrorHandler.httpError(404)); | ... | ... |
app/public/data.csv
0 → 100644
This diff could not be displayed because it is too large.
app/routes/csv.js
0 → 100644
... | @@ -2,6 +2,8 @@ var express = require('express') | ... | @@ -2,6 +2,8 @@ var express = require('express') |
2 | var router = express.Router(); | 2 | var router = express.Router(); |
3 | 3 | ||
4 | 4 | ||
5 | + | ||
6 | + | ||
5 | router.get('/',function(req,res){ | 7 | router.get('/',function(req,res){ |
6 | res.render('index.html') | 8 | res.render('index.html') |
7 | }) | 9 | }) | ... | ... |
app/views/data.csv
0 → 100644
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
-
Please register or login to post a comment