From ebfe2d644ce4797a24c2dbd7a942d66afc9892e6 Mon Sep 17 00:00:00 2001 From: Tony Bark Date: Thu, 19 Sep 2024 07:39:32 -0400 Subject: [PATCH] Preemptive setup for UI redesign Bumped version from v104 to v201 (which was intended to be v105) --- changelog.md | 4 ++++ src-tauri/tauri.conf.json | 4 ++-- src/AmtrakStatus.csproj | 3 +++ src/Components/StationBtn.razor | 18 ++++++++++++------ src/Gitinfo.txt | 2 +- src/Program.cs | 2 ++ src/_Imports.razor | 1 + 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index 7dd1437..74e69e1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Change Log +## 0.201.0 + +- Completely redesigned the interface based on the Fluent Design System. + ## 0.104.2 - Clickable links that open the default broswer. diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 83b2dfb..4871515 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "AMTK Status", - "version": "0.104.2" + "version": "0.201.0" }, "tauri": { "allowlist": { @@ -20,7 +20,7 @@ }, "windows": [ { - "title": "Amtrak Status Boards", + "title": "Amtrak Status", "resizable": true, "width": 1100, "height": 768, diff --git a/src/AmtrakStatus.csproj b/src/AmtrakStatus.csproj index e049234..fc1f2af 100644 --- a/src/AmtrakStatus.csproj +++ b/src/AmtrakStatus.csproj @@ -13,6 +13,9 @@ + + + diff --git a/src/Components/StationBtn.razor b/src/Components/StationBtn.razor index e83d475..13434b4 100644 --- a/src/Components/StationBtn.razor +++ b/src/Components/StationBtn.razor @@ -1,17 +1,23 @@ @inject IJSRuntime JsRuntime @inject NavigationManager NavigationManager - +@if (IsLink) +{ + @Name +} +else +{ + +} @code { - [Parameter] - [Required] - public string? Name { get; set; } + [Parameter] public string? Name { get; set; } + + [Parameter] public string? Code { get; set; } [Parameter] - [Required] - public string? Code { get; set; } + public bool IsLink { get; set; } private void AddrRedirect() { diff --git a/src/Gitinfo.txt b/src/Gitinfo.txt index 302bfef..a2ec10b 100644 --- a/src/Gitinfo.txt +++ b/src/Gitinfo.txt @@ -1 +1 @@ -0.104.2 \ No newline at end of file +0.201.0 \ No newline at end of file diff --git a/src/Program.cs b/src/Program.cs index 8842abd..ee8efce 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.FluentUI.AspNetCore.Components; using AmtrakStatus; var builder = WebAssemblyHostBuilder.CreateDefault(args); @@ -7,5 +8,6 @@ builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); +builder.Services.AddFluentUIComponents(); await builder.Build().RunAsync(); diff --git a/src/_Imports.razor b/src/_Imports.razor index b19a116..6905ee9 100644 --- a/src/_Imports.razor +++ b/src/_Imports.razor @@ -6,5 +6,6 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop +@using Microsoft.FluentUI.AspNetCore.Components @using AmtrakStatus @using AmtrakStatus.Components \ No newline at end of file