diff --git a/HVZ.Tests/HVZ.Web.Components.Tests/ImageUploadTest.razor b/HVZ.Tests/HVZ.Web.Components.Tests/ImageUploadTest.razor index 5e89a7c6..c758757f 100644 --- a/HVZ.Tests/HVZ.Web.Components.Tests/ImageUploadTest.razor +++ b/HVZ.Tests/HVZ.Web.Components.Tests/ImageUploadTest.razor @@ -78,7 +78,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); var imgName = cut.Find("#img-name"); @@ -109,7 +109,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); var imgName = cut.Find("#img-name"); diff --git a/HVZ.Tests/HVZ.Web.Components.Tests/LoginDisplayTest.razor b/HVZ.Tests/HVZ.Web.Components.Tests/LoginDisplayTest.razor index e6155ce8..1ed7f925 100644 --- a/HVZ.Tests/HVZ.Web.Components.Tests/LoginDisplayTest.razor +++ b/HVZ.Tests/HVZ.Web.Components.Tests/LoginDisplayTest.razor @@ -6,10 +6,17 @@ @code { TestAuthorizationContext? authContext; + Mock mockOrgRepo = new Mock(); + Mock mockUserRepo = new Mock(); + Mock mockImageService = new Mock(); [OneTimeSetUp] public void Setup() { + mockUserRepo.Setup(repo => repo.GetUserById(It.IsAny())).ReturnsAsync(new User("", "", "")); + Services.AddSingleton(mockOrgRepo.Object); + Services.AddSingleton(mockUserRepo.Object); + Services.AddSingleton(mockImageService.Object); authContext = this.AddTestAuthorization(); } @@ -30,6 +37,9 @@ public void Test_LoggedInSeesLogOutButton() { authContext?.SetAuthorized("TEST USER"); + authContext?.SetClaims( + new System.Security.Claims.Claim("DatabaseId", "1234") + ); var cut = Render( @ diff --git a/HVZ.Tests/HVZ.Web.Components.Tests/ThemeToggleTest.razor b/HVZ.Tests/HVZ.Web.Components.Tests/ThemeToggleTest.razor new file mode 100644 index 00000000..78d98446 --- /dev/null +++ b/HVZ.Tests/HVZ.Web.Components.Tests/ThemeToggleTest.razor @@ -0,0 +1,70 @@ +@using HVZ.Web.Shared.Ui_Helpers + +@inherits Bunit.TestContext + +@code { + + [OneTimeSetUp] + public void Setup() + { + + } + + [Test] + public void Test_LightMode() + { + JSInterop.Setup("getThemePreference", _ => true).SetResult("light"); + + var cut = RenderComponent(); + + cut.Render(); + + var icon = cut.Find("i"); + var toggle = cut.Find("button"); + icon.MarkupMatches(@); + toggle.MarkupMatches(@); + } + + [Test] + public void Test_DarkMode() + { + JSInterop.Setup("getThemePreference", _ => true).SetResult("dark"); + + var cut = RenderComponent(); + + cut.Render(); + + var icon = cut.Find("i"); + var toggle = cut.Find("button"); + icon.MarkupMatches(@); + toggle.MarkupMatches(@); + } + + [Test] + public void Test_ToggleTheme() + { + JSInterop.Setup("getThemePreference", _ => true).SetResult("light"); + var savePref = JSInterop.SetupVoid("saveThemePreference", _ => true); + var applyTheme = JSInterop.SetupVoid("applyTheme", _ => true); + + var cut = RenderComponent(); + + cut.Render(); + + var toggle = cut.Find("button"); + toggle.MarkupMatches( + @); + + toggle.Click(); + savePref.SetVoidResult(); + applyTheme.SetVoidResult(); + + toggle.MarkupMatches( + @); + } + +} diff --git a/HVZ.Tests/HVZ.Web.Components.Tests/ThumbnailTest.razor b/HVZ.Tests/HVZ.Web.Components.Tests/ThumbnailTest.razor index 4e240b65..5f5cf8b5 100644 --- a/HVZ.Tests/HVZ.Web.Components.Tests/ThumbnailTest.razor +++ b/HVZ.Tests/HVZ.Web.Components.Tests/ThumbnailTest.razor @@ -58,7 +58,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); } @@ -74,7 +74,7 @@ var img = cut.Find("img"); string expectedsrc = $"https://ui-avatars.com/api/?name=Kevin+Smith&size={(int)size}"; img.MarkupMatches( - @ + @ ); } @@ -87,7 +87,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); } @@ -103,7 +103,7 @@ var img = cut.Find("img"); string expectedsrc = $"https://ui-avatars.com/api/?name=Test+Org&size={(int)size}"; img.MarkupMatches( - @ + @ ); } @@ -116,7 +116,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); } @@ -132,7 +132,7 @@ var img = cut.Find("img"); string expectedsrc = $"images/users/3_thumbnail_{(int)size}.jpeg"; img.MarkupMatches( - @ + @ ); } @@ -145,7 +145,7 @@ var img = cut.Find("img"); img.MarkupMatches( - @ + @ ); } @@ -161,26 +161,7 @@ var img = cut.Find("img"); string expectedsrc = $"images/orgs/1_thumbnail_{(int)size}.jpeg"; img.MarkupMatches( - @ - ); - } - - [Test] - public void Test_AttributeSplatting() - { - var cut = Render( - @ - ); - - var imgById = cut.Find("#thumbnail"); - var imgByClass = cut.Find(".img"); - - imgById.MarkupMatches( - @ - ); - - imgByClass.MarkupMatches( - @ + @ ); } } \ No newline at end of file diff --git a/HVZ.Web/Pages/About.razor b/HVZ.Web/Pages/About.razor new file mode 100644 index 00000000..79e40f8d --- /dev/null +++ b/HVZ.Web/Pages/About.razor @@ -0,0 +1,52 @@ +@using Microsoft.AspNetCore.Components.Authorization +@using HVZ.Web.Services +@inject NavigationManager Navigation +@inject AuthenticationStateProvider AuthenticationStateProvider +@inject EmailService Email +@page "/about" + +PlayHVZ + +
+

