diff --git a/HuntStats/App.xaml.cs b/HuntStats/App.xaml.cs index 16fcd5b..32be118 100644 --- a/HuntStats/App.xaml.cs +++ b/HuntStats/App.xaml.cs @@ -16,7 +16,7 @@ protected override Window CreateWindow(IActivationState activationState) var window = base.CreateWindow(activationState); if (window != null) { - window.Title = "HüntStäts"; + window.Title = "HüntStäts by Zaxiure"; } return window; diff --git a/HuntStats/Components/Dropdown.razor b/HuntStats/Components/Dropdown.razor index 4b4dadf..56191d7 100644 --- a/HuntStats/Components/Dropdown.razor +++ b/HuntStats/Components/Dropdown.razor @@ -12,7 +12,8 @@ } } -
+ +
@{ if (DropdownContent != null) { @@ -23,14 +24,20 @@
@code { - [Parameter] - public string? Class { get; set; } - [Parameter] public RenderFragment? DropdownClickable { get; set; } [Parameter] public RenderFragment? DropdownContent { get; set; } + + [Parameter] + public bool RemoveMargin { get; set; } + + [Parameter] + public bool AlternateStyle { get; set; } + + [Parameter] + public EventCallback DropdownOpened { get; set; } = new EventCallback(); private ElementReference _clickWrapper; private ElementReference _dropdownElement; @@ -49,19 +56,22 @@ return returnClass; } - private void toggleDropdown() + private async Task toggleDropdown() { _dropdownOpened = !_dropdownOpened; - if(_dropdownOpened) _appstate.OpenedDropdown(_uniqueId); + if(_dropdownOpened) + { + _appstate.OpenedDropdown(_uniqueId); + await DropdownOpened.InvokeAsync(); + }; + } protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { - await Task.Delay(500); - await JS.InvokeAsync("createDropdown", _clickWrapper, _dropdownElement); - + await JS.InvokeVoidAsync("createDropdown", _clickWrapper, _dropdownElement); _stopAnimation = true; _initialized = true; StateHasChanged(); diff --git a/HuntStats/Components/DropdownSelect.razor b/HuntStats/Components/DropdownSelect.razor new file mode 100644 index 0000000..7e8d0c5 --- /dev/null +++ b/HuntStats/Components/DropdownSelect.razor @@ -0,0 +1,116 @@ +@using HuntStats.State +@typeparam TValue +@inject AppState AppState + + + + + + @if (SearchDisabled == null || SearchDisabled == false) + { +
+ +
+ } +
+
    + @if (searchedList != null) + { + @foreach (var item in searchedList) + { + @if (item.Color == null) + { +
  • + @(item.SecondaryVariable == null ? item.Variable : item.Variable + " - " + item.SecondaryVariable) +
    • + } + else + { +
  • +
    + + @(item.SecondaryVariable == null ? item.Variable : item.Variable + " - " + item.SecondaryVariable) + +
    • + } + } + } +
+
+ + + +@code { + [Parameter] + public TValue? Value { get; set; } + + [Parameter] + public EventCallback ValueChanged { get; set; } + + [Parameter] + public List ListItems { get; set; } + + [Parameter] + public bool SearchDisabled { get; set; } + + private ElementReference _searchInput; + + private List searchedList; + + private string? _searchValue; + + public string GetInputText() + { + if (Value != null) + { + if (ListItems.FirstOrDefault(x => Nullable.Equals(x.Id, Value)) == null) return "Select..."; + return ListItems.FirstOrDefault(x => Nullable.Equals(x.Id, Value))!.Variable; + } + + return "Select..."; + } + + public async Task FocusSearchInput() + { + if (!SearchDisabled) + { + await Task.Delay(100); + await _searchInput.FocusAsync(); + } + } + + public void SetSearchedList(ChangeEventArgs args) + { + _searchValue = args.Value.ToString(); + if (string.IsNullOrEmpty(_searchValue)) + { + searchedList = ListItems; + } + else + { + searchedList = ListItems.Where(x => x.Variable.ToLower().Contains(_searchValue.ToLower())).ToList(); + } + StateHasChanged(); + } + + public void SelectItem(ListItem item) + { + AppState.CloseOpenedDropdown(); + Value = item.Id; + ValueChanged.InvokeAsync(Value); + StateHasChanged(); + } + + protected override async Task OnInitializedAsync() + { + searchedList = ListItems; + } + + public class ListItem + { + public TValue Id { get; set; } + public string Variable { get; set; } + public string? SecondaryVariable { get; set; } + public string? Color { get; set; } + } +} \ No newline at end of file diff --git a/HuntStats/Components/Tooltip.razor b/HuntStats/Components/Tooltip.razor new file mode 100644 index 0000000..20d25ca --- /dev/null +++ b/HuntStats/Components/Tooltip.razor @@ -0,0 +1,9 @@ +
+ @Text + @ChildContent +
+ +@code { + [Parameter] public RenderFragment ChildContent { get; set; } + [Parameter] public string Text { get; set; } +} \ No newline at end of file diff --git a/HuntStats/Data/WeatherForecast.cs b/HuntStats/Data/WeatherForecast.cs deleted file mode 100644 index b9f2359..0000000 --- a/HuntStats/Data/WeatherForecast.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace HuntStats.Data; - -public class WeatherForecast -{ - public DateTime Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string Summary { get; set; } -} diff --git a/HuntStats/Data/WeatherForecastService.cs b/HuntStats/Data/WeatherForecastService.cs deleted file mode 100644 index 23846c5..0000000 --- a/HuntStats/Data/WeatherForecastService.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace HuntStats.Data; - -public class WeatherForecastService -{ - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - public Task GetForecastAsync(DateTime startDate) - { - return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }).ToArray()); - } -} - diff --git a/HuntStats/Extensions/GeneralExtensions.cs b/HuntStats/Extensions/GeneralExtensions.cs new file mode 100644 index 0000000..fa47dcd --- /dev/null +++ b/HuntStats/Extensions/GeneralExtensions.cs @@ -0,0 +1,34 @@ +namespace HuntStats.Extensions; + +public static class GeneralExtensions +{ + public static int ToStarRating(this int value) + { + if (value >= 0 && value < 2000) + { + return 1; + } + + if (value >= 2000 && value < 2300) + { + return 2; + } + + if (value >= 2300 && value < 2600) + { + return 3; + } + + if (value >= 2600 && value < 2750) + { + return 4; + } + + if (value >= 2750 && value < 3000) + { + return 5; + } + + return 6; + } +} \ No newline at end of file diff --git a/HuntStats/Features/ChartHandler.cs b/HuntStats/Features/ChartHandler.cs new file mode 100644 index 0000000..cc15988 --- /dev/null +++ b/HuntStats/Features/ChartHandler.cs @@ -0,0 +1,113 @@ +using HuntStats.Data; +using MediatR; + +namespace HuntStats.Features; + +public class MmrChartQuery : IRequest> +{ + public MmrChartQuery(int amount) + { + Amount = amount; + } + + public int Amount { get; set; } +} + +public class MmrChartQueryHandler : IRequestHandler> +{ + private readonly IDbConnectionFactory _connectionFactory; + private readonly IMediator _mediator; + + public MmrChartQueryHandler(IDbConnectionFactory connectionFactory, IMediator mediator) + { + _connectionFactory = connectionFactory; + _mediator = mediator; + } + + public async Task> Handle(MmrChartQuery request, CancellationToken cancellationToken) + { + var Matches = await _mediator.Send(new GetMatchCommand()); + var Settings = await _mediator.Send(new GetSettingsCommand()); + Matches = Matches.OrderByDescending(x => x.DateTime).Take(request.Amount).ToList(); + + return Matches.Select(x => + { + var team = x.Teams.FirstOrDefault(x => x.Players.FirstOrDefault(y => y.ProfileId == Settings.PlayerProfileId) != null); + if (team != null) + { + var totalMmr = x.Teams.Select(x => x.Players.Select(x => x.Mmr).Sum() / x.Players.Count()).Sum() / x.Teams.Count; + var mmr = team.Players.FirstOrDefault(y => y.ProfileId == Settings.PlayerProfileId).Mmr; + return new ChartInfo + { + DateTime = x.DateTime, + TotalMmr = totalMmr, + Mmr = mmr + }; + } + return null; + }).Where(x => x != null).OrderBy(x => x.DateTime).ToList(); + } +} + +public class KillChartQuery : IRequest> +{ + public KillChartQuery(int amount) + { + Amount = amount; + } + + public int Amount { get; set; } +} + +public class KillChartQueryHandler : IRequestHandler> +{ + private readonly IDbConnectionFactory _connectionFactory; + private readonly IMediator _mediator; + + public KillChartQueryHandler(IDbConnectionFactory connectionFactory, IMediator mediator) + { + _connectionFactory = connectionFactory; + _mediator = mediator; + } + + public async Task> Handle(KillChartQuery request, CancellationToken cancellationToken) + { + var Matches = await _mediator.Send(new GetMatchCommand()); + var Settings = await _mediator.Send(new GetSettingsCommand()); + Matches = Matches.OrderByDescending(x => x.DateTime).Take(request.Amount).ToList(); + + return Matches.Select(x => + { + var team = x.Teams.FirstOrDefault(x => x.Players.FirstOrDefault(y => y.ProfileId == Settings.PlayerProfileId) != null); + if (team != null) + { + var Kills = x.Teams.Select(x => x.Players.Select(y => y.KilledByMe + y.DownedByMe + y.KilledByTeammate + y.DownedByTeammate).Sum()).Sum(); + var YourKills = x.Teams.Select(x => x.Players.Select(y => y.KilledByMe + y.DownedByMe).Sum()).Sum(); + var Deaths = x.Teams.Select(x => x.Players.Select(y => y.KilledMe + y.DownedMe).Sum()).Sum(); + return new KillChartInfo + { + DateTime = x.DateTime, + YourKills = YourKills, + Deaths = Deaths, + Kills = Kills, + }; + } + return null; + }).Where(x => x != null).OrderBy(x => x.DateTime).ToList(); + } +} + +public class ChartInfo +{ + public DateTime DateTime { get; set; } + public int TotalMmr { get; set; } + public int Mmr { get; set; } +} + +public class KillChartInfo +{ + public DateTime DateTime { get; set; } + public int Kills { get; set; } + public int YourKills { get; set; } + public int Deaths { get; set; } +} \ No newline at end of file diff --git a/HuntStats/Features/MatchHandler.cs b/HuntStats/Features/MatchHandler.cs index 7d94b0b..076bcdd 100644 --- a/HuntStats/Features/MatchHandler.cs +++ b/HuntStats/Features/MatchHandler.cs @@ -1,5 +1,4 @@ using System.Text.RegularExpressions; -using ConsoleApp1.Models; using Dommel; using HuntStats.Data; using HuntStats.Models; @@ -82,7 +81,7 @@ public async Task> Handle(GetAccoladesByMatchIdCommand request, C public class GetMatchCommand : IRequest> { - + public OrderType OrderType { get; set; } = OrderType.Descending; } public class GetMatchCommandHandler : IRequestHandler> @@ -122,7 +121,9 @@ public async Task> Handle(GetMatchCommand request, CancellationT return huntMatch; }).Select(x => x.Result); - - return mappedHuntMatch.ToList(); + + if(request.OrderType == OrderType.Descending) return mappedHuntMatch.OrderByDescending(x => x.DateTime).ToList(); + if(request.OrderType == OrderType.Ascending) return mappedHuntMatch.OrderBy(x => x.DateTime).ToList(); + return null; } } \ No newline at end of file diff --git a/HuntStats/Features/XmlFileHandler.cs b/HuntStats/Features/XmlFileHandler.cs index ff09bd9..759eb6a 100644 --- a/HuntStats/Features/XmlFileHandler.cs +++ b/HuntStats/Features/XmlFileHandler.cs @@ -1,13 +1,13 @@ using System.Text.Json.Serialization; using System.Text.RegularExpressions; using System.Xml.Serialization; -using ConsoleApp1.Models; using Dommel; using HuntStats.Data; using HuntStats.Models; using HuntStats.State; using MediatR; using Newtonsoft.Json; +using Serilog; using Entry = HuntStats.Models.Entry; namespace HuntStats.Features; @@ -119,7 +119,7 @@ public bool CheckSameMatch(string filePath1, string filePath2) } var percentage = Convert.ToInt32((double)succes / total * 100); - if (percentage > 80) + if (percentage > 90) { return true; } @@ -157,170 +157,183 @@ public async Task DeleteWhenFileUnlocked(string path) // This needs to be cleaned up because holy shit.... public async Task Handle(XmlFileQuery request, CancellationToken cancellationToken) { - using var con = await _connectionFactory.GetOpenConnectionAsync(); - var settings = await con.FirstOrDefaultAsync(x => x.Id == 1); - var appdataDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\HuntStats"; - var huntFilePath = settings.Path + @"\user\profiles\default\attributes.xml"; - var huntFileTempPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\HuntStats\attributes.xml"; - - if(!Directory.Exists(appdataDirectory)) Directory - .CreateDirectory(appdataDirectory); - - if (!File.Exists(huntFilePath)) return GeneralStatus.Error; - - HuntMatchTable foundMatch = null; - - bool sameFile = false; - - if (!File.Exists(huntFileTempPath)) - { - await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath); - // await CopyWhenFileUnlocked(huntFileTempPath, huntFileTempPath + ".tmp"); - } - else - { - // await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath + ".tmp"); - sameFile = CheckSameMatch(huntFilePath, huntFileTempPath); - } - - if(!sameFile) + try { - File.Delete(huntFileTempPath); - await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath); - // File.Copy(huntFilePath, huntFileTempPath); - // File.Delete(huntFileTempPath + ".tmp"); - XmlSerializer reader = new XmlSerializer(typeof(Attributes)); - var fileText = File.ReadAllText(huntFileTempPath); - var file = new StringReader(fileText); + + using var con = await _connectionFactory.GetOpenConnectionAsync(); + var settings = await con.FirstOrDefaultAsync(x => x.Id == 1); + var appdataDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\HuntStats"; + var huntFilePath = settings.Path + @"\user\profiles\default\attributes.xml"; + var huntFileTempPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\HuntStats\attributes.xml"; + if(!Directory.Exists(appdataDirectory)) Directory + .CreateDirectory(appdataDirectory); - Attributes overview = (Attributes)reader.Deserialize(file); - - var match = new HuntMatch() - { - Teams = new List(), - DateTime = DateTime.UtcNow - }; + if (!File.Exists(huntFilePath)) return GeneralStatus.Error; + HuntMatchTable foundMatch = null; - var attributes = new Dictionary(); + bool sameFile = false; - foreach (var attr in overview.Atrributes) + if (!File.Exists(huntFileTempPath)) { - attributes.Add(attr.Name, attr.Value); + await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath); + // await CopyWhenFileUnlocked(huntFileTempPath, huntFileTempPath + ".tmp"); } - - var numberOfTeams = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumTeams").Value); - var numberOfEntries = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumEntries").Value); - var numberOfAccolades = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumAccolades").Value); - - var entries = new List(); - var accolades = new List(); - - for (int i = 0; i < numberOfEntries; i++) + else { - entries.Add(new Entry() - { - Amount = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_amount"]), - Category = attributes["MissionBagEntry_" + i + "_category"], - DescriptorName = attributes["MissionBagEntry_" + i + "_descriptorName"], - DescriptorScore = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_descriptorScore"]), - DescriptorType = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_descriptorType"]), - Reward = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_reward"]), - RewardSize = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_rewardSize"]), - UiName = attributes["MissionBagEntry_" + i + "_uiName"], - UiName2 = attributes["MissionBagEntry_" + i + "_uiName2"], - }); - } - - for (int i = 0; i < numberOfAccolades; i++) - { - accolades.Add(new Accolade() - { - BloodlineXp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_bloodlineXp"]), - Bounty = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_bounty"]), - Category = attributes["MissionAccoladeEntry_" + i + "_category"], - EventPoints = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_eventPoints"]), - Gems = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_gems"]), - GeneratedGems = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_generatedGems"]), - Gold = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_gold"]), - Header = attributes["MissionAccoladeEntry_" + i + "_header"], - Hits = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hits"]), - HunterPoints = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hunterPoints"]), - HunterXp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hunterXp"]), - Weighting = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_weighting"]), - Xp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_xp"]) - }); + // await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath + ".tmp"); + sameFile = CheckSameMatch(huntFilePath, huntFileTempPath); } - for (int i = 0; i < numberOfTeams; i++) + if(!sameFile) { - var playerAmount = Convert.ToInt32(attributes["MissionBagTeam_" + i + "_numplayers"]); - var team = new Team + File.Delete(huntFileTempPath); + await CopyWhenFileUnlocked(huntFilePath, huntFileTempPath); + // File.Copy(huntFilePath, huntFileTempPath); + // File.Delete(huntFileTempPath + ".tmp"); + XmlSerializer reader = new XmlSerializer(typeof(Attributes)); + var fileText = File.ReadAllText(huntFileTempPath); + var file = new StringReader(fileText); + + + Attributes overview = (Attributes)reader.Deserialize(file); + + var match = new HuntMatch() { - Id = i, - Players = new List(), - Mmr = Convert.ToInt32(attributes["MissionBagTeam_" + i + "_mmr"]), + Teams = new List(), + DateTime = DateTime.UtcNow }; + + + var attributes = new Dictionary(); + + foreach (var attr in overview.Atrributes) + { + attributes.Add(attr.Name, attr.Value); + } + + var numberOfTeams = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumTeams").Value); + var numberOfEntries = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumEntries").Value); + var numberOfAccolades = Convert.ToInt32(attributes.FirstOrDefault(x => x.Key == "MissionBagNumAccolades").Value); + + var entries = new List(); + var accolades = new List(); - for (int j = 0; j < playerAmount; j++) + for (int i = 0; i < numberOfEntries; i++) { - team.Players.Add(new Player() + entries.Add(new Entry() { - Name = attributes["MissionBagPlayer_" + i + "_" + j +"_blood_line_name"], - ProfileId = attributes["MissionBagPlayer_" + i + "_" + j + "_profileid"], - Mmr = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_mmr"]), - KilledMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedme"]), - DownedMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedme"]), - KilledTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedteammate"]), - DownedTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedteammate"]), - KilledByMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedbyme"]), - DownedByMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedbyme"]), - KilledByTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedbyteammate"]), - DownedByTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedbyteammate"]), - BountyExtracted = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_bountyextracted"]), - BountyPickedUp = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_bountypickedup"]), - Proximity = bool.Parse(attributes["MissionBagPlayer_" + i + "_" + j + "_proximitytome"]), - ProximityTeammate = bool.Parse(attributes["MissionBagPlayer_" + i + "_" + j + "_proximitytoteammate"]), + Amount = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_amount"]), + Category = attributes["MissionBagEntry_" + i + "_category"], + DescriptorName = attributes["MissionBagEntry_" + i + "_descriptorName"], + DescriptorScore = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_descriptorScore"]), + DescriptorType = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_descriptorType"]), + Reward = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_reward"]), + RewardSize = Convert.ToInt32(attributes["MissionBagEntry_" + i + "_rewardSize"]), + UiName = attributes["MissionBagEntry_" + i + "_uiName"], + UiName2 = attributes["MissionBagEntry_" + i + "_uiName2"], }); } - match.Teams.Add(team); - } - var matchId = Convert.ToInt32(await con.InsertAsync(new HuntMatchTable() - { - Butcher = bool.Parse(attributes["MissionBagBoss_0"]), - Spider = bool.Parse(attributes["MissionBagBoss_1"]), - Assassin = bool.Parse(attributes["MissionBagBoss_2"]), - Scrapbeak = bool.Parse(attributes["MissionBagBoss_3"]), - DateTime = DateTime.UtcNow - })); - - foreach (var entry in entries) - { - entry.MatchId = matchId; - await con.InsertAsync(entry); - } - - foreach (var accolade in accolades) - { - accolade.MatchId = matchId; - await con.InsertAsync(accolade); - } + for (int i = 0; i < numberOfAccolades; i++) + { + accolades.Add(new Accolade() + { + BloodlineXp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_bloodlineXp"]), + Bounty = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_bounty"]), + Category = attributes["MissionAccoladeEntry_" + i + "_category"], + EventPoints = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_eventPoints"]), + Gems = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_gems"]), + GeneratedGems = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_generatedGems"]), + Gold = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_gold"]), + Header = attributes["MissionAccoladeEntry_" + i + "_header"], + Hits = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hits"]), + HunterPoints = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hunterPoints"]), + HunterXp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_hunterXp"]), + Weighting = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_weighting"]), + Xp = Convert.ToInt32(attributes["MissionAccoladeEntry_" + i + "_xp"]) + }); + } + + for (int i = 0; i < numberOfTeams; i++) + { + var playerAmount = Convert.ToInt32(attributes["MissionBagTeam_" + i + "_numplayers"]); + var team = new Team + { + Id = i, + Players = new List(), + Mmr = Convert.ToInt32(attributes["MissionBagTeam_" + i + "_mmr"]), + }; + + for (int j = 0; j < playerAmount; j++) + { + team.Players.Add(new Player() + { + Name = attributes["MissionBagPlayer_" + i + "_" + j +"_blood_line_name"], + ProfileId = attributes["MissionBagPlayer_" + i + "_" + j + "_profileid"], + Mmr = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_mmr"]), + KilledMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedme"]), + DownedMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedme"]), + KilledTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedteammate"]), + DownedTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedteammate"]), + KilledByMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedbyme"]), + DownedByMe = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedbyme"]), + KilledByTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_killedbyteammate"]), + DownedByTeammate = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_downedbyteammate"]), + BountyExtracted = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_bountyextracted"]), + BountyPickedUp = Convert.ToInt32(attributes["MissionBagPlayer_" + i + "_" + j + "_bountypickedup"]), + Proximity = bool.Parse(attributes["MissionBagPlayer_" + i + "_" + j + "_proximitytome"]), + ProximityTeammate = bool.Parse(attributes["MissionBagPlayer_" + i + "_" + j + "_proximitytoteammate"]), + }); + } + match.Teams.Add(team); + } + + var matchId = Convert.ToInt32(await con.InsertAsync(new HuntMatchTable() + { + Butcher = bool.Parse(attributes["MissionBagBoss_0"]), + Spider = bool.Parse(attributes["MissionBagBoss_1"]), + Assassin = bool.Parse(attributes["MissionBagBoss_2"]), + Scrapbeak = bool.Parse(attributes["MissionBagBoss_3"]), + DateTime = DateTime.UtcNow + })); - foreach (var team in match.Teams) - { - await con.InsertAsync(new TeamTable() + foreach (var entry in entries) { - Mmr = team.Mmr, - Players = JsonConvert.SerializeObject(team.Players), - MatchId = matchId - }); + entry.MatchId = matchId; + await con.InsertAsync(entry); + } + + foreach (var accolade in accolades) + { + accolade.MatchId = matchId; + await con.InsertAsync(accolade); + } + + foreach (var team in match.Teams) + { + await con.InsertAsync(new TeamTable() + { + Mmr = team.Mmr, + Players = JsonConvert.SerializeObject(team.Players), + MatchId = matchId + }); + } } + + + _appState.MatchAdded(); + return GeneralStatus.Succes; + } + catch (Exception e) + { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Information() + .WriteTo.File("crashlog.txt").CreateLogger(); + Log.Information(e.ToString()); + Log.Information(e.StackTrace); + return GeneralStatus.Error; } - - - _appState.MatchAdded(); - return GeneralStatus.Succes; } } \ No newline at end of file diff --git a/HuntStats/HuntStats.csproj b/HuntStats/HuntStats.csproj index 20b9b92..17e6e4d 100644 --- a/HuntStats/HuntStats.csproj +++ b/HuntStats/HuntStats.csproj @@ -38,11 +38,11 @@ - - + - + + <_MauiAppIconFile Include="Resources\AppIcon\appicon.png" /> @@ -60,6 +60,7 @@ + @@ -67,6 +68,8 @@ + + diff --git a/HuntStats/MauiProgram.cs b/HuntStats/MauiProgram.cs index cf79ed5..a2b76c8 100644 --- a/HuntStats/MauiProgram.cs +++ b/HuntStats/MauiProgram.cs @@ -24,11 +24,12 @@ public static MauiApp CreateMauiApp() { #if WINDOWS - lifecycle.AddWindows(windows => windows.OnWindowCreated((del) => - { - del.Title = "HüntStäts"; - del.ExtendsContentIntoTitleBar = true; - })); + // lifecycle.AddWindows(windows => windows.OnWindowCreated((del) => + // { + // del.Title = "HüntStäts"; + // del.ExtendsContentIntoTitleBar = true; + // del. + // })); #endif }); builder.Services.AddScoped(); diff --git a/HuntStats/Models/Dataset.cs b/HuntStats/Models/Dataset.cs new file mode 100644 index 0000000..3f20a16 --- /dev/null +++ b/HuntStats/Models/Dataset.cs @@ -0,0 +1,25 @@ +using System.Text.Json.Serialization; + +namespace HuntStats.Models; + +public class Dataset +{ + [JsonPropertyName("label")] + public string Label { get; set; } + + [JsonPropertyName("data")] + public List Data { get; set; } + + [JsonPropertyName("fill")] + public bool Fill { get; set; } + + [JsonPropertyName("borderColor")] + public string BorderColor { get; set; } + + [JsonPropertyName("tension")] + public double Tension { get; set; } + + [JsonPropertyName("pointRadius")] + public double PointRadius { get; set; } +} + diff --git a/HuntStats/Models/Match.cs b/HuntStats/Models/Match.cs index d17ad7b..d20a27c 100644 --- a/HuntStats/Models/Match.cs +++ b/HuntStats/Models/Match.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace ConsoleApp1.Models; +namespace HuntStats.Models; [Table("Match")] @@ -70,4 +70,34 @@ public class Player public int BountyPickedUp { get; set; } public int BountyExtracted { get; set; } + + public int StarRating() + { + if (Mmr >= 0 && Mmr < 2000) + { + return 1; + } + + if (Mmr >= 2000 && Mmr < 2300) + { + return 2; + } + + if (Mmr >= 2300 && Mmr < 2600) + { + return 3; + } + + if (Mmr >= 2600 && Mmr < 2750) + { + return 4; + } + + if (Mmr >= 2750 && Mmr < 3000) + { + return 5; + } + + return 6; + } } \ No newline at end of file diff --git a/HuntStats/OrderType.cs b/HuntStats/OrderType.cs new file mode 100644 index 0000000..af15fe2 --- /dev/null +++ b/HuntStats/OrderType.cs @@ -0,0 +1,7 @@ +namespace HuntStats; + +public enum OrderType +{ + Ascending, + Descending +} \ No newline at end of file diff --git a/HuntStats/Pages/Index.razor b/HuntStats/Pages/Index.razor index baa2e07..a86cc05 100644 --- a/HuntStats/Pages/Index.razor +++ b/HuntStats/Pages/Index.razor @@ -1,7 +1,6 @@ @page "/" @using System.Diagnostics @using System.ComponentModel -@using ConsoleApp1.Models @using Dapper @using Dommel @using HuntStats.Data @@ -14,21 +13,87 @@ @inject IMediator Mediator @inject NavigationManager NavigationManager @inject AppState AppState +@inject IJSRuntime JS -
-
-
-

