diff --git a/GC-local-server-rewrite.sln b/GC-local-server-rewrite.sln index 606045f..c6258c5 100644 --- a/GC-local-server-rewrite.sln +++ b/GC-local-server-rewrite.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.32126.315 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-local-server-rewrite", "GC-local-server-rewrite\GC-local-server-rewrite.csproj", "{D5FFF2E8-6591-4967-8883-A28F453F0524}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC-local-web-frontend", "GC-local-web-frontend\GC-local-web-frontend.csproj", "{DAA65FBF-4C21-4052-A772-7899A65B3227}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedProject", "SharedProject\SharedProject.csproj", "{C01D0576-9D4E-4535-8055-C4905433A1EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{C01D0576-9D4E-4535-8055-C4905433A1EB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MudAdmin", "MudAdmin\MudAdmin.csproj", "{DC8E30E9-F81E-4E28-A4D2-F4576C77FFBE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,14 +19,14 @@ Global {D5FFF2E8-6591-4967-8883-A28F453F0524}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5FFF2E8-6591-4967-8883-A28F453F0524}.Release|Any CPU.ActiveCfg = Release|Any CPU {D5FFF2E8-6591-4967-8883-A28F453F0524}.Release|Any CPU.Build.0 = Release|Any CPU - {DAA65FBF-4C21-4052-A772-7899A65B3227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAA65FBF-4C21-4052-A772-7899A65B3227}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAA65FBF-4C21-4052-A772-7899A65B3227}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAA65FBF-4C21-4052-A772-7899A65B3227}.Release|Any CPU.Build.0 = Release|Any CPU {C01D0576-9D4E-4535-8055-C4905433A1EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C01D0576-9D4E-4535-8055-C4905433A1EB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C01D0576-9D4E-4535-8055-C4905433A1EB}.Release|Any CPU.ActiveCfg = Release|Any CPU {C01D0576-9D4E-4535-8055-C4905433A1EB}.Release|Any CPU.Build.0 = Release|Any CPU + {DC8E30E9-F81E-4E28-A4D2-F4576C77FFBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC8E30E9-F81E-4E28-A4D2-F4576C77FFBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC8E30E9-F81E-4E28-A4D2-F4576C77FFBE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC8E30E9-F81E-4E28-A4D2-F4576C77FFBE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GC-local-server-rewrite/GC-local-server-rewrite.csproj b/GC-local-server-rewrite/GC-local-server-rewrite.csproj index adf0fc0..7361638 100644 --- a/GC-local-server-rewrite/GC-local-server-rewrite.csproj +++ b/GC-local-server-rewrite/GC-local-server-rewrite.csproj @@ -59,7 +59,8 @@ - + + diff --git a/GC-local-server-rewrite/controllers/ApiController.cs b/GC-local-server-rewrite/controllers/ApiController.cs index 9ef55c1..86ab63b 100644 --- a/GC-local-server-rewrite/controllers/ApiController.cs +++ b/GC-local-server-rewrite/controllers/ApiController.cs @@ -3,10 +3,9 @@ using EmbedIO.Routing; using EmbedIO.WebApi; using GCLocalServerRewrite.common; using GCLocalServerRewrite.models; -using Shared.enums; -using Shared.models; +using SharedProject.enums; +using SharedProject.models; using SQLite.Net2; -using Swan.Logging; namespace GCLocalServerRewrite.controllers; diff --git a/GC-local-server-rewrite/models/Record.cs b/GC-local-server-rewrite/models/Record.cs index 5292909..81bf26a 100644 --- a/GC-local-server-rewrite/models/Record.cs +++ b/GC-local-server-rewrite/models/Record.cs @@ -1,5 +1,4 @@ using System.Xml.Serialization; -using ChoETL; using SQLite.Net2; namespace GCLocalServerRewrite.models; diff --git a/GC-local-web-frontend/App.razor b/GC-local-web-frontend/App.razor index c7730d1..a9ac211 100644 --- a/GC-local-web-frontend/App.razor +++ b/GC-local-web-frontend/App.razor @@ -9,4 +9,6 @@

Sorry, there's nothing at this address.

- \ No newline at end of file + + + \ No newline at end of file diff --git a/GC-local-web-frontend/GC-local-web-frontend.csproj b/GC-local-web-frontend/GC-local-web-frontend.csproj index 0ce0996..c8bd573 100644 --- a/GC-local-web-frontend/GC-local-web-frontend.csproj +++ b/GC-local-web-frontend/GC-local-web-frontend.csproj @@ -7,12 +7,13 @@ + - + diff --git a/GC-local-web-frontend/Pages/FetchData.razor b/GC-local-web-frontend/Pages/FetchData.razor index 85bbf60..21146da 100644 --- a/GC-local-web-frontend/Pages/FetchData.razor +++ b/GC-local-web-frontend/Pages/FetchData.razor @@ -1,12 +1,13 @@ -@page "/fetchdata" -@using global::Shared.models +@page "/fetchdata" +@using global::SharedProject.models +@using SharedProject.enums @inject HttpClient Http -Weather forecast +Play Options -

Weather forecast

+

Play Options

-

This component demonstrates fetching data from the server.

+

Play options of the specified card

@if (playOption == null) { @@ -16,26 +17,33 @@ } else { - +
- - - - - + + + + + - - - - - + + + + +
CardIdFast/Slow IndicatorFever/Trance Show
CardIdFast/Slow IndicatorFever/Trance Show
@playOption.CardId@playOption.FastSlowIndicator@playOption.FeverTrance
@playOption.CardId@playOption.FastSlowIndicator@playOption.FeverTrance
} + + @code { private PlayOption? playOption; + + private void handleChange(PlayOptions.FastSlowIndicator fastSlowIndicator) + { + Console.WriteLine(fastSlowIndicator); + } protected override async Task OnInitializedAsync() { diff --git a/GC-local-web-frontend/Pages/Index.razor b/GC-local-web-frontend/Pages/Index.razor index 66ce12c..2650dd5 100644 --- a/GC-local-web-frontend/Pages/Index.razor +++ b/GC-local-web-frontend/Pages/Index.razor @@ -4,6 +4,4 @@

Hello, world!

-Welcome to your new app. - - \ No newline at end of file +Welcome to your new app. \ No newline at end of file diff --git a/GC-local-web-frontend/Program.cs b/GC-local-web-frontend/Program.cs index 4224509..cfd1692 100644 --- a/GC-local-web-frontend/Program.cs +++ b/GC-local-web-frontend/Program.cs @@ -10,5 +10,7 @@ builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost") }); +builder.Services.AddAntDesign(); + await builder.Build().RunAsync(); \ No newline at end of file diff --git a/GC-local-web-frontend/wwwroot/index.html b/GC-local-web-frontend/wwwroot/index.html index 612ad8c..849d03f 100644 --- a/GC-local-web-frontend/wwwroot/index.html +++ b/GC-local-web-frontend/wwwroot/index.html @@ -1,4 +1,5 @@ + @@ -8,6 +9,7 @@ + @@ -19,6 +21,7 @@ Reload 🗙 + diff --git a/MudAdmin/App.razor b/MudAdmin/App.razor new file mode 100644 index 0000000..dcdcd36 --- /dev/null +++ b/MudAdmin/App.razor @@ -0,0 +1,11 @@ + + + + + + Not found + +

Sorry, there's nothing at this address.

+
+
+
\ No newline at end of file diff --git a/MudAdmin/MudAdmin.csproj b/MudAdmin/MudAdmin.csproj new file mode 100644 index 0000000..9231942 --- /dev/null +++ b/MudAdmin/MudAdmin.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MudAdmin/MudAdmin.sln b/MudAdmin/MudAdmin.sln new file mode 100644 index 0000000..7541c3c --- /dev/null +++ b/MudAdmin/MudAdmin.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31717.71 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MudAdmin", "MudAdmin.csproj", "{D6DF8A15-5B8D-4302-90D2-FC71264B18CC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6DF8A15-5B8D-4302-90D2-FC71264B18CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6DF8A15-5B8D-4302-90D2-FC71264B18CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6DF8A15-5B8D-4302-90D2-FC71264B18CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6DF8A15-5B8D-4302-90D2-FC71264B18CC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {58C61F27-917C-435B-8900-9B3CE8F8DCD4} + EndGlobalSection +EndGlobal \ No newline at end of file diff --git a/MudAdmin/Pages/Counter.razor b/MudAdmin/Pages/Counter.razor new file mode 100644 index 0000000..cf7aaff --- /dev/null +++ b/MudAdmin/Pages/Counter.razor @@ -0,0 +1,18 @@ +@page "/counter" + +Counter + +Counter +Current count: @currentCount +Click me + + +@code { + private int currentCount = 0; + + private void IncrementCount() + { + currentCount++; + } + +} \ No newline at end of file diff --git a/MudAdmin/Pages/FetchData.razor b/MudAdmin/Pages/FetchData.razor new file mode 100644 index 0000000..0774129 --- /dev/null +++ b/MudAdmin/Pages/FetchData.razor @@ -0,0 +1,62 @@ +@page "/fetchdata" +@inject HttpClient Http +@using MudAdmin.Shared + +Weather forecast + +Weather forecast +This component demonstrates fetching data from the server. +@if (forecasts == null) +{ + +} +else +{ + + + + Date + + + Temp. (C) + + + Temp. (F) + + + Summary + + + + @context.Date + @context.TemperatureC + @context.TemperatureF + @context.Summary + + + + + +} + + +@code { + private WeatherForecast[]? forecasts; + + protected override async Task OnInitializedAsync() + { + forecasts = await Http.GetFromJsonAsync("sample-data/weather.json"); + } + + 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); + } + +} \ No newline at end of file diff --git a/MudAdmin/Pages/Index.razor b/MudAdmin/Pages/Index.razor new file mode 100644 index 0000000..62270c4 --- /dev/null +++ b/MudAdmin/Pages/Index.razor @@ -0,0 +1,12 @@ +@page "/" + +Index + +Hello, world! +Welcome to your new app, powered by MudBlazor! + + You can find documentation and examples on our website here: + + www.mudblazor.com + + \ No newline at end of file diff --git a/MudAdmin/Pages/User.razor b/MudAdmin/Pages/User.razor new file mode 100644 index 0000000..7d4970b --- /dev/null +++ b/MudAdmin/Pages/User.razor @@ -0,0 +1,12 @@ +@page "/user/{CardId:long}" + +User + +@CardId + +@code { + [Parameter] + public long CardId { get; set; } + + +} \ No newline at end of file diff --git a/MudAdmin/Pages/Users.razor b/MudAdmin/Pages/Users.razor new file mode 100644 index 0000000..9cfb6af --- /dev/null +++ b/MudAdmin/Pages/Users.razor @@ -0,0 +1,49 @@ +@page "/users" +@using models = SharedProject.models +@inject NavigationManager NavigationManager + +Users + + + @foreach (var user in users) + { + + + + + @user.PlayerName + + + + Card ID + @user.CardId + + + Test + + + + } + + +@code { + private List users; + + private static readonly Random RANDOM = Random.Shared; + + protected override void OnInitialized() + { + base.OnInitialized(); + users = new List(); + for (var i = 0; i < 5; i++) + { + users.Add(new models.User(RANDOM.NextInt64(7000000000000000, 8000000000000000), i.ToString())); + } + } + + private void OnClick(models.User user) + { + NavigationManager.NavigateTo($"user/{user.CardId}"); + } + +} \ No newline at end of file diff --git a/MudAdmin/Program.cs b/MudAdmin/Program.cs new file mode 100644 index 0000000..fef3f2b --- /dev/null +++ b/MudAdmin/Program.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using MudAdmin; +using MudBlazor.Services; + +var builder = WebAssemblyHostBuilder.CreateDefault(args); +builder.RootComponents.Add("#app"); +builder.RootComponents.Add("head::after"); + +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); +builder.Services.AddMudServices(); + +await builder.Build().RunAsync(); \ No newline at end of file diff --git a/MudAdmin/Properties/launchSettings.json b/MudAdmin/Properties/launchSettings.json new file mode 100644 index 0000000..bb34c40 --- /dev/null +++ b/MudAdmin/Properties/launchSettings.json @@ -0,0 +1,30 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:65283", + "sslPort": 44398 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Mudblazor.Template": { + "commandName": "Project", + "dotnetRunMessages": "true", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/MudAdmin/Shared/MainLayout.razor b/MudAdmin/Shared/MainLayout.razor new file mode 100644 index 0000000..7d9b80b --- /dev/null +++ b/MudAdmin/Shared/MainLayout.razor @@ -0,0 +1,35 @@ +@inherits LayoutComponentBase + + + + + + + + + + + + + + + MudAdmin + + + + + + @Body + + + + +@code { + bool _drawerOpen = true; + + void DrawerToggle() + { + _drawerOpen = !_drawerOpen; + } + +} \ No newline at end of file diff --git a/MudAdmin/Shared/NavMenu.razor b/MudAdmin/Shared/NavMenu.razor new file mode 100644 index 0000000..b3c37b3 --- /dev/null +++ b/MudAdmin/Shared/NavMenu.razor @@ -0,0 +1,6 @@ + + Home + Counter + Fetch data + Users + \ No newline at end of file diff --git a/MudAdmin/_Imports.razor b/MudAdmin/_Imports.razor new file mode 100644 index 0000000..bb4ee19 --- /dev/null +++ b/MudAdmin/_Imports.razor @@ -0,0 +1,11 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.AspNetCore.Components.WebAssembly.Http +@using Microsoft.JSInterop +@using MudBlazor +@using MudAdmin +@using MudAdmin.Shared \ No newline at end of file diff --git a/MudAdmin/wwwroot/favicon.ico b/MudAdmin/wwwroot/favicon.ico new file mode 100644 index 0000000..47ad60e Binary files /dev/null and b/MudAdmin/wwwroot/favicon.ico differ diff --git a/MudAdmin/wwwroot/index.html b/MudAdmin/wwwroot/index.html new file mode 100644 index 0000000..18b9b16 --- /dev/null +++ b/MudAdmin/wwwroot/index.html @@ -0,0 +1,25 @@ + + + + + + + MudAdmin + + + + + + +
Loading...
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + + + \ No newline at end of file diff --git a/MudAdmin/wwwroot/sample-data/weather.json b/MudAdmin/wwwroot/sample-data/weather.json new file mode 100644 index 0000000..06463c0 --- /dev/null +++ b/MudAdmin/wwwroot/sample-data/weather.json @@ -0,0 +1,27 @@ +[ + { + "date": "2018-05-06", + "temperatureC": 1, + "summary": "Freezing" + }, + { + "date": "2018-05-07", + "temperatureC": 14, + "summary": "Bracing" + }, + { + "date": "2018-05-08", + "temperatureC": -13, + "summary": "Freezing" + }, + { + "date": "2018-05-09", + "temperatureC": -16, + "summary": "Balmy" + }, + { + "date": "2018-05-10", + "temperatureC": -2, + "summary": "Chilly" + } +] diff --git a/Shared/Shared.csproj b/SharedProject/SharedProject.csproj similarity index 80% rename from Shared/Shared.csproj rename to SharedProject/SharedProject.csproj index eb2460e..52b24a0 100644 --- a/Shared/Shared.csproj +++ b/SharedProject/SharedProject.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + SharedProject diff --git a/Shared/enums/PlayOptions.cs b/SharedProject/enums/PlayOptions.cs similarity index 87% rename from Shared/enums/PlayOptions.cs rename to SharedProject/enums/PlayOptions.cs index 43ddc01..29e8511 100644 --- a/Shared/enums/PlayOptions.cs +++ b/SharedProject/enums/PlayOptions.cs @@ -1,4 +1,4 @@ -namespace Shared.enums; +namespace SharedProject.enums; public static class PlayOptions { diff --git a/Shared/models/PlayOption.cs b/SharedProject/models/PlayOption.cs similarity index 76% rename from Shared/models/PlayOption.cs rename to SharedProject/models/PlayOption.cs index ce33e28..1c3bf5a 100644 --- a/Shared/models/PlayOption.cs +++ b/SharedProject/models/PlayOption.cs @@ -1,6 +1,6 @@ -using Shared.enums; +using SharedProject.enums; -namespace Shared.models; +namespace SharedProject.models; public class PlayOption { diff --git a/SharedProject/models/User.cs b/SharedProject/models/User.cs new file mode 100644 index 0000000..a2b78b6 --- /dev/null +++ b/SharedProject/models/User.cs @@ -0,0 +1,3 @@ +namespace SharedProject.models; + +public record User(long CardId, string PlayerName); \ No newline at end of file diff --git a/SharedProject/models/UserDetail.cs b/SharedProject/models/UserDetail.cs new file mode 100644 index 0000000..cf02d45 --- /dev/null +++ b/SharedProject/models/UserDetail.cs @@ -0,0 +1,3 @@ +namespace SharedProject.models; + +public record UserDetail(long CardId, string PlayerName, PlayOption PlayOption); \ No newline at end of file