INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

add "advanced" search functionality

Browse Source
This commit is contained in:
RaidMax
2023-01-23 16:38:16 -06:00
parent c961d4e953
commit 4c51d86fae
24 changed files with 771 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebfrontCore/Controllers/ActionController.cs
View File

@ -862,7 +862,6 @@ namespace WebfrontCore.Controllers
private Dictionary<string, string> GetPresetPenaltyReasons() => _appConfig.PresetPenaltyReasons.Values
.Concat(_appConfig.GlobalRules)
.Concat(_appConfig.Servers.SelectMany(server => server.Rules ?? Array.Empty<string>()))
.Distinct()
.Select((value, _) => new
{
Value = value
@ -872,6 +871,7 @@ namespace WebfrontCore.Controllers
{
Value = ""
})
.Distinct()
.ToDictionary(item => item.Value, item => item.Value);
}
}

18
WebfrontCore/Controllers/Client/ClientController.cs
View File

@ -15,6 +15,7 @@ using Data.Models;
using SharedLibraryCore.Services;
using Stats.Config;
using WebfrontCore.Permissions;
using WebfrontCore.QueryHelpers.Models;
using WebfrontCore.ViewComponents;
namespace WebfrontCore.Controllers
@ -26,15 +27,19 @@ namespace WebfrontCore.Controllers
private readonly IGeoLocationService _geoLocationService;
private readonly ClientService _clientService;
private readonly IInteractionRegistration _interactionRegistration;
private readonly IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse> _clientResourceHelper;
public ClientController(IManager manager, IMetaServiceV2 metaService, StatsConfiguration config,
IGeoLocationService geoLocationService, ClientService clientService, IInteractionRegistration interactionRegistration) : base(manager)
IGeoLocationService geoLocationService, ClientService clientService,
IInteractionRegistration interactionRegistration,
IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse> clientResourceHelper) : base(manager)
{
_metaService = metaService;
_config = config;
_geoLocationService = geoLocationService;
_clientService = clientService;
_interactionRegistration = interactionRegistration;
_clientResourceHelper = clientResourceHelper;
}
[Obsolete]
@ -241,6 +246,17 @@ namespace WebfrontCore.Controllers
return View("Find/Index", clientsDto);
}
public async Task<IActionResult> AdvancedFind(ClientResourceRequest request)
{
ViewBag.Title = Localization["WEBFRONT_SEARCH_RESULTS_TITLE"];
ViewBag.ClientResourceRequest = request;
var response = await _clientResourceHelper.QueryResource(request);
return request.Offset > 0
? PartialView("Find/_AdvancedFindList", response.Results)
: View("Find/AdvancedFind", response.Results);
}
public IActionResult Meta(int id, int count, int offset, long? startAt, MetaType? metaFilterType,
CancellationToken token)
{

3
WebfrontCore/Permissions/WebfrontEntity.cs
View File

@ -16,7 +16,8 @@ public enum WebfrontEntity
ProfilePage,
AdminMenu,
ClientNote,
Interaction
Interaction,
AdvancedSearch
}
public enum WebfrontPermission

19
WebfrontCore/QueryHelpers/Models/ClientResourceRequest.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using Data.Models;
using Data.Models.Client;
using SharedLibraryCore.QueryHelper;
namespace WebfrontCore.QueryHelpers.Models;
public class ClientResourceRequest : ClientPaginationRequest
{
public string ClientName { get; set; }
public bool IsExactClientName { get; set; }
public string ClientIp { get; set; }
public bool IsExactClientIp { get; set; }
public string ClientGuid { get; set; }
public DateTime? ClientConnected { get; set; }
public EFClient.Permission? ClientLevel { get; set; }
public Reference.Game? GameName { get; set; }
public bool IncludeGeolocationData { get; set; } = true;
}

22
WebfrontCore/QueryHelpers/Models/ClientResourceResponse.cs Normal file
View File

@ -0,0 +1,22 @@
using System;
using Data.Models;
using Data.Models.Client;
namespace WebfrontCore.QueryHelpers.Models;
public class ClientResourceResponse
{
public int ClientId { get; set; }
public int AliasId { get; set; }
public int LinkId { get; set; }
public string CurrentClientName { get; set; }
public string MatchedClientName { get; set; }
public int? CurrentClientIp { get; set; }
public int? MatchedClientIp { get; set; }
public string ClientCountryCode { get; set; }
public string ClientCountryDisplayName { get; set; }
public string ClientLevel { get; set; }
public EFClient.Permission ClientLevelValue { get; set; }
public DateTime LastConnection { get; set; }
public Reference.Game Game { get; set; }
}

