formation %!s(int64=3) %!d(string=hai) anos
pai
achega
357dc276dd
Modificáronse 1 ficheiros con 1 adicións e 9 borrados
  1. 1 9
      express-server/lib/db.js

+ 1 - 9
express-server/lib/db.js

@@ -5,20 +5,12 @@ const  config  = require('../config/config.json');
 // const { User } = require('../models/user.model');
  //const bcrypt = require('bcrypt');
 // const Role = require('../lib/role');
-//const db = config.url;
+const db = config.url;
 
-<<<<<<< HEAD
-var db = 'mongodb://mongodb-preprod.foodgame.fr:27017/mean-fatboar-db?w=majority&readPreference=primary&retryWrites=true&directConnection=true&ssl=false';
-//var mongoURI = 'mongodb://localhost:27017/my-db';
-//mongoose.set('useCreateIndex', true)
-mongoose.connect(db, {//useNewUrlParser: true,
-                        useUnifiedTopology: true, })
-=======
 //var db = 'mongodb://database_preprod:27017/mean-fatboar-db';
 //var mongoURI = 'mongodb://localhost:27017/my-db';
 //mongoose.set('useCreateIndex', true)
 mongoose.connect(db, {useNewUrlParser: true, useUnifiedTopology: true })
->>>>>>> test
 .then(() => {
     console.log("Successfully connected to the database.");
 }).catch(err => {