Skip to content

GitLab

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

Users list

parent da1831ef
Hide whitespace changes
Inline Side-by-side
controllers/admin.js
View file @ 9b63b522
......@@ -73,6 +73,22 @@ exports.getUsers = (req, res) => {
});
};
exports.getUsersList = (req, res) => {
const page = req.params.id;
User.find((err, docs) => {
console.log(page);
console.log(docs.length);
res.render('admin/list', {
message: req.flash('editProfile'),
users: docs,
user: req.user,
conect: req.user
});
});
};
exports.new = (req, res) => {
const id = req.params.id;
console.log(id);
......@@ -96,23 +112,24 @@ exports.new = (req, res) => {
res.redirect('/');
} else {
console.log('here');
User.update({ username: id }, { state: user.state, uid: uid }, (
err,
data
) => {
if (err) {
console.log(err);
res.redirect('/');
} else {
sshKey(user, err => {
if (err) {
console.log(err);
res.redirect('/');
} else
res.redirect('/admin/users');
});
User.update(
{ username: id },
{ state: user.state, uid: uid },
(err, data) => {
if (err) {
console.log(err);
res.redirect('/');
} else {
sshKey(user, err => {
if (err) {
console.log(err);
res.redirect('/');
} else
res.redirect('/admin/users');
});
}
}
});
);
// createUserCluster(uid, user, err => {
// if (err) {
// console.log(err);
......
routes/admin.js
View file @ 9b63b522
......@@ -9,6 +9,7 @@ router.get('/users', (req, res) => {
res.redirect('/admin/users/1');
});
router.get('/users/list', isLoggedIn, adminController.getUsersList);
router.get('/users/:id', isLoggedIn, adminController.getUsers);
// router.get('/users/linux', isLoggedIn, adminController.getUsersLinux);
router.get('/users/new/:id', isLoggedIn, adminController.new);
......
views/admin/list.ejs 0 → 100644
View file @ 9b63b522
<!DOCTYPE html>
<html>
<head>
<!-- Standard Meta -->
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<!-- Site Properties -->
<title>Admin | Cluster Lovelace</title>
<link rel="stylesheet" type="text/css" href="/semantic-ui/semantic.min.css">
<link rel="stylesheet" type="text/css" href="/css/font.css">
<script src="/js/jquery-3.1.1.min.js"></script>
<script src="/semantic-ui/semantic.min.js"></script>
<% include ../navbar.ejs %>
<div class="ui main text center aligned container">
<% if(message.length > 0){ %>
<div class="ui warning message">
<i class="close icon"></i>
<div class="header">Aviso</div>
<ul class="list">
<% for (msg in message) { %>
<li><%= message[msg] %></li>
<% } %>
</ul>
</div>
<% } %>
<h1 class="ui header">Panel de Administración</h1>
</div>
<div class="ui main text right aligned container">
<div class="ui icon buttons">
<a class="ui compact icon button" data-content="Usuarios" href="/admin/users/"><i class="block layout icon"></i></a>
</div>
<div class="ui icon buttons">
<a class="ui compact icon button" data-content="Todos los Usuarios" href="/admin/users/"><i class="users icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Activos" href="/admin/users/active/"><i class="checkmark icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Inactivos" href="/admin/users/inactive/"><i class="remove icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Pendientes" href="/admin/users/pending/"><i class="warning icon"></i></a>
<a class="ui compact icon button" data-content="Agregar Usuario" href="/signup"><i class="add user icon"></i></a>
<%# <a class="ui compact icon button" data-content="Importar desde SO" href="/admin/users/linux"><i class="linux icon"></i></a>%>
</div>
</div>
<div class="ui main text container">
<table class="ui tablet stackable small very compact table">
<thead>
<tr>
<th>ID</th>
<th>Fecha</th>
<th>Nombre</th>
<th>Correo Electrónico</th>
<th class="right aligned">Comentario</th>
</tr>
</thead>
<tbody>
<% for (var userbd in users) { %>
<tr>
<td><%= users[userbd].user_id %></td>
<td>
<div class="description">
<%= ("0" + users[userbd].createdAt.getDate()).slice(-2) + "/" + ("0" + (users[userbd].createdAt.getMonth() + 1)).slice(-2) + "/" + users[userbd].createdAt.getFullYear() %>
<%= ("0" + users[userbd].createdAt.getHours()).slice(-2) + ":" + ("0" + (users[userbd].createdAt.getMinutes() + 1)).slice(-2) %>
</div>
</td>
<td><%= users[userbd].name + ' ' + users[userbd].last_name %></td>
<td>
<div class="description">
<i><b><%= users[userbd].email %></b></i>
</div>
</td>
<td class="right aligned">
<div class="description">
<i><%= users[userbd].text %></i>
</div>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>
<% include ../footer %>
</body>
</html>
views/admin/users.ejs
View file @ 9b63b522
......@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<!-- Site Properties -->
<title>Admin-Cluster Lovelace</title>
<title>Admin | Cluster Lovelace</title>
<link rel="stylesheet" type="text/css" href="/semantic-ui/semantic.min.css">
<link rel="stylesheet" type="text/css" href="/css/font.css">
......@@ -30,12 +30,11 @@
<h1 class="ui header">Panel de Administración</h1>
</div>
<div class="ui main text right aligned container">
<%# <div class="ui icon buttons">
<a class="ui compact icon button" data-content="Asistencia" href="/admin/attendance/"><i class="list icon"></i></a>
<a class="ui compact icon button" data-content="Asistencia" href="/admin/attendance/new"><i class="plus icon"></i></a>
</div>%>
<div class="ui icon buttons">
<a class="ui compact icon button" data-content="Todos los Usuarios" href="/admin/users/"><i class="list icon"></i></a>
<a class="ui compact icon button" data-content="Lista de Usuarios" href="/admin/users/list"><i class="list icon"></i></a>
</div>
<div class="ui icon buttons">
<a class="ui compact icon button" data-content="Todos los Usuarios" href="/admin/users/"><i class="users icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Activos" href="/admin/users/active/"><i class="checkmark icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Inactivos" href="/admin/users/inactive/"><i class="remove icon"></i></a>
<a class="ui compact icon button" data-content="Usuarios Pendientes" href="/admin/users/pending/"><i class="warning icon"></i></a>
......
views/footer.ejs
View file @ 9b63b522
......@@ -76,6 +76,7 @@
</div>
</div>
<script type="text/javascript" src="/js/scroll.js"></script>
<script src='https://www.google.com/recaptcha/api.js'></script>
<script type="text/javascript">
$('.activating.element').popup();
</script>
......
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