3
WebfrontCore/Startup.cs
View File

@ -115,6 +115,9 @@ namespace WebfrontCore
services.AddSingleton<IResourceQueryHelper<FindClientRequest, FindClientResult>, ClientService>();
services.AddSingleton<IResourceQueryHelper<StatsInfoRequest, StatsInfoResult>, StatsResourceQueryHelper>();
services.AddSingleton<IResourceQueryHelper<StatsInfoRequest, AdvancedStatsInfo>, AdvancedClientStatsResourceQueryHelper>();
services.AddScoped(sp =>
Program.ApplicationServiceProvider
.GetRequiredService<IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>>());
services.AddSingleton(typeof(IDataValueCache<,>), typeof(DataValueCache<,>));
// todo: this needs to be handled more gracefully
services.AddSingleton(Program.ApplicationServiceProvider.GetRequiredService<DefaultSettings>());

39
WebfrontCore/Views/Client/Find/AdvancedFind.cshtml Normal file
View File

@ -0,0 +1,39 @@
@model IEnumerable<WebfrontCore.QueryHelpers.Models.ClientResourceResponse>
@{
var loc = Utilities.CurrentLocalization.LocalizationIndex;
}
<div class="content mt-0">
<h2 class="content-title mt-20">@loc["WEBFRONT_SEARCH_RESULTS_TITLE"]</h2>
<table class="table">
<thead>
<tr class="bg-primary text-light d-none d-md-table-row">
<td>@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_NAME_FULL"]</td>
<td>@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_IP"]</td>
<td>@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_COUNTRY"]</td>
<td>@loc["WEBFRONT_PROFILE_LEVEL"]</td>
<td>@loc["WEBFRONT_ADVANCED_SEARCH_LABEL_GAME"]</td>
<td class="text-right">@loc["WEBFRONT_SEARCH_LAST_CONNECTED"]</td>
</tr>
</thead>
<tbody id="searchResultContainer">
<partial name="Find/_AdvancedFindList" model="@Model"/>
</tbody>
</table>
<div class="text-center">
<i id="loaderLoad" class="oi oi-chevron-bottom loader-load-more text-primary" aria-hidden="true"></i>
</div>
</div>
@section scripts {
<script>
initLoader('/Client/AdvancedFind', '#searchResultContainer', 30, 30, () => {
return $('#advancedSearchDropdownContentFullDesktop').serializeArray()
|| $('#advancedSearchDropdownContentCompactDesktop').serializeArray()
|| $('#advancedSearchDropdownContentFullMobile').serializeArray()
|| $('#advancedSearchDropdownContentCompactMobile').serializeArray()
});
</script>
}

107
WebfrontCore/Views/Client/Find/_AdvancedFindContent.cshtml Normal file
View File

