changed names of database columns

client/src/app/admin/(tasks)/EditTask.tsx

@@ -20,12 +20,12 @@ export default function EditTask(props: {
 
 	return (
 		<TaskEditor
-			key={props.value?.name}
+			key={props.value?.taskName}
 			header={
 				<>
 					Edit Task{" "}
 					<span className="font-numbers font-normal italic">
-						&quot;{props.value?.name}&quot;
+						&quot;{props.value?.taskName}&quot;
 					</span>
 				</>
 			}

client/src/app/admin/(tasks)/TaskEditor.tsx

@@ -1,4 +1,4 @@
-import { Task } from "@/lib";
+import { AllString, Task } from "@/lib";
 import {
 	Checkbox,
 	Form,
@@ -19,7 +19,7 @@ export default function TaskEditor(props: {
 	onOpenChange?: (isOpen: boolean) => void;
 	onSubmit?: (e: Task) => void;
 }) {
-	const [name, setName] = useState(props.value?.name ?? "");
+	const [name, setName] = useState(props.value?.taskName ?? "");
 	const [enabled, setEnabled] = useState(props.value?.enabled ?? true);
 
 	// clear the inputs on closing
@@ -31,14 +31,13 @@ export default function TaskEditor(props: {
 	}, [props.isOpen]);
 
 	function submit(e: FormEvent<HTMLFormElement>) {
-		const formData = Object.fromEntries(new FormData(e.currentTarget)) as {
-			name: string;
-			enabled: string;
-		};
+		const formData = Object.fromEntries(
+			new FormData(e.currentTarget),
+		) as AllString<Exclude<Task, "taskID">>;
 
 		props.onSubmit?.({
 			...formData,
-			id: props.value?.id,
+			taskID: props.value?.taskID,
 			enabled: formData.enabled == "true",
 		});
 	}
@@ -68,7 +67,7 @@ export default function TaskEditor(props: {
 						<Input
 							value={name}
 							onValueChange={setName}
-							name="name"
+							name="taskName"
 							label="Name"
 							isRequired
 							variant="bordered"

client/src/app/admin/(tasks)/Tasks.tsx

@@ -47,7 +47,7 @@ export default function Tasks() {
 
 					switch (sortDescriptor.column) {
 						case "text":
-							cmp = a.name.localeCompare(b.name);
+							cmp = a.taskName.localeCompare(b.taskName);
 							break;
 						case "enabled":
 							if (a.enabled && !b.enabled) {
@@ -76,9 +76,9 @@ export default function Tasks() {
 		tasks.reload();
 	}
 
-	async function sendDeleteTask(id: number | undefined) {
-		if (id !== undefined) {
-			const result = await apiCall("DELETE", "tasks", { id });
+	async function sendDeleteTask(taskID: number | undefined) {
+		if (taskID !== undefined) {
+			const result = await apiCall("DELETE", "tasks", { taskID });
 
 			if (result.ok) {
 				tasks.reload();
@@ -130,8 +130,8 @@ export default function Tasks() {
 				</TableHeader>
 				<TableBody items={tasks.items}>
 					{(task) => (
-						<TableRow key={task.id}>
-							<TableCell>{task.name}</TableCell>
+						<TableRow key={task.taskID}>
+							<TableCell>{task.taskName}</TableCell>
 							<TableCell>
 								<Checkbox isSelected={task.enabled} />
 							</TableCell>
@@ -181,13 +181,13 @@ export default function Tasks() {
 				isOpen={!!deleteTask}
 				onOpenChange={(isOpen) => (!isOpen ? setDeleteTask(undefined) : null)}
 				itemName="Task"
-				onDelete={() => sendDeleteTask(deleteTask?.id)}
+				onDelete={() => sendDeleteTask(deleteTask?.taskID)}
 			>
 				{!!deleteTask ? (
 					<>
 						The task{" "}
 						<span className="font-numbers text-accent-1">
-							{deleteTask.name}
+							{deleteTask.taskName}
 						</span>{" "}
 						will be deleted.
 					</>