Welcome to PlayHVZ.org

+ @*This lives here for now until we create a settings page*@ + +

PlayHVZ is a tool for managing games of Humans vs Zombies.

+ + + + + +

Welcome back

+ + +
+
+

New to PlayHVZ?

+ Register +
+
+

Returning user?

+ Login +
+
+ + + + + + + +

Features

+
    +
  • + Organization management +
    • +
  • + OZs +
    • +
  • + Discord integration +
    • +
+
\ No newline at end of file diff --git a/HVZ.Web/Pages/Account/Login.cshtml b/HVZ.Web/Pages/Account/Login.cshtml index c17145f5..67d21b99 100644 --- a/HVZ.Web/Pages/Account/Login.cshtml +++ b/HVZ.Web/Pages/Account/Login.cshtml @@ -6,14 +6,15 @@ @{ } - + - + + @@ -64,7 +65,8 @@ - - + + - \ No newline at end of file + + \ No newline at end of file diff --git a/HVZ.Web/Pages/Account/Register.cshtml b/HVZ.Web/Pages/Account/Register.cshtml index f9a0e7e4..bd4f2a72 100644 --- a/HVZ.Web/Pages/Account/Register.cshtml +++ b/HVZ.Web/Pages/Account/Register.cshtml @@ -7,13 +7,15 @@ @{ } + - + + @@ -71,5 +73,8 @@ + + + \ No newline at end of file diff --git a/HVZ.Web/Pages/Account/Reset.cshtml b/HVZ.Web/Pages/Account/Reset.cshtml index 793cde0c..93f5341a 100644 --- a/HVZ.Web/Pages/Account/Reset.cshtml +++ b/HVZ.Web/Pages/Account/Reset.cshtml @@ -9,9 +9,10 @@ - + + Reset Password @@ -55,7 +56,9 @@ } + + \ No newline at end of file diff --git a/HVZ.Web/Pages/Account/ResetRequest.cshtml b/HVZ.Web/Pages/Account/ResetRequest.cshtml index 204ae81b..d457bc57 100644 --- a/HVZ.Web/Pages/Account/ResetRequest.cshtml +++ b/HVZ.Web/Pages/Account/ResetRequest.cshtml @@ -9,9 +9,10 @@ - + + Reset Password @@ -45,7 +46,7 @@