@ -0,0 +1,107 @@
@using WebfrontCore.QueryHelpers.Models
@using Microsoft.AspNetCore.Mvc.TagHelpers
@using WebfrontCore.Permissions
@using Data.Models.Client
@model WebfrontCore.QueryHelpers.Models.ClientResourceResponse
@{
var loc = Utilities.CurrentLocalization.LocalizationIndex;
var client = Model;
string FormatNameChange(ClientResourceResponse clientResponse)
{
return clientResponse.CurrentClientName.StripColors() != clientResponse.MatchedClientName?.StripColors()
? $"{clientResponse.CurrentClientName} [{clientResponse.MatchedClientName}{(clientResponse.MatchedClientIp is null && clientResponse.MatchedClientIp != clientResponse.CurrentClientIp ? "" : $"/{clientResponse.MatchedClientIp.ConvertIPtoString()}")}]"
: clientResponse.CurrentClientName;
}
var canSeeLevel = (ViewBag.PermissionsSet as IEnumerable<string>).HasPermission(WebfrontEntity.ClientLevel, WebfrontPermission.Read);
var canSeeIp = (ViewBag.PermissionsSet as IEnumerable<string>).HasPermission(WebfrontEntity.ClientIPAddress, WebfrontPermission.Read);
string ClassForLevel(EFClient.Permission permission) => !canSeeLevel ? "level-color-user" : $"level-color-{permission.ToString().ToLower()}";
string FormatIpForPermission(int? ip) => canSeeIp && ip is not null ? ip.ConvertIPtoString() : "-";
}
<tr class="bg-dark-dm bg-light-lm d-none d-md-table-row">
<td class="col-3">
<a asp-controller="Client" asp-action="Profile" asp-route-id="@client.ClientId">
<color-code value="@FormatNameChange(client)"></color-code>
</a>
</td>
<td class="col-2">
@FormatIpForPermission(client.CurrentClientIp)
</td>
<td class="col-2">
<div class="d-flex">
@if (string.IsNullOrEmpty(client.ClientCountryCode))
{
<div class="d-flex">
<i class="oi oi-question-mark ml-5 mr-20"></i>
<div class="font-size-12 font-weight-light">Unknown</div>
</div>
}
else
{
<img src="https://flagcdn.com/32x24/@(client.ClientCountryCode.ToLower()).png" class="mr-10 rounded align-self-center" alt="@client.ClientCountryDisplayName"/>
}
<div class="font-size-12 font-weight-light">@client.ClientCountryDisplayName</div>
</div>
</td>
<td class="col-2 @ClassForLevel(client.ClientLevelValue)">@(canSeeLevel ? client.ClientLevel : "-")</td>
<td>
<div data-toggle="tooltip" data-title="@ViewBag.Localization["GAME_" + client.Game]">
<span class="badge">@Utilities.MakeAbbreviation(ViewBag.Localization["GAME_" + client.Game])</span>
</div>
</td>
<td class="col-3">
<div class="float-right">
<div data-toggle="tooltip" data-title="@client.LastConnection.ToShortDateString()" data-placement="left">
<span class="text-muted">@client.LastConnection.HumanizeForCurrentCulture()</span>
</div>
</div>
</td>
</tr>
<tr class="d-flex d-block d-md-none">
<td class="bg-primary text-light w-half">
<div class="pb-5">@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_NAME"]</div>
<div class="pb-5">@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_ALIAS"]</div>
<div class="pb-5">@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_IP"]</div>
<div class="pb-5">@loc["WEBFRONT_ADVANCED_SEARCH_CONTENT_TABLE_COUNTRY"]</div>
<div class="pb-5">@loc["WEBFRONT_PROFILE_LEVEL"]</div>
<div class="pb-5">@loc["WEBFRONT_ADVANCED_SEARCH_LABEL_GAME"]</div>
<div class="pb-5">@loc["WEBFRONT_SEARCH_LAST_CONNECTED"]</div>
</td>
<td class="w-half bg-dark">
<div class="pb-5">
<a asp-controller="Client" asp-action="Profile" asp-route-id="@client.ClientId" class="no-decoration @ClassForLevel(client.ClientLevelValue)">
<color-code value="@client.CurrentClientName"></color-code>
</a>
</div>
<div class="pb-5">
<color-code value="@client.MatchedClientName"></color-code>
@if (client.MatchedClientIp != client.CurrentClientIp)
{
<span>/ @client.MatchedClientIp.ConvertIPtoString()</span>
}
</div>
<div class="text-muted pb-5">
@FormatIpForPermission(client.CurrentClientIp)
</div>
<div class="d-flex pb-5">
@if (string.IsNullOrEmpty(client.ClientCountryCode))
{
<div class="mr-5">Unknown</div>
}
else
{
<div class="mr-5">@client.ClientCountryDisplayName</div>
<img src="https://flagcdn.com/24x18/@(client.ClientCountryCode.ToLower()).png" class="rounded align-self-center" alt="@client.ClientCountryDisplayName"/>
}
</div>
<div class="pb-5 @ClassForLevel(client.ClientLevelValue)">@(canSeeLevel ? client.ClientLevel : "-")</div>
<div data-toggle="tooltip" data-title="@ViewBag.Localization["GAME_" + client.Game]">
<span class="badge font-size-12 mt-5 mb-5">@Utilities.MakeAbbreviation(ViewBag.Localization["GAME_" + client.Game])</span>
</div>
<div class="text-muted pb-5">@client.LastConnection.HumanizeForCurrentCulture()</div>
</td>
</tr>

6
WebfrontCore/Views/Client/Find/_AdvancedFindList.cshtml Normal file
View File

