Spaces:
Sleeping
Sleeping
Update app.js
Browse files
app.js
CHANGED
@@ -1,45 +1,35 @@
|
|
1 |
-
var createError = require('http-errors');
|
2 |
var express = require('express');
|
3 |
var path = require('path');
|
4 |
var cookieParser = require('cookie-parser');
|
5 |
var logger = require('morgan');
|
6 |
var cors = require('cors');
|
7 |
|
8 |
-
var indexRouter = require('./routes/index');
|
9 |
|
10 |
var app = express();
|
11 |
|
12 |
-
|
13 |
-
// view engine setup
|
14 |
-
app.set('views', path.join(__dirname, 'views'));
|
15 |
-
app.set('view engine', 'pug');
|
16 |
-
|
17 |
var corsOptions = {
|
18 |
origin: '*'
|
19 |
};
|
20 |
app.use(cors(corsOptions));
|
|
|
21 |
app.use(logger('dev'));
|
22 |
app.use(express.json());
|
23 |
app.use(express.urlencoded({ extended: false }));
|
24 |
app.use(cookieParser());
|
25 |
app.use(express.static(path.join(__dirname, 'public')));
|
26 |
|
27 |
-
app.use('/', indexRouter);
|
28 |
|
29 |
-
//
|
30 |
-
app.use(function(req, res, next) {
|
31 |
-
|
32 |
});
|
33 |
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
res.locals.message = err.message;
|
38 |
-
res.locals.error = req.app.get('env') === 'development' ? err : {};
|
39 |
-
|
40 |
-
// render the error page
|
41 |
-
res.status(err.status || 500);
|
42 |
-
res.render('error');
|
43 |
});
|
44 |
|
45 |
module.exports = app;
|
|
|
|
|
1 |
var express = require('express');
|
2 |
var path = require('path');
|
3 |
var cookieParser = require('cookie-parser');
|
4 |
var logger = require('morgan');
|
5 |
var cors = require('cors');
|
6 |
|
7 |
+
var indexRouter = require('./routes/index'); // This should correctly import the routes
|
8 |
|
9 |
var app = express();
|
10 |
|
11 |
+
// Enable CORS
|
|
|
|
|
|
|
|
|
12 |
var corsOptions = {
|
13 |
origin: '*'
|
14 |
};
|
15 |
app.use(cors(corsOptions));
|
16 |
+
|
17 |
app.use(logger('dev'));
|
18 |
app.use(express.json());
|
19 |
app.use(express.urlencoded({ extended: false }));
|
20 |
app.use(cookieParser());
|
21 |
app.use(express.static(path.join(__dirname, 'public')));
|
22 |
|
23 |
+
app.use('/', indexRouter); // This ensures /talk works
|
24 |
|
25 |
+
// Error handling
|
26 |
+
app.use(function (req, res, next) {
|
27 |
+
res.status(404).json({ error: "Not Found" });
|
28 |
});
|
29 |
|
30 |
+
app.use(function (err, req, res, next) {
|
31 |
+
console.error(err.stack);
|
32 |
+
res.status(500).json({ error: err.message || "Internal Server Error" });
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
});
|
34 |
|
35 |
module.exports = app;
|