WallyHackenslacker/MASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Production fixes

Browse Source
This commit is contained in:
root
2016-12-13 12:47:09 -04:00
parent f4f1daae5e
commit 88957d98a1
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.js
View File

@@ -44,7 +44,7 @@
}) })
.run(function ($rootScope) { .run(function ($rootScope) {
$rootScope.domainUrl = 'Localhost:3000'; $rootScope.domainUrl = '190.169.74.203:3000';
}); });
})(); })();

6
app/index.html
View File

@@ -39,9 +39,9 @@
<script src="bower_components/ng-scrollable/min/ng-scrollable.min.js"></script> <script src="bower_components/ng-scrollable/min/ng-scrollable.min.js"></script>
<link rel="stylesheet" href="bower_components/ng-scrollable/min/ng-scrollable.min.css" > <link rel="stylesheet" href="bower_components/ng-scrollable/min/ng-scrollable.min.css" >
<script src="bower_components/lodash/lodash.min.js" type="text/javascript"></script> <script src="bower_components/lodash/dist/lodash.min.js" ></script>
<script src="bower_components/angular-simple-logger/dist/index.js"></script>
<script src="bower_components/angular-google-maps/dist/angular-google-maps.js"></script>
<script src="bower_components/crypto-js/crypto-js.js"></script> <script src="bower_components/crypto-js/crypto-js.js"></script>
<script src="bower_components/crypto-js/md5.js"></script> <script src="bower_components/crypto-js/md5.js"></script>

2
app/partials/professor/professor_create.controller.js
View File

@@ -21,7 +21,7 @@
"lastname": vm.profesor.Apellido, "lastname": vm.profesor.Apellido,
"email": vm.profesor.Correo, "email": vm.profesor.Correo,
"number": vm.profesor.Telefono, "number": vm.profesor.Telefono,
"role": "professor", "role": "admin",
"password": vm.profesor.Password "password": vm.profesor.Password
}; };

16
app/server.js
View File

@@ -16,6 +16,7 @@ var auth = jwt({
secret: 'MY_SECRET', secret: 'MY_SECRET',
userProperty: 'payload' userProperty: 'payload'
}); });
mongoose.Promise = require('bluebird');
app.use(express.static(__dirname)); app.use(express.static(__dirname));
app.use(bodyParser.json()); app.use(bodyParser.json());
@@ -160,7 +161,7 @@ db.once('open', function() {
app.post('/professors', function(req, res){ app.post('/professors', function(req, res){
console.log('Received ADD professor request'); console.log('Received ADD professor request');
//console.log(req.body); console.log(req.body);
var professor = new Professor({ var professor = new Professor({
id: req.body.id, id: req.body.id,
@@ -175,7 +176,7 @@ db.once('open', function() {
professor.save( professor.save(
function(err, docs){ function(err, docs){
// setup e-mail data with unicode symbols /* // setup e-mail data with unicode symbols
var mailOptions = { var mailOptions = {
from: '"MASA Notifier" <masa.mailer.daemon@gmail.com>', // sender address from: '"MASA Notifier" <masa.mailer.daemon@gmail.com>', // sender address
to: req.body.email, // list of receivers to: req.body.email, // list of receivers
@@ -183,12 +184,12 @@ db.once('open', function() {
text: 'Este es un correo automatizado para informarle que ha sido registrado en la aplicación M.A.S.A. sus credenciales son: '+ req.body.id +' / '+ req.body.password, text: 'Este es un correo automatizado para informarle que ha sido registrado en la aplicación M.A.S.A. sus credenciales son: '+ req.body.id +' / '+ req.body.password,
html: 'Este es un correo automatizado para informarle que ha sido registrado en la aplicación <b> M.A.S.A.</b> sus credenciales son: '+ req.body.id +' / '+ req.body.password html: 'Este es un correo automatizado para informarle que ha sido registrado en la aplicación <b> M.A.S.A.</b> sus credenciales son: '+ req.body.id +' / '+ req.body.password
}; };
// send mail with defined transport object // send mail with defined transport object
transporter.sendMail(mailOptions, function(error, info){ transporter.sendMail(mailOptions, function(error, info){
if(error) return console.log(error); if(error) return console.log(error);
console.log('Message sent: ' + info.response); console.log('Message sent: ' + info.response);
}); });*/
var token = professor.generateJwt(); var token = professor.generateJwt();
res.status(200); res.status(200);
res.json({"token" : token}); res.json({"token" : token});
}) })
@@ -246,7 +247,8 @@ db.once('open', function() {
})(req, res); })(req, res);
}); });
}); });
//mongoose.Promise = global.Promise;
mongoose.connect('mongodb://localhost/AttendanceDB'); mongoose.connect('mongodb://localhost/AttendanceDB');
app.listen(3000); app.listen(3000, '0.0.0.0');
console.log("server running on port 3000"); console.log("server running on port 3000");

2
package.json
View File

@@ -16,6 +16,7 @@
"karma": "^0.13.9" "karma": "^0.13.9"
}, },
"dependencies": { "dependencies": {
"bluebird": "^3.4.6",
"body-parser": "latest", "body-parser": "latest",
"cookie-parser": "^1.4.1", "cookie-parser": "^1.4.1",
"express": "latest", "express": "latest",
@@ -25,6 +26,7 @@
"jsonwebtoken": "^6.2.0", "jsonwebtoken": "^6.2.0",
"mongoose": "latest", "mongoose": "latest",
"morgan": "^1.7.0", "morgan": "^1.7.0",
"nodemailer": "^2.7.0",
"passport": "^0.3.2", "passport": "^0.3.2",
"passport-local": "^1.0.0", "passport-local": "^1.0.0",
"serve-favicon": "^2.3.0" "serve-favicon": "^2.3.0"