Info

- - Hello, if you like what you see in my application please consider giving it a star on github (: +
+

Statistics

+
+
+
+ +
+ + + +
+
+
+
+
+ +
+ + + +
+
-
+
@code { + public bool RefreshChart { get; set; } = false; + + private ElementReference _mmrChart; + private ElementReference _killChart; + + public int MmrChartAmount { get; set; } = 25; + public int KillChartAmount { get; set; } = 25; + + public async Task HandleKillChartChange(int Id) + { + KillChartAmount = Id; + await JS.InvokeAsync("resetChart", _killChart); + await FetchKillChart(); + } + + public async Task HandleMmrChartChange(int Id) + { + MmrChartAmount = Id; + await JS.InvokeAsync("resetChart", _mmrChart); + await FetchMmrChart(); + } + + public List.ListItem> ListItems { get; set; } = new() + { + new DropdownSelect.ListItem() + { + Id = 5, + Variable = "5" + }, + new DropdownSelect.ListItem() + { + Id = 10, + Variable = "10" + }, + new DropdownSelect.ListItem() + { + Id = 25, + Variable = "25" + }, + new DropdownSelect.ListItem() + { + Id = 50, + Variable = "50" + }, + new DropdownSelect.ListItem() + { + Id = 100, + Variable = "100" + } + }; - public List Matches; public BackgroundWorker worker { get; set; } public bool RunBackgroundTask { get; set; } = false; public string FilePath { get; set; } @@ -36,16 +101,92 @@ protected override async Task OnInitializedAsync() { + await Task.Yield(); AppState.NewMatchAdded += AppStateOnNewMatchAdded; - Matches = await Mediator.Send(new GetMatchCommand()); + await GetChartInfo(); } private async void AppStateOnNewMatchAdded() { - Matches = await Mediator.Send(new GetMatchCommand()); + // Matches = await Mediator.Send(new GetMatchCommand()); await InvokeAsync(StateHasChanged); } + private async Task GetChartInfo() + { + await FetchKillChart(); + await FetchMmrChart(); + } + + public async Task FetchKillChart() + { + var killChartInfo = await Mediator.Send(new KillChartQuery(KillChartAmount)); + await JS.InvokeAsync("createChart", _killChart, new + { + labels = killChartInfo.Select(x => x.DateTime.ToLocalTime().ToString("dd-MM-yyyy HH:mm:ss")), + datasets = new List() + { + new Dataset() + { + Label = "Total Kills", + Data = killChartInfo.Select(x => x.Kills).ToList(), + Fill = false, + BorderColor = "rgb(166, 35, 73)", + Tension = 0.4, + PointRadius = 3 + }, + new Dataset() + { + Label = "Your kills", + Data = killChartInfo.Select(x => x.YourKills).ToList(), + Fill = false, + BorderColor = "rgb(208, 112, 0)", + Tension = 0.4, + PointRadius = 3 + }, + new Dataset() + { + Label = "Deaths", + Data = killChartInfo.Select(x => x.Deaths).ToList(), + Fill = false, + BorderColor = "rgb(150, 229, 209)", + Tension = 0.4, + PointRadius = 3 + } + } + }); + } + + public async Task FetchMmrChart() + { + var mmrChartInfo = await Mediator.Send(new MmrChartQuery(MmrChartAmount)); + await JS.InvokeAsync("createChart", _mmrChart, new + { + labels = mmrChartInfo.Select(x => x.DateTime.ToLocalTime().ToString("dd-MM-yyyy HH:mm:ss")), + datasets = new List() + { + new Dataset() + { + Label = "Mmr", + Data = mmrChartInfo.Select(x => x.Mmr).ToList(), + Fill = false, + BorderColor = "rgb(75, 192, 192)", + Tension = 0.5, + PointRadius = 0 + }, + new Dataset() + { + Label = "Match MMR", + Data = mmrChartInfo.Select(x => x.TotalMmr).ToList(), + Fill = false, + BorderColor = "rgb(166, 35, 73)", + Tension = 0.5, + PointRadius = 0 + } + } + }); + } + public async Task ToggleCheck() { if (!worker.CancellationPending) diff --git a/HuntStats/Pages/Match.razor b/HuntStats/Pages/Match.razor index edc61b5..608bb4e 100644 --- a/HuntStats/Pages/Match.razor +++ b/HuntStats/Pages/Match.razor @@ -2,7 +2,7 @@ @using MediatR @using HuntStats.Features @using HuntStats.Models -@using ConsoleApp1.Models +@using HuntStats.Extensions @inject IMediator Mediator @inject IFolderPicker FolderPicker @inject NavigationManager NavigationManager @@ -16,63 +16,178 @@
Back
-
- @if (HuntMatch != null) - { +
+
-
-
- Total kills: @Kills -
-
- Your Kills: @YourKills -
-
- Kill Assists: @Assists -
-
- Deaths: @Deaths -
- @if (EventPoints != null) + @*
*@ + @*
*@ + @* $1$ @foreach (var team in HuntMatch.Teams) #1# *@ + @* $1$ { #1# *@ + @* $1$
Team @(HuntMatch.Teams.IndexOf(team)+1)@(team.Players.FirstOrDefault(x => x.ProfileId.ToString() == Settings.PlayerProfileId) != null ? " (Own Team)" : "")
#1# *@ + @* $1$ } #1# *@ + @*
*@ + @*
*@ +
+ @foreach (var team in HuntMatch.Teams) { -
- Event Points: @EventPoints + +
+ Team #@(HuntMatch.Teams.IndexOf(team) + 1)
- } -
-
-
- @foreach (var team in HuntMatch.Teams) - { -
Team @(HuntMatch.Teams.IndexOf(team)+1)@(team.Players.FirstOrDefault(x => x.ProfileId.ToString() == Settings.PlayerProfileId) != null ? " (Own Team)" : "")
- } -
-
-
Team #@(HuntMatch.Teams.IndexOf(Team) + 1)
- @foreach (var player in Team.Players) + + @{ + Mmr = Team.Players.Select(x => x.Mmr).Sum() / Team.Players.Count(); + } + Team MMR: + @for (int i = 0; i < Mmr.ToStarRating(); i++) + { + + } + @for (int i = 0; i < (6 - Mmr.ToStarRating()); i++) + { + + } + (@Mmr) + + @foreach (var player in team.Players) {
-
+
@player.Name
@if (Settings.PlayerProfileId == null || Settings.PlayerProfileId == string.Empty) { if (player.ProfileId != "0") { -
+
This is me!
} }
- MMR: @player.Mmr + @for (int i = 0; i < @player.StarRating(); i++) + { + + } + @for (int i = 0; i < (6 - player.StarRating()); i++) + { + + } + (@player.Mmr)
+ @for (int i = 0; i < player.DownedByMe; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.DownedByTeammate; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.DownedMe; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.DownedTeammate; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.KilledByMe; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.KilledByTeammate; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.KilledMe; i++) + { + +
+ +
+ + } + @for (int i = 0; i < player.KilledTeammate; i++) + { + + +
+ +
+ + }
} -
+ }
- } +
+
+ @if (HuntMatch != null) + { +
+
+
+ Total kills: @Kills +
+
+ Your Kills: @YourKills +
+
+ Kill Assists: @Assists +
+
+ Deaths: @Deaths +
+ @if (EventPoints != null) + { +
+ Event Points: @EventPoints +
+ } +
+ @{ + Mmr = HuntMatch.Teams.Select(x => x.Players.Select(x => x.Mmr).Sum() / x.Players.Count()).Sum() / HuntMatch.Teams.Count; + } + Match MMR: + @for (int i = 0; i < Mmr.ToStarRating(); i++) + { + + } + @for (int i = 0; i < (6 - Mmr.ToStarRating()); i++) + { + + } + (@Mmr) +
+
+
+ } +
@@ -88,6 +203,8 @@ public List Accolades { get; set; } + public int Mmr { get; set; } + public int Kills { get; set; } public int Assists { get; set; } = 0; diff --git a/HuntStats/Pages/MatchList.razor b/HuntStats/Pages/MatchList.razor index b5e8862..1a6093e 100644 --- a/HuntStats/Pages/MatchList.razor +++ b/HuntStats/Pages/MatchList.razor @@ -1,7 +1,6 @@ @page "/match" @using System.Diagnostics @using System.ComponentModel -@using ConsoleApp1.Models @using Dapper @using Dommel @using HuntStats.Data @@ -16,11 +15,11 @@ @inject AppState AppState
-

Matchasdfasdfasdes

+

Matches

- -
+ +
@@ -74,6 +73,21 @@ @code { + public OrderType OrderType { get; set; } = OrderType.Descending; + + public List.ListItem> ListItems { get; set; } = new() + { + new() + { + Id = OrderType.Ascending, + Variable = "Ascending" + }, + new() + { + Id = OrderType.Descending, + Variable = "Descending" + } + }; public List Matches; public BackgroundWorker worker { get; set; } public bool RunBackgroundTask { get; set; } = false; @@ -88,9 +102,21 @@ Settings = await Mediator.Send(new GetSettingsCommand()); } + private async Task HandleOrderTypeChange(OrderType value) + { + OrderType = value; + Matches = await Mediator.Send(new GetMatchCommand() + { + OrderType = OrderType + }); + } + private async void AppStateOnNewMatchAdded() { - Matches = await Mediator.Send(new GetMatchCommand()); + Matches = await Mediator.Send(new GetMatchCommand() + { + OrderType = OrderType + }); await InvokeAsync(StateHasChanged); } diff --git a/HuntStats/Resources/AppIcon/appicon.png b/HuntStats/Resources/AppIcon/appicon.png new file mode 100644 index 0000000..6d6e7cc Binary files /dev/null and b/HuntStats/Resources/AppIcon/appicon.png differ diff --git a/HuntStats/Resources/AppIcon/appicon.svg b/HuntStats/Resources/AppIcon/appicon.svg deleted file mode 100644 index 9d63b65..0000000 --- a/HuntStats/Resources/AppIcon/appicon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/HuntStats/Resources/AppIcon/appiconfg.svg b/HuntStats/Resources/AppIcon/appiconfg.svg deleted file mode 100644 index 21dfb25..0000000 --- a/HuntStats/Resources/AppIcon/appiconfg.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/HuntStats/Shared/NavMenu.razor b/HuntStats/Shared/NavMenu.razor index f27d4e5..adc35e5 100644 --- a/HuntStats/Shared/NavMenu.razor +++ b/HuntStats/Shared/NavMenu.razor @@ -13,8 +13,8 @@
- -
Info
+ +
Dashboard
 diff --git a/HuntStats/Styles/_dropdown.scss b/HuntStats/Styles/_dropdown.scss index 93b3745..a1e733a 100644 --- a/HuntStats/Styles/_dropdown.scss +++ b/HuntStats/Styles/_dropdown.scss @@ -1,28 +1,25 @@ .dropdown-container { position: relative; - - //&:not('') { - // - //} - - .dropdown { + .dropdown:not(.alternate) { display: none; visibility: collapse; text-align: left; + margin: 15px; //display: block; //position: absolute; //bottom: 0; //left: 0; - background-color: #fff; + background-color: #272A31; + //min-height: 100px; min-width: 250px; max-width: 500px; transform: translate(0, 100%); //padding: 15px; border-radius: 10px; z-index: 998; - animation: shadowOut 0s forwards; + animation: fadeOut 0s forwards; //visibility: hidden; - + &.stopanim { display: unset; visibility: unset; @@ -30,38 +27,54 @@ animation-duration: 0s !important; transition: all 0s !important; } - + .search-container { padding: 15px; } - + .scrollable-container { max-height: 300px; overflow-y: auto; overflow-x: hidden; } - + ul { - padding: 0; + padding: 0 0px; margin: 0; list-style: none; - + > li { + position: relative; cursor: pointer; - padding: 5px 15px; + padding: 10px 10px; + margin: 0px 15px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - + transition: color .3s; + //border-bottom: 1px solid #1D1F26; + //font-size: ; + &::after { + position: absolute; + content: ''; + bottom: 0; + left: 0; + height: 2px; + width: 100%; + background-color: #1D1F26; + border-radius: 2px; + } + font-weight: 600; &:hover { - background-color: #ebebeb; + //background-color: #ebebeb; + color: #9146FF; } - &:last-of-type { - border-bottom-left-radius: 10px; + &:last-of-type::after { + display: none !important; } } } - + &.loaded { display: unset; visibility: unset; @@ -69,14 +82,128 @@ } &.opened { - animation: shadowIn .3s forwards; + animation: fadeIn .3s forwards; visibility: visible; } } -} + + .dropdown.alternate { + display: none; + visibility: collapse; + text-align: left; + background-color: #272A31; + //border-top: 0; + //min-height: 100px; + overflow: hidden; + min-width: 250px; + max-width: 500px; + transform: translate(0, 100%); + //padding: 15px; + border-radius: 10px; + border: 1px solid #585C67; + z-index: 998; + animation: fadeOut 0s forwards; + //visibility: hidden; + + &.stopanim { + display: unset; + visibility: unset; + //visibility: hidden !important; + animation-duration: 0s !important; + transition: all 0s !important; + } + + .search-container { + padding: 15px; + background-color: #1E2027; + border-bottom: 1px solid #585C67; + } -.click-wrapper { - .form-control:disabled, .form-control[readonly] { - background-color: #fff !important; + .scrollable-container { + max-height: 300px; + overflow-y: auto; + overflow-x: hidden; + } + .scrollable-container::-webkit-scrollbar-thumb + { + border-radius: 0; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0); + background-color: #707070; + } + + .scrollable-container::-webkit-scrollbar + { + background-color: #1E2027; + } + + ul { + padding: 0 0px; + margin: 0; + list-style: none; + + > li { + position: relative; + cursor: pointer; + padding: 10px 10px; + padding-bottom: 12px; + //margin: 0px 15px; + white-space: nowrap; + overflow: hidden; + background-color: #1E2027; + text-overflow: ellipsis; + transition: background-color .3s; + //border-bottom: 1px solid #1D1F26; + //font-size: ; + + .color-circle { + position: absolute; + left: 7px; + top: 50%; + transform: translate(0, -50%); + width: 16px; + border-radius: 100px; + height: 16px; + vertical-align: middle; + margin-bottom: 2px; + margin-right: 7px; + } + + span { + margin-left: 20px; + font-size: 16px !important; + line-height: 16px; + } + + &::after { + position: absolute; + content: ''; + bottom: 0; + left: 0; + height: 1px; + width: 100%; + background-color: #2F3036; + border-radius: 2px; + } + font-weight: 600; + &:hover { + background-color: #2E3036; + color: #fff; + } + &:last-of-type::after { + display: none !important; + } + } + } + + &.loaded { + display: unset; + visibility: unset; + animation-duration: .3s; + } + + &.opened { + animation: fadeIn .3s forwards; + visibility: visible; + } } } \ No newline at end of file diff --git a/HuntStats/Styles/_inputs.scss b/HuntStats/Styles/_inputs.scss index d08292c..b0e1f7a 100644 --- a/HuntStats/Styles/_inputs.scss +++ b/HuntStats/Styles/_inputs.scss @@ -22,3 +22,54 @@ input.form-control { background-color: unset !important; border: 2px solid #343740; } + +.form-control:focus { + border-color: inherit; + -webkit-box-shadow: none; + box-shadow: none; +} + +.form-control, .form-control:disabled, .form-control:read-only { + background-color: #23252D !important; + border-color: #585C67 !important; + border-radius: 2px; + color: #fff !important; + outline: none !important; + cursor: pointer; +} + +.no-margin { + margin: 0 !important; +} + +.form-multiple-group { + border: 1px solid #585C67; + padding: 15px; + padding-bottom: unset; + border-radius: 2px; + overflow-y: auto; + overflow-x: hidden; + + .form-multiple-row { + padding: 0px 10px; + } + + .form-multiple-row:not(:last-of-type) { + border-bottom: 2px solid #585C67; + margin-bottom: 1rem; + } +} + +.form-control:not(:read-only):focus { + background-color: unset !important; + border-color: unset !important; + color: #fff !important; + outline: none !important; + //box-shadow: 0 0 0 0.2rem rgb(0 123 255 / 25%); + box-shadow: 0 0 0 0.2rem rgb(35, 37, 45, 0.25); +} + +.form-control:focus-visible { + outline: unset !important; +} + diff --git a/HuntStats/Styles/_match.scss b/HuntStats/Styles/_match.scss index 98c67eb..d3f6de9 100644 --- a/HuntStats/Styles/_match.scss +++ b/HuntStats/Styles/_match.scss @@ -24,6 +24,7 @@ border-right: 1px solid #343740; } + } .btn-primary:disabled { @@ -38,6 +39,10 @@ //border-bottom: 1px solid #343740; } +.team-player.blue-background { + background-color: rgba(13, 202, 240, 0.2) !important; +} + .totals { display: flex; flex-direction: row; diff --git a/HuntStats/Styles/_tooltip.scss b/HuntStats/Styles/_tooltip.scss new file mode 100644 index 0000000..93fc108 --- /dev/null +++ b/HuntStats/Styles/_tooltip.scss @@ -0,0 +1,37 @@ +.tooltip-wrapper { + position: relative; + display: inline-block; + cursor: help; +} + +span { + pointer-events: none !important; + visibility: hidden; + position: absolute; + width: 300px; + bottom: 100%; + left: 50%; + transform: translateX(-30%); + margin-left: -60px; + background-color: #363636; + color: #fff; + text-align: center; + padding: 5px 0; + border-radius: 6px; + z-index: 1; +} + +span::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: #363636 transparent transparent transparent; +} + +.tooltip-wrapper:hover span { + visibility: visible; +} \ No newline at end of file diff --git a/HuntStats/Styles/app.scss b/HuntStats/Styles/app.scss index 79c42c8..cc3df86 100644 --- a/HuntStats/Styles/app.scss +++ b/HuntStats/Styles/app.scss @@ -22,6 +22,7 @@ body.no-anim * { @import "_sidebar-mobile.scss"; @import "_list.scss"; @import "_table.scss"; +@import "_tooltip.scss"; @import "_inputs.scss"; @import "_editcreate.scss"; @import "_login.scss"; @@ -30,6 +31,26 @@ body.no-anim * { @import "_calendar.scss"; @import "_match.scss"; +/* + * STYLE 1 + */ + +*::-webkit-scrollbar-track +{ + border-radius: 10px; +} + +*::-webkit-scrollbar +{ + width: 12px; +} + +*::-webkit-scrollbar-thumb +{ + border-radius: 10px; + background-color: #555; +} + #blazor-error-ui { display: none; } diff --git a/HuntStats/_Imports.razor b/HuntStats/_Imports.razor index ee185be..29814f8 100644 --- a/HuntStats/_Imports.razor +++ b/HuntStats/_Imports.razor @@ -6,3 +6,4 @@ @using Microsoft.JSInterop @using HuntStats @using HuntStats.Shared +@using HuntStats.Components diff --git a/HuntStats/wwwroot/css/app.css b/HuntStats/wwwroot/css/app.css index fc8da98..c374568 100644 --- a/HuntStats/wwwroot/css/app.css +++ b/HuntStats/wwwroot/css/app.css @@ -598,6 +598,44 @@ table.data-table i.fa-arrow-left, table i.fa-arrow-right { color: black; } +.tooltip-wrapper { + position: relative; + display: inline-block; + cursor: help; +} + +span { + pointer-events: none !important; + visibility: hidden; + position: absolute; + width: 300px; + bottom: 100%; + left: 50%; + transform: translateX(-30%); + margin-left: -60px; + background-color: #363636; + color: #fff; + text-align: center; + padding: 5px 0; + border-radius: 6px; + z-index: 1; +} + +span::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: #363636 transparent transparent transparent; +} + +.tooltip-wrapper:hover span { + visibility: visible; +} + input.form-control { border-radius: 10px !important; border: 2px solid #ebebeb; @@ -623,6 +661,53 @@ input.form-control { border: 2px solid #343740; } +.form-control:focus { + border-color: inherit; + -webkit-box-shadow: none; + box-shadow: none; +} + +.form-control, .form-control:disabled, .form-control:read-only { + background-color: #23252D !important; + border-color: #585C67 !important; + border-radius: 2px; + color: #fff !important; + outline: none !important; + cursor: pointer; +} + +.no-margin { + margin: 0 !important; +} + +.form-multiple-group { + border: 1px solid #585C67; + padding: 15px; + padding-bottom: unset; + border-radius: 2px; + overflow-y: auto; + overflow-x: hidden; +} +.form-multiple-group .form-multiple-row { + padding: 0px 10px; +} +.form-multiple-group .form-multiple-row:not(:last-of-type) { + border-bottom: 2px solid #585C67; + margin-bottom: 1rem; +} + +.form-control:not(:read-only):focus { + background-color: unset !important; + border-color: unset !important; + color: #fff !important; + outline: none !important; + box-shadow: 0 0 0 0.2rem rgba(35, 37, 45, 0.25); +} + +.form-control:focus-visible { + outline: unset !important; +} + .create-edit fieldset { border-bottom: 2px solid #ebebeb; } @@ -716,62 +801,171 @@ input.form-control { .dropdown-container { position: relative; } -.dropdown-container .dropdown { +.dropdown-container .dropdown:not(.alternate) { display: none; visibility: collapse; text-align: left; - background-color: #fff; + margin: 15px; + background-color: #272A31; min-width: 250px; max-width: 500px; transform: translate(0, 100%); border-radius: 10px; z-index: 998; - animation: shadowOut 0s forwards; + animation: fadeOut 0s forwards; } -.dropdown-container .dropdown.stopanim { +.dropdown-container .dropdown:not(.alternate).stopanim { display: unset; visibility: unset; animation-duration: 0s !important; transition: all 0s !important; } -.dropdown-container .dropdown .search-container { +.dropdown-container .dropdown:not(.alternate) .search-container { padding: 15px; } -.dropdown-container .dropdown .scrollable-container { +.dropdown-container .dropdown:not(.alternate) .scrollable-container { max-height: 300px; overflow-y: auto; overflow-x: hidden; } -.dropdown-container .dropdown ul { - padding: 0; +.dropdown-container .dropdown:not(.alternate) ul { + padding: 0 0px; margin: 0; list-style: none; } -.dropdown-container .dropdown ul > li { +.dropdown-container .dropdown:not(.alternate) ul > li { + position: relative; cursor: pointer; - padding: 5px 15px; + padding: 10px 10px; + margin: 0px 15px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + transition: color 0.3s; + font-weight: 600; } -.dropdown-container .dropdown ul > li:hover { - background-color: #ebebeb; +.dropdown-container .dropdown:not(.alternate) ul > li::after { + position: absolute; + content: ""; + bottom: 0; + left: 0; + height: 2px; + width: 100%; + background-color: #1D1F26; + border-radius: 2px; +} +.dropdown-container .dropdown:not(.alternate) ul > li:hover { + color: #9146FF; } -.dropdown-container .dropdown ul > li:last-of-type { - border-bottom-left-radius: 10px; +.dropdown-container .dropdown:not(.alternate) ul > li:last-of-type::after { + display: none !important; } -.dropdown-container .dropdown.loaded { +.dropdown-container .dropdown:not(.alternate).loaded { display: unset; visibility: unset; animation-duration: 0.3s; } -.dropdown-container .dropdown.opened { - animation: shadowIn 0.3s forwards; +.dropdown-container .dropdown:not(.alternate).opened { + animation: fadeIn 0.3s forwards; visibility: visible; } - -.click-wrapper .form-control:disabled, .click-wrapper .form-control[readonly] { - background-color: #fff !important; +.dropdown-container .dropdown.alternate { + display: none; + visibility: collapse; + text-align: left; + background-color: #272A31; + overflow: hidden; + min-width: 250px; + max-width: 500px; + transform: translate(0, 100%); + border-radius: 10px; + border: 1px solid #585C67; + z-index: 998; + animation: fadeOut 0s forwards; +} +.dropdown-container .dropdown.alternate.stopanim { + display: unset; + visibility: unset; + animation-duration: 0s !important; + transition: all 0s !important; +} +.dropdown-container .dropdown.alternate .search-container { + padding: 15px; + background-color: #1E2027; + border-bottom: 1px solid #585C67; +} +.dropdown-container .dropdown.alternate .scrollable-container { + max-height: 300px; + overflow-y: auto; + overflow-x: hidden; +} +.dropdown-container .dropdown.alternate .scrollable-container::-webkit-scrollbar-thumb { + border-radius: 0; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0); + background-color: #707070; +} +.dropdown-container .dropdown.alternate .scrollable-container::-webkit-scrollbar { + background-color: #1E2027; +} +.dropdown-container .dropdown.alternate ul { + padding: 0 0px; + margin: 0; + list-style: none; +} +.dropdown-container .dropdown.alternate ul > li { + position: relative; + cursor: pointer; + padding: 10px 10px; + padding-bottom: 12px; + white-space: nowrap; + overflow: hidden; + background-color: #1E2027; + text-overflow: ellipsis; + transition: background-color 0.3s; + font-weight: 600; +} +.dropdown-container .dropdown.alternate ul > li .color-circle { + position: absolute; + left: 7px; + top: 50%; + transform: translate(0, -50%); + width: 16px; + border-radius: 100px; + height: 16px; + vertical-align: middle; + margin-bottom: 2px; + margin-right: 7px; +} +.dropdown-container .dropdown.alternate ul > li span { + margin-left: 20px; + font-size: 16px !important; + line-height: 16px; +} +.dropdown-container .dropdown.alternate ul > li::after { + position: absolute; + content: ""; + bottom: 0; + left: 0; + height: 1px; + width: 100%; + background-color: #2F3036; + border-radius: 2px; +} +.dropdown-container .dropdown.alternate ul > li:hover { + background-color: #2E3036; + color: #fff; +} +.dropdown-container .dropdown.alternate ul > li:last-of-type::after { + display: none !important; +} +.dropdown-container .dropdown.alternate.loaded { + display: unset; + visibility: unset; + animation-duration: 0.3s; +} +.dropdown-container .dropdown.alternate.opened { + animation: fadeIn 0.3s forwards; + visibility: visible; } .calendar { @@ -858,6 +1052,10 @@ input.form-control { font-size: 24px; } +.team-player.blue-background { + background-color: rgba(13, 202, 240, 0.2) !important; +} + .totals { display: flex; flex-direction: row; @@ -872,6 +1070,22 @@ input.form-control { border-radius: 15px; } +/* + * STYLE 1 + */ +*::-webkit-scrollbar-track { + border-radius: 10px; +} + +*::-webkit-scrollbar { + width: 12px; +} + +*::-webkit-scrollbar-thumb { + border-radius: 10px; + background-color: #555; +} + #blazor-error-ui { display: none; } diff --git a/HuntStats/wwwroot/css/app.css.map b/HuntStats/wwwroot/css/app.css.map index c4e6b7f..8c9a63f 100644 --- a/HuntStats/wwwroot/css/app.css.map +++ b/HuntStats/wwwroot/css/app.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../Styles/app.scss","../../Styles/_animations.scss","../../Styles/_sidebar.scss","../../Styles/_variables.scss","../../Styles/_sidebar-mobile.scss","../../Styles/_list.scss","../../Styles/_table.scss","../../Styles/_inputs.scss","../../Styles/_editcreate.scss","../../Styles/_login.scss","../../Styles/_tabnav.scss","../../Styles/_dropdown.scss","../../Styles/_calendar.scss","../../Styles/_match.scss"],"names":[],"mappings":"AAAQ;AACA;AAER;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;ACfF;EACE;IACE;;EAEF;IACE;;;AAIJ;EACE;IACE;;EAEF;IACE;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;EAEF;IACE;;;AAIJ;EACE;IACE;;EAEF;IACE;;EAEF;IACE;IACA;;;ACxCJ;EAEE;;AAIA;EACE;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;;AAGF;EACE;;AAKA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;;AAIF;EACE;EACA;;AAGJ;EAEE;EAEA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EAEE;EAEA;;AAEA;EACE;;AAGF;EACE;;AAMN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;EACE;EAEA;EACA;EACA;;AAEA;EACE;;AAIJ;EAEE;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;;AAIA;EAEE;EACA;EACA;EAEA;EACA;EACA,QCxPQ;EDyPR;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;AAOR;EACE;EACA;;AAEA;EACE;;AAIJ;EACE;;AAGF;EACE;EACA;;AAEA;EACE;;AAIJ;EACE;;AAKJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAMR;EACA;;AACE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;;AE9WN;EACE;IACE;;EAgBF;IACE;IACA;IACA;IACA;IACA;IAEA;;EAGF;IACE;IACA;;;AAUJ;EACE;EACA;EAEA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;;;AAIJ;EAKI;IACE;;EAGF;IACE;IACA;IACA;IACA;IACA;IACA;IACA;IAEA;IACA;;EAEA;IACE;IACA;IACA;IACA;IACA;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;IACA;;EAGF;IACE;IACA;;EAIJ;IACE;IAEA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGF;IACE;;EAIF;IACE;IACA;;EAGA;IACE;IACA;;EAGF;IACE;;EAIJ;IACE;;;AC/IJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AC5DF;EACE,OHEqB;EGDrB;;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;;;AAIF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIF;EACE;EACA;;;AAGF;EACE;EACA;;;ACjGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;ACrBA;EACE;;AAEA;EACE;;;ACLN;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AC9CN;EACI;EACA;EAGA;EACA;;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;EACA;;;AAKJ;EACI;EACA;EACA;;AAEA;EACI;;;AClCR;EACE;;AAMA;EACE;EACA;EACA;EAKA;EACA;EACA;EACA;EAEA;EACA;EACA;;AAGA;EACE;EACA;EAEA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;AAKN;EACE;EACA;EACA;;AAGF;EACE;EACA;;;AAMJ;EACE;;;AC/EJ;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;;AAKN;EAIE;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAQJ;EACE;EACA;EACA;;AAME;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACE;;AAGF;EACE;;AAGF;EACE;;;ACpER;EACE;EAEA;EAEA;;AAGA;EACE;EACA;EAEA;EACA;EACA;;AAIF;EACE;;AAGF;EACE;;;AAKJ;EACE;;;AAIF;EACE;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;;AbnBJ;EACE","file":"app.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../Styles/app.scss","../../Styles/_animations.scss","../../Styles/_sidebar.scss","../../Styles/_variables.scss","../../Styles/_sidebar-mobile.scss","../../Styles/_list.scss","../../Styles/_table.scss","../../Styles/_tooltip.scss","../../Styles/_inputs.scss","../../Styles/_editcreate.scss","../../Styles/_login.scss","../../Styles/_tabnav.scss","../../Styles/_dropdown.scss","../../Styles/_calendar.scss","../../Styles/_match.scss"],"names":[],"mappings":"AAAQ;AACA;AAER;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;ACfF;EACE;IACE;;EAEF;IACE;;;AAIJ;EACE;IACE;;EAEF;IACE;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;EAEF;IACE;;;AAIJ;EACE;IACE;;EAEF;IACE;;EAEF;IACE;IACA;;;ACxCJ;EAEE;;AAIA;EACE;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;;AAGF;EACE;;AAKA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;;AAIF;EACE;EACA;;AAGJ;EAEE;EAEA;;AAEA;EACE;;AAGF;EACE;;AAIJ;EAEE;EAEA;;AAEA;EACE;;AAGF;EACE;;AAMN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;EACE;EAEA;EACA;EACA;;AAEA;EACE;;AAIJ;EAEE;EACA;EACA;EACA;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;EACE;EACA;EACA;EACA;;AAIA;EAEE;EACA;EACA;EAEA;EACA;EACA,QCxPQ;EDyPR;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;AAOR;EACE;EACA;;AAEA;EACE;;AAIJ;EACE;;AAGF;EACE;EACA;;AAEA;EACE;;AAIJ;EACE;;AAKJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAMR;EACA;;AACE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;;;AE9WN;EACE;IACE;;EAgBF;IACE;IACA;IACA;IACA;IACA;IAEA;;EAGF;IACE;IACA;;;AAUJ;EACE;EACA;EAEA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;;;AAIJ;EAKI;IACE;;EAGF;IACE;IACA;IACA;IACA;IACA;IACA;IACA;IAEA;IACA;;EAEA;IACE;IACA;IACA;IACA;IACA;;EAGF;IACE;;EAGF;IACE;;EAGF;IACE;IACA;;EAGF;IACE;IACA;;EAIJ;IACE;IAEA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGF;IACE;;EAIF;IACE;IACA;;EAGA;IACE;IACA;;EAGF;IACE;;EAIJ;IACE;;;AC/IJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AC5DF;EACE,OHEqB;EGDrB;;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;;;AAIF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIF;EACE;EACA;;;AAGF;EACE;EACA;;;ACjGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;;;ACnCF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;;AAGF;EACE;;;ACvEA;EACE;;AAEA;EACE;;;ACLN;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AC9CN;EACI;EACA;EAGA;EACA;;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;EACA;;;AAKJ;EACI;EACA;EACA;;AAEA;EACI;;;AClCR;EACE;;AACA;EACE;EACA;EACA;EACA;EAKA;EAEA;EACA;EACA;EAEA;EACA;EACA;;AAGA;EACE;EACA;EAEA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAaA;;AAVA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAEE;;AAEF;EACE;;AAKN;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;AAGA;EACE;EACA;EAEA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEF;EAEE;EACA;EACA;;AAGF;EAEE;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EAiCA;;AA7BA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAEF;EACE;;AAKN;EACE;EACA;EACA;;AAGF;EACE;EACA;;;AC7MN;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;;AAKN;EAIE;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAQJ;EACE;EACA;EACA;;AAME;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACE;;AAGF;EACE;;AAGF;EACE;;;ACpER;EACE;EAEA;EAEA;;AAGA;EACE;EACA;EAEA;EACA;EACA;;AAIF;EACE;;AAGF;EACE;;;AAMJ;EACE;;;AAIF;EACE;EACA;EACA;;;AAIF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;;AdvBJ;AAAA;AAAA;AAIA;EAEE;;;AAGF;EAEE;;;AAGF;EAEE;EACA;;;AAGF;EACE","file":"app.css"} \ No newline at end of file diff --git a/HuntStats/wwwroot/index.html b/HuntStats/wwwroot/index.html index c10bfbf..b460206 100644 --- a/HuntStats/wwwroot/index.html +++ b/HuntStats/wwwroot/index.html @@ -7,7 +7,9 @@ - + + + @@ -22,10 +24,46 @@ 🗙
+ +