mirror of
https://github.com/franjsco/tick3t-api
synced 2025-01-05 11:27:07 +01:00
fix
This commit is contained in:
commit
eec4c818e8
@ -13,8 +13,12 @@ const mongoose = require('./config/database');
|
|||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
app.set('secretKey', 'ciccio'); // sostituire con variabili ambiente (env)
|
app.set('secretKey', 'ciccio'); // sostituire con variabili ambiente (env)
|
||||||
app.disable('etag');
|
app.disable('etag');
|
||||||
|
=======
|
||||||
|
app.set('secretKey', 'ciccio'); // sostituire con variabili ambiente
|
||||||
|
>>>>>>> 32333cc9f65fbfb1b2804906d69a379ea71010c0
|
||||||
|
|
||||||
// connection to mongodb
|
// connection to mongodb
|
||||||
mongoose.connection.on('error', console.error.bind(console, 'MongoDB connection error:'));
|
mongoose.connection.on('error', console.error.bind(console, 'MongoDB connection error:'));
|
||||||
@ -22,6 +26,11 @@ mongoose.connection.on('error', console.error.bind(console, 'MongoDB connection
|
|||||||
// middleware
|
// middleware
|
||||||
app.use(bodyParser.urlencoded({ extended: false }));
|
app.use(bodyParser.urlencoded({ extended: false }));
|
||||||
app.use(bodyParser.json());
|
app.use(bodyParser.json());
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
app.disable('etag');
|
||||||
|
|
||||||
|
>>>>>>> 32333cc9f65fbfb1b2804906d69a379ea71010c0
|
||||||
app.use(cors());
|
app.use(cors());
|
||||||
|
|
||||||
// routes
|
// routes
|
||||||
|
Loading…
Reference in New Issue
Block a user