Improved First Start experience (#400)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.gitignore

@@ -13,6 +13,9 @@ TagzApp.Web.db
 *.userosscache
 *.sln.docstates
 
+# Ignore vim swap files
+*.swp
+
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 

scripts/AddSqliteSecurityMigration.cmd

@@ -0,0 +1 @@
+dotnet ef migrations add --context TagzApp.Security.SecurityContext -p ..\src\TagzApp.Storage.Sqlite.Security\ -s ..\src\TagzApp.Web %1

src/TagzApp.Blazor.Client/Components/Pages/Waterfall.razor

@@ -32,7 +32,7 @@ else
 
 @code {
 
-	private SortedList<DateTimeOffset, TagzApp.ViewModels.Data.ContentModel> _Content = new();
+	private SortedList<string, TagzApp.ViewModels.Data.ContentModel> _Content = new();
 
 	WaterfallModal Modal = new();
 	ContentModel ModalContent = null!;
@@ -57,7 +57,8 @@ else
 
 		foreach (var content in existingContent)
 		{
-			_Content.Add(content.Timestamp, content);
+			if (_Content.ContainsKey(content.Timestamp.ToString("yyyyMMddHHmmss") + content.ProviderId)) continue;
+			_Content.Add(content.Timestamp.ToString("yyyyMMddHHmmss") + content.ProviderId, content);
 		}
 
 		await base.OnInitializedAsync();
@@ -96,7 +97,7 @@ else
 				return;
 			}
 
-			_Content.Add(content.Timestamp, content);
+			_Content.Add(content.Timestamp.ToString("yyyyMMddHHmmss") + content.ProviderId, content);
 			StateHasChanged();
 		});
 
@@ -136,7 +137,7 @@ else
 			{
 				if (item is ContentModel content)
 				{
-					_Content.Add(content.Timestamp, content);
+					_Content.Add(content.Timestamp.ToString("yyyyMMddHHmmss") + content.ProviderId, content);
 				}
 			}
 			_PauseQueue.Clear();

src/TagzApp.Blazor/Components/Admin/Pages/Index.razor

@@ -1,6 +1,7 @@
 @page "/Admin/Index"
 @using Microsoft.AspNetCore.Authorization
-@attribute [Authorize(Roles = RolesAndPolicies.Role.Admin)]
+@* @attribute [Authorize(Roles = "Admin")] *@
+@inject NavigationManager NavigationManager
 @layout Admin.Shared.AdminLayout
 
 
@@ -10,9 +11,16 @@
 
 @code {
 
+	[CascadingParameter]
+	private HttpContext HttpContext { get; set; } = default!;
+
 	protected override Task OnInitializedAsync()
 	{
-
+		var user = HttpContext.User;
+		if (!user.IsInRole("Admin"))
+		{
+			NavigationManager.NavigateTo("/");
+		}
 		return base.OnInitializedAsync();
 	}
 

src/TagzApp.Blazor/Components/Admin/Pages/ModalCustomization.razor

@@ -1,12 +1,12 @@
 @page "/admin/modalcustomization"
 
-@attribute [Authorize(policy: RolesAndPolicies.Policy.AdminRoleOnly)]
 @using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Authorization
 @using System.Drawing
 @layout AdminLayout
 @inject IJSRuntime JSRuntime
 @inject ModalConfiguration Config
+@inject NavigationManager NavigationManager
 @rendermode InteractiveServer
 
 <div class="row" style="min-height: 300px">
@@ -108,6 +108,19 @@
 	private string _BackgroundImage;
 	private string _BackgroundImageMimeType;
 
+	[CascadingParameter]
+	private HttpContext HttpContext { get; set; } = default!;
+
+	protected override Task OnInitializedAsync()
+	{
+		var user = HttpContext.User;
+		if (!user.IsInRole("Admin"))
+		{
+			NavigationManager.NavigateTo("/");
+		}
+		return base.OnInitializedAsync();
+	}
+
 	async Task SaveChanges()
 	{
 

src/TagzApp.Blazor/Components/Admin/Pages/Users.razor

@@ -4,10 +4,23 @@
 @using Microsoft.EntityFrameworkCore
 @layout Admin.Shared.AdminLayout
 @inject UserManager<TagzAppUser> UserManager
+@inject NavigationManager NavigationManager
+@inject ApplicationConfiguration AppConfig
+@inject IJSRuntime Js
 @rendermode InteractiveServer
 
 <h3>User Roles Management</h3>
 
+@if (AppConfig.SingleUserMode) {
+ <div>You're in Single User Mode
+
+    <p class="alert alert-primary" role="alert">Converting to Multi-User Mode is a one-way operation that cannot be reversed.  You will need to register as a new user and login with that user immediately to be granted Admin access.  After that, you can add more users with various roles.
+   </p>
+
+	<button type="button" class="btn btn-danger" @onclick="ConvertUserMode">Change to Multi-User Mode</button>
+
+ </div>
+} else {
 <table>
 	<tr>
 		@*<th>User ID</th>*@
@@ -29,17 +42,29 @@
 </table>
 
 <ManageRoles @ref="ManageRolesDialog" CurrentUser="SelectedUser" OnComplete="CloseManageRoles" />
+}
 
 @code {
 
+	[CascadingParameter]
+	private HttpContext HttpContext { get; set; } = default!;
+
 	private List<TagzAppUser> UserList { get; set; } = [];
 
 	private TagzAppUser SelectedUser { get; set; } = new();
 
 	private ManageRoles ManageRolesDialog = new();
 
-	override protected async Task OnInitializedAsync()
+	override protected async Task OnParametersSetAsync()
 	{
+
+		if (AppConfig.SingleUserMode) return;
+		var user = HttpContext.User;
+		if (!user.IsInRole("Admin"))
+		{
+			NavigationManager.NavigateTo("/");
+		}
+
 		UserList = await UserManager.Users.ToListAsync();
 	}
 
@@ -54,4 +79,15 @@
 		SelectedUser = null;
 	}
 
-}
+  private async Task ConvertUserMode()
+  {
+		var accepted = await Js.InvokeAsync<bool>("confirm", "Are you sure you would like to convert to multi-user mode?  This is a one-way operation and cannot be reversed");
+		if (accepted) {
+			AppConfig.SingleUserMode = false;
+   		await AppConfig.SaveConfiguration(ConfigureTagzAppFactory.Current);
+			Program.Restart();
+			NavigationManager.NavigateTo("/");
+		}
+  }
+
+}

