From 5d3cd5a4e7f0509821dc9e66a84e445045df8eaa Mon Sep 17 00:00:00 2001 From: rsandb Date: Mon, 16 Jan 2023 17:05:33 -0600 Subject: [PATCH] convert modal into widget copy still needs tweaking --- .../src/components/Dashboard/WelcomeCard.tsx | 52 +++++++++++++++ .../src/components/Dashboard/WelcomeModal.tsx | 64 ------------------- website/src/components/Dashboard/index.ts | 2 +- website/src/pages/dashboard.tsx | 4 +- 4 files changed, 55 insertions(+), 67 deletions(-) create mode 100644 website/src/components/Dashboard/WelcomeCard.tsx delete mode 100644 website/src/components/Dashboard/WelcomeModal.tsx diff --git a/website/src/components/Dashboard/WelcomeCard.tsx b/website/src/components/Dashboard/WelcomeCard.tsx new file mode 100644 index 00000000..058e1e80 --- /dev/null +++ b/website/src/components/Dashboard/WelcomeCard.tsx @@ -0,0 +1,52 @@ +import { Box, Button, Divider, Text, useColorMode } from "@chakra-ui/react"; +import { useSession } from "next-auth/react"; +import { useState } from "react"; +import { FiX } from "react-icons/fi"; + +export function WelcomeCard() { + const { colorMode } = useColorMode(); + const backgroundColor = colorMode === "light" ? "white" : "gray.700"; + const titleColor = colorMode === "light" ? "blue.500" : "blue.300"; + + const { data: session } = useSession(); + + const [showCard, setShowCard] = useState("true"); + + if (!session) { + return <>; + } + if (session && session.user && session.user.isNew) + return ( + <> + + + + + Welcome, {session.user.name || "Contributor"}! + + + + + + Open Assistant is an open-source AI assistant that uses and trains advanced language models to + understand and respond to humans. + + + Complete tasks to help train the model and earn points. + + + + + + + ); +} diff --git a/website/src/components/Dashboard/WelcomeModal.tsx b/website/src/components/Dashboard/WelcomeModal.tsx deleted file mode 100644 index 7ecaebac..00000000 --- a/website/src/components/Dashboard/WelcomeModal.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import { - Box, - Button, - Divider, - Modal, - ModalBody, - ModalCloseButton, - ModalContent, - ModalFooter, - ModalHeader, - ModalOverlay, - Text, -} from "@chakra-ui/react"; -import { useSession } from "next-auth/react"; -import { useState } from "react"; - -export function WelcomeModal() { - const { data: session } = useSession(); - - const [showModal, setShowModal] = useState(true); - - if (!session) { - return <>; - } - if (session && session.user && session.user.isNew) - return ( - <> - setShowModal(false)} isCentered> - - - - - - Welcome, {session.user.name || "Contributor"}! - - - - - - - Open Assistant is an open-source AI assistant that uses and trains advanced language models to - understand and respond to humans. - - - Complete tasks to help train the model and earn points. - - - - - - - - - - ); -} diff --git a/website/src/components/Dashboard/index.ts b/website/src/components/Dashboard/index.ts index 0d6ca5e3..84a93850 100644 --- a/website/src/components/Dashboard/index.ts +++ b/website/src/components/Dashboard/index.ts @@ -1,3 +1,3 @@ export { LeaderboardTable } from "./LeaderboardTable"; export { TaskOption } from "./TaskOption"; -export { WelcomeModal } from "./WelcomeModal"; +export { WelcomeCard } from "./WelcomeCard"; diff --git a/website/src/pages/dashboard.tsx b/website/src/pages/dashboard.tsx index c4245554..78a47fd4 100644 --- a/website/src/pages/dashboard.tsx +++ b/website/src/pages/dashboard.tsx @@ -1,6 +1,6 @@ import { Flex } from "@chakra-ui/react"; import Head from "next/head"; -import { LeaderboardTable, TaskOption, WelcomeModal } from "src/components/Dashboard"; +import { LeaderboardTable, TaskOption, WelcomeCard } from "src/components/Dashboard"; import { getDashboardLayout } from "src/components/Layout"; import { TaskCategory } from "src/components/Tasks/TaskTypes"; @@ -12,7 +12,7 @@ const Dashboard = () => { - +