diff --git a/src/iRLeagueManager.Web/Components/EditEventModal.razor b/src/iRLeagueManager.Web/Components/EditEventModal.razor index a5855fd1..039497dd 100644 --- a/src/iRLeagueManager.Web/Components/EditEventModal.razor +++ b/src/iRLeagueManager.Web/Components/EditEventModal.razor @@ -26,8 +26,7 @@ MinimumLength=1 MaximumSuggestions=100 EnableDropDown=true - class="form-control py-0 px-0 ps-1 border border-top-0" - style="border-color: #ced4da !important" + class="form-control py-0 px-0 ps-1" placeholder="Search by Track name..."> @track?.TrackName diff --git a/src/iRLeagueManager.Web/Components/EventSelect.razor b/src/iRLeagueManager.Web/Components/EventSelect.razor index 947f15f9..0db65bfb 100644 --- a/src/iRLeagueManager.Web/Components/EventSelect.razor +++ b/src/iRLeagueManager.Web/Components/EventSelect.razor @@ -64,7 +64,7 @@ [Parameter] public EventCallback SelectedChanged { get; set; } - private const string BaseClass = "input-group container px-0 mb-2 mx-0"; + private const string BaseClass = "input-group"; private string CssClass { get diff --git a/src/iRLeagueManager.Web/Components/LoadingHeader.razor b/src/iRLeagueManager.Web/Components/LoadingHeader.razor index ef046d5f..f1bde7b6 100644 --- a/src/iRLeagueManager.Web/Components/LoadingHeader.razor +++ b/src/iRLeagueManager.Web/Components/LoadingHeader.razor @@ -1,10 +1,10 @@ @using System.ComponentModel
-
+
@ChildContent + - @code { diff --git a/src/iRLeagueManager.Web/Components/Reviews/ReviewCard.razor b/src/iRLeagueManager.Web/Components/Reviews/ReviewCard.razor index d86db5f5..25e3f752 100644 --- a/src/iRLeagueManager.Web/Components/Reviews/ReviewCard.razor +++ b/src/iRLeagueManager.Web/Components/Reviews/ReviewCard.razor @@ -51,7 +51,7 @@
-
+
Involved
@@ -76,7 +76,7 @@
-
+
Involved Drivers
diff --git a/src/iRLeagueManager.Web/Components/Settings/ChampionshipPreview.razor b/src/iRLeagueManager.Web/Components/Settings/ChampionshipPreview.razor index 5c072bee..7ffc2365 100644 --- a/src/iRLeagueManager.Web/Components/Settings/ChampionshipPreview.razor +++ b/src/iRLeagueManager.Web/Components/Settings/ChampionshipPreview.razor @@ -9,7 +9,7 @@
@name
@if (string.IsNullOrEmpty(displayName) == false && displayName != name) { -    => "@displayName" +    "@displayName" }
@if (ChampSeason is not null) diff --git a/src/iRLeagueManager.Web/Components/Settings/EditChampSeasonModal.razor b/src/iRLeagueManager.Web/Components/Settings/EditChampSeasonModal.razor index 08f6af50..9bbcc89e 100644 --- a/src/iRLeagueManager.Web/Components/Settings/EditChampSeasonModal.razor +++ b/src/iRLeagueManager.Web/Components/Settings/EditChampSeasonModal.razor @@ -3,14 +3,17 @@ -
+ @{ + var accordionId = $"champseason-{Vm.ChampSeasonId}-accordion"; + } +
-

+

-
+
@@ -20,42 +23,49 @@
-

-

-
- @foreach(var resultConfig in Vm.ResultConfigViewModels) - { -
OnResultConfigClick(resultConfig))> - -
- - + +
+
+ } +
+
-
- } -
- +
-
+

-

