prod

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "git.ignoreLimitWarning": true
+}

angular-client/src/app/services/auth.service.ts

@@ -97,7 +97,7 @@ export class AuthService {
   // iscription get  token on login 
   signUP(data): Observable<Token> {
     debugger;
-    return this.http.post<Token>(`https://api-preprod.foodgame.fr/api/auth/signup`, data)
+    return this.http.post<Token>(`${this.apiUrl}/api/auth/signup`, data)
       .pipe(map(token => {
         // store jwt token in local storage 
         localStorage.setItem('token', JSON.stringify(token));
@@ -139,7 +139,7 @@ resetPassword(data): Observable<any> {
   getUserInfo(): Observable<User> {
     
     let decodedToken : payloadToken = jwt_decode(this.tokenSubject.value.token); 
-    return this.http.get<User>(`https://api-preprod.foodgame.fr/api/users/${decodedToken.userId}`)
+    return this.http.get<User>(`${this.apiUrl}/api/users/${decodedToken.userId}`)
       .pipe(map(user => {
         // store user info in local storage 
         localStorage.setItem('user', JSON.stringify(user));

express-server/index.js

@@ -1,19 +1,15 @@
 const express = require('express');
 const bodyparser = require('body-parser');
-//const passport = require('passport');
 const mongoose = require('mongoose');
-//const cors = require('cors');
+// const cors = require('cors');
 // const config = require('./config/db.config');
-
-
 const userRoutes = require('./routes/user');
 const employeeRoutes = require('./routes/employee');
 const authRoutes = require('./routes/auth');
-//const oauthRoutes = require('./routes/oauth');
 const ticketRoutes = require('./routes/ticket');
 const emailsRoutes = require('./routes/emailing');
-//const authGoogle = require('./routes/google');
-//const authFacebook = require('./routes/facebook');
+const authGoogle = require('./routes/google');
+const authFacebook = require('./routes/facebook');
 const tirageRoutes = require('./routes/tirage');
 const contactRoutes = require('./routes/contact');
 const restaurantRoutes = require('./routes/restaurant');
@@ -37,16 +33,15 @@ app.use(metricsMiddleware);
 
 //metrics
 app.use(makeApiMiddleware()); 
-//app.use(cors());
 
 app.get("/api", (req, res) => {
     res.status(200).send("Api Works.");
   });
 
-  // var corsOptions = {
-  //   origin: 'https://localhost:4200',
-  //   optionsSuccessStatus: 200 
-  // }
+// var corsOptions = {
+//     origin: 'http://example.com',
+//     optionsSuccessStatus: 200 
+//   }
 
 //Définition des CORS Middleware 
 app.use(function(req, res, next) {
@@ -64,21 +59,19 @@ app.use(function(req, res, next) {
   });
 
 
+
 // parse requests  body params
 app.use(bodyparser.json());
 app.use(bodyparser.urlencoded({extended: true}));
-//app.use(passport.initialize());
 
 //simple route
-app.use('api/users', userRoutes );
+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',  authRoutes );
 app.use('/api/emails',  emailsRoutes );
-//app.use('/api/auth/google',  authGoogle );
-//app.use('/api/auth/facebook',  authFacebook );
+app.use('/api/auth/google',  authGoogle );
+app.use('/api/auth/facebook',  authFacebook );
 app.use('/api/tirage',  tirageRoutes );
 app.use('/api/contact',  contactRoutes );
 app.use('/api/restaurants',  restaurantRoutes );
@@ -93,4 +86,4 @@ require('./lib/db');
 const PORT = process.env.PORT || 4000;
 app.listen(PORT, () => {
     console.log(`Api listen on port ${PORT}.`);
-});
+});

express-server/lib/db.js

@@ -1,10 +1,10 @@
 const mongoose = require('mongoose');
 const  config  = require('../config/config.json');
-//const { Ticket } = require('../models/ticket.model');
-//const { Restaurant} = require('../models/restaurant.model');
-// const { User } = require('../models/user.model');
- //const bcrypt = require('bcrypt');
-// const Role = require('../lib/role');
+const { Ticket } = require('../models/ticket.model');
+const { Restaurant} = require('../models/restaurant.model');
+const { User } = require('../models/user.model');
+ const bcrypt = require('bcrypt');
+const Role = require('../lib/role');
 //const db = config.url;
 
 var db = 'mongodb://database_preprod:27017/mean-fatboar-db';
@@ -20,46 +20,46 @@ mongoose.connect(db, {useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = mongoose.connection;
 
-// let min = 999999999;
-// let max = 10000000000;
-// for (i = 0; i < 2; i++) {
-//     let code = Math.floor(Math.random() * (max - min + 1)) + min;
+let min = 999999999;
+let max = 10000000000;
+for (i = 0; i < 2; i++) {
+    let code = Math.floor(Math.random() * (max - min + 1)) + min;
      
-//          const ticke = new Ticket({
-//              code: code,
-//              isUsed: false,
-//              gains: "un menu du jour",
-//              date_used: new Date(),
-//              index: 'index',
-//              isServed: true
-//         });
+         const ticke = new Ticket({
+             code: code,
+             isUsed: false,
+             gains: "un menu du jour",
+             date_used: new Date(),
+             index: 'index',
+             isServed: true
+        });
         
-//          ticke.save();
-//      }
-// const resto = new Restaurant({
-//     "index": 5,
-//     "name": "FatBoar 5",
-//     "adress": "20 Rue Houdart, 95700 Roissy-en-France, France",
-//     "longitude": 2.515081,
-//     "latitude": 49.002317
-//   });
-//   resto.save();
+         ticke.save();
+     }
+const resto = new Restaurant({
+    "index": 5,
+    "name": "FatBoar 5",
+    "adress": "20 Rue Houdart, 95700 Roissy-en-France, France",
+    "longitude": 2.515081,
+    "latitude": 49.002317
+  });
+  resto.save();
 
-// const salt = bcrypt.genSaltSync(12);
-//  password = bcrypt.hashSync('Pass@123', 12);
-//  console.log('fgfg', password);
-// let date = new Date(1997, 1 , 12 , 20, 40);
+const salt = bcrypt.genSaltSync(12);
+ password = bcrypt.hashSync('Pass@123', 12);
+ console.log('fgfg', password);
+let date = new Date(1997, 1 , 12 , 20, 40);
  
-//  const user = new User({
-//                       firstname: " adrien",
-//                       lastname: "xxxxxxx",
-//                       email: "adrien@hotmail.fr",
-//                       role: 'admin',
-//                       birthday: date,
-//                       phonenumber: '0680705876',
-//                       isActive: true,
-//                       password: password
-//                   });
+ const user = new User({
+                      firstname: " adrien",
+                      lastname: "xxxxxxx",
+                      email: "adrien@hotmail.fr",
+                      role: 'client',
+                      birthday: date,
+                      phonenumber: '0680705876',
+                      isActive: true,
+                      password: password
+                  });
                   
 
-//  user.save();
+ user.save();