Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

Fix: 654 bug submit button disabled when not logged in (#657)

Maxwell DeMaiof29faad19b0b
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx b/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
index b5336349..c9545124 100644
--- a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
@@ -25,6 +25,7 @@ import {
} from '@repo/ui/components/dialog';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { Markdown } from '@repo/ui/components/markdown';
+import { Button } from '@repo/ui/components/button';
interface Props {
challenge: ChallengeRouteData;
@@ -107,7 +108,7 @@ export function Description({ challenge }: Props) {
</Dialog>
<Tooltip>
<TooltipTrigger asChild>
- <button
+ <Button
className="group flex h-6 items-center rounded-full bg-zinc-200 px-3 focus:outline-none focus-visible:ring-2 disabled:cursor-not-allowed disabled:bg-zinc-100 dark:bg-zinc-700 disabled:dark:bg-zinc-700/50"
disabled={!session.data?.user.id}
onClick={() => {
@@ -136,7 +137,7 @@ export function Description({ challenge }: Props) {
'h-4 w-4',
)}
/>
- </button>
+ </Button>
</TooltipTrigger>
<TooltipContent>
<p>{session.data?.user.id ? 'Bookmark' : 'Login to Bookmark'}</p>
diff --git a/apps/web/src/app/[locale]/challenge/_components/vote.tsx b/apps/web/src/app/[locale]/challenge/_components/vote.tsx
index 9b5bf24f..427d1c89 100644
--- a/apps/web/src/app/[locale]/challenge/_components/vote.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/vote.tsx
@@ -8,6 +8,7 @@ import { debounce } from 'lodash';
import { useRef, useState } from 'react';
import { incrementOrDecrementUpvote } from '../increment.action';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { Button } from '@repo/ui/components/button';
interface VoteProps {
voteCount: number;
@@ -39,8 +40,8 @@ export function Vote({
return (
<Tooltip>
<TooltipTrigger asChild>
- <button
- className="group flex h-6 items-center gap-1 rounded-full bg-zinc-200 pl-[0.675rem] pr-2 text-sm focus:outline-none focus-visible:ring-2 disabled:cursor-not-allowed disabled:bg-zinc-100 dark:bg-zinc-700 disabled:dark:bg-zinc-700/50"
+ <Button
+ className="group flex h-6 items-center gap-1 rounded-full bg-zinc-200 py-0 pl-[0.675rem] pr-2 text-sm focus:outline-none focus-visible:ring-2 disabled:cursor-not-allowed disabled:bg-zinc-100 dark:bg-zinc-700 disabled:dark:bg-zinc-700/50"
disabled={disabled}
onClick={() => {
let shouldIncrement = false;
@@ -74,7 +75,7 @@ export function Vote({
'stroke-zinc-500 group-hover:stroke-zinc-600 group-disabled:stroke-zinc-300 dark:stroke-zinc-300 group-hover:dark:stroke-zinc-100 group-disabled:dark:stroke-zinc-500/50':
!hasVoted,
},
- 'h-4 w-4 duration-200',
+ 'my-auto h-4 w-4 duration-200',
)}
/>
<span
@@ -89,7 +90,7 @@ export function Vote({
>
{votes}
</span>
- </button>
+ </Button>
</TooltipTrigger>
<TooltipContent>
<p>{session.data?.user.id ? 'Upvote' : 'Login to Upvote'}</p>
diff --git a/packages/ui/src/components/button.tsx b/packages/ui/src/components/button.tsx
index 4cc51c67..6390a3f4 100644
--- a/packages/ui/src/components/button.tsx
+++ b/packages/ui/src/components/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '../cn';
const buttonVariants = cva(
- 'inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 disabled:pointer-events-none ring-offset-background',
+ 'inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 disabled:cursor-not-allowed ring-offset-background',
{
variants: {
variant: {