From 1f19933c23dbb39ed4fc197f96a10a27e101626e Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Fri, 18 Dec 2020 21:40:42 -0500 Subject: [PATCH] Complete NodaTime conversion also delete default pages --- .../Client/JobsJobsJobs.Client.csproj | 5 +- .../Client/Pages/Citizen/Dashboard.razor | 1 + src/JobsJobsJobs/Client/Pages/Counter.razor | 16 ------- src/JobsJobsJobs/Client/Pages/FetchData.razor | 46 ------------------- src/JobsJobsJobs/Client/Program.cs | 4 ++ src/JobsJobsJobs/Client/Shared/NavMenu.razor | 6 +++ .../Controllers/WeatherForecastController.cs | 40 ---------------- .../Server/JobsJobsJobs.Server.csproj | 5 ++ src/JobsJobsJobs/Server/Startup.cs | 6 ++- .../Shared/JobsJobsJobs.Shared.csproj | 2 +- src/JobsJobsJobs/Shared/WeatherForecast.cs | 17 ------- 11 files changed, 25 insertions(+), 123 deletions(-) delete mode 100644 src/JobsJobsJobs/Client/Pages/Counter.razor delete mode 100644 src/JobsJobsJobs/Client/Pages/FetchData.razor delete mode 100644 src/JobsJobsJobs/Server/Controllers/WeatherForecastController.cs delete mode 100644 src/JobsJobsJobs/Shared/WeatherForecast.cs diff --git a/src/JobsJobsJobs/Client/JobsJobsJobs.Client.csproj b/src/JobsJobsJobs/Client/JobsJobsJobs.Client.csproj index b231dcb..ce2a994 100644 --- a/src/JobsJobsJobs/Client/JobsJobsJobs.Client.csproj +++ b/src/JobsJobsJobs/Client/JobsJobsJobs.Client.csproj @@ -6,9 +6,10 @@ - - + + + diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor b/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor index 0b21952..bfa6ba2 100644 --- a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor +++ b/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor @@ -41,6 +41,7 @@ else { errorMessage = profileResult.Error; } + retrievingProfile = false; } } } diff --git a/src/JobsJobsJobs/Client/Pages/Counter.razor b/src/JobsJobsJobs/Client/Pages/Counter.razor deleted file mode 100644 index 8641f78..0000000 --- a/src/JobsJobsJobs/Client/Pages/Counter.razor +++ /dev/null @@ -1,16 +0,0 @@ -@page "/counter" - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/src/JobsJobsJobs/Client/Pages/FetchData.razor b/src/JobsJobsJobs/Client/Pages/FetchData.razor deleted file mode 100644 index 84c59e5..0000000 --- a/src/JobsJobsJobs/Client/Pages/FetchData.razor +++ /dev/null @@ -1,46 +0,0 @@ -@page "/fetchdata" -@using JobsJobsJobs.Shared -@inject HttpClient Http - -

Weather forecast

- -

This component demonstrates fetching data from the server.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[] forecasts; - - protected override async Task OnInitializedAsync() - { - forecasts = await Http.GetFromJsonAsync("WeatherForecast"); - } - -} diff --git a/src/JobsJobsJobs/Client/Program.cs b/src/JobsJobsJobs/Client/Program.cs index 4adaa42..b7c2c9d 100644 --- a/src/JobsJobsJobs/Client/Program.cs +++ b/src/JobsJobsJobs/Client/Program.cs @@ -2,10 +2,13 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using NodaTime; +using NodaTime.Serialization.SystemTextJson; using System; using System.Collections.Generic; using System.Net.Http; using System.Text; +using System.Text.Json; using System.Threading.Tasks; namespace JobsJobsJobs.Client @@ -19,6 +22,7 @@ namespace JobsJobsJobs.Client builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); builder.Services.AddSingleton(new AppState()); + builder.Services.AddSingleton(new JsonSerializerOptions().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb)); await builder.Build().RunAsync(); } } diff --git a/src/JobsJobsJobs/Client/Shared/NavMenu.razor b/src/JobsJobsJobs/Client/Shared/NavMenu.razor index d0fc6c4..ff92828 100644 --- a/src/JobsJobsJobs/Client/Shared/NavMenu.razor +++ b/src/JobsJobsJobs/Client/Shared/NavMenu.razor @@ -1,5 +1,6 @@ @inject AppState state @inject NavigationManager nav +@implements IDisposable
Jobs, Jobs, Jobs @@ -82,4 +83,9 @@ { collapseNavMenu = !collapseNavMenu; } + + public void Dispose() + { + state.OnChange -= StateHasChanged; + } } \ No newline at end of file diff --git a/src/JobsJobsJobs/Server/Controllers/WeatherForecastController.cs b/src/JobsJobsJobs/Server/Controllers/WeatherForecastController.cs deleted file mode 100644 index 7411183..0000000 --- a/src/JobsJobsJobs/Server/Controllers/WeatherForecastController.cs +++ /dev/null @@ -1,40 +0,0 @@ -using JobsJobsJobs.Shared; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JobsJobsJobs.Server.Controllers -{ - [ApiController] - [Route("[controller]")] - public class WeatherForecastController : ControllerBase - { - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - private readonly ILogger _logger; - - public WeatherForecastController(ILogger logger) - { - _logger = logger; - } - - [HttpGet] - public IEnumerable Get() - { - var rng = new Random(); - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = DateTime.Now.AddDays(index), - TemperatureC = rng.Next(-20, 55), - Summary = Summaries[rng.Next(Summaries.Length)] - }) - .ToArray(); - } - } -} diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj index dd6057c..edad51e 100644 --- a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj +++ b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj @@ -8,6 +8,7 @@ + @@ -18,5 +19,9 @@ + + + + diff --git a/src/JobsJobsJobs/Server/Startup.cs b/src/JobsJobsJobs/Server/Startup.cs index 5c8018d..dda0659 100644 --- a/src/JobsJobsJobs/Server/Startup.cs +++ b/src/JobsJobsJobs/Server/Startup.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; using NodaTime; +using NodaTime.Serialization.SystemTextJson; using Npgsql; using System.Text; @@ -26,11 +27,14 @@ namespace JobsJobsJobs.Server // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { + // TODO: configure JSON serialization for NodaTime services.AddScoped(_ => new NpgsqlConnection(Configuration.GetConnectionString("JobsDb"))); services.AddSingleton(SystemClock.Instance); services.AddLogging(); services.AddControllersWithViews(); - services.AddRazorPages(); + services.AddRazorPages() + .AddJsonOptions(options => + options.JsonSerializerOptions.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb)); services.AddAuthentication(options => { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; diff --git a/src/JobsJobsJobs/Shared/JobsJobsJobs.Shared.csproj b/src/JobsJobsJobs/Shared/JobsJobsJobs.Shared.csproj index 84ed6e0..a27a8db 100644 --- a/src/JobsJobsJobs/Shared/JobsJobsJobs.Shared.csproj +++ b/src/JobsJobsJobs/Shared/JobsJobsJobs.Shared.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/JobsJobsJobs/Shared/WeatherForecast.cs b/src/JobsJobsJobs/Shared/WeatherForecast.cs deleted file mode 100644 index 2294174..0000000 --- a/src/JobsJobsJobs/Shared/WeatherForecast.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace JobsJobsJobs.Shared -{ - public class WeatherForecast - { - public DateTime Date { get; set; } - - public int TemperatureC { get; set; } - - public string? Summary { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } -}