diff --git a/.gitignore b/.gitignore index 7dff4d4d..d4a49b30 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ letsencrypt + # Dependencies node_modules .pnp diff --git a/apps/dispatch/app/_components/left/Chat.tsx b/apps/dispatch/app/_components/left/Chat.tsx index 16c340a3..3ea02d35 100644 --- a/apps/dispatch/app/_components/left/Chat.tsx +++ b/apps/dispatch/app/_components/left/Chat.tsx @@ -56,7 +56,7 @@ export const Chat = () => { (d) => d.userId !== session.data?.user.id && !chats[d.userId], ); const filteredAircrafts = aircrafts?.filter( - (a) => a.userId !== session.data?.user.id && dispatcherConnected && !chats[a.userId], + (a) => a.userId !== session.data?.user.id && !chats[a.userId], ); const btnActive = pilotConnected || dispatcherConnected; diff --git a/apps/hub/app/(app)/admin/report/_components/NewReport.tsx b/apps/hub/app/(app)/admin/report/_components/NewReport.tsx index 38d633fe..7aa1f36e 100644 --- a/apps/hub/app/(app)/admin/report/_components/NewReport.tsx +++ b/apps/hub/app/(app)/admin/report/_components/NewReport.tsx @@ -40,9 +40,11 @@ export const NewReportForm = ({ defaultValues: { reportedUserId: defaultValues?.reportedUserId || "", senderUserId: session.data?.user.id || "", + reviewerComment: null, + reviewerUserId: null, }, }); - + console.log(form.formState.errors); return (
{ email, }, }); - const oldUser = (OLD_USER as OldUser[]).find((u) => u.email.toLowerCase() === email); + const oldUser = (v1User as OldUser[]).find((u) => u.email.toLowerCase() === email); if (!user) { if (oldUser) { user = await createNewUserFromOld(oldUser); diff --git a/apps/hub/app/(auth)/register/action.ts b/apps/hub/app/(auth)/register/action.ts index 2bc261c5..5404372b 100644 --- a/apps/hub/app/(auth)/register/action.ts +++ b/apps/hub/app/(auth)/register/action.ts @@ -1,7 +1,7 @@ "use server"; import { prisma, Prisma } from "@repo/db"; import bcrypt from "bcryptjs"; -import OLD_USER from "../../api/auth/[...nextauth]/var.User.json"; +import v1User from "../../api/auth/[...nextauth]/var.User.json"; import { OldUser } from "../../../types/oldUser"; export const register = async ({ password, ...user }: Omit) => { @@ -29,7 +29,7 @@ export const register = async ({ password, ...user }: Omit u.email.toLocaleLowerCase() === user.email, );