-
+
@if (Vm.StandingConfig is not null) {
diff --git a/src/iRLeagueManager.Web/Components/Settings/EditScoring.razor b/src/iRLeagueManager.Web/Components/Settings/EditScoring.razor index f5d925f1..6bf42ff8 100644 --- a/src/iRLeagueManager.Web/Components/Settings/EditScoring.razor +++ b/src/iRLeagueManager.Web/Components/Settings/EditScoring.razor @@ -22,7 +22,7 @@ MaxPoints: @pointRule.MaxPoints DropOff p.Pl: @pointRule.PointDropOff } - + diff --git a/src/iRLeagueManager.Web/Components/Settings/PointTable.razor b/src/iRLeagueManager.Web/Components/Settings/PointTable.razor index b9ca5024..af2d59df 100644 --- a/src/iRLeagueManager.Web/Components/Settings/PointTable.razor +++ b/src/iRLeagueManager.Web/Components/Settings/PointTable.razor @@ -1,6 +1,8 @@ -@inherits MvvmComponentBase +@using static iRLeagueManager.Web.ViewModels.PointRuleViewModel; +@inherits MvvmComponentBase
+ @GetPointTypeString() @if (@Bind(PointRule, x => x.PointsPerPlace).Count() > 0) { @@ -24,10 +26,6 @@
} - else - { - Points from source - }
@code { @@ -41,4 +39,22 @@ base.OnParametersSet(); BlazorParameterNullException.ThrowIfNull(this, PointRule); } + + private string GetPointTypeString() + { + if (PointRule.PointsPerPlace.Count() == 0) + { + return "Keep points"; + } + switch (PointRule.RuleType) + { + case PointRuleType.PointList: + return "Points per place"; + case PointRuleType.MaxPoints: + return $"Max pts.: {PointRule.MaxPoints}; Drop-off: {PointRule.PointDropOff}"; + case PointRuleType.Formula: + return $"Formula"; + } + return "Unknown"; + } } diff --git a/src/iRLeagueManager.Web/Components/Settings/ResultConfigPreview.razor b/src/iRLeagueManager.Web/Components/Settings/ResultConfigPreview.razor index 5e3f7887..fbbc164c 100644 --- a/src/iRLeagueManager.Web/Components/Settings/ResultConfigPreview.razor +++ b/src/iRLeagueManager.Web/Components/Settings/ResultConfigPreview.razor @@ -16,6 +16,7 @@
@scoring.Name
+ Sort results by: @string.Join(" then ", scoring.PointRule.FinalSortOptions)
diff --git a/src/iRLeagueManager.Web/Pages/Leagues.razor b/src/iRLeagueManager.Web/Pages/Leagues.razor index 8a807393..13d024ee 100644 --- a/src/iRLeagueManager.Web/Pages/Leagues.razor +++ b/src/iRLeagueManager.Web/Pages/Leagues.razor @@ -8,12 +8,14 @@ @inject LeaguesViewModel vm @inject ILeagueApiClient apiClient -
- x.Loading)> -

Leagues

- +
+
+ x.Loading)> +

Leagues

+ +
- +
diff --git a/src/iRLeagueManager.Web/Pages/Protests.razor b/src/iRLeagueManager.Web/Pages/Protests.razor index d2297440..da60fbad 100644 --- a/src/iRLeagueManager.Web/Pages/Protests.razor +++ b/src/iRLeagueManager.Web/Pages/Protests.razor @@ -6,7 +6,7 @@ @inject ReviewsPageViewModel ReviewsVm @inject ClientLocalTimeProvider ClientTime -
+

File Protest

@@ -189,7 +189,7 @@ if (@event?.EventId != null) { var navUrl = $"./{LeagueName}/Protests/Events/{@event.EventId}"; - NavigationManager.NavigateTo(navUrl); + NavigationManager.NavigateTo(navUrl, replace: true); await ReviewsVm.LoadFromEventAsync(@event.EventId); } SessionId = @event?.Sessions.FirstOrDefault()?.SessionId; diff --git a/src/iRLeagueManager.Web/Pages/Results.razor b/src/iRLeagueManager.Web/Pages/Results.razor index cab774b6..e46fd74a 100644 --- a/src/iRLeagueManager.Web/Pages/Results.razor +++ b/src/iRLeagueManager.Web/Pages/Results.razor @@ -13,44 +13,48 @@ @inherits LeagueComponentBase @inject ResultsPageViewModel vm -
- x.Loading)> -

