From a018b6b8f128fb9a06c6f5739e28f35f254851eb Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sun, 15 Jan 2023 22:30:22 -0500 Subject: [PATCH] Clean up a bit --- .../JobsJobsJobs.V3Migration.fsproj | 12 ------ src/JobsJobsJobs.V3Migration/Program.fs | 4 -- src/JobsJobsJobs/App/src/router/index.ts | 7 ---- src/JobsJobsJobs/Domain/SharedTypes.fs | 38 +------------------ src/JobsJobsJobs/Domain/Types.fs | 10 ++--- 5 files changed, 7 insertions(+), 64 deletions(-) delete mode 100644 src/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj delete mode 100644 src/JobsJobsJobs.V3Migration/Program.fs diff --git a/src/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj b/src/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj deleted file mode 100644 index 7b4f671..0000000 --- a/src/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - net6.0 - - - - - - - diff --git a/src/JobsJobsJobs.V3Migration/Program.fs b/src/JobsJobsJobs.V3Migration/Program.fs deleted file mode 100644 index 103e536..0000000 --- a/src/JobsJobsJobs.V3Migration/Program.fs +++ /dev/null @@ -1,4 +0,0 @@ - - -// For more information see https://aka.ms/fsharp-console-apps -printfn "Hello from F#" \ No newline at end of file diff --git a/src/JobsJobsJobs/App/src/router/index.ts b/src/JobsJobsJobs/App/src/router/index.ts index f5b5132..269c3d7 100644 --- a/src/JobsJobsJobs/App/src/router/index.ts +++ b/src/JobsJobsJobs/App/src/router/index.ts @@ -36,13 +36,6 @@ const routes: Array = [ component: () => import(/* webpackChunkName: "account" */ "../views/citizen/AccountProfile.vue"), meta: { auth: true, title: "Account Profile" } }, - // Job Listing URLs - { - path: "/help-wanted", - name: "HelpWanted", - component: () => import(/* webpackChunkName: "joblist" */ "../views/listing/HelpWanted.vue"), - meta: { auth: true, title: "Help Wanted" } - }, // Success Story URLs { path: "/success-story/list", diff --git a/src/JobsJobsJobs/Domain/SharedTypes.fs b/src/JobsJobsJobs/Domain/SharedTypes.fs index 17b6fb7..dd5d344 100644 --- a/src/JobsJobsJobs/Domain/SharedTypes.fs +++ b/src/JobsJobsJobs/Domain/SharedTypes.fs @@ -2,7 +2,6 @@ module JobsJobsJobs.Domain.SharedTypes open JobsJobsJobs.Domain -open Microsoft.Extensions.Options open NodaTime /// The data to add or update an other contact @@ -46,29 +45,8 @@ type AccountProfileForm = } -/// The data required to register a new citizen (user) -type CitizenRegistrationForm = - { /// The first name of the new citizen - FirstName : string - - /// The last name of the new citizen - LastName : string - - /// The display name for the new citizen - DisplayName : string option - - /// The citizen's e-mail address - Email : string - - /// The citizen's password - Password : string - - /// Confirmation of the citizen's password - ConfirmPassword : string - } - - /// The data needed to display a listing +[] type ListingForView = { /// The listing itself Listing : Listing @@ -98,19 +76,6 @@ type ListingSearchForm = } -/// A successful logon -type LogOnSuccess = - { /// The JSON Web Token (JWT) to use for API access - Jwt : string - - /// The ID of the logged-in citizen (as a string) - CitizenId : string - - /// The name of the logged-in citizen - Name : string - } - - /// The various ways profiles can be searched [] type ProfileSearchForm = @@ -182,6 +147,7 @@ type PublicSearchForm = /// A public profile search result +[] type PublicSearchResult = { /// The name of the continent on which the citizen resides Continent : string diff --git a/src/JobsJobsJobs/Domain/Types.fs b/src/JobsJobsJobs/Domain/Types.fs index 0cbfcfd..e331f97 100644 --- a/src/JobsJobsJobs/Domain/Types.fs +++ b/src/JobsJobsJobs/Domain/Types.fs @@ -4,7 +4,7 @@ open NodaTime open System /// A user of Jobs, Jobs, Jobs; a citizen of Gitmo Nation -[] +[] type Citizen = { /// The ID of the user Id : CitizenId @@ -60,7 +60,7 @@ module Citizen = /// A continent -[] +[] type Continent = { /// The ID of the continent Id : ContinentId @@ -80,7 +80,7 @@ module Continent = /// A job listing -[] +[] type Listing = { /// The ID of the job listing Id : ListingId @@ -179,7 +179,7 @@ module SecurityInfo = /// A job seeker profile -[] +[] type Profile = { /// The ID of the citizen to whom this profile belongs Id : CitizenId @@ -243,7 +243,7 @@ module Profile = /// A record of success finding employment -[] +[] type Success = { /// The ID of the success report Id : SuccessId