From 2e2efdec650bd0e660be91e528912e1bffffec96 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Tue, 10 Jan 2023 12:51:56 +0900 Subject: [PATCH] Fixing a small remaining issues, reporting labels, rejecting tasks, and redirecting users on landing page --- website/src/components/FlaggableElement.tsx | 2 +- website/src/components/Messages.tsx | 8 +++++--- website/src/pages/api/reject_task.ts | 1 + website/src/pages/index.tsx | 11 +++++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/website/src/components/FlaggableElement.tsx b/website/src/components/FlaggableElement.tsx index df7296cc..2f3f25b2 100644 --- a/website/src/components/FlaggableElement.tsx +++ b/website/src/components/FlaggableElement.tsx @@ -45,7 +45,7 @@ export const FlaggableElement = (props) => { }); const { trigger } = useSWRMutation("/api/set_label", poster, { onSuccess: () => { - setIsEditing.off; + setIsEditing.off(); }, }); diff --git a/website/src/components/Messages.tsx b/website/src/components/Messages.tsx index 71ff237b..b14b0aaa 100644 --- a/website/src/components/Messages.tsx +++ b/website/src/components/Messages.tsx @@ -1,6 +1,6 @@ import { Grid } from "@chakra-ui/react"; import { useColorMode } from "@chakra-ui/react"; -import { useMemo } from "react"; +import { forwardRef, useMemo } from "react"; import { FlaggableElement } from "./FlaggableElement"; @@ -43,7 +43,7 @@ export const Messages = ({ return {items}; }; -export const MessageView = ({ is_assistant, text, message_id }: Message) => { +export const MessageView = forwardRef(({ is_assistant, text, message_id }: Message, ref) => { const { colorMode } = useColorMode(); const bgColor = useMemo(() => { @@ -55,4 +55,6 @@ export const MessageView = ({ is_assistant, text, message_id }: Message) => { }, [colorMode, is_assistant]); return
{text}
; -}; +}); + +MessageView.displayName = "MessageView"; diff --git a/website/src/pages/api/reject_task.ts b/website/src/pages/api/reject_task.ts index d146c44b..fc807b67 100644 --- a/website/src/pages/api/reject_task.ts +++ b/website/src/pages/api/reject_task.ts @@ -1,6 +1,7 @@ import { Prisma } from "@prisma/client"; import { getToken } from "next-auth/jwt"; import { oasstApiClient } from "src/lib/oasst_api_client"; +import prisma from "src/lib/prismadb"; const handler = async (req, res) => { const token = await getToken({ req }); diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index 04f99829..64b1a0d5 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -1,10 +1,21 @@ import Head from "next/head"; +import { useRouter } from "next/router"; +import { useSession } from "next-auth/react"; +import { useEffect } from "react"; import { CallToAction } from "src/components/CallToAction"; import { Faq } from "src/components/Faq"; import { Hero } from "src/components/Hero"; import { getTransparentHeaderLayout } from "src/components/Layout"; const Home = () => { + const router = useRouter(); + const { status } = useSession(); + useEffect(() => { + if (status === "authenticated") { + router.push("/dashboard"); + } + }, [router, status]); + return ( <>