Success! Please check your email.

} - - + + - \ No newline at end of file + diff --git a/HVZ.Web/Pages/Explore.razor b/HVZ.Web/Pages/Explore.razor new file mode 100644 index 00000000..da23cecd --- /dev/null +++ b/HVZ.Web/Pages/Explore.razor @@ -0,0 +1,7 @@ +@page "/explore" + +

Explore

+ +@code { + +} diff --git a/HVZ.Web/Pages/Index.razor b/HVZ.Web/Pages/Index.razor index 0ed1b368..fb15ef93 100644 --- a/HVZ.Web/Pages/Index.razor +++ b/HVZ.Web/Pages/Index.razor @@ -3,24 +3,21 @@ @inject NavigationManager Navigation @inject AuthenticationStateProvider AuthenticationStateProvider @inject EmailService Email -@* @inject ImageService Image *@ @page "/" -Index +PlayHVZ Home - +
+ @*Home*@ +

Home

+ @*This lives here for now until we create a settings page*@ + + + + + + + + - - - -

- Hello, @context.User.Claims.FirstOrDefault(c => c.Type == "FullName")?.Value! -

- - - Login - - - - - +
\ No newline at end of file diff --git a/HVZ.Web/Pages/_Layout.cshtml b/HVZ.Web/Pages/_Layout.cshtml index 198236ff..b44d01c3 100644 --- a/HVZ.Web/Pages/_Layout.cshtml +++ b/HVZ.Web/Pages/_Layout.cshtml @@ -3,14 +3,15 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - + - + + @@ -28,5 +29,8 @@ + + @**@ + diff --git a/HVZ.Web/Shared/LoginDisplay.razor b/HVZ.Web/Shared/LoginDisplay.razor index 8ed3d64d..ee96d228 100644 --- a/HVZ.Web/Shared/LoginDisplay.razor +++ b/HVZ.Web/Shared/LoginDisplay.razor @@ -2,17 +2,21 @@ @inject NavigationManager Navigation @inject AuthenticationStateProvider AuthenticationStateProvider - - - - Logout - - - Login - - - - +
+ + + + Logout +
+ +
+ + + Login + + + +
@code { private string? id = "1234"; diff --git a/HVZ.Web/Shared/MainLayout.razor b/HVZ.Web/Shared/MainLayout.razor index 84a16aa2..e888be3b 100644 --- a/HVZ.Web/Shared/MainLayout.razor +++ b/HVZ.Web/Shared/MainLayout.razor @@ -1,20 +1,19 @@ -@inherits LayoutComponentBase +@using HVZ.Web.Shared.Navigation +@inherits LayoutComponentBase HVZ.Web
-
- -
-
- - About -
+ +
@Body
+ +
+
diff --git a/HVZ.Web/Shared/NavMenu.razor b/HVZ.Web/Shared/NavMenu.razor index 1b3df88c..76823d70 100644 --- a/HVZ.Web/Shared/NavMenu.razor +++ b/HVZ.Web/Shared/NavMenu.razor @@ -1,6 +1,6 @@ -
+@*
- HVZ.Web + PlayHVZ @@ -36,4 +36,4 @@ { collapseNavMenu = !collapseNavMenu; } -} +} *@ diff --git a/HVZ.Web/Shared/Navigation/Footer.razor b/HVZ.Web/Shared/Navigation/Footer.razor new file mode 100644 index 00000000..68bd3011 --- /dev/null +++ b/HVZ.Web/Shared/Navigation/Footer.razor @@ -0,0 +1,25 @@ +@*
+ anything that should stick to the bottom of the screen goes here + +
*@ +
+

Footer Sticky

