From 4f1c7b782a0f2ed83f711e2983bacb1a31675bc0 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Thu, 7 Jan 2021 22:49:10 -0500
Subject: [PATCH] Display profile now works

wrapping up #2
---
 .../Client/Pages/Citizen/Authorized.razor     |  2 +
 .../Client/Pages/Citizen/Dashboard.razor      |  6 ++-
 .../Client/Pages/Citizen/EditProfile.razor    | 22 ++++----
 .../Client/Pages/Citizen/EditProfile.razor.cs | 18 +++++--
 src/JobsJobsJobs/Client/Pages/Index.razor     |  8 +--
 .../Client/Pages/Profile/View.razor           | 41 ++++++++++++++-
 .../Client/Pages/Profile/View.razor.cs        | 51 +++++++++++++++++--
 .../Client/Shared/ErrorList.razor             |  2 +-
 src/JobsJobsJobs/Client/Shared/NavMenu.razor  |  2 +-
 .../Client/Shared/PageTitle.razor             | 11 ++++
 src/JobsJobsJobs/Client/wwwroot/index.html    |  8 +++
 .../Server/.config/dotnet-tools.json          | 12 +++++
 src/JobsJobsJobs/Server/Data/Converters.cs    |  4 --
 src/JobsJobsJobs/Server/Data/JobsDbContext.cs |  2 +
 .../Server/JobsJobsJobs.Server.csproj         |  1 +
 .../Server/JobsJobsJobs.Server.csproj.user    |  1 +
 .../PublishProfiles/FolderProfile.pubxml      | 23 +++++++++
 .../PublishProfiles/FolderProfile.pubxml.user |  9 ++++
 18 files changed, 192 insertions(+), 31 deletions(-)
 create mode 100644 src/JobsJobsJobs/Client/Shared/PageTitle.razor
 create mode 100644 src/JobsJobsJobs/Server/.config/dotnet-tools.json
 create mode 100644 src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml
 create mode 100644 src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml.user

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
 
+<PageTitle Title="Logging in..." />
+
 <p>@Message</p>
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
 
+<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>
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
 
+<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
 {
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
         /// </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
             {
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
 
+<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");
 }
\ No newline at end of file
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/View.razor b/src/JobsJobsJobs/Client/Pages/Profile/View.razor
index 9dbf01f..1909c57 100644
--- a/src/JobsJobsJobs/Client/Pages/Profile/View.razor
+++ b/src/JobsJobsJobs/Client/Pages/Profile/View.razor
@@ -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>
-}
\ No newline at end of file
+}
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs b/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
index ecdf7f1..c9691b6 100644
--- a/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
@@ -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;
         }
     }
 }
diff --git a/src/JobsJobsJobs/Client/Shared/ErrorList.razor b/src/JobsJobsJobs/Client/Shared/ErrorList.razor
index 0f1599d..8c03d02 100644
--- a/src/JobsJobsJobs/Client/Shared/ErrorList.razor
+++ b/src/JobsJobsJobs/Client/Shared/ErrorList.razor
@@ -8,7 +8,7 @@ else
   <ul>
     @foreach (var msg in Errors)
     {
-      <li>@msg</li>
+      <li><pre>@msg</pre></li>
     }
   </ul>
 }
diff --git a/src/JobsJobsJobs/Client/Shared/NavMenu.razor b/src/JobsJobsJobs/Client/Shared/NavMenu.razor
index ff92828..4fdf956 100644
--- a/src/JobsJobsJobs/Client/Shared/NavMenu.razor
+++ b/src/JobsJobsJobs/Client/Shared/NavMenu.razor
@@ -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">
diff --git a/src/JobsJobsJobs/Client/Shared/PageTitle.razor b/src/JobsJobsJobs/Client/Shared/PageTitle.razor
new file mode 100644
index 0000000..f7f8d08
--- /dev/null
+++ b/src/JobsJobsJobs/Client/Shared/PageTitle.razor
@@ -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");
+    }
+}
diff --git a/src/JobsJobsJobs/Client/wwwroot/index.html b/src/JobsJobsJobs/Client/wwwroot/index.html
index 0688532..b86b985 100644
--- a/src/JobsJobsJobs/Client/wwwroot/index.html
+++ b/src/JobsJobsJobs/Client/wwwroot/index.html
@@ -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>
 
diff --git a/src/JobsJobsJobs/Server/.config/dotnet-tools.json b/src/JobsJobsJobs/Server/.config/dotnet-tools.json
new file mode 100644
index 0000000..96442e7
--- /dev/null
+++ b/src/JobsJobsJobs/Server/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "5.0.1",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/JobsJobsJobs/Server/Data/Converters.cs b/src/JobsJobsJobs/Server/Data/Converters.cs
index 6197b83..7f8d07f 100644
--- a/src/JobsJobsJobs/Server/Data/Converters.cs
+++ b/src/JobsJobsJobs/Server/Data/Converters.cs
@@ -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
 {
diff --git a/src/JobsJobsJobs/Server/Data/JobsDbContext.cs b/src/JobsJobsJobs/Server/Data/JobsDbContext.cs
index 14c3171..972b81a 100644
--- a/src/JobsJobsJobs/Server/Data/JobsDbContext.cs
+++ b/src/JobsJobsJobs/Server/Data/JobsDbContext.cs
@@ -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 =>
diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj
index abcb4ec..9a66b15 100644
--- a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj
+++ b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <UserSecretsId>553960ef-0c79-47d4-98d8-9ca1708e558f</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj.user b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj.user
index a97ca33..4aff699 100644
--- a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj.user
+++ b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.csproj.user
@@ -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>
diff --git a/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml b/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..cece0ca
--- /dev/null
+++ b/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml
@@ -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>
\ No newline at end of file
diff --git a/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml.user b/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..ce1fec1
--- /dev/null
+++ b/src/JobsJobsJobs/Server/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -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>
\ No newline at end of file