@ -0,0 +1,6 @@
@model IEnumerable<WebfrontCore.QueryHelpers.Models.ClientResourceResponse>
@foreach (var client in Model)
{
<partial name="Find/_AdvancedFindContent" model="@client"/>
}

125
WebfrontCore/Views/Shared/Partials/_SearchResourceFilter.cshtml Normal file
View File

@ -0,0 +1,125 @@
@using Data.Models.Client
@using SharedLibraryCore.Dtos
@using WebfrontCore.QueryHelpers.Models
@using Data.Models
@model string
@{
var existingClientFilter = ViewBag.ClientResourceRequest as ClientResourceRequest;
}
<h6 class="dropdown-header">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_TITLE"]</h6>
<div class="dropdown-divider"></div>
<div class="dropdown-content">
<form asp-controller="Client" asp-action="AdvancedFind" method="get" id="advancedSearchDropdownContent@(Model)" onsubmit="showLoader()">
<div class="form-group">
<label for="searchType@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_FOR"]</label>
<br/>
<select class="form-control" id="searchType@(Model)" name="searchType" disabled="disabled">
<option value="client">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_TYPE_PLAYERS"]</option>
</select>
</div>
<div class="form-group">
<label for="clientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_NAME"]</label>
<div class="d-flex">
<input type="text" class="form-control" name="clientName" id="clientName@(Model)"
placeholder="Unknown Soldier" value="@existingClientFilter?.ClientName"/>
<div class="custom-control ml-10 align-self-center">
<div class="custom-switch">
@if (existingClientFilter?.IsExactClientName ?? false)
{
<input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true"
checked="checked">
}
else
{
<input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true">
}
<label for="isExactClientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<label for="clientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_IP"]</label>
<div class="d-flex">
<input type="text" class="form-control" name="clientIP" id="clientIP@(Model)" placeholder="1.1.1.1"
value="@existingClientFilter?.ClientIp">
<div class="custom-control ml-10 align-self-center">
<div class="custom-switch">
@if (existingClientFilter?.IsExactClientIp ?? false)
{
<input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true"
checked="checked">
}
else
{
<input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true">
}
<label for="isExactClientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
</div>
</div>
</div>
</div>
<div class="form-group">
<label for="clientGuid@(Model)">GUID <span class="text-primary">&bull;</span> XUID <span class="text-primary">&bull;</span> NetworkID</label>
<input type="text" class="form-control" name="clientGuid" id="clientGuid@(Model)"
placeholder="110000100000001" value="@existingClientFilter?.ClientGuid"/>
</div>
<div class="form-group">
<label for="clientLevel@(Model)" class="w-half">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_PERMISSION"]</label>
<label for="clientGameName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_GAME"]</label>
<div class="d-flex">
<select class="form-control w-half" id="clientLevel@(Model)" name="clientLevel">
<option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
@foreach (EFClient.Permission permission in Enum.GetValues(typeof(EFClient.Permission)))
{
<option value="@((int)permission)" selected="@(permission == existingClientFilter?.ClientLevel)">
@permission.ToLocalizedLevelName()
</option>
}
</select>
<select class="form-control w-half ml-10" id="clientGameName@(Model)" name="gameName">
<option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
@foreach (Reference.Game game in Enum.GetValues(typeof(Reference.Game)))
{
<option value="@((int)game)" selected="@(game == existingClientFilter?.GameName)">
@ViewBag.Localization["GAME_" + game]
</option>
}
</select>
</div>
</div>
<div class="form-group">
<label for="clientConnected@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_CONNECTED_SINCE"]</label>
<div class="d-flex">
@{ var oneYearAgo = DateTime.UtcNow.AddYears(-1).ToShortDateString(); }
<input type="text" class="form-control date-picker-input w-half" name="clientConnected"
id="clientConnected@(Model)" data-date="@oneYearAgo"
value="@(existingClientFilter?.ClientConnected?.ToShortDateString() ?? oneYearAgo)"/>
<div class="custom-control ml-10 align-self-center">
<div class="custom-switch">
@if (existingClientFilter?.Direction is SortDirection.Descending)
{
<input type="checkbox" id="resultOrder@(Model)" name="direction"
value="@((int)SortDirection.Ascending)">
}
else
{
<input type="checkbox" id="resultOrder@(Model)" name="direction"
value="@((int)SortDirection.Ascending)" checked="checked">
}
<label for="resultOrder@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_OLDEST_FIRST"]</label>
</div>
</div>
</div>
</div>
<input type="submit" class="btn btn-primary" value="@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_BUTTON_SUBMIT"]"/>
</form>
</div>

