diff --git a/ClientHub/App.razor.cs b/ClientHub/App.razor.cs deleted file mode 100644 index 90c9fcb..0000000 --- a/ClientHub/App.razor.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OI.Metrology.ClientHub; - -public partial class App -{ } \ No newline at end of file diff --git a/ClientHub/Data/WeatherForecast.cs b/ClientHub/Data/WeatherForecast.cs deleted file mode 100644 index f670038..0000000 --- a/ClientHub/Data/WeatherForecast.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace OI.Metrology.ClientHub.Data; - -public class WeatherForecast -{ - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } -} \ No newline at end of file diff --git a/ClientHub/Data/WeatherForecastService.cs b/ClientHub/Data/WeatherForecastService.cs deleted file mode 100644 index 24178d6..0000000 --- a/ClientHub/Data/WeatherForecastService.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace OI.Metrology.ClientHub.Data; - -public class WeatherForecastService -{ - private static readonly string[] _Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - public Task GetForecastAsync(DateOnly startDate) - { - return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = _Summaries[Random.Shared.Next(_Summaries.Length)] - }).ToArray()); - } -} \ No newline at end of file diff --git a/ClientHub/OI.Metrology.ClientHub.csproj b/ClientHub/OI.Metrology.ClientHub.csproj index 1ff7cc5..b5d6b0a 100644 --- a/ClientHub/OI.Metrology.ClientHub.csproj +++ b/ClientHub/OI.Metrology.ClientHub.csproj @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/ClientHub/Pages/Error.cshtml b/ClientHub/Pages/Error.cshtml index 3bd7411..432b20b 100644 --- a/ClientHub/Pages/Error.cshtml +++ b/ClientHub/Pages/Error.cshtml @@ -1,4 +1,4 @@ -@page +@page @model OI.Metrology.ClientHub.Pages.ErrorModel diff --git a/ClientHub/Pages/Error.cshtml.cs b/ClientHub/Pages/Error.cshtml.cs index 7f66220..6f45b9b 100644 --- a/ClientHub/Pages/Error.cshtml.cs +++ b/ClientHub/Pages/Error.cshtml.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using System.Diagnostics; diff --git a/ClientHub/Pages/FetchData.razor b/ClientHub/Pages/FetchData.razor deleted file mode 100644 index 7fe4d4e..0000000 --- a/ClientHub/Pages/FetchData.razor +++ /dev/null @@ -1,41 +0,0 @@ -@page "/fetchdata" - -@using OI.Metrology.ClientHub.Data -@using Microsoft.AspNetCore.Components.Web - -@namespace OI.Metrology.ClientHub.Pages - -Weather forecast - -

Weather forecast

- -

This component demonstrates fetching data from a service.