Results

- - - - @if (@Bind(vm, x => x.Results)?.Count == 0) - { -
-

No Results

+
+
+
+ x.Loading)> +

Results

+ +
- } -
- - - - @if (vm.SelectedEvent?.HasResult == true && SharedState.SeasonFinished == false) + @if (@Bind(vm, x => x.Results)?.Count == 0) + { +
+

No Results

+
+ } +
+
    + @foreach((var eventResult, var i) in @Bind(vm, x => x.Results).Select((x, i) => (x,i))) { - - @if (vm.Results.Count > 0) +
  • + @Bind(eventResult, x => x.Name) +
    • + } +
+ + + @if (vm.SelectedEvent?.HasResult == true && SharedState.SeasonFinished == false) { - + @if (vm.Results.Count > 0) + { + + } } - } - - + + +
+ @if (@Bind(vm, x => x.SelectedEvent) != null && @Bind(vm, x => x.SelectedEventResult) != null) { @foreach(var result in @Bind(vm.SelectedEventResult!, x => x.SessionResults).OrderByDescending(x => x.SessionNr)) @@ -96,8 +100,9 @@ { resultIndex = 0; } - var navUri = $"./{LeagueName}/Results/Events/{@event.EventId}?{resultTabParam}={resultIndex}"; - NavigationManager.NavigateTo(navUri); + var navUri = $"/{LeagueName}/Results/Events/{@event.EventId}?{resultTabParam}={resultIndex}"; + bool replace = NavigationManager.Uri.Contains($"/Events/") == false || NavigationManager.Uri.Contains(navUri); + NavigationManager.NavigateTo(navUri, replace: replace); } } @@ -116,7 +121,7 @@ private void SetSelectedResultIndex(int index) { - NavigationManager.NavigateTo(GetTabLink(index)); + NavigationManager.NavigateTo(GetTabLink(index), replace: true); } private string GetTabLink(int index) diff --git a/src/iRLeagueManager.Web/Pages/Reviews.razor b/src/iRLeagueManager.Web/Pages/Reviews.razor index aa3947ed..46c4fbc3 100644 --- a/src/iRLeagueManager.Web/Pages/Reviews.razor +++ b/src/iRLeagueManager.Web/Pages/Reviews.razor @@ -12,24 +12,27 @@ @inject ReviewsPageViewModel ReviewsVm @inject ClientLocalTimeProvider ClientTime -
- x.Loading))> -

Reviews

- +
+
+
+ x.Loading)> +

Reviews

+ + +
- - - @if (ReviewsVm.ProtestsEnabled) - { -
    -
  • - Reviews -
    • -
  • - Protests -
    • -
- } + @if (ReviewsVm.ProtestsEnabled) + { +
    +
  • + Reviews +
    • +
  • + Protests +
    • +
+ } +
@switch (SelectedTabIndex) @@ -183,9 +186,10 @@ { if (@event?.EventId != null) { - var navUrl = $"./{LeagueName}/Reviews/Events/{@event.EventId}?{NavigationManager.QueryString()}"; + var navUrl = $"/{LeagueName}/Reviews/Events/{@event.EventId}?{NavigationManager.QueryString()}"; navUrl = NavigationManager.GetUriWithQueryParameters(navUrl, GetQueryParameters()); - NavigationManager.NavigateTo(navUrl); + bool replace = NavigationManager.Uri.Contains($"/Events/") == false || NavigationManager.Uri.Contains(navUrl); + NavigationManager.NavigateTo(navUrl, replace: replace); await ReviewsVm.LoadFromEventAsync(@event.EventId); } } diff --git a/src/iRLeagueManager.Web/Pages/Schedules.razor b/src/iRLeagueManager.Web/Pages/Schedules.razor index a35aaf18..b6674bbb 100644 --- a/src/iRLeagueManager.Web/Pages/Schedules.razor +++ b/src/iRLeagueManager.Web/Pages/Schedules.razor @@ -9,10 +9,12 @@ @inject SchedulesPageViewModel vm @inject JsonSerializerOptions jsonOptions -
- x.Loading)> -

