Skip to content

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

Added Challenge Creator Below Title (#183)

metal-faceb020ef363ac7
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f274369e..a155e66a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,10 +10,10 @@ cp .env.example .env
```
### 2 Configure your database
-You can either use planetscale or a local docker container to run your database.
-Use either 2.a or 2.b for the next step.
+You can either use planetscale or a local docker container to run your database.
+Use either 2.a or 2.b for the next step.
-### 2.a Docker local DB
+### 2.a Docker local DB
Starting the docker container
```
@@ -103,3 +103,6 @@ pnpm refresh
[planetscale-quick-start]: https://planetscale.com/docs/tutorials/planetscale-quick-start-guide
[new-oauth]: https://github.com/settings/applications/new
+#### Dependencies
+
+UI Library: [shadcn](https://ui.shadcn.com/)
diff --git a/src/app/challenge/[id]/getChallengeRouteData.ts b/src/app/challenge/[id]/getChallengeRouteData.ts
index 28a90be4..71280b26 100644
--- a/src/app/challenge/[id]/getChallengeRouteData.ts
+++ b/src/app/challenge/[id]/getChallengeRouteData.ts
@@ -9,6 +9,7 @@ export async function getChallengeRouteData(id: string, session: Session | null)
const challenge = await prisma.challenge.findFirst({
where: { id: +id },
include: {
+ user: true,
_count: {
select: { vote: true },
},
diff --git a/src/components/challenge/description/index.tsx b/src/components/challenge/description/index.tsx
index ac123bb7..f991cdd6 100644
--- a/src/components/challenge/description/index.tsx
+++ b/src/components/challenge/description/index.tsx
@@ -12,6 +12,7 @@ import { useForm } from 'react-hook-form';
import { Bookmark as BookmarkIcon, Share, ThumbsUp } from 'lucide-react';
import { Button } from '~/components/ui/button';
+import { UserBadge } from '~/components/ui/user-badge';
import {
Dialog,
DialogContent,
@@ -54,6 +55,7 @@ export function Description({ challenge }: Props) {
const [hasVoted, setHasVoted] = useState(challenge.vote.length > 0);
const [hasBookmarked, setHasBookmarked] = useState(challenge.bookmark.length > 0);
const session = useSession();
+
const debouncedSearch = useRef(
debounce(async (challengeId: number, userId: string, shouldIncrement: boolean) => {
const votes = await incrementOrDecrementUpvote(challengeId, userId, shouldIncrement);
@@ -133,7 +135,9 @@ export function Description({ challenge }: Props) {
return (
<>
<div className="flex items-baseline justify-between">
- <TypographyH3 className="mb-2 font-medium">{challenge.name}</TypographyH3>
+ <TypographyH3 className="mb-2 font-medium flex items-center gap-2">
+ {challenge.name}
+ </TypographyH3>
<Dialog>
<DialogTrigger>
<ActionMenu
@@ -228,7 +232,8 @@ export function Description({ challenge }: Props) {
</Dialog>
</div>
- <div className="mb-6 flex items-center gap-4">
+ <div className="mb-6 flex items-center gap-2">
+ <UserBadge username={challenge.user.name ? challenge.user.name : ''} />
<DifficultyBadge difficulty={challenge.difficulty} />
<TooltipProvider>
diff --git a/src/components/ui/user-badge.tsx b/src/components/ui/user-badge.tsx
new file mode 100644
index 00000000..fff5400a
--- /dev/null
+++ b/src/components/ui/user-badge.tsx
@@ -0,0 +1,27 @@
+import { Tooltip, TooltipContent, TooltipTrigger } from './tooltip';
+import Link from 'next/link';
+import { Button } from '~/components/ui/button';
+
+export interface UserBadgeProps {
+ username: string;
+}
+
+const UserBadge = (props: UserBadgeProps) => {
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ className="h-fit w-fit rounded-full bg-neutral-200 p-1 px-2 text-xs font-bold text-neutral-500 dark:bg-zinc-700 dark:text-neutral-400 hover:bg-neutral-300 dark:hover:bg-neutral-500"
+ size="sm"
+ >
+ <Link href={`/@${props.username}`}>@ {props.username}</Link>
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <span>Author</span>
+ </TooltipContent>
+ </Tooltip>
+ );
+};
+
+export { UserBadge };