Skip to content

Commit

Permalink
💬 Display category descriptions (#477)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClumsyVlad committed May 15, 2024
1 parent ddccc2b commit 86f08b5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/app/waves/create/preview/wavePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { urls } from "@/constants/urls";
import { cn } from "@/lib/cn";
import { formatDate } from "@/lib/dates";
import { LOCAL_STORAGE_KEYS } from "@/lib/localStorage";
import { Badge } from "@/components/ui/badge";
import { Button, buttonVariants } from "@/components/ui/button";
import {
Card,
Expand All @@ -15,6 +14,7 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card";
import { CategoryBadge } from "@/components/ui/categories/categoryBadge";
import { PageHeader } from "@/components/ui/pageHeader";
import { Separator } from "@/components/ui/separator";
import { CalendarIcon } from "@/components/icons/calendarIcon";
Expand Down Expand Up @@ -56,9 +56,9 @@ export default function PreviewApplication() {
<div className="flex flex-wrap items-center gap-2">
<span className="text-xs font-bold">Categories:</span>
<ul className="flex flex-wrap items-center gap-2">
{validatedWaveData.categories.map(({ name, color }, index) => (
<li key={name + index}>
<Badge variant={color}>{name}</Badge>
{validatedWaveData.categories.map((category, index) => (
<li key={category.name + index}>
<CategoryBadge category={category} />
</li>
))}
</ul>
Expand Down
23 changes: 12 additions & 11 deletions src/components/ui/categories/categoryBadge.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
import { type CategoryColor } from "@/types/CategoryColor";
import { Category } from "@/types/Category";

import { Badge } from "../badge";
import { Tooltip, TooltipContent, TooltipTrigger } from "../tooltip";
import { getCategoryIcon } from "./getCategoryIcon";

interface Category {
color: CategoryColor;
name: string;
}

interface CategoryBadgeProps {
category: Category;
category: Omit<Category, "id">;
}

export function CategoryBadge({ category }: CategoryBadgeProps) {
return (
<Badge variant={category.color}>
{getCategoryIcon(category.color)}
{category.name}
</Badge>
<Tooltip>
<TooltipTrigger>
<Badge variant={category.color}>
{getCategoryIcon(category.color)}
{category.name}
</Badge>
</TooltipTrigger>
<TooltipContent>{category.description}</TooltipContent>
</Tooltip>
);
}
1 change: 1 addition & 0 deletions src/drizzle/queries/waves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const getWaves = cache(async () => {
id: true,
name: true,
color: true,
description: true,
},
},
},
Expand Down

0 comments on commit 86f08b5

Please sign in to comment.