Merge branch 'master' into 37_visualizar_escalas

Dulce-Work-Schedule · May 12, 2018 · 02c0db0 · 02c0db0
2 parents f83ffb2 + 235a581
commit 02c0db0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/Schedule/Client/api.js b/Schedule/Client/api.js
@@ -1,3 +1,4 @@
+
 module.exports = function api(options) {
     currentWeekNumber = require('current-week-number');
 
@@ -270,4 +271,3 @@ module.exports = function api(options) {
 
 
 
-}
diff --git a/Schedule/Client/client_schedule.js b/Schedule/Client/client_schedule.js
@@ -1,4 +1,5 @@
 var express = require('express');
+
 var bodyParser = require('body-parser')
 var seneca = require('seneca');
 var senecaWeb = require('seneca-web');
@@ -22,6 +23,7 @@ var strategy = new JwtStrategy(jwtOptions, async function(payload, next){
 Passport.use(strategy)
 
 Passport.serializeUser((schedule, cb) => {
+
   cb(null, schedule)
 })
 

diff --git a/Schedule/Client/package.json b/Schedule/Client/package.json
@@ -10,11 +10,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+
     "bcrypt": "^2.0.1",
     "body-parser": "1.15.2",
     "current-week-number": "^1.0.7",
     "express": "^4.14.0",
     "jsonwebtoken": "^8.2.0",
+
     "mongoose": "^4.6.1",
     "morgan": "^1.9.0",
     "nodemon": "^1.10.2",

diff --git a/Schedule/Client/test/schedule.test.js b/Schedule/Client/test/schedule.test.js
@@ -22,4 +22,6 @@ describe('Routing', function() {
       });
     });
   });
+
 })
+
diff --git a/Schedule/Server/package.json b/Schedule/Server/package.json
@@ -2,9 +2,10 @@
   "name": "node-app",
   "version": "1.0.0",
   "description": "",
-  "main": "client_sector.js",
+
+  "main": "app.js",
   "scripts": {
-    "start": "nodemon client_sector.js",
+    "start": "nodemon schedule.js",
     "test": "./node_modules/.bin/mocha --reporter spec"
   },
   "author": "",

diff --git a/Schedule/Server/schedule.js b/Schedule/Server/schedule.js
@@ -1,4 +1,5 @@
 
+
 var seneca = require('seneca');
 var currentWeekNumber = require('current-week-number');
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,6 @@ describe('Routing', function() { @@
           });
         });
       });
     })
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@


		var seneca = require('seneca');
		var currentWeekNumber = require('current-week-number');

Expand Down