Schedules

- +
+
+ x.Loading)> +

Schedules

+ +
diff --git a/src/iRLeagueManager.Web/Pages/Seasons.razor b/src/iRLeagueManager.Web/Pages/Seasons.razor index 7042bda7..2918c6d1 100644 --- a/src/iRLeagueManager.Web/Pages/Seasons.razor +++ b/src/iRLeagueManager.Web/Pages/Seasons.razor @@ -1,4 +1,5 @@ -@page "/{LeagueName}/Seasons" +@page "/{LeagueName}" +@page "/{LeagueName}/Seasons" @page "/{LeagueName}/Seasons/{SeasonId:long}" @using iRLeagueManager.Web.Components @using iRLeagueManager.Web.ViewModels @@ -9,7 +10,7 @@ @inject SharedStateService sharedState @*@inject AuthenticationStateProvider authStateProvider*@ -
+
x.Loading)>

Seasons

 diff --git a/src/iRLeagueManager.Web/Pages/Settings/Settings.razor b/src/iRLeagueManager.Web/Pages/Settings/Settings.razor index 22293484..2d9e9688 100644 --- a/src/iRLeagueManager.Web/Pages/Settings/Settings.razor +++ b/src/iRLeagueManager.Web/Pages/Settings/Settings.razor @@ -1,17 +1,16 @@ @page "/{LeagueName}/Settings" @page "/{LeagueName}/Settings/Season/{SeasonId:long}" -@attribute [Authorize] @using System.Text @using iRLeagueManager.Web.Components @using iRLeagueManager.Web.Components.Settings @inherits LeagueComponentBase @inject NavigationManager navigationManager -
-

Settings

 - - -
+
+
+

Settings

 + +
    @@ -33,25 +32,31 @@ Reviews
+ + +
+ + +
@if (HasRendered) { @switch (selectedTabIndex) { case 0: - + break; case 1: - + break; case 2: - + break; case 3: - + break; case 4: - + break; default:

Index out of bounds!

diff --git a/src/iRLeagueManager.Web/Pages/Standings.razor b/src/iRLeagueManager.Web/Pages/Standings.razor index 09ad1de0..f622bd22 100644 --- a/src/iRLeagueManager.Web/Pages/Standings.razor +++ b/src/iRLeagueManager.Web/Pages/Standings.razor @@ -14,26 +14,31 @@ @inherits LeagueComponentBase @inject StandingsPageViewModel vm -
- x.Loading)> -

Standings

- - - - @if (@Bind(vm, x => x.Standings)?.Count == 0) - { -
-

No Standings

+
+
+
+ x.Loading)> +

Standings

+ +
- } -
    - @foreach((var standing, var i) in @Bind(vm, x => x.Standings).Select((x, i) => (x,i))) - { -
  • - @standing.Name -
    • - } -
+ + @if (@Bind(vm, x => x.Standings)?.Count == 0) + { +
+

No Standings

+
+ } +
    + @foreach((var standing, var i) in @Bind(vm, x => x.Standings).Select((x, i) => (x,i))) + { +
  • + @standing.Name +
    • + } +
