Skip to content

GitLab

Commit dcabfcec authored by Alejandro E. Rendon's avatar Alejandro E. Rendon
Browse files

Prettier

parent 5daaaea0
Hide whitespace changes
Inline Side-by-side
bin/www
View file @ dcabfcec
......@@ -56,9 +56,7 @@ function onError(error) {
throw error;
}
const bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;
const bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
// handle specific listen errors with friendly messages
switch (error.code) {
......@@ -80,8 +78,6 @@ function onError(error) {
*/
function onListening() {
const addr = server.address();
const bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port;
debug('Listening on ' + bind);
}
controllers/admin.js
View file @ dcabfcec
const User = require('../models/user').User,
List = require('../models/attendance').List,
{exec} = require('child_process'),
{decrypt} = require('../config/crypto'),
nodemailer = require('nodemailer'),
{auth} = require('../config/email'),
{emailAdmin} = require('../helpers/user'),
// {getLinuxUsers} = require('../helpers/user'),
{linuxPass} = require('../helpers/user'),
{getLinuxId} = require('../helpers/user');
List = require('../models/attendance').List,
{ exec } = require('child_process'),
{ decrypt } = require('../config/crypto'),
nodemailer = require('nodemailer'),
{ auth } = require('../config/email'),
{ emailAdmin } = require('../helpers/user'),
// {getLinuxUsers} = require('../helpers/user'),
{ linuxPass } = require('../helpers/user'),
{ getLinuxId } = require('../helpers/user');
exports.add = (req, res) => {
const id = req.params.id;
User.findOne({username: id}, (err, user) => {
User.findOne({ username: id }, (err, user) => {
console.log(user);
if(err)
if (err)
console.log(err);
else {
if(user.state === 2) {
if (user.state === 2) {
user.state = 1;
user.save((err) => {
if(err) {
user.save(err => {
if (err) {
console.log(err);
return res.status(500);
}
......@@ -34,15 +34,15 @@ exports.add = (req, res) => {
exports.remove = (req, res) => {
const id = req.params.id;
User.findOne({username: id}, (err, user) => {
User.findOne({ username: id }, (err, user) => {
console.log(user);
if(err)
if (err)
console.log(err);
else {
if(user.state === 1) {
if (user.state === 1) {
user.state = 2;
user.save((err) => {
if(err) {
user.save(err => {
if (err) {
console.log(err);
return res.status(500);
}
......@@ -70,10 +70,11 @@ exports.getUsers = (req, res) => {
console.log(docs.length);
res.render('admin/users', {
message: req.flash('editProfile'),
users: docs, user: req.user,
conect: req.user,
});
message: req.flash('editProfile'),
users: docs,
user: req.user,
conect: req.user,
});
});
};
......@@ -81,69 +82,59 @@ exports.new = (req, res) => {
const id = req.params.id;
console.log(id);
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err) {
console.log(err);
else {
res.redirect('/');
} else {
console.log(user);
user.state = 2;
getLinuxId((err, uid) => {
if(err) {
if (err) {
console.log(err);
res.redirect('/admin/users/');
} else {
User.update({username: id}, {
state: user.state,
uid: uid,
}, (err, data) => {
if(err) {
console.log(err);
res.redirect('/admin/users/');
} else {
// getLinuxId((err, uid) => {
// const userPath = 'sudo adduser --home /homeshare/' +
// id + ' --uid ' +
// String(uid) + ' --ingroup adm --ingroup cdrom --ingroup dip --ingroup plugdev --ingroup lpadmin --ingroup sambashare ' + id;
// console.log(userPath);
// const passPath = 'echo ' + id + ':'+
// decrypt(user.linux) + ' | sudo chpasswd';
// // console.log(passPath);
// exec(userPath, (err, stdout, stderr) => {
// if(err) {
// console.log('Error in terminal');
// console.log(err);
// } else if(stderr) {
// console.log(stderr);
// } else {
// console.log(stdout);
// }
// });
// });
}
res.redirect('/');
});
User.update(
{ username: id },
{
state: user.state,
uid: uid,
},
(err, data) => {
if (err) {
console.log(err);
res.redirect('/admin/users/');
} else {
res.redirect('/');
}
},
);
}
});
}
});
res.redirect('/');
// res.redirect('/admin/users/newPass/' + id);
};
exports.linuxPass = (req, res) => {
const id = req.params.id;
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err)
console.log(err);
else {
const passPath = 'echo ' + id + ':' +
decrypt(user.linux) + ' | sudo chpasswd';
const passPath = 'echo ' +
id +
':' +
decrypt(user.linux) +
' | sudo chpasswd';
// console.log(user);
exec(passPath, (err, stdout, stderr) => {
if(err)
if (err)
console.log(err);
else if(stderr)
else if (stderr)
console.log(stderr);
else {
console.log('pass sucess');
......@@ -158,26 +149,26 @@ exports.activeUser = (req, res) => {
const id = req.params.id;
console.log(id);
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err)
console.log(err);
else {
console.log(user);
user.state = 2;
const passPath = 'echo ' + id + ':'+
decrypt(user.linux) + ' | sudo chpasswd';
User.update({username: id}, {state: user.state}, (err, data) => {
if(err)
const passPath = 'echo ' +
id +
':' +
decrypt(user.linux) +
' | sudo chpasswd';
User.update({ username: id }, { state: user.state }, (err, data) => {
if (err)
console.log(err);
else {
exec(passPath, (err, stdout, stderr) => {
if(err)
console.log(err);
else if(stderr)
console.log(stderr);
else
console.log(stdout);
if (err) console.log(err);
else if (stderr) console.log(stderr);
else console.log(stdout);
});
}
});
......@@ -191,23 +182,22 @@ exports.inactiveUser = (req, res) => {
const id = req.params.id;
console.log(id);
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err)
console.log(err);
else {
console.log(user);
user.state = 3;
const passPath = 'echo ' + id + ':'+
user.linux + ' | sudo chpasswd';
const passPath = 'echo ' + id + ':' + user.linux + ' | sudo chpasswd';
User.update({username: id}, {state: user.state}, (err, data) => {
if(err)
User.update({ username: id }, { state: user.state }, (err, data) => {
if (err)
console.log(err);
else {
exec(passPath, (err, stdout, stderr) => {
if(err)
if (err)
console.log(err);
else if(stderr)
else if (stderr)
console.log(stderr);
else {
console.log(stdout);
......@@ -222,23 +212,35 @@ exports.inactiveUser = (req, res) => {
};
exports.getActiveUsers = (req, res) => {
User.find({state: 1}, (err, docs) => {
User.find({ state: 1 }, (err, docs) => {
// console.log(docs);
res.render('admin/users', {users: docs, user: req.user, conect: req.user});
res.render('admin/users', {
users: docs,
user: req.user,
conect: req.user,
});
});
};
exports.getPendingUsers = (req, res) => {
User.find({state: 0}, (err, docs) => {
User.find({ state: 0 }, (err, docs) => {
// console.log(docs);
res.render('admin/users', {users: docs, user: req.user, conect: req.user});
res.render('admin/users', {
users: docs,
user: req.user,
conect: req.user,
});
});
};
exports.getInactiveUsers = function(req, res) {
User.find({state: 3}, function(err, docs) {
User.find({ state: 3 }, function(err, docs) {
// console.log(docs);
res.render('admin/users', {users: docs, user: req.user, conect: req.user});
res.render('admin/users', {
users: docs,
user: req.user,
conect: req.user,
});
});
};
......@@ -247,13 +249,13 @@ exports.getUsersLinux = function(req, res) {
// const path = 'awk -F: \'{printf "%s:%s:%s\\n",$1,$3,$5}\' /etc/passwd';
exec(path, (err, stdout, stderr) => {
if(err) {
if (err) {
console.log('error en terminal');
} else {
const out = stdout.split('\n');
// console.log(out[linuxUser].split(':'));
for(let linuxUser = 0; linuxUser < out.length - 1; linuxUser++) {
// console.log(out[linuxUser].split(':'));
for (let linuxUser = 0; linuxUser < out.length - 1; linuxUser++) {
let linux = out[linuxUser].split(':');
const user = new User({
username: linux[0],
......@@ -261,15 +263,15 @@ exports.getUsersLinux = function(req, res) {
uid: linux[1],
});
User.findOne({uid: user.uid}, function(err, docs) {
if(err) {
User.findOne({ uid: user.uid }, function(err, docs) {
if (err) {
console.log(err);
} else if (docs === null) {
user.state = 2;
user.so = 1;
user.save(function(err) {
if(err) {
if (err) {
console.log(err);
return res.status(500);
}
......@@ -284,19 +286,19 @@ exports.getUsersLinux = function(req, res) {
exports.Attendance = (req, res) => {
List.find((err, docs) => {
if(err)
if (err)
res.redirect('/');
else
res.render('attendance/attendance', {
conect: req.user,
users: docs,
});
conect: req.user,
users: docs,
});
// console.log(docs);
});
};
exports.getAttendance = (req, res) => {
res.render('attendance/new', {conect: req.user});
res.render('attendance/new', { conect: req.user });
};
exports.newAttendance = (req, res) => {
......@@ -309,7 +311,7 @@ exports.newAttendance = (req, res) => {
});
list.save(function(err) {
if(err) {
if (err) {
console.log(err);
}
});
......@@ -318,10 +320,12 @@ exports.newAttendance = (req, res) => {
exports.emailContact = (req, res) => {
emailAdmin((err, data) => {
if(err)
if (err)
console.log(err);
else {
const transporter = nodemailer.createTransport('smtps://' + auth.user + ':' + auth.pass + '@smtp.gmail.com');
const transporter = nodemailer.createTransport(
'smtps://' + auth.user + ':' + auth.pass + '@smtp.gmail.com',
);
const mailOptions = {
from: req.body.name + ' ' + req.body.last + ' <' + req.body.email + '>',
......@@ -331,10 +335,8 @@ exports.emailContact = (req, res) => {
text: req.body.text,
};
transporter.sendMail(mailOptions, (err, res) => {
if(err)
console.log(err);
else
console.log(res);
if (err) console.log(err);
else console.log(res);
});
}
});
......
controllers/session.js
View file @ dcabfcec
......@@ -41,7 +41,7 @@ exports.newUser = function(req, res) {
User.findOne(
{
$or: [{ email: req.body.email }, { username: req.body.username }]
$or: [{ email: req.body.email }, { username: req.body.username }],
},
function(err, user) {
if (err) return done(err);
......@@ -51,12 +51,12 @@ exports.newUser = function(req, res) {
if (user.email === req.body.email)
req.flash(
'signupMessage',
'Existe un registro con el Correo Electrónico ingresado'
'Existe un registro con el Correo Electrónico ingresado',
);
if (user.username === req.body.username)
req.flash(
'signupMessage',
'Existe un registro con el Nombre de Usuario ingresado'
'Existe un registro con el Nombre de Usuario ingresado',
);
res.redirect('/signup');
} else if (req.body.password !== req.body.confirmPassword) {
......@@ -92,43 +92,39 @@ exports.newUser = function(req, res) {
console.log(err);
else {
const transporter = nodemailer.createTransport(
'smtps://' + auth.user + ':' + auth.pass + '@smtp.gmail.com'
'smtps://' + auth.user + ':' + auth.pass + '@smtp.gmail.com',
);
const mailOptions = {
from: (
req.body.name +
' ' +
req.body.last_name +
' <' +
req.body.email +
'>'
),
from: req.body.name +
' ' +
req.body.last_name +
' <' +
req.body.email +
'>',
to: data,
subject: 'Contacto-Cluster Lovelace',
// text: req.body.text,
html: (
'Sr Admin, solicitud de cuenta pendiente: <br />' +
'<hr />' +
'<b>Username: </b>' +
req.body.username +
'<br />' +
'<b>Nombre: </b>' +
req.body.name +
' ' +
req.body.last_name +
'<br />' +
'<b>Código: </b>' +
req.body.user_id +
'<br />' +
'<b>Correo Electrónico: </b>' +
req.body.email +
'<br /><hr />' +
'<b>Justificación: </b><br />' +
'<i>' +
req.body.text +
'</i>'
)
html: 'Sr Admin, solicitud de cuenta pendiente: <br />' +
'<hr />' +
'<b>Username: </b>' +
req.body.username +
'<br />' +
'<b>Nombre: </b>' +
req.body.name +
' ' +
req.body.last_name +
'<br />' +
'<b>Código: </b>' +
req.body.user_id +
'<br />' +
'<b>Correo Electrónico: </b>' +
req.body.email +
'<br /><hr />' +
'<b>Justificación: </b><br />' +
'<i>' +
req.body.text +
'</i>',
};
transporter.sendMail(mailOptions, (err, res) => {
if (err) console.log(err);
......@@ -141,6 +137,6 @@ exports.newUser = function(req, res) {
}
});
}
}
},
);
};
controllers/user.js
View file @ dcabfcec
const {User} = require('../models/user');
const { User } = require('../models/user');
const passport = require('passport');
const LocalStrategy = require('passport-local');
const multer = require('multer');
......@@ -6,22 +6,22 @@ const multer = require('multer');
exports.index = (req, res) => {
// console.log(req.user);
res.render('user/profile', {
user: req.user,
conect: req.user,
message: req.flash('editProfile'),
});
user: req.user,
conect: req.user,
message: req.flash('editProfile'),
});
};
exports.getUser = (req, res) => {
// console.log(req.params.id);
const username = req.params.id;
User.findOne({username: username}, (err, user) => {
if(err)
User.findOne({ username: username }, (err, user) => {
if (err)
console.log(err);
else if(user) {
else if (user) {
// console.log(user);
res.render('user/profile', {user: user, conect: req.user, message: ''});
res.render('user/profile', { user: user, conect: req.user, message: '' });
} else {
console.log('No existe el Usuario');
res.redirect('/');
......@@ -35,16 +35,14 @@ exports.editUser = (req, res) => {
// console.log(req.user);
// console.log(id);
if(req.user.state != 1) {
if(id !== conect.username)
res.redirect('/');
if (req.user.state != 1) {
if (id !== conect.username) res.redirect('/');
}
User.findOne({username: id}, (err, user) => {
if(err)
console.log(err);
else if(user !== null)
res.render('user/edit', {user: user, conect: conect});
User.findOne({ username: id }, (err, user) => {
if (err) console.log(err);
else if (user !== null)
res.render('user/edit', { user: user, conect: conect });
else
res.redirect('/');
});
......@@ -54,16 +52,14 @@ exports.photoUser = (req, res) => {
const id = req.params.id;
const conect = req.user;
if(req.user.state != 1) {
if(id !== conect.username)
res.redirect('/');
if (req.user.state != 1) {
if (id !== conect.username) res.redirect('/');
}
User.findOne({username: id}, (err, user) => {
if(err)
console.log(err);
else if(user !== null)
res.render('user/photo', {user: user, conect: conect});
User.findOne({ username: id }, (err, user) => {
if (err) console.log(err);
else if (user !== null)
res.render('user/photo', { user: user, conect: conect });
else
res.redirect('/');
});
......@@ -74,15 +70,14 @@ exports.editPhotoUser = (req, res) => {
const id = req.params.id;
const conect = req.user;
if(req.user.state != 1) {
if(id !== conect.username)
res.redirect('/');
if (req.user.state != 1) {
if (id !== conect.username) res.redirect('/');
}
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err)
console.log(err);
else if(user !== null) {
else if (user !== null) {
const storage = multer.diskStorage({
destination: (req, file, callback) => {
callback(null, './images/profile');
......@@ -91,7 +86,7 @@ exports.editPhotoUser = (req, res) => {
callback(null, file.fieldname + '-' + Date.now());
},
});
const upload = multer({storage: storage}).single('userPhoto');
const upload = multer({ storage: storage }).single('userPhoto');
// upload(req, res, function(err) {
// if (err)
......@@ -103,7 +98,6 @@ exports.editPhotoUser = (req, res) => {
});
};
// PUT
exports.saveEditUser = (req, res) => {
const id = req.params.id;
......@@ -111,8 +105,8 @@ exports.saveEditUser = (req, res) => {
console.log(conect);
console.log(id);
User.findOne({username: id}, (err, user) => {
if(err)
User.findOne({ username: id }, (err, user) => {
if (err)
console.log(err);
else {
console.log(user);
......@@ -123,18 +117,20 @@ exports.saveEditUser = (req, res) => {
user.email = req.body.email;
user.profession = req.body.profession;
user.save((err) => {
if(!err) {
req.flash('editProfile', 'Perfil de ' +
req.params.id + ' editado con éxito');
if(conect.state === 1)
user.save(err => {
if (!err) {
req.flash(
'editProfile',
'Perfil de ' + req.params.id + ' editado con éxito',
);
if (conect.state === 1)
res.redirect('/admin/users/');
else
res.render('user/profile', {
user: user,
conect: user,
message: req.flash('editProfile'),
});
user: user,
conect: user,
message: req.flash('editProfile'),
});
} else
res.render('index');
});
......
helpers/user.js
View file @ dcabfcec
const User = require('../models/user').User,
{exec} = require('child_process');
{ exec } = require('child_process');
exports.emailAdmin = (callback) => {
User.find({state: 1}, (err, users) => {
exports.emailAdmin = callback => {
User.find({ state: 1 }, (err, users) => {
let email = '';
if (err) {
console.log(err);
return callback(err);
} else {
for (user in users) {
if (email !== '')
email += (', ');
email += (String(users[user].email));
if (email !== '') email += ', ';
email += String(users[user].email);
}
return callback(null, email);
}
});
};
exports.getLinuxUsers = (callback) => {
exports.getLinuxUsers = callback => {
const path = 'cut -d: -f1 /etc/passwd';
exec(path, (err, stdout, stderr) => {
if(err) {
if (err) {
console.log(err);
return callback(err);
} else if(stderr) {
} else if (stderr) {
console.log(stderr);
return callback(stderr);
} else {
......@@ -35,14 +34,14 @@ exports.getLinuxUsers = (callback) => {
};
// exports.getLinuxId = (users, callback) => {
exports.getLinuxId = (callback) => {
exports.getLinuxId = callback => {
const path = 'cut -d: -f3 /etc/passwd';
exec(path, (err, stdout, stderr) => {
if(err) {
if (err) {
console.log(err);
return callback(err);
} else if(stderr) {
} else if (stderr) {
console.log(stderr);
return callback(stderr);
} else {
......@@ -52,11 +51,10 @@ exports.getLinuxId = (callback) => {
while (flag) {
for (userId in uid) {
if (Number(uid[userId]) === start)
flag = false;
if (Number(uid[userId]) === start) flag = false;
}
if (!flag) {
start ++;
start++;
flag = true;
} else {
return callback(null, start);
......
models/user.js
View file @ dcabfcec
......@@ -49,9 +49,9 @@ const userSchema = new Schema({
default: '',
},
password: {
type: String,
require: true,
default: '',
type: String,
require: true,
default: '',
},
linux: {
type: String,
......
package.json
View file @ dcabfcec
......@@ -20,7 +20,7 @@
"dependencies": {
"bcrypt-nodejs": "0.0.3",
"bcryptjs": "^2.4.0",
"body-parser": "~1.15.1",
"body-parser": "1.16.1",
"child_process": "^1.0.2",
"colors": "^1.1.2",
"compression": "^1.6.2",
......@@ -47,7 +47,8 @@
"passport": "^0.3.2",
"passport-jwt": "^2.2.1",
"passport-local": "^1.0.0",
"serve-favicon": "~2.3.0"
"serve-favicon": "~2.3.0",
"simple-ssh": "^0.9.0"
},
"devDependencies": {
"eslint": "^3.12.0"
......
public/js/index.js
View file @ dcabfcec
$(document)
.ready(function() {
// fix menu when passed
$('.masthead')
.visibility({
once: false,
onBottomPassed: function() {
$('.fixed.menu').transition('fade in');
},
onBottomPassedReverse: function() {
$('.fixed.menu').transition('fade out');
},
})
;
// create sidebar and attach to menu open
$('.ui.sidebar')
.sidebar('attach events', '.toc.item')
;
$(document).ready(function() {
// fix menu when passed
$('.masthead').visibility({
once: false,
onBottomPassed: function() {
$('.fixed.menu').transition('fade in');
},
onBottomPassedReverse: function() {
$('.fixed.menu').transition('fade out');
},
});
;
// create sidebar and attach to menu open
$('.ui.sidebar').sidebar('attach events', '.toc.item');
});
public/js/scroll.js
View file @ dcabfcec
(function($) {
$(function() {
$('a[href^="#"]').on('click', function(ev) {
const target = $(this.getAttribute('href'));
if(typeof target !== 'undefined') {
ev.preventDefault();
$('html, body').stop().animate({
scrollTop: target.offset().top,
}, 1000);
}
});
});
$(function() {
$('a[href^="#"]').on('click', function(ev) {
const target = $(this.getAttribute('href'));
if (typeof target !== 'undefined') {
ev.preventDefault();
$('html, body').stop().animate(
{
scrollTop: target.offset().top,
},
1000,
);
}
});
});
})(jQuery);
public/js/sticky.js
View file @ dcabfcec
$(document)
.ready(function() {
// fix main menu to page on passing
$('.main.menu').visibility({
type: 'fixed',
});
$('.overlay').visibility({
type: 'fixed',
offset: 80,
});
// lazy load images
$('.image').visibility({
type: 'image',
transition: 'vertical flip in',
duration: 500,
});
// show dropdown on hover
$('.main.menu .ui.dropdown').dropdown({
on: 'hover',
});
})
;
$(document).ready(function() {
// fix main menu to page on passing
$('.main.menu').visibility({
type: 'fixed',
});
$('.overlay').visibility({
type: 'fixed',
offset: 80,
});
// lazy load images
$('.image').visibility({
type: 'image',
transition: 'vertical flip in',
duration: 500,
});
// show dropdown on hover
$('.main.menu .ui.dropdown').dropdown({
on: 'hover',
});
});
routes/index.js
View file @ dcabfcec
......@@ -20,7 +20,7 @@ router.get('/login', function(req, res) {
res.render('user/login', {
user: req.user,
conect: req.user,
message: req.flash('loginMessage')
message: req.flash('loginMessage'),
});
});
......@@ -36,7 +36,7 @@ router.get('/signup', function(req, res) {
res.render('user/signup', {
user: req.user,
conect: req.user,
message: req.flash('signupMessage')
message: req.flash('signupMessage'),
});
});
......@@ -54,8 +54,8 @@ router.post(
passport.authenticate('local-login', {
successRedirect: '/user',
failureRedirect: '/login',
failureFlash: true
})
failureFlash: true,
}),
);
// router.get('/quizes', quizController.index);
......
routes/user.js
View file @ dcabfcec
......@@ -16,8 +16,7 @@ router.get('/edit/photo/:id', isLoggedIn, userController.photoUser);
router.put('/edit/:id', isLoggedIn, userController.saveEditUser);
function isLoggedIn(req, res, next) {
if (req.isAuthenticated())
return next();
if (req.isAuthenticated()) return next();
res.redirect('/login');
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment