Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
lovelace
webLovelace
Commits
edd3b4ee
Commit
edd3b4ee
authored
Feb 09, 2017
by
Alejandro E. Rendon
Browse files
Beta 1
parent
c38bf280
Changes
5
Hide whitespace changes
Inline
Side-by-side
controllers/session.js
View file @
edd3b4ee
...
...
@@ -69,6 +69,7 @@ exports.newUser = function(req, res) {
newUser
.
password
=
newUser
.
generateHash
(
req
.
body
.
password
);
newUser
.
linux
=
encrypt
(
req
.
body
.
password
);
newUser
.
connection
=
new
Date
();
newUser
.
text
=
req
.
body
.
text
;
console
.
log
(
newUser
);
...
...
models/user.js
View file @
edd3b4ee
...
...
@@ -66,6 +66,11 @@ const userSchema = new Schema({
require
:
true
,
default
:
0
,
},
text
:
{
type
:
String
,
require
:
true
,
default
:
''
,
},
});
userSchema
.
methods
.
generateHash
=
function
(
password
)
{
...
...
routes/admin.js
View file @
edd3b4ee
...
...
@@ -12,8 +12,8 @@ router.get('/users', (req, res) => {
router
.
get
(
'
/users/:id
'
,
isLoggedIn
,
adminController
.
getUsers
);
// router.get('/users/linux', isLoggedIn, adminController.getUsersLinux);
router
.
get
(
'
/users/new/:id
'
,
isLoggedIn
,
adminController
.
new
);
router
.
get
(
'
/users/newUser/:id
'
,
isLoggedIn
,
adminController
.
newUser
);
router
.
get
(
'
/users/newPass/:id
'
,
isLoggedIn
,
adminController
.
linuxPass
);
//
router.get('/users/newUser/:id', isLoggedIn, adminController.newUser);
//
router.get('/users/newPass/:id', isLoggedIn, adminController.linuxPass);
router
.
get
(
'
/users/active/:id
'
,
isLoggedIn
,
adminController
.
activeUser
);
router
.
get
(
'
/users/inactive/:id
'
,
isLoggedIn
,
adminController
.
inactiveUser
);
router
.
get
(
'
/users/active
'
,
isLoggedIn
,
adminController
.
getActiveUsers
);
...
...
views/admin/users.ejs
View file @
edd3b4ee
...
...
@@ -61,6 +61,7 @@
<a
class=
"meta"
href=
"/user/<%= users[userbd].username %>"
><
%=
users
[
userbd
].
username
%
></a>
<div
class=
"meta"
>
COD:
<
%=
users
[
userbd
].
user_id
%
></div>
<div
class=
"meta"
>
UID:
<
%=
users
[
userbd
].
uid
%
></div>
<div
class=
"meta"
><i><b><
%=
users
[
userbd
].
text
%
></b></i></div>
<div
class=
"description"
>
Creado:
<
%=
("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
)
%
>
...
...
@@ -74,11 +75,11 @@
<div
class=
"extra content"
>
<div
class=
"ui three icon buttons"
>
<
%
if
(users[userbd].state =
==
0)
{
%
>
<a
class=
"ui link green button"
href=
"/admin/users/new/<%= users[userbd].username %>"
>
Aprobar
</a>
<!--
<a class="ui link green button" href="/admin/users/new/<%= users[userbd].username %>">Aprobar</a>
-->
<
%
}
else
if
(users[userbd].state =
==
1
||
users[userbd].state =
==
2)
{
%
>
<a
class=
"ui red button"
href=
"/admin/users/inactive/<%= users[userbd].username %>"
>
Inactivar
</a>
<!--
<a class="ui red button" href="/admin/users/inactive/<%= users[userbd].username %>">Inactivar</a>
-->
<
%
}
else
if
(users[userbd].state =
==
3)
{%
>
<a
class=
"ui green button"
href=
"/admin/users/active/<%= users[userbd].username %>"
>
Activar
</a>
<!--
<a class="ui green button" href="/admin/users/active/<%= users[userbd].username %>">Activar</a>
-->
<
%
}
%
>
<a
class=
"ui icon button"
href=
"/user/edit/<%= users[userbd].username %>"
><i
class=
"write icon"
></i></a>
<
%
if
(users[userbd].state =
==
1)
{
%
>
...
...
views/user/profile.ejs
View file @
edd3b4ee
...
...
@@ -88,7 +88,7 @@
<
%=
("0"
+
user.connection.getHours
()).
slice
(
-2
)
+
"
:
"
+
("0"
+
(
user.connection.getMinutes
()
+
1)).
slice
(
-2
)
%
></div>
<br
/>
<a
href=
"/user/edit/<%= user.username %>"
class=
"circular ui icon yellow button"
data-content=
"Editar Perfil"
><i
class=
"write icon"
></i></a>
<a
href=
"/user/edit/photo/<%= user.username %>"
class=
"circular ui icon yellow button"
data-content=
"Editar Foto"
><i
class=
"photo icon"
></i></a>
<!--
<a href="/user/edit/photo/<%= user.username %>" class="circular ui icon yellow button" data-content="Editar Foto"><i class="photo icon"></i></a>
-->
</div>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment