bit-badger/jobs-jobs-jobs
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 19 Activity

Display profile now works

Browse Source 
wrapping up #2
This commit is contained in:
Daniel J. Summers 2021-01-07 22:49:10 -05:00
parent ef12da01dc
commit 4f1c7b782a
18 changed files with 192 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor
View File

@ -3,4 +3,6 @@
@inject NavigationManager nav
@inject AppState state
<PageTitle Title="Logging in..." />
<p>@Message</p>

6
src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor
View File

@ -2,6 +2,8 @@
@inject HttpClient http
@inject AppState state
<PageTitle Title="Dashboard" />
<h3>Welcome, @state.User!.Name!</h3>
@if (RetrievingData)
@ -17,17 +19,19 @@ else
Your employment profile was last updated <FullDateTime TheDate=@Profile.LastUpdatedOn />. Your profile currently
lists @Profile.Skills.Length skill@(Profile.Skills.Length != 1 ? "s" : "").
</p>
<p><a href="/profile/view/@state.User.Id">View Your Employment Profile</a></p>
}
else
{
<p>You do not have an employment profile established; click &ldquo;Profile&rdquo;* in the menu to get started!</p>
}
<hr>
<p>
There @(ProfileCount == 1 ? "is" : "are") @(ProfileCount == 0 ? "no" : ProfileCount) employment
profile@(ProfileCount != 1 ? "s" : "") from citizens of Gitmo Nation.
@if (ProfileCount > 0)
{
<text>Take a look around and see if you can help them find work!</text>
<text>Take a look around and see if you can help them find work!</text> <em>(coming soon)</em>
}
</p>
</ErrorList>

20
src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor
View File

@ -1,22 +1,16 @@
@page "/citizen/profile"
@inject HttpClient http
@inject AppState state
@inject NavigationManager nav
@inject IToastService toast
<PageTitle Title="Edit Profile" />
<h3>Employment Profile</h3>
@if (AllLoaded)
{
@if (ErrorMessages.Count > 0)
{
<p><strong>Error</strong></p>
@foreach (var msg in ErrorMessages)
{
<p>@msg</p>
}
}
else
{
<ErrorList Errors=@ErrorMessages>
<EditForm Model=@ProfileForm OnValidSubmit=@SaveProfile>
<DataAnnotationsValidator />
<div class="form-row">
@ -111,7 +105,13 @@
</div>
</div>
</EditForm>
@if (!IsNew)
{
<p>
<br><a href="/profile/view/@state.User!.Id"><span class="oi oi-file"></span> View Your User Profile</a>
</p>
}
</ErrorList>
}
else
{

18
src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs
View File

@ -33,6 +33,11 @@ namespace JobsJobsJobs.Client.Pages.Citizen
/// </summary>
private IEnumerable<Continent> Continents { get; set; } = Enumerable.Empty<Continent>();
/// <summary>
/// Whether this is a new profile or not
/// </summary>
private bool IsNew { get; set; } = false;
/// <summary>
/// Error messages from API access
/// </summary>
@ -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
{

8
src/JobsJobsJobs/Client/Pages/Index.razor
View File

@ -1,6 +1,8 @@
@page "/"
@inject IJSRuntime js
<PageTitle Title="Welcome!" />
<p>
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
<a href="https://noagendashow.net">
The Best Podcast in the Universe
</a> <em><a class="audio" @onclick=@PlayTrue>(it&rsquo;s true!)</a></em> and find out what you&rsquo;re missing.
</a> <em><a class="audio" @onclick=@PlayTrue>(that&rsquo;s true!)</a></em> and find out what you&rsquo;re missing.
</p>
<audio id="itstrue">
<audio id="thatstrue">
<source src="/audio/thats-true.mp3">
</audio>
@code {
async void PlayTrue() => await js.InvokeVoidAsync("Audio.play", "itstrue");
async void PlayTrue() => await js.InvokeVoidAsync("Audio.play", "thatstrue");
}

39
src/JobsJobsJobs/Client/Pages/Profile/View.razor
View File

@ -8,8 +8,45 @@
}
else
{
<PageTitle Title=@($"Employment Profile for {Citizen.DisplayName}") />
<ErrorList Errors=@ErrorMessages>
<h3>View Profile</h3>
<h2><a href="@Citizen.ProfileUrl" target="_blank">@Citizen.DisplayName</a></h2>
<h4>@Profile.Continent!.Name, @Profile.Region</h4>
<p>@WorkTypes</p>
<hr>
<div>
@(new MarkupString(Profile.Biography.ToHtml()))
</div>
@if (Profile.Skills.Length > 0)
{
<hr>
<h4>Skills</h4>
<ul>
@foreach (var skill in Profile.Skills)
{
var notes = skill.Notes == null ? "" : $" ({skill.Notes})";
<li>@skill.Description@notes</li>
}
</ul>
}
@if (Profile.Experience != null)
{
<hr>
<h4>Experience / Employment History</h4>
<div>
@(new MarkupString(Profile.Experience.ToHtml()))
</div>
}
@if (Id == state.User!.Id.ToString())
{
<hr>
<p><a href="/citizen/profile"><span class="oi oi-pencil"></span> Edit Your Profile</a></p>
}
</ErrorList>
}

51
src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
View File

@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Components;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@ -9,22 +8,62 @@ namespace JobsJobsJobs.Client.Pages.Profile
{
public partial class View : ComponentBase
{
/// <summary>
/// Whether data for this component is loading
/// </summary>
private bool IsLoading { get; set; } = true;
private Domain.Citizen? Citizen { get; set; }
/// <summary>
/// The citizen whose profile is being displayed
/// </summary>
private Domain.Citizen Citizen { get; set; } = default!;
private Domain.Profile? Profile { get; set; }
/// <summary>
/// The profile to display
/// </summary>
private Domain.Profile Profile { get; set; } = default!;
/// <summary>
/// The work types for the top of the page
/// </summary>
private MarkupString WorkTypes
{
get
{
IEnumerable<string> parts()
{
if (Profile.SeekingEmployment)
{
yield return "<strong><em>CURRENTLY SEEKING EMPLOYMENT</em></strong>";
}
else
{
yield return "Not actively seeking employment";
}
yield return $"{(Profile.FullTime ? "I" : "Not i")}nterested in full-time employment";
yield return $"{(Profile.RemoteWork ? "I" : "Not i")}nterested in remote opportunities";
}
return new MarkupString(string.Join(" &bull; ", parts()));
}
}
/// <summary>
/// Error messages from data retrieval
/// </summary>
private IList<string> ErrorMessages { get; } = new List<string>();
/// <summary>
/// The ID of the citizen whose profile should be displayed
/// </summary>
[Parameter]
public string Id { get; set; } = default!;
protected override async Task OnInitializedAsync()
{
ServerApi.SetJwt(http, state);
var citizenTask = ServerApi.RetrieveOne<Domain.Citizen>(http, $"/api/citizen/{Id}");
var profileTask = ServerApi.RetrieveOne<Domain.Profile>(http, $"/api/profile/get/{Id}");
var citizenTask = ServerApi.RetrieveOne<Domain.Citizen>(http, $"citizen/get/{Id}");
var profileTask = ServerApi.RetrieveOne<Domain.Profile>(http, $"profile/get/{Id}");
await Task.WhenAll(citizenTask, profileTask);
@ -53,6 +92,8 @@ namespace JobsJobsJobs.Client.Pages.Profile
{
ErrorMessages.Add(profileTask.Result.Error);
}
IsLoading = false;
}
}
}

2
src/JobsJobsJobs/Client/Shared/ErrorList.razor
View File

@ -8,7 +8,7 @@ else
<ul>
@foreach (var msg in Errors)
{
<li>@msg</li>
<li><pre>@msg</pre></li>
}
</ul>
}

2
src/JobsJobsJobs/Client/Shared/NavMenu.razor
View File

@ -33,7 +33,7 @@
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="/citizen/profile">
<span class="oi oi-spreadsheet" aria-hidden="true"></span> Profile
<span class="oi oi-pencil" aria-hidden="true"></span> Edit Profile
</NavLink>
</li>
<li class="nav-item px-3">

11
src/JobsJobsJobs/Client/Shared/PageTitle.razor Normal file
View File

@ -0,0 +1,11 @@
@inject IJSRuntime js
@code {
[Parameter]
public string Title { get; set; } = default!;
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
await js.InvokeVoidAsync("setPageTitle", $"{Title} ~ Jobs, Jobs, Jobs");
}
}

