diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor b/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor index ebf5eee..dfec9cb 100644 --- a/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor +++ b/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor @@ -3,4 +3,6 @@ @inject NavigationManager nav @inject AppState state + +

@Message

diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor b/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor index ecf4dc1..b687348 100644 --- a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor +++ b/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor @@ -2,6 +2,8 @@ @inject HttpClient http @inject AppState state + +

Welcome, @state.User!.Name!

@if (RetrievingData) @@ -17,17 +19,19 @@ else Your employment profile was last updated . Your profile currently lists @Profile.Skills.Length skill@(Profile.Skills.Length != 1 ? "s" : "").

+

View Your Employment Profile

} else {

You do not have an employment profile established; click “Profile”* in the menu to get started!

} +

There @(ProfileCount == 1 ? "is" : "are") @(ProfileCount == 0 ? "no" : ProfileCount) employment profile@(ProfileCount != 1 ? "s" : "") from citizens of Gitmo Nation. @if (ProfileCount > 0) { - Take a look around and see if you can help them find work! + Take a look around and see if you can help them find work! (coming soon) }

diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor b/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor index e652248..cf938a1 100644 --- a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor +++ b/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor @@ -1,22 +1,16 @@ @page "/citizen/profile" @inject HttpClient http @inject AppState state +@inject NavigationManager nav @inject IToastService toast + +

Employment Profile

@if (AllLoaded) { - @if (ErrorMessages.Count > 0) - { -

Error

- @foreach (var msg in ErrorMessages) - { -

@msg

- } - } - else - { +
@@ -111,7 +105,13 @@
- } + @if (!IsNew) + { +

+
View Your User Profile +

+ } +
} else { diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs b/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs index 1a3f637..c26f519 100644 --- a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs +++ b/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs @@ -33,6 +33,11 @@ namespace JobsJobsJobs.Client.Pages.Citizen /// private IEnumerable Continents { get; set; } = Enumerable.Empty(); + /// + /// Whether this is a new profile or not + /// + private bool IsNew { get; set; } = false; + /// /// Error messages from API access /// @@ -57,9 +62,15 @@ namespace JobsJobsJobs.Client.Pages.Citizen if (profileTask.Result.IsOk) { - ProfileForm = (profileTask.Result.Ok == null) - ? new ProfileForm() - : ProfileForm.FromProfile(profileTask.Result.Ok); + if (profileTask.Result.Ok == null) + { + ProfileForm = new ProfileForm(); + IsNew = true; + } + else + { + ProfileForm = ProfileForm.FromProfile(profileTask.Result.Ok); + } if (ProfileForm.Skills.Count == 0) AddNewSkill(); } else @@ -98,6 +109,7 @@ namespace JobsJobsJobs.Client.Pages.Citizen if (res.IsSuccessStatusCode) { toast.ShowSuccess("Profile Saved Successfully"); + nav.NavigateTo($"/profile/view/{state.User!.Id}"); } else { diff --git a/src/JobsJobsJobs/Client/Pages/Index.razor b/src/JobsJobsJobs/Client/Pages/Index.razor index d99f9a8..8850a8b 100644 --- a/src/JobsJobsJobs/Client/Pages/Index.razor +++ b/src/JobsJobsJobs/Client/Pages/Index.razor @@ -1,6 +1,8 @@ @page "/" @inject IJSRuntime js + +

Future home of No Agenda Jobs, where citizens of Gitmo Nation can assist one another in finding or enhancing their employment. This will enable them to continue providing value for value to Adam and John, as they continue their work @@ -10,12 +12,12 @@ Do you not understand the terms in the paragraph above? No worries; just head over to The Best Podcast in the Universe - (it’s true!) and find out what you’re missing. + (that’s true!) and find out what you’re missing.

-