Skip to content

Commit 8dfec99

Browse files
committed
Classe 32
1 parent 056be95 commit 8dfec99

File tree

5 files changed

+39
-8
lines changed

5 files changed

+39
-8
lines changed

components/message/controller.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const store = require('./store');
22
const socket = require('../../socket').socket;
3+
const config = require('../../config');
34

45
function addMessage(chat, user, message, file) {
56
return new Promise((resolve, reject) => {
@@ -11,7 +12,7 @@ function addMessage(chat, user, message, file) {
1112

1213
let fileUrl = '';
1314
if (file) {
14-
fileUrl = 'http://localhost:3000/app/files/' + file.filename;
15+
fileUrl = config.host + ':' + config.port + config.publicRoute + '/'+ config.filesRoute + '/' + file.filename;
1516
}
1617

1718
const fullMessage = {

components/message/network.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const express = require('express');
22
const multer = require('multer');
33

4+
const config = require('../../config');
45
const response = require('../../network/response');
56
const controller = require('./controller');
67
const router = express.Router();
78

89
const upload = multer({
9-
dest: 'public/files/',
10+
dest: 'public/' + config.filesRoute + '/',
1011
});
1112

1213
router.get('/', function (req, res) {

config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const config = {
2+
dbUrl: process.env.DB_URL || 'mongodb://user:[email protected]:55107/telegrom',
3+
port: process.env.PORT || 3000,
4+
host: process.env.HOST || 'http://localhost',
5+
publicRoute: process.env.PUBLIC_ROUTE || '/app',
6+
filesRoute: process.env.FILES_ROUTE || 'files'
7+
};
8+
9+
module.exports = config;

network/response.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1+
const statusMessages = {
2+
'200': 'Done',
3+
'201': 'Created',
4+
'400': 'Invalid format',
5+
'500': 'Internal error'
6+
}
7+
18
exports.success = function (req, res, message, status) {
2-
res.status(status || 200).send({
9+
let statusCode = status;
10+
let statusMessage = message;
11+
12+
if (!status) {
13+
status = 200;
14+
}
15+
16+
if (!message) {
17+
statusMessage = statusMessages[status];
18+
}
19+
20+
res.status(statusCode).send({
321
error: '',
4-
body: message
22+
body: statusMessage
523
});
624
}
725

server.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ const express = require('express');
22
const app = express();
33
const server = require('http').Server(app);
44

5+
const config = require('./config');
6+
57
const cors = require('cors');
68
const bodyParser = require('body-parser');
79
const socket = require('./socket');
810
const db = require('./db');
911
const router = require('./network/routes');
1012

11-
db('mongodb://user:[email protected]:55107/telegrom');
13+
db(config.dbUrl);
1214

1315
app.use(cors());
1416

@@ -19,8 +21,8 @@ socket.connect(server);
1921

2022
router(app);
2123

22-
app.use('/app', express.static('public'));
24+
app.use(publicRoute, express.static('public'));
2325

24-
server.listen(3000, function () {
25-
console.log('La aplicación está escuchando en http://localhost:3000');
26+
server.listen(config.port, function () {
27+
console.log('La aplicación está escuchando en '+ config.host +':' + config.port);
2628
});

0 commit comments

Comments
 (0)