From c41ee12da8a0086f4b0ac75130b50fc9f644d3a3 Mon Sep 17 00:00:00 2001 From: yikth Date: Tue, 1 Sep 2020 10:15:39 +0800 Subject: [PATCH] update backend app.js * change to port 7000 --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ backend/app.js | 4 ++++ backend/bin/www | 2 +- backend/package-lock.json | 9 +++++++++ backend/package.json | 1 + 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 00dcf0c..8ccc392 100644 --- a/README.md +++ b/README.md @@ -64,4 +64,43 @@ }); module.exports = router; + ``` +7. Open app.js and `add this line` + ``` + var createError = require('http-errors'); + var express = require('express'); + var path = require('path'); + var cookieParser = require('cookie-parser'); + var logger = require('morgan'); + var cors = require("cors"); // add this line + + var indexRouter = require('./routes/index'); + var usersRouter = require('./routes/users'); + var mypageRouter = require('./routes/mypage'); // add this line + + var app = express(); + + // view engine setup + app.set('views', path.join(__dirname, 'views')); + app.set('view engine', 'pug'); + + app.use(logger('dev')); + app.use(express.json()); + app.use(express.urlencoded({ extended: false })); + app.use(cookieParser()); + app.use(express.static(path.join(__dirname, 'public'))); + + app.use(cors()); // add this line + app.use('/', indexRouter); + app.use('/users', usersRouter); + app.use('/mypage', mypageRouter); // add this line + + // catch 404 and forward to error handler + app.use(function(req, res, next) { + next(createError(404)); + }); + ``` +8. Install cors locally. Navigate to `backend` folder + ``` + $ sudo npm install cors ``` \ No newline at end of file diff --git a/backend/app.js b/backend/app.js index ab7aed4..9111d25 100644 --- a/backend/app.js +++ b/backend/app.js @@ -3,9 +3,11 @@ var express = require('express'); var path = require('path'); var cookieParser = require('cookie-parser'); var logger = require('morgan'); +var cors = require("cors"); // add this line var indexRouter = require('./routes/index'); var usersRouter = require('./routes/users'); +var mypageRouter = require('./routes/mypage'); // add this line var app = express(); @@ -19,8 +21,10 @@ app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); +app.use(cors()); // add this line app.use('/', indexRouter); app.use('/users', usersRouter); +app.use('/mypage', mypageRouter); // add this line // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/backend/bin/www b/backend/bin/www index 192c6f3..537242b 100644 --- a/backend/bin/www +++ b/backend/bin/www @@ -12,7 +12,7 @@ var http = require('http'); * Get port from environment and store in Express. */ -var port = normalizePort(process.env.PORT || '3000'); +var port = normalizePort(process.env.PORT || '7000'); app.set('port', port); /** diff --git a/backend/package-lock.json b/backend/package-lock.json index 08612a0..ef0a969 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -220,6 +220,15 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", diff --git a/backend/package.json b/backend/package.json index 880f6e8..567f653 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "cookie-parser": "~1.4.4", + "cors": "^2.8.5", "debug": "~2.6.9", "express": "~4.16.1", "http-errors": "~1.6.3",