3
WebfrontCore/Views/Shared/_Layout.cshtml
View File

@ -126,7 +126,7 @@
<i class="oi oi-moon"></i>
</div>
<div class="d-none d-md-block ">
<partial name="_SearchResourceForm"/>
<partial name="_SearchResourceForm" model="@("Full")"/>
</div>
<div class="d-flex d-lg-none">
<a href="#" onclick="halfmoon.toggleModal('contextMenuModal')">
@ -158,6 +158,7 @@
<script type="text/javascript" src="~/lib/moment-timezone/moment-timezone.js"></script>
<script type="text/javascript" src="~/lib/chart.js/dist/Chart.bundle.min.js"></script>
<script type="text/javascript" src="~/lib/halfmoon/js/halfmoon.js"></script>
<script type="text/javascript" src="~/lib/vanillajs-datepicker/dist/js/datepicker.js"></script>
<script type="text/javascript" src="~/js/action.js"></script>
<script type="text/javascript" src="~/js/loader.js"></script>
<script type="text/javascript" src="~/js/search.js"></script>

2
WebfrontCore/Views/Shared/_LeftNavBar.cshtml
View File

@ -9,7 +9,7 @@
<div class="sidebar-menu list">
<div class="sidebar-content m-0">
<div class="pr-20 pl-20 mb-20 d-block d-lg-none">
<partial name="_SearchResourceForm"/>
<partial name="_SearchResourceForm" model="@("Compact")"/>
</div>
<span class="sidebar-title">@ViewBag.Localization["WEBFRONT_NAV_TITLE_MAIN"]</span>
<div class="sidebar-divider"></div>

38
WebfrontCore/Views/Shared/_SearchResourceForm.cshtml
View File

@ -1,12 +1,40 @@
<form class="form-inline ml-auto" method="get" asp-controller="Client" asp-action="Find">
@model string
<div class="ml-auto d-inline-flex w-full">
<div class="input-group">
<input id="client_search_mobile" name="clientName" class="form-control" type="text" placeholder="@ViewBag.Localization["WEBFRONT_NAV_SEARCH"]" required="required"/>
<has-permission entity="AdvancedSearch" required-permission="Read">
<div class="input-group-prepend dropdown with-arrow d-block d-md-none">
<button class="btn" type="button" data-toggle="dropdown">
<i class="oi oi-chevron-bottom"></i>
</button>
<div class="dropdown-menu w-300">
<partial name="Partials/_SearchResourceFilter" model="@(Model + "Mobile")"/>
</div>
</div>
</has-permission>
<form asp-controller="Client" asp-action="AdvancedFind" method="get" asp-route-isLegacyQuery="true"
id="basicSearchForm@(Model)" class="flex-fill">
<input name="clientName" class="form-control" type="text"
placeholder="@ViewBag.Localization["WEBFRONT_NAV_SEARCH"]" required="required"/>
</form>
<has-permission entity="AdvancedSearch" required-permission="Read">
<div class="input-group-append dropdown dropleft with-arrow d-md-block d-none">
<button class="btn" type="button" data-toggle="dropdown">
<i class="oi oi-chevron-bottom"></i>
</button>
<div class="dropdown-menu w-400">
<partial name="Partials/_SearchResourceFilter" model="@(Model + "Desktop")"/>
</div>
</div>
</has-permission>
<div class="input-group-append">
<button class="btn" type="submit">
<button class="btn" form="basicSearchForm@(Model)" type="submit">
<i class="oi oi-magnifying-glass"></i>
</button>
</div>
</div>
</div>
<br/>
</form>
</div>

1
WebfrontCore/bundleconfig.json
View File

@ -17,6 +17,7 @@
"wwwroot/lib/chart.js/dist/Chart.bundle.min.js",
"wwwroot/lib/halfmoon/js/halfmoon.min.js",
"wwwroot/lib/canvas.js/canvasjs.js",
"wwwroot/lib/vanillajs-datepicker/dist/js/datepicker.min.js",
"wwwroot/js/action.js",
"wwwroot/js/console.js",
"wwwroot/js/penalty.js",

4
WebfrontCore/libman.json
View File