src/TagzApp.Blazor/Components/Admin/Shared/AdminNavMenu.razor

@@ -8,5 +8,7 @@
 	<li class="nav-item"><NavLink class="nav-link" href="/Admin/ModalCustomization">Modal Customization</NavLink></li>
 
 	@* NOTE: Temporary placeholder *@
-	<li class="nav-item"><NavLink class="nav-link" href="/Admin/YouTubeChat">YouTubeChat</NavLink></li>
+@*	<li class="nav-item"><NavLink class="nav-link" href="/Admin/YouTubeChat">YouTubeChat</NavLink></li>
+*@
+
 </ul>

src/TagzApp.Blazor/Components/Layout/Footer.razor

@@ -1,10 +1,10 @@
 <footer class="border-top footer text-muted text-center">
-		&copy; 2023 - TagzApp.Web -
+		&copy; 2023,2024 - TagzApp.Web -
 		<a href="/Privacy">Privacy</a> -
 		Running on .NET @fxVersion -
 		<a target="_blank" href="https://github.com/FritzAndFriends/TagzApp">Source Code</a>
 </footer>
 
 @code {
 	string fxVersion = System.Environment.Version.ToString();
-}
+}

src/TagzApp.Blazor/Components/Layout/Header.razor

@@ -54,4 +54,4 @@
 	[CascadingParameter]
 	private HttpContext HttpContext { get; set; } = default!;
 
-}
+}

src/TagzApp.Blazor/Components/LoginView.razor

@@ -3,19 +3,20 @@
 @using TagzApp.Blazor.Components.Account
 @inject IdentityUserAccessor UserMgr
 @inject NavigationManager NavigationManager
+@inject ApplicationConfiguration AppConfig
 @implements IDisposable
 
 <AuthorizeView Roles="@RolesAndPolicies.Role.Admin">
 <Authorized>
 		<div class="nav-item px-3">
-			<NavLink class="nav-link" href="Admin/Index">
-				<span class="bi bi-gear-fill-nav-menu" aria-hidden="true"></span> Admin
+			<NavLink class="nav-link" href="Admin/Index" title="System Configuration and Administration features">
+				<span class="bi bi-gear-fill-nav-menu" aria-hidden="true"></span> System Admin
 			</NavLink>
 		</div>
 	</Authorized>
 </AuthorizeView>
 
-
+@if (!AppConfig.SingleUserMode) {
 <AuthorizeView>
 	<Authorized>
 		<div class="nav-item px-3">
@@ -46,6 +47,7 @@
 		</div>
 	</NotAuthorized>
 </AuthorizeView>
+}
 
 @code {
 
@@ -96,4 +98,4 @@
 	}
 
 
-}
+}

src/TagzApp.Blazor/Components/Pages/FirstStartConfiguration.razor

@@ -1,14 +1,27 @@
 @page "/FirstStartConfiguration"
 @using Microsoft.AspNetCore.Components.Sections
-@rendermode InteractiveServer
+@rendermode @(new InteractiveServerRenderMode(false))
 
 <PageTitle>First Start Configuration</PageTitle>
 
 <h1>First Start Configuration</h1>
 
+@if (CurrentConfig != null && CurrentConfig is EmptyConfigureTagzApp)
+{
+	var config = CurrentConfig as EmptyConfigureTagzApp;
+	if (!string.IsNullOrEmpty(config.Message))
+	{
+		<div class="alert alert-danger" role="alert">
+			@config.Message
+		</div>
+	}
+}
 
 @* Add a form to allow selection of a provider and setting a connection string *@
