Finish real name implementation (#12)
Load name from profile on page load, update user's "current" name once the page is saved
This commit is contained in:
parent
e63a12b774
commit
d6f4628e1c
|
@ -48,9 +48,9 @@ namespace JobsJobsJobs.Client.Pages.Citizens
|
||||||
ServerApi.SetJwt(http, state);
|
ServerApi.SetJwt(http, state);
|
||||||
var continentTask = state.GetContinents(http);
|
var continentTask = state.GetContinents(http);
|
||||||
var profileTask = ServerApi.RetrieveProfile(http, state);
|
var profileTask = ServerApi.RetrieveProfile(http, state);
|
||||||
//var citizenTask = ServerApi.RetrieveOne<Citizen>(http,)
|
var citizenTask = ServerApi.RetrieveOne<Citizen>(http, $"citizen/get/{state.User!.Id}");
|
||||||
|
|
||||||
await Task.WhenAll(continentTask, profileTask);
|
await Task.WhenAll(continentTask, profileTask, citizenTask);
|
||||||
|
|
||||||
Continents = continentTask.Result;
|
Continents = continentTask.Result;
|
||||||
|
|
||||||
|
@ -72,6 +72,15 @@ namespace JobsJobsJobs.Client.Pages.Citizens
|
||||||
{
|
{
|
||||||
errors.Add(profileTask.Result.Error);
|
errors.Add(profileTask.Result.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (citizenTask.Result.IsOk)
|
||||||
|
{
|
||||||
|
ProfileForm.RealName = citizenTask.Result.Ok!.RealName ?? "";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
errors.Add(citizenTask.Result.Error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -99,12 +108,22 @@ namespace JobsJobsJobs.Client.Pages.Citizens
|
||||||
foreach (var blankSkill in blankSkills) ProfileForm.Skills.Remove(blankSkill);
|
foreach (var blankSkill in blankSkills) ProfileForm.Skills.Remove(blankSkill);
|
||||||
|
|
||||||
var res = await http.PostAsJsonAsync("/api/profile/save", ProfileForm);
|
var res = await http.PostAsJsonAsync("/api/profile/save", ProfileForm);
|
||||||
if (res.IsSuccessStatusCode)
|
if (res.IsSuccessStatusCode && state.User != null)
|
||||||
{
|
{
|
||||||
|
var citizen = await ServerApi.RetrieveOne<Citizen>(http, $"citizen/get/{state.User.Id}");
|
||||||
|
|
||||||
|
if (citizen.IsOk)
|
||||||
|
{
|
||||||
|
state.User = state.User with { Name = citizen.Ok!.CitizenName };
|
||||||
toast.ShowSuccess("Profile Saved Successfully");
|
toast.ShowSuccess("Profile Saved Successfully");
|
||||||
nav.NavigateTo($"/profile/view/{state.User!.Id}");
|
nav.NavigateTo($"/profile/view/{state.User!.Id}");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
toast.ShowError(citizen.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
var error = await res.Content.ReadAsStringAsync();
|
var error = await res.Content.ReadAsStringAsync();
|
||||||
if (!string.IsNullOrEmpty(error)) error = $"- {error}";
|
if (!string.IsNullOrEmpty(error)) error = $"- {error}";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user