8
src/JobsJobsJobs/Client/wwwroot/index.html
View File

@ -35,6 +35,14 @@
document.getElementById(audio).play()
}
}
/**
* Set the title of the document. (called by PageTitle component)
*
* @param theTitle The title to be set
*/
function setPageTitle(theTitle) {
document.title = theTitle
}
</script>
</body>

12
src/JobsJobsJobs/Server/.config/dotnet-tools.json Normal file
View File

@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "5.0.1",
"commands": [
"dotnet-ef"
]
}
}
}

4
src/JobsJobsJobs/Server/Data/Converters.cs
View File

@ -1,9 +1,5 @@
using JobsJobsJobs.Shared;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace JobsJobsJobs.Server.Data
{

2
src/JobsJobsJobs/Server/Data/JobsDbContext.cs
View File

@ -81,6 +81,8 @@ namespace JobsJobsJobs.Server.Data
m.Property(e => e.LastUpdatedOn).HasColumnName("last_updated_on").IsRequired();
m.Property(e => e.Experience).HasColumnName("experience")
.HasConversion(Converters.OptionalMarkdownStringConverter);
m.Ignore(e => e.Continent);
m.Ignore(e => e.Skills);
});
modelBuilder.Entity<Skill>(m =>

1
src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj
View File

@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Nullable>enable</Nullable>
<UserSecretsId>553960ef-0c79-47d4-98d8-9ca1708e558f</UserSecretsId>
</PropertyGroup>
<ItemGroup>

1
src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj.user
View File

@ -6,6 +6,7 @@
<ActiveDebugProfile>JobsJobsJobs.Server</ActiveDebugProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

23
src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<DeleteExistingFiles>True</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishSingleFile>True</PublishSingleFile>
<PublishTrimmed>True</PublishTrimmed>
<ProjectGuid>35aeecbf-489d-41c5-9ba3-6e43ad7a8196</ProjectGuid>
<SelfContained>true</SelfContained>
</PropertyGroup>
</Project>

9
src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml.user Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>C:\Users\danie\Documents\sandbox\jobs-jobs-jobs\src\JobsJobsJobs\Server\bin\Release\net5.0\publish\</_PublishTargetUrl>
</PropertyGroup>
</Project>