From dca0ba1774022a9ef56587dc2a593c4821836b3a Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Sat, 7 Jan 2023 19:57:59 +0900 Subject: [PATCH 1/3] Fixing most of the eslint warnings in the web code --- website/src/components/CollapsableText.tsx | 12 ++++++++++-- website/src/components/ContextMessages.tsx | 2 +- website/src/components/FlaggableElement.tsx | 2 +- website/src/components/Messages/MessageTable.tsx | 4 ++-- .../src/components/Messages/MessageTableEntry.tsx | 4 ++-- .../components/Messages/MessageWithChildren.tsx | 15 +++++++-------- website/src/components/SideMenuLayout.tsx | 2 +- .../components/Survey/TaskControlsOverridable.tsx | 2 +- website/src/components/Vision.tsx | 2 +- website/src/pages/about.tsx | 6 +++--- website/src/pages/api/username.tsx | 2 +- website/src/pages/dashboard.tsx | 3 +-- website/src/pages/messages/[id]/index.tsx | 10 ++++------ website/src/pages/messages/index.tsx | 6 +++--- website/src/pages/privacy-policy.tsx | 2 -- website/src/pages/terms-of-service.tsx | 2 -- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/website/src/components/CollapsableText.tsx b/website/src/components/CollapsableText.tsx index b0cfb3b9..1f34c508 100644 --- a/website/src/components/CollapsableText.tsx +++ b/website/src/components/CollapsableText.tsx @@ -1,5 +1,13 @@ -import { Button, useDisclosure } from "@chakra-ui/react"; -import { Modal, ModalOverlay, ModalContent, ModalHeader, ModalBody, ModalCloseButton } from "@chakra-ui/react"; +import { + Button, + Modal, + ModalBody, + ModalCloseButton, + ModalContent, + ModalHeader, + ModalOverlay, + useDisclosure, +} from "@chakra-ui/react"; import React from "react"; export const CollapsableText = ({ text, maxLength = 220 }) => { diff --git a/website/src/components/ContextMessages.tsx b/website/src/components/ContextMessages.tsx index 150dddfa..8217f8b7 100644 --- a/website/src/components/ContextMessages.tsx +++ b/website/src/components/ContextMessages.tsx @@ -1,5 +1,5 @@ import { Box } from "@chakra-ui/react"; -import { Message } from "./Messages"; +import { Message } from "src/components/Messages"; export const ContextMessages = ({ messages }: { messages: Message[] }) => { return ( diff --git a/website/src/components/FlaggableElement.tsx b/website/src/components/FlaggableElement.tsx index a55d29c5..dbd20e93 100644 --- a/website/src/components/FlaggableElement.tsx +++ b/website/src/components/FlaggableElement.tsx @@ -24,8 +24,8 @@ import { import { FlagIcon, QuestionMarkCircleIcon } from "@heroicons/react/20/solid"; import { useState } from "react"; import poster from "src/lib/poster"; -import useSWRMutation from "swr/mutation"; import { colors } from "styles/Theme/colors"; +import useSWRMutation from "swr/mutation"; export const FlaggableElement = (props) => { const [isEditing, setIsEditing] = useBoolean(); diff --git a/website/src/components/Messages/MessageTable.tsx b/website/src/components/Messages/MessageTable.tsx index 65f6efb1..ee1d3687 100644 --- a/website/src/components/Messages/MessageTable.tsx +++ b/website/src/components/Messages/MessageTable.tsx @@ -1,5 +1,5 @@ -import { Box, CircularProgress, Stack, StackDivider, useColorModeValue } from "@chakra-ui/react"; -import { MessageTableEntry } from "./MessageTableEntry"; +import { Stack, StackDivider } from "@chakra-ui/react"; +import { MessageTableEntry } from "src/components/MessageTableEntry"; export function MessageTable({ messages }) { return ( diff --git a/website/src/components/Messages/MessageTableEntry.tsx b/website/src/components/Messages/MessageTableEntry.tsx index d272b960..9fad7262 100644 --- a/website/src/components/Messages/MessageTableEntry.tsx +++ b/website/src/components/Messages/MessageTableEntry.tsx @@ -1,7 +1,7 @@ -import { Avatar, Box, HStack, LinkBox, useColorModeValue } from "@chakra-ui/react"; +import { Avatar, HStack, LinkBox, useColorModeValue } from "@chakra-ui/react"; import { boolean } from "boolean"; import NextLink from "next/link"; -import { FlaggableElement } from "../FlaggableElement"; +import { FlaggableElement } from "src/components/FlaggableElement"; interface Message { text: string; diff --git a/website/src/components/Messages/MessageWithChildren.tsx b/website/src/components/Messages/MessageWithChildren.tsx index 8fcd8658..c412f996 100644 --- a/website/src/components/Messages/MessageWithChildren.tsx +++ b/website/src/components/Messages/MessageWithChildren.tsx @@ -1,10 +1,9 @@ -import { Box, CircularProgress, Flex, HStack, StackDivider, Text, TextProps, StackProps } from "@chakra-ui/react"; -import { useState } from "react"; -import useSWR from "swr"; - -import fetcher from "src/lib/fetcher"; -import { MessageTableEntry } from "./MessageTableEntry"; +import { Box, CircularProgress, Flex, HStack, StackDivider, StackProps, Text, TextProps } from "@chakra-ui/react"; import { boolean } from "boolean"; +import { useState } from "react"; +import { MessageTableEntry } from "src/components/Messages/MessageTableEntry"; +import fetcher from "src/lib/fetcher"; +import useSWR from "swr"; const MessageHeaderProps: TextProps = { align: "center", @@ -36,7 +35,7 @@ export function MessageWithChildren(props: MessageWithChildrenProps) { onSuccess: (data) => { setMessage(data); }, - onError: (err, key, config) => { + onError: () => { setMessage(null); }, }); @@ -44,7 +43,7 @@ export function MessageWithChildren(props: MessageWithChildrenProps) { onSuccess: (data) => { setChildren(data); }, - onError: (err, key, config) => { + onError: () => { setChildren(null); }, }); diff --git a/website/src/components/SideMenuLayout.tsx b/website/src/components/SideMenuLayout.tsx index e6c521a1..ae8cfbc2 100644 --- a/website/src/components/SideMenuLayout.tsx +++ b/website/src/components/SideMenuLayout.tsx @@ -1,6 +1,6 @@ import { Box, useColorMode } from "@chakra-ui/react"; +import { MenuButtonOption, SideMenu } from "src/components/SideMenu"; import { colors } from "styles/Theme/colors"; -import { SideMenu, MenuButtonOption } from "src/components/SideMenu"; interface SideMenuLayoutProps { menuButtonOptions: MenuButtonOption[]; diff --git a/website/src/components/Survey/TaskControlsOverridable.tsx b/website/src/components/Survey/TaskControlsOverridable.tsx index b5333087..a66a4a68 100644 --- a/website/src/components/Survey/TaskControlsOverridable.tsx +++ b/website/src/components/Survey/TaskControlsOverridable.tsx @@ -10,7 +10,7 @@ import { ModalOverlay, useDisclosure, } from "@chakra-ui/react"; -import { TaskControls, TaskControlsProps } from "./TaskControls"; +import { TaskControls, TaskControlsProps } from "src/components/TaskControls"; interface TaskControlsOverridableProps extends TaskControlsProps { isValid: boolean; diff --git a/website/src/components/Vision.tsx b/website/src/components/Vision.tsx index f6dad567..1c15d60b 100644 --- a/website/src/components/Vision.tsx +++ b/website/src/components/Vision.tsx @@ -1,5 +1,5 @@ -import { Container } from "./Container"; import Image from "next/image"; +import { Container } from "src/components/Container"; const Vision = () => { return ( diff --git a/website/src/pages/about.tsx b/website/src/pages/about.tsx index fdce53f6..490a6095 100644 --- a/website/src/pages/about.tsx +++ b/website/src/pages/about.tsx @@ -1,9 +1,9 @@ +import Image from "next/image"; +import { CallToAction } from "src/components/CallToAction"; import { Container } from "src/components/Container"; +import Roadmap from "src/components/Roadmap"; import Services from "src/components/Services"; import Vision from "src/components/Vision"; -import Roadmap from "src/components/Roadmap"; -import { CallToAction } from "src/components/CallToAction"; -import Image from "next/image"; const AboutPage = () => { return ( diff --git a/website/src/pages/api/username.tsx b/website/src/pages/api/username.tsx index 556edfa9..6cf362c2 100644 --- a/website/src/pages/api/username.tsx +++ b/website/src/pages/api/username.tsx @@ -1,5 +1,5 @@ import { getSession } from "next-auth/react"; -import prisma from "../../lib/prismadb"; +import prisma from "src/lib/prismadb"; // POST /api/post // Required fields in body: title diff --git a/website/src/pages/dashboard.tsx b/website/src/pages/dashboard.tsx index 8ab4d527..ece95212 100644 --- a/website/src/pages/dashboard.tsx +++ b/website/src/pages/dashboard.tsx @@ -1,7 +1,6 @@ import Head from "next/head"; - -import { getDashboardLayout } from "src/components/Layout"; import { LeaderboardTable, TaskOption } from "src/components/Dashboard"; +import { getDashboardLayout } from "src/components/Layout"; const Dashboard = () => { return ( diff --git a/website/src/pages/messages/[id]/index.tsx b/website/src/pages/messages/[id]/index.tsx index e778e74a..eacd5a72 100644 --- a/website/src/pages/messages/[id]/index.tsx +++ b/website/src/pages/messages/[id]/index.tsx @@ -1,13 +1,11 @@ import { Box, Container, Text, useColorModeValue } from "@chakra-ui/react"; import Head from "next/head"; -import { useRouter } from "next/router"; import { useState } from "react"; -import useSWR from "swr"; - -import fetcher from "src/lib/fetcher"; -import { MessageTableEntry } from "src/components/Messages/MessageTableEntry"; import { LoadingScreen } from "src/components/Loading/LoadingScreen"; +import { MessageTableEntry } from "src/components/Messages/MessageTableEntry"; import { MessageWithChildren } from "src/components/Messages/MessageWithChildren"; +import fetcher from "src/lib/fetcher"; +import useSWR from "swr"; const MessageDetail = ({ id }) => { const mainBg = useColorModeValue("bg-slate-300", "bg-slate-900"); @@ -18,7 +16,7 @@ const MessageDetail = ({ id }) => { onSuccess: (data) => { setParent(data); }, - onError: (err, key, config) => { + onError: () => { setParent(null); }, }); diff --git a/website/src/pages/messages/index.tsx b/website/src/pages/messages/index.tsx index 96ee19db..276a35ed 100644 --- a/website/src/pages/messages/index.tsx +++ b/website/src/pages/messages/index.tsx @@ -1,10 +1,10 @@ import { Box, CircularProgress, SimpleGrid, Text, useColorModeValue } from "@chakra-ui/react"; import Head from "next/head"; import { useState } from "react"; -import useSWRImmutable from "swr/immutable"; -import fetcher from "src/lib/fetcher"; -import { MessageTable } from "src/components/Messages/MessageTable"; import { getDashboardLayout } from "src/components/Layout"; +import { MessageTable } from "src/components/Messages/MessageTable"; +import fetcher from "src/lib/fetcher"; +import useSWRImmutable from "swr/immutable"; const MessagesDashboard = () => { const boxBgColor = useColorModeValue("white", "gray.700"); diff --git a/website/src/pages/privacy-policy.tsx b/website/src/pages/privacy-policy.tsx index 164fab93..b5949f42 100644 --- a/website/src/pages/privacy-policy.tsx +++ b/website/src/pages/privacy-policy.tsx @@ -1,7 +1,5 @@ import { Container, Heading } from "@chakra-ui/react"; import Head from "next/head"; -import { Footer } from "src/components/Footer"; -import { Header } from "src/components/Header"; import { getTransparentHeaderLayout } from "src/components/Layout"; const PrivacyPolicy = () => { diff --git a/website/src/pages/terms-of-service.tsx b/website/src/pages/terms-of-service.tsx index ce60a20e..44d3168d 100644 --- a/website/src/pages/terms-of-service.tsx +++ b/website/src/pages/terms-of-service.tsx @@ -1,7 +1,5 @@ import { Container, Heading } from "@chakra-ui/react"; import Head from "next/head"; -import { Footer } from "src/components/Footer"; -import { Header } from "src/components/Header"; import { getTransparentHeaderLayout } from "src/components/Layout"; const TermsOfService = () => { From 19ff44f442fb8fbca20205388d4ea7ef4681131b Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Sat, 7 Jan 2023 20:01:50 +0900 Subject: [PATCH 2/3] Fixing a build issue I introduced --- website/src/components/Messages/MessageTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/components/Messages/MessageTable.tsx b/website/src/components/Messages/MessageTable.tsx index ee1d3687..95ccc540 100644 --- a/website/src/components/Messages/MessageTable.tsx +++ b/website/src/components/Messages/MessageTable.tsx @@ -1,5 +1,5 @@ import { Stack, StackDivider } from "@chakra-ui/react"; -import { MessageTableEntry } from "src/components/MessageTableEntry"; +import { MessageTableEntry } from "src/components/Messages/MessageTableEntry"; export function MessageTable({ messages }) { return ( From ac409be6f957718e283342fed3f0cdef6d4c5a57 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Sat, 7 Jan 2023 20:04:54 +0900 Subject: [PATCH 3/3] Fixing a build issue I introduced --- website/src/components/Survey/TaskControlsOverridable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/components/Survey/TaskControlsOverridable.tsx b/website/src/components/Survey/TaskControlsOverridable.tsx index a66a4a68..25e973fb 100644 --- a/website/src/components/Survey/TaskControlsOverridable.tsx +++ b/website/src/components/Survey/TaskControlsOverridable.tsx @@ -10,7 +10,7 @@ import { ModalOverlay, useDisclosure, } from "@chakra-ui/react"; -import { TaskControls, TaskControlsProps } from "src/components/TaskControls"; +import { TaskControls, TaskControlsProps } from "src/components/Survey/TaskControls"; interface TaskControlsOverridableProps extends TaskControlsProps { isValid: boolean;