Forced merge: merge ai-dev into master
This commit is contained in:
commit
9d1bc153d1
@ -1,4 +1,3 @@
|
||||
|
||||
const express = require('express');
|
||||
const cors = require('cors');
|
||||
const app = express();
|
||||
@ -39,6 +38,7 @@ const guestsRoutes = require('./routes/guests');
|
||||
const budgetsRoutes = require('./routes/budgets');
|
||||
const publicRoutes = require('./routes/public');
|
||||
|
||||
|
||||
const getBaseUrl = (url) => {
|
||||
if (!url) return '';
|
||||
return url.endsWith('/api') ? url.slice(0, -4) : url;
|
||||
@ -89,17 +89,19 @@ app.use(cors({origin: true}));
|
||||
require('./auth/auth');
|
||||
|
||||
|
||||
const publicRoutes = require('./routes/public');
|
||||
|
||||
|
||||
app.use(bodyParser.json());
|
||||
|
||||
app.use('/api', publicRoutes);
|
||||
|
||||
app.use('/api/auth', authRoutes);
|
||||
app.use('/api/file', fileRoutes);
|
||||
app.use('/api/pexels', pexelsRoutes);
|
||||
app.enable('trust proxy');
|
||||
|
||||
|
||||
app.use('/api', publicRoutes);
|
||||
|
||||
app.use('/api/users', passport.authenticate('jwt', {session: false}), usersRoutes);
|
||||
|
||||
app.use('/api/roles', passport.authenticate('jwt', {session: false}), rolesRoutes);
|
||||
@ -158,4 +160,4 @@ db.sequelize.sync().then(function () {
|
||||
});
|
||||
});
|
||||
|
||||
module.exports = app;
|
||||
module.exports = app;
|
||||
Loading…
x
Reference in New Issue
Block a user