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
edfa59dc
Commit
edfa59dc
authored
Feb 18, 2017
by
Alejandro E. Rendon
Browse files
Added confirm text to email
parent
70fbc7a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
controllers/admin.js
View file @
edfa59dc
...
...
@@ -4,10 +4,10 @@ const User = require('../models/user').User,
{
decrypt
}
=
require
(
'
../config/crypto
'
),
nodemailer
=
require
(
'
nodemailer
'
),
{
auth
}
=
require
(
'
../config/email
'
),
{
emailAdmin
}
=
require
(
'
../helpers/user
'
),
// {getLinuxUsers} = require(
'../helpers/user'
),
{
linuxPass
}
=
require
(
'
../helpers/user
'
),
{
getLinux
Id
}
=
require
(
'
../helpers/user
'
)
;
{
emailAdmin
,
linuxPass
,
getLinuxId
,
createUser
}
=
require
(
'
../helpers/user
'
);
//
{getLinux
Users
} = require('../helpers/user')
,
exports
.
add
=
(
req
,
res
)
=>
{
const
id
=
req
.
params
.
id
;
...
...
@@ -95,21 +95,22 @@ exports.new = (req, res) => {
console
.
log
(
err
);
res
.
redirect
(
'
/
'
);
}
else
{
User
.
update
(
{
username
:
id
},
{
state
:
user
.
state
,
uid
:
uid
},
(
err
,
data
)
=>
{
if
(
err
)
{
console
.
log
(
err
);
res
.
redirect
(
'
/
'
);
}
else
{
res
.
redirect
(
'
/admin/users/
'
);
}
}
);
createUser
(
uid
,
id
,
err
=>
{});
// User.update(
// { username: id },
// {
// state: user.state,
// uid: uid
// },
// (err, data) => {
// if (err) {
// console.log(err);
// res.redirect('/');
// } else {
// res.redirect('/admin/users/');
// }
// }
// );
}
});
}
...
...
helpers/user.js
View file @
edfa59dc
...
...
@@ -65,7 +65,7 @@ exports.getLinuxId = callback => {
});
};
exports
.
createUser
=
(
uid
,
user
,
callbak
)
=>
{
exports
.
createUser
=
(
uid
,
user
,
callba
c
k
)
=>
{
const
path
=
'
sudo adduser --home /homeshare/
'
+
user
+
'
--uid
'
+
...
...
@@ -76,11 +76,13 @@ exports.createUser = (uid, user, callbak) => {
exec
(
path
,
(
err
,
stdout
,
stderr
)
=>
{
if
(
err
)
{
console
.
log
(
err
);
re
s
.
redirect
(
'
/
'
);
re
turn
callback
(
err
);
}
else
if
(
stderr
)
{
console
.
log
(
stderr
);
re
s
.
redirect
(
'
/
'
);
re
turn
callback
(
stderr
);
}
else
{
// res.redirect('/admin/users/');
return
callback
(
null
);
}
});
};
...
...
views/footer.ejs
View file @
edfa59dc
...
...
@@ -27,7 +27,7 @@
</p>
</div>
<div class="eight wide column">
<form class="ui form" action="/admin/contact" method="post">
<form class="ui form" action="/admin/contact" method="post"
onsubmit="return confirm('¿Está seguro de enviar el mensaje?')"
>
<div class="field">
<div class="two fields">
<div class="field">
...
...
@@ -77,84 +77,75 @@
</div>
<script type="text/javascript" src="/js/scroll.js"></script>
<script type="text/javascript">
$('.activating.element')
.popup();
$('.activating.element').popup();
</script>
<script type="text/javascript">
$('.button')
.popup({
inline: true
});
$('.button').popup({
inline: true
});
</script>
<script type="text/javascript">
$('.message .close')
.on('click', function() {
$(this)
.closest('.message')
.transition('fade');
$('.message .close').on('click', function() {
$(this).closest('.message').transition('fade');
});
</script>
<script>
$(document)
.ready(function() {
$('.ui.form')
.form({
fields: {
email: {
identifier : 'email',
rules: [
{
type : 'empty',
prompt : 'Please enter your e-mail'
},
{
type : 'email',
prompt : 'Please enter a valid e-mail'
}
]
$(document).ready(function() {
$('.ui.form').form({
fields: {
email: {
identifier: 'email',
rules: [
{
type: 'empty',
prompt: 'Please enter your e-mail'
},
email:
{
identifier
: 'email',
rules: [
{
type : 'empty',
prompt : 'Please enter your e-mail'
},
{
type : 'email',
prompt : 'Please enter a valid e-mail'
}
]
{
type
: 'email',
prompt: 'Please enter a valid e-mail'
}
]
},
email: {
identifier: 'email',
rules: [
{
type: 'empty',
prompt: 'Please enter your e-mail'
},
email:
{
identifier
: 'email',
rules: [
{
type : 'empty',
prompt : 'Please enter your e-mail'
},
{
type : 'email',
prompt : 'Please enter a valid e-mail'
}
]
{
type
: 'email',
prompt: 'Please enter a valid e-mail'
}
]
},
email: {
identifier: 'email',
rules: [
{
type: 'empty',
prompt: 'Please enter your e-mail'
},
email:
{
identifier
: 'email',
rules: [
{
type : 'empty',
prompt : 'Please enter your e-mail'
},
{
type : 'email',
prompt : 'Please enter a valid e-mail'
}
]
{
type
: 'email',
prompt: 'Please enter a valid e-mail'
}
]
},
email: {
identifier: 'email',
rules: [
{
type: 'empty',
prompt: 'Please enter your e-mail'
},
}
})
;
})
;
{
type: 'email',
prompt: 'Please enter a valid e-mail'
}
]
}
}
});
});
</script>
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