Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Client search #303

Merged
merged 15 commits into from
Feb 16, 2023
Merged

Client search #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
df10417
User management
armisss4 Dec 29, 2022
4b5057e
Security fixes
armisss4 Dec 29, 2022
4cc79da
Merge pull request #1 from armisss4/develop
armisss4 Dec 29, 2022
93731c3
User control patch
armisss4 Dec 30, 2022
f8a1041
Merge pull request #2 from armisss4/User-control-patch
armisss4 Dec 30, 2022
b6eb046
Revert "User control patch"
armisss4 Jan 4, 2023
b06eb96
Merge pull request #5 from armisss4/revert-2-User-control-patch
armisss4 Jan 4, 2023
43148ce
Revert "Merge from development branch"
armisss4 Jan 4, 2023
fdb36e4
Merge pull request #6 from armisss4/revert-1-develop
armisss4 Jan 4, 2023
705e49b
Return client search input field
armisss4 Jan 16, 2023
34415d1
Add search functionality
armisss4 Jan 16, 2023
aef2697
Client search
armisss4 Jan 16, 2023
e483e2d
Client search
armisss4 Jan 16, 2023
e67f377
Clients search
armisss4 Jan 16, 2023
12df100
Client search initial commit
armisss4 Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
</ul>

<!-- SEARCH FORM -->
<!-- <form class="form-inline ml-3">-->
<!-- <div class="input-group input-group-sm">-->
<!-- <input class="form-control form-control-navbar" type="search" placeholder="Search"-->
<!-- aria-label="Search">-->
<!-- <div class="input-group-append">-->
<!-- <button class="btn btn-navbar" type="submit">-->
<!-- <i class="fas fa-search"></i>-->
<!-- </button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<form class="form-inline ml-3" style="display: none" id="search-form">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" placeholder="Search"
aria-label="Search" id="search-input">
<div class="input-group-append">
<button class="btn-navbar" type="submit" disabled>
<i class="fas fa-search"></i>
</button>
</div>
</div>
</form>

<!-- Right navbar links -->
<div class="navbar-nav ml-auto">
Expand Down
22 changes: 22 additions & 0 deletions templates/clients.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,28 @@ <h4 class="modal-title">Remove</h4>
populateClientList();
})

// show search bar and override :contains to be case-insensitive
$(document).ready(function () {
$("#search-form").show();
jQuery.expr[':'].contains = function(a, i, m) {
return jQuery(a).text().toUpperCase()
.indexOf(m[3].toUpperCase()) >= 0;
};
})

// hide all clients and display only the ones that meet the search criteria (name, email, IP)
$('#search-input').keyup(function () {
var query = $(this).val();
$('.col-lg-4').hide();
$(".info-box-text").each(function() {
if($(this).children('i.fa-user').length > 0 || $(this).children('i.fa-envelope').length > 0)
{
$(this).filter(':contains("' + query + '")').parent().parent().parent().show();
}
})
$(".badge-secondary").filter(':contains("' + query + '")').parent().parent().parent().show();
})

// modal_pause_client modal event
$("#modal_pause_client").on('show.bs.modal', function (event) {
const button = $(event.relatedTarget);
Expand Down