diff --git a/packages/backend/src/routes/primary/signup.ts b/packages/backend/src/routes/primary/signup.ts index 3f0fac4..f46bf85 100644 --- a/packages/backend/src/routes/primary/signup.ts +++ b/packages/backend/src/routes/primary/signup.ts @@ -15,20 +15,13 @@ export default function PrimarySignUp(fastify: FastifyInstance) { try { const requiredInvitationCode = await fastify.orm.em.getRepository(ConfigEntity).get("requiredInvitationCode", "true") as string; - let reqInvCodeSchema: ZodObject; - if (requiredInvitationCode !== "true") { - reqInvCodeSchema = z.object({}); - } else { - reqInvCodeSchema = z.object({ - invitationCode: z.string().trim().min(1), - }); - } - const result = UserRepository.schema.pick({ userid: true, email: true, password: true, - }).merge(reqInvCodeSchema).safeParse(req.body); + }).merge(z.object({ + reqInvCode: z.string().trim().min(1).optional(), + })).safeParse(req.body); if (!result.success) { console.log(result.error.issues) @@ -36,7 +29,7 @@ export default function PrimarySignUp(fastify: FastifyInstance) { } const error = await fastify.orm.em.getRepository(UserEntity).createUser({ - ...(result.data as any), + ...result.data, isAdmin: false, }); diff --git a/packages/frontend/src/components/Textarea.vue b/packages/frontend/src/components/Textarea.vue index 2764c13..9dc3ab0 100644 --- a/packages/frontend/src/components/Textarea.vue +++ b/packages/frontend/src/components/Textarea.vue @@ -63,8 +63,9 @@ defineProps<{ const model = defineModel(); const id = useId(); -const resize = (event: any) => { - event.target.style.height = "auto"; - event.target.style.height = event.target.scrollHeight + 'px'; +const resize = (event: Event) => { + const target = event.target as HTMLTextAreaElement; + target.style.height = "auto"; + target.style.height = target.scrollHeight + 'px'; } \ No newline at end of file diff --git a/packages/frontend/src/routes/community/channel.vue b/packages/frontend/src/routes/community/channel.vue index 9a849e7..3d2e1a7 100644 --- a/packages/frontend/src/routes/community/channel.vue +++ b/packages/frontend/src/routes/community/channel.vue @@ -183,10 +183,11 @@ const message = ref(""); const isInsideRange = ref(false); const isLoading = ref(false); -const messagesScroll = async (event: any) => { +const messagesScroll = async (event: Event) => { const handleSize = 200; - const isCurrentInside = event.target.scrollTop < handleSize; + const target = event.target as HTMLDivElement; + const isCurrentInside = target.scrollTop < handleSize; if (isCurrentInside && !isInsideRange.value && !isLoading.value) { isLoading.value = true; await new Promise(resolve => setTimeout(resolve, 0)); @@ -230,9 +231,10 @@ const messagesScroll = async (event: any) => { isInsideRange.value = isCurrentInside; } -const resize = (event: any) => { - event.target.style.height = "auto"; - event.target.style.height = event.target.scrollHeight + 'px'; +const resize = (event: Event) => { + const target = event.target as HTMLTextAreaElement; + target.style.height = "auto"; + target.style.height = target.scrollHeight + 'px'; } const send = async (e: Event) => { diff --git a/packages/frontend/src/routes/community/index.vue b/packages/frontend/src/routes/community/index.vue index c23639e..c039b0f 100644 --- a/packages/frontend/src/routes/community/index.vue +++ b/packages/frontend/src/routes/community/index.vue @@ -248,8 +248,9 @@ if (!account.value?.success) { } } -const handleOutsideClick = (event: any) => { - if (menuElem.value?.menuElem && !menuElem.value.menuElem.contains(event.target)) { +const handleOutsideClick = (event: Event) => { + const target = event.target as HTMLElement; + if (menuElem.value?.menuElem && !menuElem.value.menuElem.contains(target)) { isMenuOpen.value = false; } }