Compare commits

...

6 Commits

Author SHA1 Message Date
andrzej be83489ea6 add test data to db 2024-06-25 12:21:07 +02:00
andrzej 4145d84d65 improve client side data validation 2024-06-25 12:20:56 +02:00
andrzej ef70bd9d92 properly render null date values 2024-06-25 12:20:41 +02:00
andrzej e1e4ce23f1 delete unneccessary 2024-06-25 12:20:28 +02:00
andrzej 5563de438a clearer headings 2024-06-25 12:20:10 +02:00
andrzej c2bfee6b87 fix create pages 2024-06-25 11:18:30 +02:00
7 changed files with 42 additions and 7 deletions

Binary file not shown.

View File

@ -2,6 +2,8 @@ import PubForm from "app/ui/forms/pub";
import { getGenres } from "app/lib/get";
import prisma from "app/lib/db";
import { CreateContainer, CreateContainerContent, CreateContainerDescription, CreateContainerHeader } from "app/ui/createContainer";
import { revalidatePath } from "next/cache";
import { redirect } from "next/navigation";
export default async function Page() {
async function createPub(data) {
"use server"
@ -20,11 +22,13 @@ export default async function Page() {
{ genres: { set: genresArray } }
})
console.log(genresRes)
revalidatePath("/publication")
redirect("/publication")
}
const genres = await getGenres()
return (
<CreateContainer>
<CreateContainerHeader>Create Publication</CreateContainerHeader>
<CreateContainerHeader>New publication</CreateContainerHeader>
<CreateContainerContent>
<CreateContainerDescription>
Create a new entry for a publication i.e. a place you intend to submit to.

View File

@ -28,7 +28,7 @@ export default async function Page() {
}
return (
<CreateContainer>
<CreateContainerHeader>Create Story</CreateContainerHeader>
<CreateContainerHeader>New story</CreateContainerHeader>
<CreateContainerContent>
<CreateContainerDescription>Make an entry for a new work of fiction i.e. a thing you intend to submit for publication.</CreateContainerDescription>
<StoryForm genres={genres} createStory={createStory} className="mt-6" />

View File

@ -42,7 +42,7 @@ export const columns: ColumnDef<SubComplete>[] = [
cell: props => { return props.getValue().toLocaleDateString() }
},
{
accessorFn: row => new Date(row.responded),
accessorFn: row => row.responded ? new Date(row.responded) : null,
id: "responded",
header: ({ column }) => {
return (
@ -57,7 +57,7 @@ export const columns: ColumnDef<SubComplete>[] = [
},
enableColumnFilter: false,
sortingFn: "datetime",
cell: props => { return props.getValue().toLocaleDateString() }
cell: props => props.getValue() ? props.getValue().toLocaleDateString() : '-'
},
{
accessorFn: row => {

View File

@ -1,8 +1,8 @@
"use server"
import { getPubs, getResponses, getStories } from "app/lib/get";
import SubmissionForm from "app/ui/forms/sub";
import { SelectForm } from "app/ui/forms/selectDemo";
import prisma from "app/lib/db";
import { CreateContainer, CreateContainerContent, CreateContainerHeader } from "app/ui/createContainer";
export default async function Page() {
const stories = await getStories()
@ -13,5 +13,12 @@ export default async function Page() {
const res = await prisma.sub.create({ data })
console.log(res)
}
return <SubmissionForm stories={stories} pubs={pubs} responses={responses} createSub={createSub} />
return (
<CreateContainer>
<CreateContainerHeader>New submission</CreateContainerHeader>
<CreateContainerContent>
<SubmissionForm stories={stories} pubs={pubs} responses={responses} createSub={createSub} />
</CreateContainerContent>
</CreateContainer>
)
}

View File

@ -29,7 +29,7 @@ import { Genre } from "@prisma/client"
const formSchema = z.object({
title: z.string().min(2).max(50),
link: z.string(),
query_after_days: z.number().min(30),
query_after_days: z.coerce.number().min(30),
genres: z.array(z.number()),
})

View File

@ -40,6 +40,30 @@ const FormSchema = z.object({
responded: z.date().transform((date) => date.toString()).optional(),
responseId: z.coerce.number()
})
.refine(object => {
const submitted = new Date(object.submitted)
const responded = object.responded ? new Date(object.responded) : null
return responded >= submitted || responded === null
},
{
path: ["responded"],
message: "'Responded' must be a later date than 'submitted'"
})
.refine(object => {
if (object.responded) {
//there is a 'responded' date and the response is not 'pending'
return object.responseId !== 7
}
if (!object.responded) {
//there is not a 'responded' date and the response is pending
return object.responseId === 7
}
},
{
path: ["responseId"],
message: "A pending response cannot have a date, and a non-pending response must have a date"
}
)
export default function SubmissionForm({ stories, pubs, responses, createSub }) {