diff --git a/SharedProject/Models/UserSetting.cs b/SharedProject/Models/UserSetting.cs index 3b5fa5f..ec92c9d 100644 --- a/SharedProject/Models/UserSetting.cs +++ b/SharedProject/Models/UserSetting.cs @@ -19,4 +19,8 @@ public class UserSetting public PlaySetting PlaySetting { get; set; } = new(); public int NotesPosition { get; set; } + + public string MyDonName { get; set; } = String.Empty; + + public string Title { get; set; } = String.Empty; } \ No newline at end of file diff --git a/TaikoLocalServer/Controllers/Api/UserSettingsController.cs b/TaikoLocalServer/Controllers/Api/UserSettingsController.cs index 4cde4c2..2396523 100644 --- a/TaikoLocalServer/Controllers/Api/UserSettingsController.cs +++ b/TaikoLocalServer/Controllers/Api/UserSettingsController.cs @@ -35,7 +35,9 @@ public class UserSettingsController : BaseController IsSkipOn = user.IsSkipOn, NotesPosition = user.NotesPosition, PlaySetting = PlaySettingConverter.ShortToPlaySetting(user.OptionSetting), - ToneId = user.SelectedToneId + ToneId = user.SelectedToneId, + MyDonName = user.MyDonName, + Title = user.Title }; return Ok(response); } @@ -58,6 +60,8 @@ public class UserSettingsController : BaseController user.SelectedToneId = userSetting.ToneId; user.AchievementDisplayDifficulty = userSetting.AchievementDisplayDifficulty; user.OptionSetting = PlaySettingConverter.PlaySettingToShort(userSetting.PlaySetting); + user.MyDonName = userSetting.MyDonName; + user.Title = userSetting.Title; context.Update(user); await context.SaveChangesAsync(); diff --git a/TaikoWebUI/Pages/Card.razor b/TaikoWebUI/Pages/Card.razor index 5e17edd..747d593 100644 --- a/TaikoWebUI/Pages/Card.razor +++ b/TaikoWebUI/Pages/Card.razor @@ -4,86 +4,110 @@ @using SharedProject.Models @inject HttpClient Client + +

Card: @Baid

@if (response is not null) { - - - On - Off - - - On - Off - - - On - Off - - - On - Off - - - @foreach (var item in Enum.GetValues()) - { - - } - - - @for (var i = -5; i <= 5; i++) - { - - } - - - @foreach (var item in Enum.GetValues()) - { - - } - - - @for (uint i = 0; i < 15; i++) - { - var index= i; - @speedStrings[index] - } - - - On - Off - - - On - Off - - - @if (isSavingOptions) - { - - Saving... - } - else - { - - Save - } - - + + + + +

Profile Options

+ + + + + + + On + Off + + + + On + Off + + + @foreach (var item in Enum.GetValues()) + { + + } + +
+
+ + + +

Song Options

+ + + + + + + + + + + + + + + + @for (uint i = 0; i < 15; i++) + { + var index = i; + @speedStrings[index] + } + + + + @foreach (var item in Enum.GetValues()) + { + + } + + + + Notes Position + + + + +
+
+
+ + + + @if (isSavingOptions) + { + + Saving... + } + else + { + + Save + } + + + +
+ + + + + } @code { @@ -94,15 +118,24 @@ private UserSetting? response; private bool isSavingOptions; - + private readonly string[] speedStrings = { "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "2.0", "2.5", "3.0", "3.5", "4.0"}; + private readonly string[] notePositionStrings = new string[] { "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5"}; + + private List _breadcrumbs = new List + { + new BreadcrumbItem("Dashboard", href: "Dashboard"), + }; + protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); isSavingOptions = false; response = await Client.GetFromJsonAsync($"api/UserSettings/{Baid}"); + + _breadcrumbs.Add(new BreadcrumbItem($"Card: {Baid}", href: null, disabled: true)); } private async Task SaveOptions() @@ -110,6 +143,5 @@ isSavingOptions = true; await Client.PostAsJsonAsync($"api/UserSettings/{Baid}", response); isSavingOptions = false; - } - + } } \ No newline at end of file diff --git a/TaikoWebUI/Pages/Dashboard.razor b/TaikoWebUI/Pages/Dashboard.razor index 0d5e42d..1868902 100644 --- a/TaikoWebUI/Pages/Dashboard.razor +++ b/TaikoWebUI/Pages/Dashboard.razor @@ -3,45 +3,75 @@ @inject NavigationManager UriHelper @page "/Dashboard" - - @if (response is null) - { - No Data - } - else - { - - @foreach (var user in response.Users) - { - - - - - Baid @user.Baid - - - - - + +

Dashboard

+ + +@if (response is null) +{ + @if (isLoading is true) { + @for (uint i = 0; i < 3; i++) { + + - Access Code - @user.AccessCode + + + + + + + + + } - + } else { + + + No data. + + } - -
+} +else +{ + @foreach (var user in response.Users) + { + + + + + @user.Baid + + + + Access Code + @user.AccessCode + + + + Delete + Edit + + + + + } +} + @code { private DashboardResponse? response; + private bool isLoading = true; protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); response = await Client.GetFromJsonAsync("api/Dashboard"); + + isLoading = false; } diff --git a/TaikoWebUI/Shared/MainLayout.razor b/TaikoWebUI/Shared/MainLayout.razor index 22b1ed6..bcd814b 100644 --- a/TaikoWebUI/Shared/MainLayout.razor +++ b/TaikoWebUI/Shared/MainLayout.razor @@ -7,9 +7,6 @@ - - - @@ -18,7 +15,7 @@ - + @Body diff --git a/TaikoWebUI/Shared/NavMenu.razor b/TaikoWebUI/Shared/NavMenu.razor index f3934ee..ca8ebc8 100644 --- a/TaikoWebUI/Shared/NavMenu.razor +++ b/TaikoWebUI/Shared/NavMenu.razor @@ -1,6 +1,6 @@  - Home +@* Home Counter - Fetch data + Fetch data*@ Dashboard \ No newline at end of file