feat(Documents) Notes/Docs page improvements and warning cleanup
This commit is contained in:
@@ -100,17 +100,17 @@
|
||||
|
||||
#if NO_SQL
|
||||
[Parameter]
|
||||
public List<WebSectionModel> WebSections { get; set; }
|
||||
public List<WebSectionModel> WebSections { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public List<WebPageModel> WebPages { get; set; }
|
||||
public List<WebPageModel> WebPages { get; set; } = default!;
|
||||
|
||||
#else
|
||||
[Parameter]
|
||||
public DbSet<WebSectionModel> WebSections { get; set; }
|
||||
public DbSet<WebSectionModel> WebSections { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public DbSet<WebPageModel> WebPages { get; set; }
|
||||
public DbSet<WebPageModel> WebPages { get; set; } = default!;
|
||||
#endif
|
||||
|
||||
protected override void OnInitialized() {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
@using Microsoft.EntityFrameworkCore
|
||||
<div class="mobileFooter">
|
||||
<div class="mobileNavSectionsContainer">
|
||||
@foreach (var _section in WebSections) {
|
||||
<div class="mobileNavSectionButton" @onclick="() => OnSectionClicked(_section)" @onclick:preventDefault="true" @onclick:stopPropagation="true">
|
||||
@foreach (var webSection in WebSections) {
|
||||
<div class="mobileNavSectionButton" @onclick="() => OnSectionClicked(webSection)" @onclick:preventDefault="true" @onclick:stopPropagation="true">
|
||||
<div class="mobileNavSectionButtonText">
|
||||
@_section.Name
|
||||
@webSection?.Name
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@@ -17,18 +17,18 @@
|
||||
</div>
|
||||
|
||||
@if (selectedSection != null) {
|
||||
var pages = (from page in WebPages
|
||||
List<WebPageModel?> webPages = (from page in WebPages
|
||||
where page.WebSectionModelId == selectedSection.Id
|
||||
select page).ToList();
|
||||
select page).ToList()!;
|
||||
|
||||
<div class="mobileNavPagesContainer">
|
||||
@foreach (var _page in pages) {
|
||||
if (_page.IsPrivate.Equals("True")) {
|
||||
@foreach (var webPage in webPages) {
|
||||
if (webPage!.IsPrivate.Equals("True")) {
|
||||
continue;
|
||||
}
|
||||
<div class="mobileNavPageButton" @onclick="() => OnPageLinkClicked(_page)" @onclick:preventDefault="true" @onclick:stopPropagation="true">
|
||||
<div class="mobileNavPageButton" @onclick="() => OnPageLinkClicked(webPage)" @onclick:preventDefault="true" @onclick:stopPropagation="true">
|
||||
<div class="mobileNavPageButtonText">
|
||||
@_page.Name
|
||||
@webPage.Name
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
|
||||
<style>
|
||||
fullPageButton {
|
||||
.fullPageButton {
|
||||
position: fixed;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
@@ -140,10 +140,10 @@
|
||||
@code {
|
||||
#if NO_SQL
|
||||
[Parameter]
|
||||
public List<WebSectionModel> WebSections { get; set; }
|
||||
public List<WebSectionModel?> WebSections { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public List<WebPageModel> WebPages { get; set; }
|
||||
public List<WebPageModel> WebPages { get; set; } = default!;
|
||||
|
||||
#else
|
||||
[Parameter]
|
||||
@@ -154,22 +154,22 @@
|
||||
#endif
|
||||
|
||||
[Inject]
|
||||
public NavigationManager NavigationManager { get; set; }
|
||||
public NavigationManager NavigationManager { get; set; } = default!;
|
||||
|
||||
|
||||
public WebSectionModel selectedSection;
|
||||
public WebPageModel selectedPage;
|
||||
private WebSectionModel? selectedSection;
|
||||
private WebPageModel? selectedPage;
|
||||
|
||||
|
||||
void OnSectionClicked(WebSectionModel webSection) {
|
||||
void OnSectionClicked(WebSectionModel? webSection) {
|
||||
selectedSection = webSection;
|
||||
}
|
||||
|
||||
void OnPageLinkClicked(WebPageModel webPage) {
|
||||
void OnPageLinkClicked(WebPageModel? webPage) {
|
||||
selectedPage = webPage;
|
||||
selectedSection = null;
|
||||
|
||||
NavigationManager.NavigateTo(webPage.Href);
|
||||
NavigationManager.NavigateTo(webPage?.Href!);
|
||||
}
|
||||
|
||||
void OnPageClicked(EventArgs eventArgs) {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
@inject NavigationManager NavigationManager;
|
||||
|
||||
|
||||
@if (IsOnPage) {
|
||||
@if (isOnPage) {
|
||||
<NavLink href="@Page.Href" class="navContainer navLink navSelected">
|
||||
<div class="navName">
|
||||
@Page.Name
|
||||
@@ -62,14 +62,15 @@ else {
|
||||
@code {
|
||||
|
||||
[Parameter]
|
||||
public WebPageModel Page { get; set; }
|
||||
public WebPageModel Page { get; set; } = default!;
|
||||
|
||||
bool IsOnPage = false;
|
||||
bool isOnPage = false;
|
||||
|
||||
protected override async Task OnParametersSetAsync() {
|
||||
protected override Task OnParametersSetAsync() {
|
||||
var uri = NavigationManager.Uri.Remove(0, NavigationManager.BaseUri.Count()).ToLower();
|
||||
|
||||
IsOnPage = Page.Href.ToLower().Equals(uri);
|
||||
isOnPage = Page.Href.ToLower().Equals(uri);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@
|
||||
@code {
|
||||
|
||||
[Parameter]
|
||||
public WebSectionModel? Section { get; set; }
|
||||
public WebSectionModel Section { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public List<WebPageModel>? Children { get; set; }
|
||||
public List<WebPageModel> Children { get; set; } = default!;
|
||||
|
||||
}
|
||||
@@ -16,11 +16,11 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="fullPageButton @NavOpen" @onclick="OnNavClicked" @onclick:stopPropagation="false" @onclick:preventDefault="false">
|
||||
<div class="fullPageButton @navOpen" @onclick="OnNavClicked" @onclick:stopPropagation="false" @onclick:preventDefault="false">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="tabletNav @NavOpen">
|
||||
<div class="tabletNav @navOpen">
|
||||
@foreach (var _section in WebSections) {
|
||||
var pages = (from page in WebPages
|
||||
where page.WebSectionModelId == _section.Id
|
||||
@@ -144,11 +144,11 @@
|
||||
|
||||
#if NO_SQL
|
||||
[Parameter]
|
||||
public List<WebSectionModel> WebSections { get; set; }
|
||||
public List<WebSectionModel> WebSections { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public List<WebPageModel> WebPages { get; set; }
|
||||
|
||||
public List<WebPageModel> WebPages { get; set; } = default!;
|
||||
|
||||
#else
|
||||
[Parameter]
|
||||
public DbSet<WebSectionModel> WebSections { get; set; }
|
||||
@@ -159,15 +159,15 @@
|
||||
|
||||
|
||||
|
||||
bool NavOpen = true;
|
||||
bool navOpen = true;
|
||||
|
||||
void OnNavClicked(EventArgs eventArgs) {
|
||||
NavOpen = !NavOpen;
|
||||
navOpen = !navOpen;
|
||||
}
|
||||
|
||||
|
||||
void OnPageClicked(EventArgs eventArgs) {
|
||||
NavOpen = false;
|
||||
navOpen = false;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user