Connect, collaborate, and grow with a community of TypeScript developers
Add some toolips and fix lints (#281)
Sean Boultf1b87e4c36ca
diff --git a/src/components/challenge/editor/index.tsx b/src/components/challenge/editor/index.tsxindex 4883b8ff..75d568b6 100644--- a/src/components/challenge/editor/index.tsx+++ b/src/components/challenge/editor/index.tsx@@ -266,7 +266,12 @@ export const CodePanel = (props: Props) => {<div className="sticky top-0 flex h-[40px] flex-row-reverse items-center border-b border-zinc-300 px-3 py-2 dark:border-zinc-700 dark:bg-[#1e1e1e]"><Dialog><DialogTrigger>- <Settings size={20} className="stroke-zinc-500 stroke-1 hover:stroke-zinc-400" />+ <Tooltip>+ <TooltipTrigger>+ <Settings size={20} className="stroke-zinc-500 stroke-1 hover:stroke-zinc-400" />+ </TooltipTrigger>+ <TooltipContent className="px-2 py-1">Settings</TooltipContent>+ </Tooltip></DialogTrigger><DialogContent className="w-[200px]"><DialogHeader>@@ -305,27 +310,25 @@ export const CodePanel = (props: Props) => {{editorState && <VimStatusBar editor={editorState} initVimMode={initVimMode} />}<div className="flex items-center justify-center gap-4">{props.extraButton}- <TooltipProvider>- <Tooltip delayDuration={0.05} open={session?.user?.id ? false : undefined}>- <TooltipTrigger asChild>- <span>- <Button- size="sm"- className="cursor-pointer rounded-lg bg-emerald-600 duration-300 hover:bg-emerald-500 dark:bg-emerald-400 dark:hover:bg-emerald-300"- // eslint-disable-next-line @typescript-eslint/no-misused-promises- onClick={handleSubmit}- disabled={!initialTypecheckDone || !session?.user}- >- {!initialTypecheckDone && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}- {props.submitText ?? 'Submit'}- </Button>- </span>- </TooltipTrigger>- <TooltipContent>- <p>Login to Submit</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>+ <Button+ size="sm"+ className="cursor-pointer rounded-lg bg-emerald-600 duration-300 hover:bg-emerald-500 dark:bg-emerald-400 dark:hover:bg-emerald-300"+ // eslint-disable-next-line @typescript-eslint/no-misused-promises+ onClick={handleSubmit}+ disabled={!initialTypecheckDone || !session?.user}+ >+ {!initialTypecheckDone && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}+ {props.submitText ?? 'Submit'}+ </Button>+ </span>+ </TooltipTrigger>+ <TooltipContent>+ <p>Login to Submit</p>+ </TooltipContent>+ </Tooltip></div></div></>diff --git a/src/components/report/index.tsx b/src/components/report/index.tsxindex 75f2d3c4..b7e6af80 100644--- a/src/components/report/index.tsx+++ b/src/components/report/index.tsx@@ -90,216 +90,220 @@ export default function ReportDialog({}return (- <Dialog- open={show}- onOpenChange={(e) => {- setShow(e);- }}- >- <DialogTrigger asChild={triggerAsChild}>{children}</DialogTrigger>- <DialogContent>- <form- onSubmit={handleSubmit(async (e) => {- let args = {} as UserReport | ChallengeReport | CommentReport | SolutionReport;- switch (reportType) {- case 'CHALLENGE':- args = {- ...props,- text: e.comments,- type: reportType,- } as ChallengeReport;- break;- case 'COMMENT':- args = {- ...props,- text: e.comments,- type: reportType,- } as CommentReport;- break;- case 'USER':- args = {- ...props,- text: e.comments,- type: reportType,- } as UserReport;- break;- case 'SOLUTION':- args = {- ...props,- text: e.comments,- type: reportType,- } as SolutionReport;- }+ <div>+ <Dialog+ open={show}+ onOpenChange={(e) => {+ setShow(e);+ }}+ >+ <DialogTrigger asChild={triggerAsChild}>{children}</DialogTrigger>+ <DialogContent>+ <form+ onSubmit={handleSubmit(async (e) => {+ let args = {} as UserReport | ChallengeReport | CommentReport | SolutionReport;+ switch (reportType) {+ case 'CHALLENGE':+ args = {+ ...props,+ text: e.comments,+ type: reportType,+ } as ChallengeReport;+ break;+ case 'COMMENT':+ args = {+ ...props,+ text: e.comments,+ type: reportType,+ } as CommentReport;+ break;+ case 'USER':+ args = {+ ...props,+ text: e.comments,+ type: reportType,+ } as UserReport;+ break;+ case 'SOLUTION':+ args = {+ ...props,+ text: e.comments,+ type: reportType,+ } as SolutionReport;+ }- // This shit is like... extra jank.- const issues = Object.entries(e).reduce((all, [key, value]) => {- if (key === 'comments') return all;- if (value)- all.push({- type: key.toUpperCase() as IssueType,- });- return all;- }, [] as { type: IssueType }[]);+ // This shit is like... extra jank.+ const issues = Object.entries(e).reduce((all, [key, value]) => {+ if (key === 'comments') return all;+ if (value)+ all.push({+ type: key.toUpperCase() as IssueType,+ });+ return all;+ }, [] as { type: IssueType }[]);- const value = await addReport({- ...args,- issues,- });+ const value = await addReport({+ ...args,+ issues,+ });- switch (value) {- case 'already_exists':- toast({- title: 'Already reported',- description: <p>You have already made a report with this information.</p>,- });- break;- case 'created':- toast({- title: 'Created',- variant: 'success',- description: <p>A report has been made.</p>,- });- break;- case 'not_logged_in':- toast({- title: 'Not Logged In',- variant: 'destructive',- description: <p>You must be logged in to make a report.</p>,- });- }- setShow(false);- })}- >- <DialogHeader>- <DialogTitle>{desc}</DialogTitle>- <DialogDescription>Please be as thorough in your report as you can.</DialogDescription>- </DialogHeader>- <div className="mt-4 flex flex-col gap-2">- <Text intent="leading">Please select all that apply:</Text>- <FormField- name="derogatory"- render={() => (- <FormItem>- <div className="flex items-center gap-2">- <Checkbox- {...register('derogatory')}- onCheckedChange={(e) => setValue('derogatory', e as boolean)}- />- <div>Derogatory</div>- </div>- </FormItem>- )}- control={control}- />- <FormField- name="derogatory"- render={() => (- <FormItem>- <div className="flex items-center gap-2">- <Checkbox- {...register('bullying')}- onCheckedChange={(e) => setValue('bullying', e as boolean)}- />- <div>Bullying</div>- </div>- </FormItem>- )}- control={control}- />- <FormField- name="hateSpeech"- render={() => (- <FormItem>- <div className="flex items-center gap-2">- <Checkbox- {...register('hateSpeech')}- onCheckedChange={(e) => setValue('hateSpeech', e as boolean)}- />- <div>Hate speech</div>- </div>- </FormItem>- )}- control={control}- />- <FormField- name="spam"- render={() => (- <FormItem>- <div className="flex items-center gap-2">- <Checkbox- {...register('spam')}- onCheckedChange={(e) => setValue('spam', e as boolean)}- />- <div>Spam</div>- </div>- </FormItem>- )}- control={control}- />- <FormField- name="threat"- render={() => (- <FormItem>- <div className="flex items-center gap-2">- <Checkbox- {...register('threat')}- onCheckedChange={(e) => setValue('threat', e as boolean)}- />- <div>Threat of violence</div>- </div>- </FormItem>- )}- control={control}- />- {reportType === 'CHALLENGE' && (+ switch (value) {+ case 'already_exists':+ toast({+ title: 'Already reported',+ description: <p>You have already made a report with this information.</p>,+ });+ break;+ case 'created':+ toast({+ title: 'Created',+ variant: 'success',+ description: <p>A report has been made.</p>,+ });+ break;+ case 'not_logged_in':+ toast({+ title: 'Not Logged In',+ variant: 'destructive',+ description: <p>You must be logged in to make a report.</p>,+ });+ }+ setShow(false);+ })}+ >+ <DialogHeader>+ <DialogTitle>{desc}</DialogTitle>+ <DialogDescription>+ Please be as thorough in your report as you can.+ </DialogDescription>+ </DialogHeader>+ <div className="mt-4 flex flex-col gap-2">+ <Text intent="leading">Please select all that apply:</Text><FormField- name="unclear"+ name="derogatory"render={() => (<FormItem><div className="flex items-center gap-2"><Checkbox- {...register('unclear')}- onCheckedChange={(e) => setValue('unclear', e as boolean)}+ {...register('derogatory')}+ onCheckedChange={(e) => setValue('derogatory', e as boolean)}/>- <div>Unclear</div>+ <div>Derogatory</div></div></FormItem>)}control={control}/>- )}-- <FormField- name="comments"- render={() => (- <FormItem className="my-3">- <div className="flex flex-col gap-3">- <div>Other information</div>- <Textarea- {...register('comments')}- placeholder="Any extra information to help our moderator team when reviewing this report."- />- </div>- </FormItem>+ <FormField+ name="derogatory"+ render={() => (+ <FormItem>+ <div className="flex items-center gap-2">+ <Checkbox+ {...register('bullying')}+ onCheckedChange={(e) => setValue('bullying', e as boolean)}+ />+ <div>Bullying</div>+ </div>+ </FormItem>+ )}+ control={control}+ />+ <FormField+ name="hateSpeech"+ render={() => (+ <FormItem>+ <div className="flex items-center gap-2">+ <Checkbox+ {...register('hateSpeech')}+ onCheckedChange={(e) => setValue('hateSpeech', e as boolean)}+ />+ <div>Hate speech</div>+ </div>+ </FormItem>+ )}+ control={control}+ />+ <FormField+ name="spam"+ render={() => (+ <FormItem>+ <div className="flex items-center gap-2">+ <Checkbox+ {...register('spam')}+ onCheckedChange={(e) => setValue('spam', e as boolean)}+ />+ <div>Spam</div>+ </div>+ </FormItem>+ )}+ control={control}+ />+ <FormField+ name="threat"+ render={() => (+ <FormItem>+ <div className="flex items-center gap-2">+ <Checkbox+ {...register('threat')}+ onCheckedChange={(e) => setValue('threat', e as boolean)}+ />+ <div>Threat of violence</div>+ </div>+ </FormItem>+ )}+ control={control}+ />+ {reportType === 'CHALLENGE' && (+ <FormField+ name="unclear"+ render={() => (+ <FormItem>+ <div className="flex items-center gap-2">+ <Checkbox+ {...register('unclear')}+ onCheckedChange={(e) => setValue('unclear', e as boolean)}+ />+ <div>Unclear</div>+ </div>+ </FormItem>+ )}+ control={control}+ />)}- control={control}- />- </div>- <DialogFooter>- <Button- variant="outline"- onClick={(e) => {- e.preventDefault();- setShow(false);- }}- >- Cancel- </Button>- <Button type="submit">Send report</Button>- </DialogFooter>- </form>- </DialogContent>- </Dialog>+ <FormField+ name="comments"+ render={() => (+ <FormItem className="my-3">+ <div className="flex flex-col gap-3">+ <div>Other information</div>+ <Textarea+ {...register('comments')}+ placeholder="Any extra information to help our moderator team when reviewing this report."+ />+ </div>+ </FormItem>+ )}+ control={control}+ />+ </div>++ <DialogFooter>+ <Button+ variant="outline"+ onClick={(e) => {+ e.preventDefault();+ setShow(false);+ }}+ >+ Cancel+ </Button>+ <Button type="submit">Send report</Button>+ </DialogFooter>+ </form>+ </DialogContent>+ </Dialog>+ </div>);}