specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Finish validation touchup

Browse source
This commit is contained in:
Xaekai 2017-06-04 23:44:46 -07:00
parent d42de93d74
commit 699aa2abe1
4 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/web/account.js
View file

@ -202,7 +202,6 @@ function handleAccountChannelPage(req, res) {
db.channels.listUserChannels(req.user.name, function (err, channels) {
sendPug(res, "account-channels", {
domain: req.host,
channels: channels
});
});

1
src/web/pug.js
View file

@ -13,6 +13,7 @@ function merge(locals, res) {
siteTitle: Config.get("html-template.title"),
siteDescription: Config.get("html-template.description"),
siteAuthor: "Calvin 'calzoneman' 'cyzon' Montgomery",
domain: res.req.host,
loginDomain: Config.get("https.enabled") ? Config.get("https.full-address")
: Config.get("http.full-address"),
csrfToken: typeof res.req.csrfToken === 'function' ? res.req.csrfToken() : '',

14
templates/account-channels.pug
View file

@ -56,29 +56,29 @@ html(lang="en")
input(type="hidden", name="action", value="new_channel")
.form-group
label.control-label(for="channelname") Channel URL
span#validation.text-danger.pull-right
.input-group
span.input-group-addon #{domain}/r/
input#channelname.form-control(type="text", name="name", maxlength="30", onkeyup="checkChannel()")
p#validate_channel.text-danger.pull-right
button#register.btn.btn-primary.btn-block(type="submit") Register
include footer
+footer()
script( type='text/javascript').
function checkChannel(){
function nameIsInvalid(id){
if(/\s/.test(id)){
return 'Channel URLs may not contain spaces';
return 'Channel URL may not contain spaces';
}
if(id === ''){
return 'Channel URLs must not be empty';
return 'Channel URL must not be empty';
}
if(!/^[\w-]{1,30}$/.test(id)){
return 'Channel URLs may only consist of a-z, A-Z, 0-9, - and _';
return 'Channel URL may only consist of a-z, A-Z, 0-9, - and _';
}
return false;
}
function checkChannel(){
var box = $("#channelname");
var value = box.val();
var lastkey = Date.now();
@ -89,11 +89,11 @@ html(lang="en")
return;
}
if(nameIsInvalid(value)){
$('#validation').text(nameIsInvalid(value))
$('#validate_channel').text(nameIsInvalid(value))
.parent().addClass('has-error').removeClass('has-success');
$('#register').addClass('disabled');
} else {
$('#validation').text('')
$('#validate_channel').text('')
.parent().addClass('has-success').removeClass('has-error');
$('#register').removeClass('disabled');
}

40
templates/register.pug
View file

@ -33,15 +33,19 @@ html(lang="en")
.form-group
label.control-label(for="username") Username
input#username.form-control(type="text", name="name", onkeyup="checkUsername()", maxlength="20")
p#validate_username.text-danger.pull-right
.form-group
label.control-label(for="password") Password
input#password.form-control(type="password", name="password", onkeyup="checkPasswords()")
p#validate_password.text-danger.pull-right
.form-group
label.control-label(for="password_confirm") Confirm Password
input#password_confirm.form-control(type="password", onkeyup="checkPasswords()")
p#validate_confirm.text-danger.pull-right
.form-group
label.control-label(for="email") Email (optional)
input#email.form-control(type="email", name="email")
p#validate_email.text-danger.pull-right
p
| Providing an email address is optional and will allow you to recover your account via email if you forget your password.
strong   If you do not provide an email address, you will not be able to recover a lost account!
@ -62,55 +66,51 @@ html(lang="en")
return valid;
}
function checkUsername() {
function createError(text, target){
function stateError(text){
target.parent()
.addClass("has-error")
.removeClass("has-success");
$("<p/>").addClass("text-danger")
.attr("id", "usernameerror")
.text(text)
.insertAfter(target);
$("#validate_username").text(text);
}
var target = $("#username");
var name = target.val();
$("#usernameerror").remove();
if (name === "") {
createError('Username must not be empty', target)
stateError('Username must not be empty')
return false;
} else if (!(/^[-\w\u00c0-\u00ff]{1,20}$/).test(name)) {
createError("Username must consist of 1-20 characters" +
" a-Z, A-Z, 0-9, -, or _.", target);
stateError("Username must consist of 1-20 characters" +
" a-Z, A-Z, 0-9, -, or _.");
return false;
} else {
target.parent().removeClass("has-error")
target.parent()
.removeClass("has-error")
.addClass("has-success");
$("#validate_username").text('');
}
}
function checkPasswords() {
function createError(text, target, id){
function stateError(text, target, validator){
target.parent()
.addClass("has-error")
.removeClass("has-success");
$("<p/>").addClass("text-danger")
.attr("id", id)
.text(text)
.insertAfter(target);
$(`#${validator}`).text(text);
}
var target = $("#password");
var target2 = $("#password_confirm");
var pw = target.val();
var pwc = target2.val();
$("#passwordempty").remove();
$("#passwordmismatch").remove();
$("#validate_password").text('');
$("#validate_confirm").text('');
if (pw === "") {
createError('Password must not be empty', target, 'passwordempty')
stateError('Password must not be empty', target, 'validate_password')
return false;
} else {
target.parent().removeClass("has-error")
target.parent()
.removeClass("has-error")
.addClass("has-success");
if (pw !== pwc) {
createError('Passwords do not match', target2, 'passwordmismatch')
stateError('Passwords do not match', target2, 'validate_confirm')
return false;
} else {
target2.parent()