+
+ @if (@Bind(vm, x => x.SelectedStanding) != null) { x.SelectedStanding)/> @@ -54,15 +59,15 @@ if (@event?.EventId != null) { var standingIndex = NavigationManager.QueryParameter(standingTabParam); - NavigationManager.NavigateTo($"./{LeagueName}/Standings/Events/{@event.EventId}"); await vm.LoadFromEventAsync(@event.EventId); - + if (standingIndex >= vm.Standings.Count() || standingIndex < 0) { standingIndex = 0; } - var navUri = $"./{LeagueName}/Standings/Events/{@event.EventId}?{standingTabParam}={standingIndex}"; - NavigationManager.NavigateTo(navUri); + var navUri = $"/{LeagueName}/Standings/Events/{@event.EventId}?{standingTabParam}={standingIndex}"; + bool replace = NavigationManager.Uri.Contains($"/Events/") == false || NavigationManager.Uri.Contains(navUri); + NavigationManager.NavigateTo(navUri, replace: replace); } } diff --git a/src/iRLeagueManager.Web/Pages/_Layout.cshtml b/src/iRLeagueManager.Web/Pages/_Layout.cshtml index 5589a7ad..db06c0d8 100644 --- a/src/iRLeagueManager.Web/Pages/_Layout.cshtml +++ b/src/iRLeagueManager.Web/Pages/_Layout.cshtml @@ -8,10 +8,14 @@ - + + @**@ + + + + - diff --git a/src/iRLeagueManager.Web/Shared/Header.razor b/src/iRLeagueManager.Web/Shared/Header.razor index 45f4cfc9..cca95e89 100644 --- a/src/iRLeagueManager.Web/Shared/Header.razor +++ b/src/iRLeagueManager.Web/Shared/Header.razor @@ -1,13 +1,203 @@ -@inherits LeagueComponentBase +@using System.Security.Claims; +@inherits LeagueComponentBase +@inject LeaguesViewModel Vm -@if (string.IsNullOrEmpty(Shared.LeagueName)) -{ -

iRLeaguemanager

-} -else -{ -

@Shared.LeagueName

-} +
+ +
@code { + private static string VersionString { get; } = $"{System.Reflection.Assembly.GetEntryAssembly()!.GetName().Version!.Major}.{System.Reflection.Assembly.GetEntryAssembly()!.GetName().Version!.Minor}.{System.Reflection.Assembly.GetEntryAssembly()!.GetName().Version!.Build}"; + + private string CurrentLeagueTarget => string.IsNullOrEmpty(Shared.LeagueName) ? "Leagues" : Shared.LeagueName; + + private string UserName => Shared.Username ?? string.Empty; + + private long SeasonSelect + { + get => Shared.SeasonId; + set => _ = OnSeasonSelectChanged(value); + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + await base.OnAfterRenderAsync(firstRender); + if (firstRender == false) + { + return; + } + if (Vm.Leagues.Count > 0) + { + return; + } + await Vm.OnAfterRenderAsync(firstRender); + } + + private async Task OnSeasonSelectChanged(long value) + { + if (Shared.LeagueName == null || value == 0) + { + return; + } + await ApiService.SetCurrentSeasonAsync(Shared.LeagueName, value); + if (NavigationManager.Uri.Contains($"{Shared.LeagueName}/Results")) + { + ForceNavigateTo($"{Shared.LeagueName}/Results"); + } + if (NavigationManager.Uri.Contains($"{Shared.LeagueName}/Schedules")) + { + ForceNavigateTo($"{Shared.LeagueName}/Schedules"); + } + if (NavigationManager.Uri.Contains($"{Shared.LeagueName}/Standings")) + { + ForceNavigateTo($"{Shared.LeagueName}/Standings"); + } + if (NavigationManager.Uri.Contains($"{Shared.LeagueName}/Reviews")) + { + ForceNavigateTo($"{Shared.LeagueName}/Reviews"); + } + await InvokeAsync(StateHasChanged); + } + + private string GetFullUserName(ClaimsPrincipal user) + { + if (user.Identity?.Name is null) + { + return string.Empty; + } + + return user.Identity.Name; + } + + private IEnumerable GetCurrentLeagueRoles(ClaimsPrincipal user) + { + var roles = user.Claims + .Where(x => x.Type == ClaimTypes.Role) + .Where(x => LeagueRoles.IsLeagueRoleName(Shared.LeagueName ?? string.Empty, x.Value)) + .Select(x => LeagueRoles.GetRoleName(x.Value)) + .NotNull(); + return roles.ToList(); + } } diff --git a/src/iRLeagueManager.Web/Shared/LeagueComponentBase.cs b/src/iRLeagueManager.Web/Shared/LeagueComponentBase.cs index ec42edc4..fa63ed51 100644 --- a/src/iRLeagueManager.Web/Shared/LeagueComponentBase.cs +++ b/src/iRLeagueManager.Web/Shared/LeagueComponentBase.cs @@ -6,6 +6,7 @@ using Microsoft.JSInterop; using MvvmBlazor.Components; using System.ComponentModel; +using System.Net; namespace iRLeagueManager.Web.Shared; @@ -17,6 +18,7 @@ public abstract partial class LeagueComponentBase : MvvmComponentBase public LeagueApiService ApiService { get; set; } = default!; [Inject] public NavigationManager NavigationManager { get; set; } = default!; + [Inject] protected IJSRuntime JsRuntime { get; set; } = default!; @@ -65,6 +67,13 @@ protected override void OnParametersSet() { SeasonId = Shared.SeasonId; } + if (HasRendered) + { + if (EventId != Event?.EventId) + { + EventList.Selected = EventList.EventList.FirstOrDefault(x => x.EventId == EventId); + } + } ParametersSet = true; } @@ -135,7 +144,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender) } } - protected async Task LoadEventList(long seasonId) + public async Task LoadEventList(long seasonId) { await EventList.LoadEventListAsync(seasonId); } @@ -171,10 +180,10 @@ private void OnEventListPropertyChanged(object? sender, PropertyChangedEventArgs protected string GetRoleString(params string[] roleNames) { IEnumerable roles = new[] { "Admin" }; - if (LeagueName != null) + if (Shared.LeagueName != null) { var leagueRoleNames = roleNames - .Select(x => LeagueRoles.GetLeagueRoleName(LeagueName, x)) + .Select(x => LeagueRoles.GetLeagueRoleName(Shared.LeagueName, x)) .NotNull(); roles = roles.Concat(leagueRoleNames); } @@ -185,4 +194,44 @@ protected async Task ScrollToElementId(string id) { await JsRuntime.InvokeVoidAsync("scrollToElementId", id); } + + protected void NavigateTo(string url, bool replace = false) + { + NavigationManager.NavigateTo(url, replace: replace); + } + + protected void ForceNavigateTo(string url, bool fullReload = false) + { + if (fullReload) + { + NavigationManager.NavigateTo(url, forceLoad: true); + return; + } + + NavigationManager.NavigateTo("/"); + NavigationManager.NavigateTo(url); + } + + /// + /// Get the current url as HTML encoded + /// + /// + protected string GetCurrentUrlEncoded() + { + return WebUtility.UrlEncode(new Uri(NavigationManager.Uri).PathAndQuery); + } + + /// + /// Get the url from returnUrl= parameter. If returnUrl is not set -> return the current url as HTML encoded instead + /// + /// + protected string GetReturnUrl() + { + var returnUrl = NavigationManager.QueryParameter("returnUrl"); + if (string.IsNullOrEmpty(returnUrl)) + { + return GetCurrentUrlEncoded(); + } + return WebUtility.UrlEncode(returnUrl); + } } diff --git a/src/iRLeagueManager.Web/Shared/MainLayout.razor b/src/iRLeagueManager.Web/Shared/MainLayout.razor index 16545ad0..73292278 100644 --- a/src/iRLeagueManager.Web/Shared/MainLayout.razor +++ b/src/iRLeagueManager.Web/Shared/MainLayout.razor @@ -1,18 +1,9 @@ @inherits LayoutComponentBase iRLeagueManager.Web +
-
-
-
- -
- -
- -
- - +
@Body diff --git a/src/iRLeagueManager.Web/Shared/MainLayout.razor.css b/src/iRLeagueManager.Web/Shared/MainLayout.razor.css index 476c46aa..fab5a404 100644 --- a/src/iRLeagueManager.Web/Shared/MainLayout.razor.css +++ b/src/iRLeagueManager.Web/Shared/MainLayout.razor.css @@ -1,16 +1,18 @@ .page { + padding-top: 4rem; position: relative; display: flex; flex-direction: column; - min-height: 100vh; + min-height: calc(100vh - 2.4em); } .page-footer { - position: fixed; + position: relative; left: 0; bottom: 0; width: 100%; - height: 1.25rem; + min-height: 0.4em; + height: auto; background-color: dimgray; color: white; padding: 0px, 4px, 0px, 4px !important; diff --git a/src/iRLeagueManager.Web/ViewModels/EventListViewModel.cs b/src/iRLeagueManager.Web/ViewModels/EventListViewModel.cs index de672f3e..fb503d17 100644 --- a/src/iRLeagueManager.Web/ViewModels/EventListViewModel.cs +++ b/src/iRLeagueManager.Web/ViewModels/EventListViewModel.cs @@ -15,7 +15,21 @@ public EventListViewModel(ILoggerFactory loggerFactory, LeagueApiService apiServ public ObservableCollection EventList { get => eventList; set => Set(ref eventList, value); } private EventViewModel? selected; - public EventViewModel? Selected { get => selected; set => Set(ref selected, value); } + public EventViewModel? Selected + { + get => selected; + set + { + var old = selected; + Set(ref selected, value); + if (selected?.EventId != old?.EventId) + { + EventChanged?.Invoke(this, new EventChangedEventArgs(old, value)); + } + } + } + + public event EventHandler? EventChanged; public async Task LoadEventListAsync(long seasonId) { @@ -83,4 +97,16 @@ public async Task LoadEventListFromEventAsync(long eventId, CancellationToken ca Loading = false; } } + + public class EventChangedEventArgs : EventArgs + { + public EventViewModel? Old; + public EventViewModel? New; + + public EventChangedEventArgs(EventViewModel? old, EventViewModel? @new) + { + Old = old; + New = @new; + } + } } diff --git a/src/iRLeagueManager.Web/appsettings.json b/src/iRLeagueManager.Web/appsettings.json index 8813a99e..bc04f2c2 100644 --- a/src/iRLeagueManager.Web/appsettings.json +++ b/src/iRLeagueManager.Web/appsettings.json @@ -9,8 +9,8 @@ } }, "AllowedHosts": "*", - "APIServer": "http://localhost:5000", - //"APIServer": "https://irleaguemanager.net/api/", + //"APIServer": "http://localhost:5000", + "APIServer": "https://irleaguemanager.net/api/", "DefaultUser": "testuser", "DefaultPassword": "TestPass123!" } diff --git a/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj b/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj index 693ec648..8de15574 100644 --- a/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj +++ b/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj @@ -2,7 +2,7 @@ net6.0 - 0.5.0 + 0.5.1 enable enable aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3 diff --git a/src/iRLeagueManager.Web/wwwroot/css/site.css b/src/iRLeagueManager.Web/wwwroot/css/site.css index 499ad32b..6c1d0cc8 100644 --- a/src/iRLeagueManager.Web/wwwroot/css/site.css +++ b/src/iRLeagueManager.Web/wwwroot/css/site.css @@ -1,10 +1,137 @@ @import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); @import url(toggle.css); +.blazored-typeahead { + border-color: rgb(206, 212, 218); +} + +@media (prefers-color-scheme: dark) { + :root { + --bs-body-bg: rgb(42, 42, 42); + --bs-inset-bg: rgb(32, 32, 32); + --bs-form-bg: var(--bs-inset-bg); + --bs-card-bg: var(--bs-inset-bg); + --bs-list-group-bg: var(--bs-inset-bg); + --bs-list-group-item-hover-bg: rgba(255, 255, 255, 0.08); + --bs-card-header-bg: rgb(59, 59, 59); + --bs-border-color: rgba(255, 255, 255, 0.250); + --bs-border-color-bright: rgba(255, 255, 255, 0.420); + } + + .form-control { + background: var(--bs-form-bg); + } + + .form-select { + background: var(--bs-form-bg); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"); + background-position-x: calc(100% - 12px); + background-position-y: 50%; + background-repeat: no-repeat; + background-size: 16px 12px; + } + + .card { + background: var(--bs-card-bg); + border-color: var(--bs-border-color); + } + + .card-header { + background: var(--bs-card-header-bg); + border-color: var(--bs-border-color); + } + + .list-group { + background: var(--bs-list-group-bg); + } + + .list-group .list-group-item { + background: var(--bs-list-group-bg); + } + + .list-group .list-group-item-action:hover { + background: var(--bs-list-group-item-hover-bg); + } + + .blazored-typeahead { + border-color: var(--bs-border-color) !important; + } + + .blazored-typeahead__input-icon:hover { + background: var(--bs-list-group-item-hover-bg); + } + + .blazored-typeahead__input-icon:hover .blazored-typeahead__down-arrow path { + fill: #dbdbdb; + } + + .blazored-typeahead__results { + background: var(--bs-form-bg); + border-color: var(--bs-border-color-bright); + } + + .blazored-typeahead__result, + .blazored-typeahead__notfound, + .blazored-typeahead__results-help-template, + .blazored-typeahead__results-header, + .blazored-typeahead__results-footer { + padding: .5rem; + border-top: 1px solid var(--bs-form-bg); + border-bottom: 1px solid var(--bs-form-bg); + } + + .blazored-typeahead__active-item, + .blazored-typeahead__result:hover, + .blazored-typeahead__result:focus { + background-color: var(--bs-list-group-item-hover-bg); + border-top: var(--bs-list-group-item-hover-bg); + border-bottom: var(--bs-list-group-item-hover-bg); + } + + .blazored-modal { + border-color: var(--bs-border-color-bright) !important; + } +} + +.logo { + margin: 0; + height: 2.8rem; + width: auto; + overflow: hidden; + align-items: center; +} + + .logo img { + height: 100%; + vertical-align: central; + margin-bottom: 4px; + } + .root { --bs-border-radius: .25rem; } +.blazored-modal { + background-color: var(--bs-body-bg) !important; +} + +.sticky-header { + position: sticky; + z-index: 10; + top: 4rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + background: var(--bs-body-bg); +} + +@media (max-height: 900px) { + .sticky-header { + position: unset; + z-index: inherit; + top: 0; + } +} + html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 1rem; @@ -44,11 +171,11 @@ h3 { } .page-header { + z-index:11; background: #34495e; color: #ffffff; - text-align: center; - padding: 0.5rem; - height: 4rem; + padding: 0.25rem 0.75rem; + min-height: 4em; } .alternate > tbody > tr:nth-child(odd) { @@ -162,6 +289,10 @@ a, .btn-link { filter: brightness(110%); } +.input-group > .valid, .invalid { + outline-offset: -1px; +} + .input-group-list > .input-group:not(:first-child) > * { border-top-left-radius: 0; border-top-right-radius: 0; @@ -170,6 +301,9 @@ a, .btn-link { .input-group-list > .input-group:not(:last-child) > * { border-bottom-left-radius: 0; border-bottom-right-radius: 0; +} + +.input-group-list > .input-group:not(:last-child) > *:not(:focus):not(.btn) { border-bottom: none; } @@ -251,6 +385,12 @@ a, .btn-link { display: none; } +@media (min-width: 1600px) { + .container, .container-lg, .container-md, .container-sm, .container-xl, .container-xxl { + max-width: 1520px; + } +} + @keyframes lds-ring { 0% { transform: rotate(0deg); diff --git a/src/iRLeagueManager.Web/wwwroot/css/toggle.css b/src/iRLeagueManager.Web/wwwroot/css/toggle.css index efdb1109..b21c19b5 100644 --- a/src/iRLeagueManager.Web/wwwroot/css/toggle.css +++ b/src/iRLeagueManager.Web/wwwroot/css/toggle.css @@ -1,4 +1,4 @@ -@import url(bootstrap/bootstrap.min.css); +/*@import url(bootstrap/bootstrap.min.css);*/ /* The switch - the box around the slider */ .switch { diff --git a/src/iRLeagueManager.Web/wwwroot/logo/iRLM_Logo_17_darkbg.png b/src/iRLeagueManager.Web/wwwroot/logo/iRLM_Logo_17_darkbg.png new file mode 100644 index 00000000..f1962877 Binary files /dev/null and b/src/iRLeagueManager.Web/wwwroot/logo/iRLM_Logo_17_darkbg.png differ
Id