formation пре 3 година
родитељ
комит
8d3a6e5247
2 измењених фајлова са 8 додато и 8 уклоњено
  1. 4 4
      express-server/index.js
  2. 4 4
      express-server/lib/db.js

+ 4 - 4
express-server/index.js

@@ -9,10 +9,10 @@ const cors = require('cors');
 const userRoutes = require('./routes/user');
 const employeeRoutes = require('./routes/employee');
 const authRoutes = require('./routes/auth');
-const oauthRoutes = require('./routes/oauth');
+//const oauthRoutes = require('./routes/oauth');
 const ticketRoutes = require('./routes/ticket');
 const emailsRoutes = require('./routes/emailing');
-//const authGoogle = require('./routes/google');
+const authGoogle = require('./routes/google');
 const authFacebook = require('./routes/facebook');
 const tirageRoutes = require('./routes/tirage');
 const contactRoutes = require('./routes/contact');
@@ -76,8 +76,8 @@ app.use('/api/users', userRoutes );
 app.use('/api/employees', employeeRoutes );
 app.use('/api/tickets', ticketRoutes );
 app.use('/api/auth',  authRoutes );
-app.use('/api/auth', oauthRoutes );
-//app.use('/api/auth',  authGoogle );
+//app.use('/api/auth', oauthRoutes );
+app.use('/api/auth',  authGoogle );
 app.use('/api/emails',  emailsRoutes );
 //app.use('/api/auth/google',  authGoogle );
 //app.use('/api/auth/facebook',  authFacebook );

+ 4 - 4
express-server/lib/db.js

@@ -5,11 +5,11 @@ 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;
 
-var db = 'mongodb://database_preprod:27017/mean-fatboar-db';
-//var mongoURI = 'mongodb://localhost:27017/my-db';
-//mongoose.set('useCreateIndex', 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 })
 .then(() => {
     console.log("Successfully connected to the database.");