@ -29,6 +29,10 @@
{
"library": "halfmoon@1.1.1",
"destination": "wwwroot/lib/halfmoon"
},
{
"library": "vanillajs-datepicker@1.2.0",
"destination": "wwwroot/lib/vanillajs-datepicker"
}
]
}

26
WebfrontCore/wwwroot/css/src/main.scss
View File

@ -1,5 +1,9 @@
@import 'profile.scss';
$dp-background-color: #191c20;
$dp-cell-focus-background-color: rgba(255, 255, 255, 0.05);
@import '../../lib/vanillajs-datepicker/sass/datepicker';
:root {
--blue-color: #117ac0;
@ -471,3 +475,25 @@ table.no-cell-divider td.first-row, table.no-cell-divider th.first-row {
table.no-cell-divider td.last-row, table.no-cell-divider th.last-row {
padding-bottom: 1.5rem;
}
.datepicker-picker {
padding: 1rem;
}
.view-switch {
margin: 0 1rem 0 1rem;
}
.datepicker-header {
margin-bottom: 1rem;
}
.datepicker-view .days {
margin: auto !important
}
@media (max-width: 768px) {
:root {
--sidebar-width: 90%;
}
}

26
WebfrontCore/wwwroot/js/loader.js
View File

@ -5,7 +5,7 @@ let startAt = null;
let isLoaderLoading = false;
let loadUri = '';
let loaderResponseId = '';
let additionalParams = [];
let additionalParams = undefined;
function initLoader(location, loaderId, count = 10, start = count, additional = []) {
loadUri = location;
@ -52,14 +52,23 @@ function loadMoreItems() {
showLoader();
isLoaderLoading = true;
let params = {offset: loaderOffset, count: loadCount, startAt: startAt};
for (let i = 0; i < additionalParams.length; i++) {
let param = additionalParams[i];
params[param.name] = param.value instanceof Function ? param.value() : param.value;
if (additionalParams instanceof Function) {
params = {
...params,
...flatParams(additionalParams())
}
} else {
for (let i = 0; i < additionalParams.length; i++) {
let param = additionalParams[i];
params[param.name] = param.value instanceof Function ? param.value() : param.value;
}
}
$.get(loadUri, params)
.done(function (response) {
$(loaderResponseId).append(response);
if (response.trim().length === 0) {
staleLoader();
loaderReachedEnd = true;
@ -82,3 +91,12 @@ function loadMoreItems() {
});
loaderOffset += loadCount;
}
function flatParams(params) {
return params.map(function (b) {
return {[b.name]: b.value}
}).reduce(function (prev, curr) {
for (const key in curr) prev[key] = curr[key];
return prev;
})
}

58
WebfrontCore/wwwroot/js/search.js
View File

@ -1,27 +1,35 @@
$(document).ready(function() {
$('.form-inline').submit(function(e) {
const id = $(e.currentTarget).find('input');
if ($(id).val().length < 3) {
e.preventDefault();
$(id)
.addClass('input-text-danger')
.delay(25)
.queue(function () {
$(this).addClass('input-border-transition').dequeue();
})
.delay(1000)
.queue(function () {
$(this).removeClass('input-text-danger').dequeue();
})
.delay(500)
.queue(function () {
$(this).removeClass('input-border-transition').dequeue();
});
}
$(document).ready(function () {
$('.form-inline').submit(function (e) {
const id = $(e.currentTarget).find('input');
if ($(id).val().length < 3) {
e.preventDefault();
$(id)
.addClass('input-text-danger')
.delay(25)
.queue(function () {
$(this).addClass('input-border-transition').dequeue();
})
.delay(1000)
.queue(function () {
$(this).removeClass('input-text-danger').dequeue();
})
.delay(500)
.queue(function () {
$(this).removeClass('input-border-transition').dequeue();
});
} else if ($(id).val().startsWith("chat|")) {
e.preventDefault();
window.location = "/Message/Find?query=" + $(id).val();
}
});
else if ($(id).val().startsWith("chat|")) {
e.preventDefault();
window.location = "/Message/Find?query=" + $(id).val();
}
});
$('.date-picker-input').each((index, selector) => {
new Datepicker(selector, {
buttonClass: 'btn',
format: 'yyyy-mm-dd',
nextArrow: '>',
prevArrow: '<',
orientation: 'auto top'
});
})
});