+
+ diff --git a/HVZ.Web/Shared/Navigation/NavBar.razor b/HVZ.Web/Shared/Navigation/NavBar.razor new file mode 100644 index 00000000..8644731f --- /dev/null +++ b/HVZ.Web/Shared/Navigation/NavBar.razor @@ -0,0 +1,50 @@ +@inject NavigationManager NavigationManager + + +@code +{ + string currentLocation = ""; + + string homeLink = ""; + string exploreLink = "explore"; + string aboutLink = "about"; + + string HomeActive => currentLocation == homeLink ? "active" : null!; + string ExploreActive => currentLocation == exploreLink ? "active" : null!; + string AboutActive => currentLocation == aboutLink ? "active" : null!; + + protected override void OnInitialized() + { + // Get the first URL path after the domain name + // https://www.playhvz.org/pathToGet + currentLocation = NavigationManager.Uri.Split("/")[3]; + + NavigationManager.LocationChanged += (_, eventArgs) => { + currentLocation = eventArgs.Location.Split("/")[3]; + InvokeAsync(StateHasChanged); + }; + } +} diff --git a/HVZ.Web/Shared/Navigation/NavBar.razor.css b/HVZ.Web/Shared/Navigation/NavBar.razor.css new file mode 100644 index 00000000..e69de29b diff --git a/HVZ.Web/Shared/RedirectToAbout.razor b/HVZ.Web/Shared/RedirectToAbout.razor new file mode 100644 index 00000000..79886728 --- /dev/null +++ b/HVZ.Web/Shared/RedirectToAbout.razor @@ -0,0 +1,10 @@ +@inject NavigationManager Navigation + +@code { + // Navigation has to be done in OnAfterRender, cannot be called in OnInitialized + // Keep in mind when using in in home + protected override void OnAfterRender(bool firstTime) + { + Navigation.NavigateTo("/about"); + } +} diff --git a/HVZ.Web/Shared/Ui Helpers/ImageUploader.razor b/HVZ.Web/Shared/Ui Helpers/ImageUploader.razor index 0bdbba63..18658f73 100644 --- a/HVZ.Web/Shared/Ui Helpers/ImageUploader.razor +++ b/HVZ.Web/Shared/Ui Helpers/ImageUploader.razor @@ -9,7 +9,7 @@ } else { - +

@file.Name

} diff --git a/HVZ.Web/Shared/Ui Helpers/ThemeToggle.razor b/HVZ.Web/Shared/Ui Helpers/ThemeToggle.razor new file mode 100644 index 00000000..8e2cd890 --- /dev/null +++ b/HVZ.Web/Shared/Ui Helpers/ThemeToggle.razor @@ -0,0 +1,38 @@ +@inject IJSRuntime JS + + + +@code { + bool prefersLightTheme = true; + + string GetTheme => prefersLightTheme ? "light" : "dark"; + + string GetButtonStyle => prefersLightTheme ? "dark" : "light"; + + string GetThemeIcon => prefersLightTheme ? "sun" : "moon"; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (!firstRender) return; + + var themePref = await JS.InvokeAsync("getThemePreference", new object { }); + + if (themePref == "dark") + { + prefersLightTheme = false; + } + else + { + prefersLightTheme = true; + } + + } + + async void ToggleTheme() + { + prefersLightTheme = !prefersLightTheme; + await JS.InvokeVoidAsync("saveThemePreference", GetTheme); + await JS.InvokeVoidAsync("applyTheme", GetTheme); + StateHasChanged(); + } +} diff --git a/HVZ.Web/Shared/Ui Helpers/Thumbnail.razor b/HVZ.Web/Shared/Ui Helpers/Thumbnail.razor index 13d15f1d..c0f06ca9 100644 --- a/HVZ.Web/Shared/Ui Helpers/Thumbnail.razor +++ b/HVZ.Web/Shared/Ui Helpers/Thumbnail.razor @@ -3,7 +3,7 @@ @inject IUserRepo UserRepo @inject IOrgRepo OrgRepo - + @code { diff --git a/HVZ.Web/wwwroot/css/site.css b/HVZ.Web/wwwroot/css/site.css index dc4c68b3..9bf49f8f 100644 --- a/HVZ.Web/wwwroot/css/site.css +++ b/HVZ.Web/wwwroot/css/site.css @@ -1,5 +1,22 @@ @import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); +::-webkit-scrollbar { + width: 10px; +} + +::-webkit-scrollbar-track { + background-color: rgba(0, 0, 0, 0); +} + +::-webkit-scrollbar-thumb { + background-color: gray; + border-radius: 4px; +} + +::-webkit-scrollbar-thumb:hover { + background-color: lightgray; +} + html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/HVZ.Web/wwwroot/js/theme.js b/HVZ.Web/wwwroot/js/theme.js new file mode 100644 index 00000000..37d5c6ad --- /dev/null +++ b/HVZ.Web/wwwroot/js/theme.js @@ -0,0 +1,35 @@ + +/// Get the user theme preference from local storage and apply it to the page + +getTheme(); + +function getTheme() { + let theme = getThemePreference(); + if (theme !== null) { + applyTheme(theme); + return; + } + + const darkThemeMq = window.matchMedia("(prefers-color-scheme: dark)"); + if (darkThemeMq.matches) + theme = "dark"; + else + theme = "light"; + + saveThemePreference(theme); + + applyTheme(theme); +} + +function applyTheme(theme) { + console.log(theme) + document.getElementsByTagName("html")[0].setAttribute("data-bs-theme", theme) +} + +function saveThemePreference(preference) { + localStorage.setItem("theme", preference); +} + +function getThemePreference() { + return localStorage.getItem("theme"); +} \ No newline at end of file diff --git a/HVZ.sln b/HVZ.sln index efaf5e16..6227d1da 100644 --- a/HVZ.sln +++ b/HVZ.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HVZ.Web", "HVZ.Web\HVZ.Web.csproj", "{A015B3E2-3E3A-4504-A20F-EB7A2F26610D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HVZ.Web", "HVZ.Web\HVZ.Web.csproj", "{A015B3E2-3E3A-4504-A20F-EB7A2F26610D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HVZ.Persistence", "HVZ.Persistence\HVZ.Persistence.csproj", "{DDA3D690-D9B1-4404-8F3A-4448ABCAE214}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HVZ.Persistence", "HVZ.Persistence\HVZ.Persistence.csproj", "{DDA3D690-D9B1-4404-8F3A-4448ABCAE214}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HVZ.Persistence.MongoDB", "HVZ.Persistence.MongoDB\HVZ.Persistence.MongoDB.csproj", "{4AF84EDD-F4B7-4315-9EE4-63EAECCA25FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HVZ.Persistence.MongoDB", "HVZ.Persistence.MongoDB\HVZ.Persistence.MongoDB.csproj", "{4AF84EDD-F4B7-4315-9EE4-63EAECCA25FC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HVZ.Tests", "HVZ.Tests\HVZ.Tests.csproj", "{66120091-6BF5-4998-88CF-2B70DE8033C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HVZ.Tests", "HVZ.Tests\HVZ.Tests.csproj", "{66120091-6BF5-4998-88CF-2B70DE8033C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HVZ.DiscordIntegration", "HVZ.DiscordIntegration\HVZ.DiscordIntegration.csproj", "{CB0C8E7F-980E-45CB-9C06-AB39E4362888}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HVZ.DiscordIntegration", "HVZ.DiscordIntegration\HVZ.DiscordIntegration.csproj", "{CB0C8E7F-980E-45CB-9C06-AB39E4362888}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,18 +23,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|x64.ActiveCfg = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|x64.Build.0 = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|x86.ActiveCfg = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Debug|x86.Build.0 = Debug|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|Any CPU.Build.0 = Release|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|x64.ActiveCfg = Release|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|x64.Build.0 = Release|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|x86.ActiveCfg = Release|Any CPU - {07C591C3-C318-4815-B99A-39913A26CD8C}.Release|x86.Build.0 = Release|Any CPU {A015B3E2-3E3A-4504-A20F-EB7A2F26610D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A015B3E2-3E3A-4504-A20F-EB7A2F26610D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A015B3E2-3E3A-4504-A20F-EB7A2F26610D}.Debug|x64.ActiveCfg = Debug|Any CPU