Merge pull request #3 from mayerdev/patch-3

Update server.js
This commit is contained in:
Sergey 2020-02-10 19:04:05 +03:00 committed by GitHub
commit da896dd1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,13 +23,13 @@ MongoClient.connect(db_config.url, {useNewUrlParser: true, useUnifiedTopology: t
const storage = multer.diskStorage({ const storage = multer.diskStorage({
destination: 'dist/public/img/service-icons', destination: 'dist/public/img/service-icons',
filename: function(req, file, cb) { filename: function(req, file, cb) {
cb(null, file.fieldname + '-' + Date.now() + path.extname(file.originalname)); cb(null, `${file.fieldname}-${Date.now()}${path.extname(file.originalname)}`);
} }
}); });
// Config // Config
server.use(cors()); server.use(cors());
server.use(express.static(path.join(__dirname, '../dist/public'))); server.use(express.static(`${__dirname}/../dist/public`));
server.use(multer({storage: storage}).single('img')); server.use(multer({storage: storage}).single('img'));
server.use(express.urlencoded({ extended: false })); server.use(express.urlencoded({ extended: false }));
server.use(express.json()); server.use(express.json());
@ -39,7 +39,7 @@ MongoClient.connect(db_config.url, {useNewUrlParser: true, useUnifiedTopology: t
server.use(passport.session()); server.use(passport.session());
server.use(methodOverride('_method')); server.use(methodOverride('_method'));
server.set('view engine', 'pug'); server.set('view engine', 'pug');
server.set('views', path.join(__dirname, '../dist/views')); server.set('views', `${__dirname}/../dist/views`);
// Routes // Routes
require('./routes/main')(server, db); // маршруты сайта require('./routes/main')(server, db); // маршруты сайта
@ -60,9 +60,4 @@ MongoClient.connect(db_config.url, {useNewUrlParser: true, useUnifiedTopology: t
console.log(error); console.log(error);
}); });
}) })
.finally(() => { .finally(server.listen(process.env.PORT || 3000, console.log('App is running...')));
const port = process.env.PORT || 3000;
server.listen(port, () => {
console.log('App is running...');
});
});