-<form @onsubmit="@OnFormValidate">
+<EditForm FormName="SiteConfig" Model="Config" OnValidSubmit="OnFormValidate">
+
+	<DataAnnotationsValidator />
+	<ValidationSummary />
 
 	<p>
 		Let's get some initial configuration for TagzApp to work properly. Would you like a basic configuration with all
@@ -19,21 +32,13 @@
 	<div class="form-group">
 
 		<InputRadioGroup @bind-Value="Config.ConfigurationType">
-				<div>
-					<InputRadio class="form-check-input" Value="@("basic")"   /> Basic
+			<div>
+				<InputRadio class="form-check-input" Value="@("basic")" /> Basic
 				<InputRadio class="form-check-input" Value="@("advanced")" @onclick="@(() => Console.WriteLine("Hello from advanced mode!"))" /> Advanced
 			</div>
 		</InputRadioGroup>
-@* 		<label for="provider" class="me-3">Configuration Type:</label>
-		<input class="form-check-input" type="radio" id="configurationType_basic" name="configurationType" value="Basic" checked="checked">
-		<label class="form-check-label" for="configurationType_basic">
-			Basic
-		</label>
-		<input class="form-check-input" type="radio" id="configurationType_advanced" name="configurationType" value="Advanced">
-		<label class="form-check-label" for="configurationType_advanced">
-			Advanced
-		</label>
- *@	</div>
+
+	</div>
 
 	<p>
 		We'll start with
@@ -42,17 +47,18 @@
 	</p>
 
 	<div class="form-group config-basic">
-		<label for="provider">Provider</label>
-		<select class="form-control" id="provider" @bind="Config.Provider">
+		<label for="provider">Basic Provider</label>
+		<InputSelect class="form-control" id="provider" @bind-Value="Config.Provider" 
+			@onchange="PrecalculateBasicConnectionString">
 			<option value="">- SELECT -</option>
 			<option value="Postgres">Postgres</option>
-			<option value="Sqlite">Sqlite</option>
-			<option value="InMemory">InMemory</option>
-		</select>
+			<option value="Sqlite">Sqlite - Good for a personal install</option>
+			<option value="InMemory">InMemory - Good for Testing</option>
+		</InputSelect>
 	</div>
 	<div class="form-group config-basic">
 		<label for="connectionString">Connection String</label>
-		<input type="text" class="form-control" id="connectionString" @bind="Config.ConnectionString" />
+		<InputText class="form-control" id="connectionString" @bind-Value="Config.ConnectionString" />
 		@* Add a validation message *@
 		<span asp-validation-for="ConnectionString" class="text-danger"></span>
 	</div>
@@ -67,16 +73,16 @@
 		@* Add fields to select a provider and connectionstring *@
 		<div class="form-group config-advanced">
 			<label for="contentProvider">Content Database Provider</label>
-			<select class="form-control" id="contentProvider" @bind="Config.ContentProvider" >
+			<InputSelect class="form-control" id="contentProvider" @bind-Value="Config.ContentProvider">
 				<option value="">- SELECT -</option>
 				<option value="Postgres">Postgres</option>
 				<option value="Sqlite">Sqlite</option>
-				<option value="InMemory">InMemory</option>
-			</select>
+				<option value="InMemory">InMemory - Good for testing</option>
+			</InputSelect>
 		</div>
 		<div class="form-group config-advanced">
 			<label for="connectionString">Content Connection String</label>
-			<InputText class="form-control" id="connectionString" Value="Config.ContentConnectionString" />
+			<InputText class="form-control" id="connectionString" @bind-Value="Config.ContentConnectionString" />
 
 			<ValidationMessage For="@(() => Config.ContentConnectionString)" class="text-danger"></ValidationMessage>
 
@@ -88,19 +94,16 @@
 		</p>
 		<div class="form-group config-advanced">
 			<label for="contentProvider">Security Database Provider</label>
-			<select class="form-control" id="securityProvider" @bind="Config.SecurityProvider">
+			<InputSelect class="form-control" id="securityProvider" @bind-Value="Config.SecurityProvider">
 				<option value="">- SELECT -</option>
 				<option value="Postgres">Postgres</option>
 				<option value="Sqlite">Sqlite</option>
-			</select>
+			</InputSelect>
 
 		</div>
 		<div class="form-group config-advanced">
 			<label for="connectionString">Security Connection String</label>
-			<input type="text" class="form-control" id="securityConnectionString" @bind="Config.SecurityConnectionString" />
-
-			@* Add a validation message *@
-			<span asp-validation-for="SecurityConnectionString" class="text-danger"></span>
+			<InputText class="form-control" id="securityConnectionString" @bind-Value="Config.SecurityConnectionString" />
 
 		</div>
 
@@ -110,4 +113,4 @@
 		<button type="submit" class="btn btn-primary form-control">Submit</button>
 	</div>
 
-</form>
+</EditForm>