- -@if (_WeatherForecasts is null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (WeatherForecast weatherForecast in _WeatherForecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@weatherForecast.Date.ToShortDateString()@weatherForecast.TemperatureC@weatherForecast.TemperatureF@weatherForecast.Summary
-} diff --git a/ClientHub/Pages/FetchData.razor.cs b/ClientHub/Pages/FetchData.razor.cs deleted file mode 100644 index f24a0a5..0000000 --- a/ClientHub/Pages/FetchData.razor.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNetCore.Components; -using OI.Metrology.ClientHub.Data; - -namespace OI.Metrology.ClientHub.Pages; - -public partial class FetchData -{ - private WeatherForecast[]? _WeatherForecasts; - [Inject] protected WeatherForecastService? ForecastService { get; set; } - - protected override async Task OnInitializedAsync() - { - if (ForecastService is null) - throw new NullReferenceException(nameof(ForecastService)); - _WeatherForecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now)); - } -} \ No newline at end of file diff --git a/ClientHub/Pages/FetchServiceShopOrders.razor b/ClientHub/Pages/FetchServiceShopOrders.razor deleted file mode 100644 index ed3b8fd..0000000 --- a/ClientHub/Pages/FetchServiceShopOrders.razor +++ /dev/null @@ -1,7 +0,0 @@ -@page "/fetchServiceShoporders" - -@using Microsoft.AspNetCore.Components.Web - -@namespace OI.Metrology.ClientHub.Pages - -Service-Shop Orders \ No newline at end of file diff --git a/ClientHub/Pages/FetchServiceShopOrders.razor.cs b/ClientHub/Pages/FetchServiceShopOrders.razor.cs deleted file mode 100644 index 87dd81c..0000000 --- a/ClientHub/Pages/FetchServiceShopOrders.razor.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OI.Metrology.ClientHub.Pages; - -public partial class FetchServiceShopOrders -{ } \ No newline at end of file diff --git a/ClientHub/Pages/Index.razor.cs b/ClientHub/Pages/Index.razor.cs deleted file mode 100644 index 9ff4a5e..0000000 --- a/ClientHub/Pages/Index.razor.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OI.Metrology.ClientHub.Pages; - -public partial class Index -{ } \ No newline at end of file diff --git a/ClientHub/Pages/_Host.cshtml b/ClientHub/Pages/_Host.cshtml index 182a336..4fb7fd4 100644 --- a/ClientHub/Pages/_Host.cshtml +++ b/ClientHub/Pages/_Host.cshtml @@ -47,7 +47,7 @@ - +
diff --git a/ClientHub/Program.cs b/ClientHub/Program.cs index 0a34631..f86dc71 100644 --- a/ClientHub/Program.cs +++ b/ClientHub/Program.cs @@ -1,6 +1,5 @@ using IgniteUI.Blazor.Controls; -using OI.Metrology.ClientHub.Data; -using OI.Metrology.ClientHub.Models; +using OI.Metrology.View.Models; using Serilog; using Serilog.Core; @@ -21,7 +20,7 @@ internal class Program Serilog.ILogger log = Log.ForContext(); try { - AppSettings appSettings = Models.Binder.AppSettings.Get(builder.Configuration); + AppSettings appSettings = View.Models.Binder.AppSettings.Get(builder.Configuration); // Add services to the container. _ = builder.Services.AddRazorPages(); _ = builder.Services.AddIgniteUIBlazor(typeof(IgbIconModule)); @@ -29,8 +28,6 @@ internal class Program _ = builder.Services.AddHttpContextAccessor(); _ = builder.Services.AddSingleton(_ => appSettings); - _ = builder.Services.AddSingleton(); - _ = builder.Services.AddSingleton(); _ = builder.Services.AddScoped(serviceProvider => new HttpClient { BaseAddress = new Uri(appSettings.ApiUrl) }); WebApplication app = builder.Build(); diff --git a/ClientHub/Shared/NavMenu.razor.cs b/ClientHub/Shared/NavMenu.razor.cs deleted file mode 100644 index b5101eb..0000000 --- a/ClientHub/Shared/NavMenu.razor.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OI.Metrology.ClientHub.Shared; - -public partial class NavMenu -{ } \ No newline at end of file diff --git a/ClientHub/_Imports.razor b/ClientHub/_Imports.razor index a548560..e2df7fc 100644 --- a/ClientHub/_Imports.razor +++ b/ClientHub/_Imports.razor @@ -7,4 +7,3 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using OI.Metrology.ClientHub -@using OI.Metrology.ClientHub.Shared diff --git a/OI-Metrology.sln b/OI-Metrology.sln index 3ecee65..e8a893a 100644 --- a/OI-Metrology.sln +++ b/OI-Metrology.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archive", "Archive\OI.Metro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\OI.Metrology.Shared.csproj", "{A807EAE3-7DCB-4E5E-BE54-0D7410D18B3E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "View", "View\OI.Metrology.View.csproj", "{D7988D0C-FE5D-429B-AA1C-911A1A29A468}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\OI.Metrology.Server.csproj", "{25C86DF8-EC1A-4D4B-AD4E-6561174824B9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\OI.Metrology.Tests.csproj", "{B67FB8C4-402E-4D53-90A6-90F6FDB9D082}" @@ -36,5 +38,9 @@ Global {B67FB8C4-402E-4D53-90A6-90F6FDB9D082}.Debug|Any CPU.Build.0 = Debug|Any CPU {B67FB8C4-402E-4D53-90A6-90F6FDB9D082}.Release|Any CPU.ActiveCfg = Release|Any CPU {B67FB8C4-402E-4D53-90A6-90F6FDB9D082}.Release|Any CPU.Build.0 = Release|Any CPU + {D7988D0C-FE5D-429B-AA1C-911A1A29A468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7988D0C-FE5D-429B-AA1C-911A1A29A468}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7988D0C-FE5D-429B-AA1C-911A1A29A468}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7988D0C-FE5D-429B-AA1C-911A1A29A468}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/ClientHub/App.razor b/View/App.razor similarity index 74% rename from ClientHub/App.razor rename to View/App.razor index 27aa685..deb51ae 100644 --- a/ClientHub/App.razor +++ b/View/App.razor @@ -1,4 +1,8 @@ -@namespace OI.Metrology.ClientHub +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using OI.Metrology.View.Shared + +@namespace OI.Metrology.View diff --git a/View/App.razor.cs b/View/App.razor.cs new file mode 100644 index 0000000..697b396 --- /dev/null +++ b/View/App.razor.cs @@ -0,0 +1,10 @@ +namespace OI.Metrology.View; + +public partial class App : Microsoft.AspNetCore.Components.ComponentBase +{ + + public App() + { + } + +} \ No newline at end of file diff --git a/ClientHub/Models/AppSettings.cs b/View/Models/AppSettings.cs similarity index 93% rename from ClientHub/Models/AppSettings.cs rename to View/Models/AppSettings.cs index e20934c..d27a9d2 100644 --- a/ClientHub/Models/AppSettings.cs +++ b/View/Models/AppSettings.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace OI.Metrology.ClientHub.Models; +namespace OI.Metrology.View.Models; public record AppSettings(string ApiUrl, string BuildNumber, diff --git a/ClientHub/Models/Binder/AppSettings.cs b/View/Models/Binder/AppSettings.cs similarity index 96% rename from ClientHub/Models/Binder/AppSettings.cs rename to View/Models/Binder/AppSettings.cs index 67ce882..9129bcb 100644 --- a/ClientHub/Models/Binder/AppSettings.cs +++ b/View/Models/Binder/AppSettings.cs @@ -1,7 +1,8 @@ +using Microsoft.Extensions.Configuration; using System.ComponentModel.DataAnnotations; using System.Text.Json; -namespace OI.Metrology.ClientHub.Models.Binder; +namespace OI.Metrology.View.Models.Binder; public class AppSettings { diff --git a/View/OI.Metrology.View.csproj b/View/OI.Metrology.View.csproj new file mode 100644 index 0000000..98ae133 --- /dev/null +++ b/View/OI.Metrology.View.csproj @@ -0,0 +1,22 @@ + + + net7.0 + enable + enable + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ClientHub/Pages/AwaitingDisposition.razor b/View/Pages/AwaitingDisposition.razor similarity index 92% rename from ClientHub/Pages/AwaitingDisposition.razor rename to View/Pages/AwaitingDisposition.razor index e0eba7e..b467890 100644 --- a/ClientHub/Pages/AwaitingDisposition.razor +++ b/View/Pages/AwaitingDisposition.razor @@ -1,9 +1,9 @@ -@page "/" +@page "/" @page "/AwaitingDisposition" @using Microsoft.AspNetCore.Components.Web -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View Awaiting Disposition

Awaiting Disposition

diff --git a/ClientHub/Pages/AwaitingDisposition.razor.cs b/View/Pages/AwaitingDisposition.razor.cs similarity index 85% rename from ClientHub/Pages/AwaitingDisposition.razor.cs rename to View/Pages/AwaitingDisposition.razor.cs index 1637833..c7f6184 100644 --- a/ClientHub/Pages/AwaitingDisposition.razor.cs +++ b/View/Pages/AwaitingDisposition.razor.cs @@ -1,8 +1,9 @@ -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Logging; using Microsoft.JSInterop; -using OI.Metrology.ClientHub.Models; +using OI.Metrology.View.Models; -namespace OI.Metrology.ClientHub.Pages; +namespace OI.Metrology.View; public partial class AwaitingDisposition { diff --git a/ClientHub/Pages/AwaitingDisposition.razor.css b/View/Pages/AwaitingDisposition.razor.css similarity index 100% rename from ClientHub/Pages/AwaitingDisposition.razor.css rename to View/Pages/AwaitingDisposition.razor.css diff --git a/ClientHub/Pages/Counter.razor b/View/Pages/Counter.razor similarity index 86% rename from ClientHub/Pages/Counter.razor rename to View/Pages/Counter.razor index c628543..08b9e8a 100644 --- a/ClientHub/Pages/Counter.razor +++ b/View/Pages/Counter.razor @@ -2,7 +2,7 @@ @using Microsoft.AspNetCore.Components.Web -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View.Pages Counter diff --git a/ClientHub/Pages/Counter.razor.cs b/View/Pages/Counter.razor.cs similarity index 75% rename from ClientHub/Pages/Counter.razor.cs rename to View/Pages/Counter.razor.cs index 3348f8c..219f0e5 100644 --- a/ClientHub/Pages/Counter.razor.cs +++ b/View/Pages/Counter.razor.cs @@ -1,6 +1,7 @@ -using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Components; -namespace OI.Metrology.ClientHub.Pages; +namespace OI.Metrology.View.Pages; public partial class Counter { diff --git a/ClientHub/Pages/Export.razor b/View/Pages/Export.razor similarity index 95% rename from ClientHub/Pages/Export.razor rename to View/Pages/Export.razor index 4898f47..704feae 100644 --- a/ClientHub/Pages/Export.razor +++ b/View/Pages/Export.razor @@ -1,10 +1,10 @@ -@page "/Export" +@page "/Export" @using IgniteUI.Blazor.Controls @using Microsoft.AspNetCore.Components.Web @using OI.Metrology.Shared.DataModels -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View Export Data diff --git a/ClientHub/Pages/Export.razor.cs b/View/Pages/Export.razor.cs similarity index 97% rename from ClientHub/Pages/Export.razor.cs rename to View/Pages/Export.razor.cs index 68fbf4e..79ad450 100644 --- a/ClientHub/Pages/Export.razor.cs +++ b/View/Pages/Export.razor.cs @@ -1,11 +1,13 @@ -using IgniteUI.Blazor.Controls; +using IgniteUI.Blazor.Controls; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Logging; using Microsoft.JSInterop; using OI.Metrology.Shared.DataModels; using OI.Metrology.Shared.Models.Stateless; using System.Net; +using System.Net.Http.Json; -namespace OI.Metrology.ClientHub.Pages; +namespace OI.Metrology.View; public partial class Export { diff --git a/ClientHub/Pages/Export.razor.css b/View/Pages/Export.razor.css similarity index 100% rename from ClientHub/Pages/Export.razor.css rename to View/Pages/Export.razor.css diff --git a/ClientHub/Pages/Index.razor b/View/Pages/Index.razor similarity index 56% rename from ClientHub/Pages/Index.razor rename to View/Pages/Index.razor index 9129765..680d7bc 100644 --- a/ClientHub/Pages/Index.razor +++ b/View/Pages/Index.razor @@ -1,7 +1,7 @@ -@page "/Index" +@page "/index" @using Microsoft.AspNetCore.Components.Web -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View Index diff --git a/View/Pages/Index.razor.cs b/View/Pages/Index.razor.cs new file mode 100644 index 0000000..a345f79 --- /dev/null +++ b/View/Pages/Index.razor.cs @@ -0,0 +1,4 @@ +namespace OI.Metrology.View; + +public partial class Index +{ } \ No newline at end of file diff --git a/ClientHub/Pages/RunHeaders.razor b/View/Pages/RunHeaders.razor similarity index 93% rename from ClientHub/Pages/RunHeaders.razor rename to View/Pages/RunHeaders.razor index e78d41d..02fda83 100644 --- a/ClientHub/Pages/RunHeaders.razor +++ b/View/Pages/RunHeaders.razor @@ -1,8 +1,8 @@ -@page "/RunHeaders" +@page "/RunHeaders" @using Microsoft.AspNetCore.Components.Web -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View Run Headers diff --git a/ClientHub/Pages/RunHeaders.razor.cs b/View/Pages/RunHeaders.razor.cs similarity index 88% rename from ClientHub/Pages/RunHeaders.razor.cs rename to View/Pages/RunHeaders.razor.cs index e068a0f..ec712bf 100644 --- a/ClientHub/Pages/RunHeaders.razor.cs +++ b/View/Pages/RunHeaders.razor.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -namespace OI.Metrology.ClientHub.Pages; +namespace OI.Metrology.View; public partial class RunHeaders { diff --git a/ClientHub/Pages/RunHeaders.razor.css b/View/Pages/RunHeaders.razor.css similarity index 100% rename from ClientHub/Pages/RunHeaders.razor.css rename to View/Pages/RunHeaders.razor.css diff --git a/ClientHub/Pages/RunInfo.razor b/View/Pages/RunInfo.razor similarity index 96% rename from ClientHub/Pages/RunInfo.razor rename to View/Pages/RunInfo.razor index a5a0dfa..9b71385 100644 --- a/ClientHub/Pages/RunInfo.razor +++ b/View/Pages/RunInfo.razor @@ -1,8 +1,8 @@ -@page "/RunInfo/{ToolTypeId:int?}/{HeaderId:int?}" +@page "/RunInfo/{ToolTypeId:int?}/{HeaderId:int?}" @using Microsoft.AspNetCore.Components.Web -@namespace OI.Metrology.ClientHub.Pages +@namespace OI.Metrology.View Run Info diff --git a/ClientHub/Pages/RunInfo.razor.cs b/View/Pages/RunInfo.razor.cs similarity index 93% rename from ClientHub/Pages/RunInfo.razor.cs rename to View/Pages/RunInfo.razor.cs index 7903e17..7de43da 100644 --- a/ClientHub/Pages/RunInfo.razor.cs +++ b/View/Pages/RunInfo.razor.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -namespace OI.Metrology.ClientHub.Pages; +namespace OI.Metrology.View; public partial class RunInfo { diff --git a/ClientHub/Pages/RunInfo.razor.css b/View/Pages/RunInfo.razor.css similarity index 100% rename from ClientHub/Pages/RunInfo.razor.css rename to View/Pages/RunInfo.razor.css diff --git a/ClientHub/Shared/MainLayout.razor b/View/Shared/MainLayout.razor similarity index 97% rename from ClientHub/Shared/MainLayout.razor rename to View/Shared/MainLayout.razor index 8656248..c01e3ef 100644 --- a/ClientHub/Shared/MainLayout.razor +++ b/View/Shared/MainLayout.razor @@ -1,5 +1,5 @@ @inherits LayoutComponentBase -@namespace OI.Metrology.ClientHub.Shared +@namespace OI.Metrology.View.Shared
diff --git a/ClientHub/Shared/MainLayout.razor.cs b/View/Shared/MainLayout.razor.cs similarity index 57% rename from ClientHub/Shared/MainLayout.razor.cs rename to View/Shared/MainLayout.razor.cs index 604ce39..577c814 100644 --- a/ClientHub/Shared/MainLayout.razor.cs +++ b/View/Shared/MainLayout.razor.cs @@ -1,20 +1,19 @@ using Microsoft.AspNetCore.Components; using System.Diagnostics; -namespace OI.Metrology.ClientHub.Shared; +namespace OI.Metrology.View.Shared; public partial class MainLayout { - + private string? _RequestId; [Inject] protected Models.AppSettings? AppSettings { get; set; } - [Inject] protected IHttpContextAccessor? HttpContextAccessor { get; set; } protected override void OnParametersSet() { base.OnParametersSet(); - _RequestId = Activity.Current?.Id ?? HttpContextAccessor?.HttpContext?.TraceIdentifier; + _RequestId = Activity.Current?.Id ?? string.Empty; } } \ No newline at end of file diff --git a/ClientHub/Shared/MainLayout.razor.css b/View/Shared/MainLayout.razor.css similarity index 100% rename from ClientHub/Shared/MainLayout.razor.css rename to View/Shared/MainLayout.razor.css diff --git a/ClientHub/Shared/NavMenu.razor b/View/Shared/NavMenu.razor similarity index 90% rename from ClientHub/Shared/NavMenu.razor rename to View/Shared/NavMenu.razor index bf9e648..c430c72 100644 --- a/ClientHub/Shared/NavMenu.razor +++ b/View/Shared/NavMenu.razor @@ -1,4 +1,7 @@ -@namespace OI.Metrology.ClientHub.Shared +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Routing + +@namespace OI.Metrology.View.Shared
diff --git a/View/Shared/NavMenu.razor.cs b/View/Shared/NavMenu.razor.cs new file mode 100644 index 0000000..3d92244 --- /dev/null +++ b/View/Shared/NavMenu.razor.cs @@ -0,0 +1,4 @@ +namespace OI.Metrology.View.Shared; + +public partial class NavMenu +{ } \ No newline at end of file diff --git a/ClientHub/Shared/NavMenu.razor.css b/View/Shared/NavMenu.razor.css similarity index 100% rename from ClientHub/Shared/NavMenu.razor.css rename to View/Shared/NavMenu.razor.css