From 941ed7e1940e75e9a28428f54e0603e81d785184 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 13:45:40 -0400 Subject: [PATCH 1/7] user search in admin/users --- public/src/forum/admin/users.js | 16 ++++++---- public/templates/admin/index.tpl | 21 ++++++++++++- public/templates/admin/users.tpl | 51 +++++++++++++++++--------------- src/user.js | 27 +++++++---------- 4 files changed, 68 insertions(+), 47 deletions(-) diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 7906579950..c589ee4b34 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -3,6 +3,7 @@ jQuery('document').ready(function() { var yourid = templates.get('yourid'); + var timeoutId = 0; var url = window.location.href, parts = url.split('/'), @@ -17,14 +18,17 @@ }); jQuery('#search-user').on('keyup', function () { - console.log('derp'); - jQuery('.icon-spinner').removeClass('none'); - console.log($('#search-user').val()); - socket.emit('api:admin.user.search', $('#search-user').val()); - }); - + if(timeoutId !== 0) { + clearTimeout(timeoutId); + timeoutId = 0; + } + timeoutId = setTimeout(function() { + jQuery('.icon-spinner').removeClass('none'); + socket.emit('api:admin.user.search', $('#search-user').val()); + }, 250); + }); function isUserAdmin(element) { diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl index 7d1d74fce0..843a155ede 100644 --- a/public/templates/admin/index.tpl +++ b/public/templates/admin/index.tpl @@ -43,7 +43,26 @@ socket.emit('api:get_all_rooms'); socket.on('api:admin.user.search', function(data) { - console.log(data); + var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ + users: data + }), + userListEl = document.querySelector('.users'); + + userListEl.innerHTML = html; + jQuery('.icon-spinner').addClass('none'); + + if(data && data.length === 0) { + $('#user-notfound-notify').html('User not found!') + .show() + .addClass('label-important') + .removeClass('label-success'); + } + else + $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') + .show() + .addClass('label-success') + .removeClass('label-important'); + }); \ No newline at end of file diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl index bac6328897..1f9bc8af8a 100644 --- a/public/templates/admin/users.tpl +++ b/public/templates/admin/users.tpl @@ -11,33 +11,36 @@

+ User not found!
- -
- - - -
- {users.username} -
-
- {users.reputation} - +
- + + diff --git a/src/user.js b/src/user.js index 2d26c535cd..9f095c6af2 100644 --- a/src/user.js +++ b/src/user.js @@ -255,22 +255,17 @@ var utils = require('./../public/src/utils.js'), User.search = function(username, callback) { console.log('searching '+username); - RDB.keys('username:'+ username + '*:uid', function(err, keys) { + RDB.keys('username:*'+ username + '*:uid', function(err, keys) { if(err === null) { - //console.log(data); - - /*var keys = []; - for(var i=0, ii=data.length; i Date: Wed, 26 Jun 2013 13:46:04 -0400 Subject: [PATCH 2/7] user search in admin/users --- src/user.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/user.js b/src/user.js index 9f095c6af2..8a89fa604f 100644 --- a/src/user.js +++ b/src/user.js @@ -254,7 +254,6 @@ var utils = require('./../public/src/utils.js'), } User.search = function(username, callback) { - console.log('searching '+username); RDB.keys('username:*'+ username + '*:uid', function(err, keys) { if(err === null) { if(keys && keys.length) { From 7a478637e3298237ba00c2756ebdfe257c601cc9 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 13:54:04 -0400 Subject: [PATCH 3/7] added forum link to /admin header --- public/templates/admin/header.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index 21ef16da22..c05d2e7ff8 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -38,6 +38,9 @@
    +
  • + Forum +
  • Home
    • From a59fdcbf6a52f539c4e6b6de19b59b59b0bda8bf Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 14:57:20 -0400 Subject: [PATCH 4/7] for andrew --- public/src/forum/admin/users.js | 154 ++++++++++++++++--------------- public/templates/admin/index.tpl | 7 +- 2 files changed, 86 insertions(+), 75 deletions(-) diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index c589ee4b34..7451f883af 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -1,4 +1,83 @@ + + +function initUsers() { + + + function isUserAdmin(element) { + var parent = $(element).parents('.users-box'); + return (parent.attr('data-admin') !== "0"); + } + + function getUID(element) { + var parent = $(element).parents('.users-box'); + return parent.attr('data-uid'); + } + + jQuery('.admin-btn').each(function(index, element) { + var adminBtn = $(element); + var isAdmin = isUserAdmin(adminBtn); + + if(isAdmin) + adminBtn.addClass('btn-success'); + else + adminBtn.removeClass('btn-success'); + + }); + + jQuery('.delete-btn').each(function(index, element) { + var deleteBtn = $(element); + var isAdmin = isUserAdmin(deleteBtn); + + if(isAdmin) + deleteBtn.addClass('disabled'); + else + deleteBtn.show(); + }); + + jQuery('.admin-btn').on('click', function() { + var adminBtn = $(this); + var isAdmin = isUserAdmin(adminBtn); + var parent = adminBtn.parents('.users-box'); + var uid = getUID(adminBtn); + + if(isAdmin) { + socket.emit('api:admin.user.removeAdmin', uid); + adminBtn.removeClass('btn-success'); + parent.find('.delete-btn').removeClass('disabled'); + parent.attr('data-admin', 0); + } + else { + bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) { + if(confirm) { + socket.emit('api:admin.user.makeAdmin', uid); + adminBtn.addClass('btn-success'); + parent.find('.delete-btn').addClass('disabled'); + parent.attr('data-admin', 1); + } + }); + } + + return false; + }); + + jQuery('.delete-btn').on('click', function() { + var deleteBtn = $(this); + var isAdmin = isUserAdmin(deleteBtn); + var parent = deleteBtn.parents('.users-box'); + var uid = getUID(deleteBtn); + + if(!isAdmin) { + bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) { + socket.emit('api:admin.user.deleteUser', uid); + }); + } + + return false; + }); +} + + (function() { jQuery('document').ready(function() { @@ -23,85 +102,14 @@ timeoutId = 0; } - timeoutId = setTimeout(function() { jQuery('.icon-spinner').removeClass('none'); socket.emit('api:admin.user.search', $('#search-user').val()); }, 250); }); - - function isUserAdmin(element) { - var parent = $(element).parents('.users-box'); - return (parent.attr('data-admin') !== "0"); - } - - function getUID(element) { - var parent = $(element).parents('.users-box'); - return parent.attr('data-uid'); - } - - jQuery('.admin-btn').each(function(index, element) { - var adminBtn = $(element); - var isAdmin = isUserAdmin(adminBtn); - - if(isAdmin) - adminBtn.addClass('btn-success'); - else - adminBtn.removeClass('btn-success'); - - }); - - jQuery('.delete-btn').each(function(index, element) { - var deleteBtn = $(element); - var isAdmin = isUserAdmin(deleteBtn); - - if(isAdmin) - deleteBtn.addClass('disabled'); - else - deleteBtn.show(); - }); - - jQuery('.admin-btn').on('click', function() { - var adminBtn = $(this); - var isAdmin = isUserAdmin(adminBtn); - var parent = adminBtn.parents('.users-box'); - var uid = getUID(adminBtn); - - if(isAdmin) { - socket.emit('api:admin.user.removeAdmin', uid); - adminBtn.removeClass('btn-success'); - parent.find('.delete-btn').removeClass('disabled'); - parent.attr('data-admin', 0); - } - else { - bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) { - if(confirm) { - socket.emit('api:admin.user.makeAdmin', uid); - adminBtn.addClass('btn-success'); - parent.find('.delete-btn').addClass('disabled'); - parent.attr('data-admin', 1); - } - }); - } - - return false; - }); - - jQuery('.delete-btn').on('click', function() { - var deleteBtn = $(this); - var isAdmin = isUserAdmin(deleteBtn); - var parent = deleteBtn.parents('.users-box'); - var uid = getUID(deleteBtn); - - if(!isAdmin) { - bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) { - socket.emit('api:admin.user.deleteUser', uid); - }); - } - - return false; - }); + initUsers(); + }); diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl index 843a155ede..c33b5bda4a 100644 --- a/public/templates/admin/index.tpl +++ b/public/templates/admin/index.tpl @@ -43,6 +43,7 @@ socket.emit('api:get_all_rooms'); socket.on('api:admin.user.search', function(data) { + console.log('move this into user.js but it should execute only once'); var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ users: data }), @@ -57,12 +58,14 @@ .addClass('label-important') .removeClass('label-success'); } - else + else { $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') .show() .addClass('label-success') .removeClass('label-important'); - + } + + user.initUsers(); }); \ No newline at end of file From cde765b17d9a07117a92a1587e185d3d88c7a0e2 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 15:19:18 -0400 Subject: [PATCH 5/7] remove socket listeners in admin/users/search --- public/src/forum/admin/users.js | 168 ++++++++++++++++++------------- public/templates/admin/index.tpl | 26 +---- src/user.js | 5 + 3 files changed, 104 insertions(+), 95 deletions(-) diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 7451f883af..37204dfbec 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -1,84 +1,82 @@ +(function() { + function initUsers() { -function initUsers() { - - - function isUserAdmin(element) { - var parent = $(element).parents('.users-box'); - return (parent.attr('data-admin') !== "0"); - } + function isUserAdmin(element) { + var parent = $(element).parents('.users-box'); + return (parent.attr('data-admin') !== "0"); + } - function getUID(element) { - var parent = $(element).parents('.users-box'); - return parent.attr('data-uid'); - } + function getUID(element) { + var parent = $(element).parents('.users-box'); + return parent.attr('data-uid'); + } - jQuery('.admin-btn').each(function(index, element) { - var adminBtn = $(element); - var isAdmin = isUserAdmin(adminBtn); - - if(isAdmin) - adminBtn.addClass('btn-success'); - else - adminBtn.removeClass('btn-success'); + jQuery('.admin-btn').each(function(index, element) { + var adminBtn = $(element); + var isAdmin = isUserAdmin(adminBtn); + + if(isAdmin) + adminBtn.addClass('btn-success'); + else + adminBtn.removeClass('btn-success'); - }); + }); - jQuery('.delete-btn').each(function(index, element) { - var deleteBtn = $(element); - var isAdmin = isUserAdmin(deleteBtn); - - if(isAdmin) - deleteBtn.addClass('disabled'); - else - deleteBtn.show(); - }); + jQuery('.delete-btn').each(function(index, element) { + var deleteBtn = $(element); + var isAdmin = isUserAdmin(deleteBtn); + + if(isAdmin) + deleteBtn.addClass('disabled'); + else + deleteBtn.show(); + }); - jQuery('.admin-btn').on('click', function() { - var adminBtn = $(this); - var isAdmin = isUserAdmin(adminBtn); - var parent = adminBtn.parents('.users-box'); - var uid = getUID(adminBtn); - - if(isAdmin) { - socket.emit('api:admin.user.removeAdmin', uid); - adminBtn.removeClass('btn-success'); - parent.find('.delete-btn').removeClass('disabled'); - parent.attr('data-admin', 0); - } - else { - bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) { - if(confirm) { - socket.emit('api:admin.user.makeAdmin', uid); - adminBtn.addClass('btn-success'); - parent.find('.delete-btn').addClass('disabled'); - parent.attr('data-admin', 1); - } - }); - } - - return false; - }); + jQuery('.admin-btn').on('click', function() { + var adminBtn = $(this); + var isAdmin = isUserAdmin(adminBtn); + var parent = adminBtn.parents('.users-box'); + var uid = getUID(adminBtn); + + if(isAdmin) { + socket.emit('api:admin.user.removeAdmin', uid); + adminBtn.removeClass('btn-success'); + parent.find('.delete-btn').removeClass('disabled'); + parent.attr('data-admin', 0); + } + else { + bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) { + if(confirm) { + socket.emit('api:admin.user.makeAdmin', uid); + adminBtn.addClass('btn-success'); + parent.find('.delete-btn').addClass('disabled'); + parent.attr('data-admin', 1); + } + }); + } + + return false; + }); - jQuery('.delete-btn').on('click', function() { - var deleteBtn = $(this); - var isAdmin = isUserAdmin(deleteBtn); - var parent = deleteBtn.parents('.users-box'); - var uid = getUID(deleteBtn); + jQuery('.delete-btn').on('click', function() { + var deleteBtn = $(this); + var isAdmin = isUserAdmin(deleteBtn); + var parent = deleteBtn.parents('.users-box'); + var uid = getUID(deleteBtn); - if(!isAdmin) { - bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) { - socket.emit('api:admin.user.deleteUser', uid); - }); - } - - return false; - }); -} + if(!isAdmin) { + bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) { + socket.emit('api:admin.user.deleteUser', uid); + }); + } + + return false; + }); + } -(function() { jQuery('document').ready(function() { var yourid = templates.get('yourid'); @@ -103,13 +101,43 @@ function initUsers() { } timeoutId = setTimeout(function() { + var username = $('#search-user').val(); + jQuery('.icon-spinner').removeClass('none'); - socket.emit('api:admin.user.search', $('#search-user').val()); + socket.emit('api:admin.user.search', username); + }, 250); }); initUsers(); + socket.removeAllListeners('api:admin.user.search'); + + socket.on('api:admin.user.search', function(data) { + + var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ + users: data + }), + userListEl = document.querySelector('.users'); + + userListEl.innerHTML = html; + jQuery('.icon-spinner').addClass('none'); + + if(data && data.length === 0) { + $('#user-notfound-notify').html('User not found!') + .show() + .addClass('label-important') + .removeClass('label-success'); + } + else { + $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') + .show() + .addClass('label-success') + .removeClass('label-important'); + } + + initUsers(); + }); }); diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl index c33b5bda4a..788ae1746b 100644 --- a/public/templates/admin/index.tpl +++ b/public/templates/admin/index.tpl @@ -42,30 +42,6 @@ app.enter_room('admin'); socket.emit('api:get_all_rooms'); - socket.on('api:admin.user.search', function(data) { - console.log('move this into user.js but it should execute only once'); - var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ - users: data - }), - userListEl = document.querySelector('.users'); - - userListEl.innerHTML = html; - jQuery('.icon-spinner').addClass('none'); - - if(data && data.length === 0) { - $('#user-notfound-notify').html('User not found!') - .show() - .addClass('label-important') - .removeClass('label-success'); - } - else { - $('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!') - .show() - .addClass('label-success') - .removeClass('label-important'); - } - - user.initUsers(); - }); + \ No newline at end of file diff --git a/src/user.js b/src/user.js index 8a89fa604f..ae5862e2d3 100644 --- a/src/user.js +++ b/src/user.js @@ -254,6 +254,11 @@ var utils = require('./../public/src/utils.js'), } User.search = function(username, callback) { + if(!username) { + callback([]); + return; + } + RDB.keys('username:*'+ username + '*:uid', function(err, keys) { if(err === null) { if(keys && keys.length) { From 04947184568225f1f9a5e8bc1e84d3126d51752d Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 15:33:20 -0400 Subject: [PATCH 6/7] added the form back for login --- public/templates/login.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/login.tpl b/public/templates/login.tpl index 6f20aa4923..4cf156f7a6 100644 --- a/public/templates/login.tpl +++ b/public/templates/login.tpl @@ -7,12 +7,12 @@ Failed Login Attempt

-
+


  Forgot Password? -
+ Invalid username/password
From 07ceabd371853de79c1153bd34b8c55ceeaa5856 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 26 Jun 2013 15:55:17 -0400 Subject: [PATCH 7/7] added space after reps in topic.tpl and topic.js --- public/src/forum/topic.js | 4 ++-- public/templates/topic.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 3e65275d77..5f22e626d2 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -427,8 +427,8 @@ ptotal += value; utotal += value; - post_rep.html(ptotal); - user_rep.html(utotal); + post_rep.html(ptotal+ ' '); + user_rep.html(utotal+ ' '); } diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index d8f054928b..2a9b880353 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -79,7 +79,7 @@
-
{posts.post_rep}
+
{posts.post_rep}
posted by {posts.username} {posts.relativeTime} ago