feat: fix category category loading
This commit is contained in:
@@ -1 +0,0 @@
|
||||
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
|
||||
|
Before Width: | Height: | Size: 391 B |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB |
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
|
||||
|
Before Width: | Height: | Size: 128 B |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
|
||||
|
Before Width: | Height: | Size: 385 B |
@@ -1,20 +1,33 @@
|
||||
import { Metadata } from "next";
|
||||
|
||||
import { ArticlesFeed } from "#dashboard/components/articles-feed";
|
||||
import { CategoriesCarousel } from "#dashboard/components/categories-carousel";
|
||||
import { PageHeader } from "#dashboard/components/shell/page-header";
|
||||
import { PageLayout } from "#dashboard/components/shell/page-layout";
|
||||
import { HydrateClient, prefetch, trpc } from "#dashboard/trpc/server";
|
||||
import { HydrateClient, batchPrefetch, trpc } from "#dashboard/trpc/server";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Articles | Basango Dashboard",
|
||||
};
|
||||
|
||||
export default function Page() {
|
||||
prefetch(trpc.categories.list.queryOptions());
|
||||
prefetch(trpc.articles.list.infiniteQueryOptions({ limit: 12 }));
|
||||
batchPrefetch([
|
||||
trpc.articles.list.infiniteQueryOptions({ limit: 12 }),
|
||||
trpc.categories.list.queryOptions(),
|
||||
]);
|
||||
|
||||
return (
|
||||
<HydrateClient>
|
||||
<PageLayout title="Articles">
|
||||
<PageLayout
|
||||
header={
|
||||
<>
|
||||
<PageHeader title="Articles" />
|
||||
<CategoriesCarousel />
|
||||
</>
|
||||
}
|
||||
headersNumber={2}
|
||||
title="Articles"
|
||||
>
|
||||
<ArticlesFeed />
|
||||
</PageLayout>
|
||||
</HydrateClient>
|
||||
|
||||
@@ -6,25 +6,19 @@ import { useInfiniteQuery } from "@tanstack/react-query";
|
||||
import { Loader2 } from "lucide-react";
|
||||
import * as React from "react";
|
||||
|
||||
import { useCategoryFilterParams } from "#dashboard/hooks/use-category-filter-params";
|
||||
import { useTRPC } from "#dashboard/trpc/client";
|
||||
|
||||
import { ArticleCard, ArticleCardSkeleton } from "./article-card";
|
||||
import { CategoriesCarousel } from "./categories-carousel";
|
||||
|
||||
type ArticlesTableProps = {
|
||||
sourceId?: string;
|
||||
};
|
||||
|
||||
const PLACEHOLDER_COUNT = 8;
|
||||
|
||||
export function ArticlesFeed({ sourceId }: ArticlesTableProps) {
|
||||
const { selectedCategory } = useCategoryFilterParams();
|
||||
|
||||
const trpc = useTRPC();
|
||||
const [selectedCategory, setSelectedCategory] = React.useState<string | null>(null);
|
||||
|
||||
const handleCategorySelect = React.useCallback((categoryId: string | null) => {
|
||||
setSelectedCategory((current) => (current === categoryId ? null : categoryId));
|
||||
}, []);
|
||||
|
||||
const query = useInfiniteQuery(
|
||||
trpc.articles.list.infiniteQueryOptions(
|
||||
{
|
||||
@@ -48,8 +42,6 @@ export function ArticlesFeed({ sourceId }: ArticlesTableProps) {
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<CategoriesCarousel onSelect={handleCategorySelect} selectedCategory={selectedCategory} />
|
||||
|
||||
{query.isError && (
|
||||
<Alert variant="destructive">
|
||||
<AlertTitle>Unable to load articles</AlertTitle>
|
||||
@@ -61,7 +53,7 @@ export function ArticlesFeed({ sourceId }: ArticlesTableProps) {
|
||||
|
||||
{isInitialLoading ? (
|
||||
<div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
|
||||
{Array.from({ length: PLACEHOLDER_COUNT }).map((_, index) => (
|
||||
{Array.from({ length: 8 }).map((_, index) => (
|
||||
<ArticleCardSkeleton key={index} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -1,34 +1,23 @@
|
||||
"use client";
|
||||
|
||||
import {
|
||||
Carousel,
|
||||
CarouselContent,
|
||||
CarouselItem,
|
||||
CarouselNext,
|
||||
CarouselPrevious,
|
||||
} from "@basango/ui/components/carousel";
|
||||
import { Carousel, CarouselContent, CarouselItem } from "@basango/ui/components/carousel";
|
||||
import { Skeleton } from "@basango/ui/components/skeleton";
|
||||
import { cn } from "@basango/ui/lib/utils";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import * as React from "react";
|
||||
|
||||
import { Show } from "#dashboard/components/shell/show";
|
||||
import { useCategoryFilterParams } from "#dashboard/hooks/use-category-filter-params";
|
||||
import { useTRPC } from "#dashboard/trpc/client";
|
||||
|
||||
type Props = {
|
||||
onSelect: (categoryId: string | null) => void;
|
||||
selectedCategory: string | null;
|
||||
};
|
||||
|
||||
const PLACEHOLDER_COUNT = 10;
|
||||
|
||||
export function CategoriesCarousel({ onSelect, selectedCategory }: Props) {
|
||||
export function CategoriesCarousel() {
|
||||
const { selectedCategory, setSelectedCategory } = useCategoryFilterParams();
|
||||
const trpc = useTRPC();
|
||||
const { data, isLoading } = useQuery(trpc.categories.list.queryOptions());
|
||||
const categories = data ?? [];
|
||||
|
||||
return (
|
||||
<div className="relative">
|
||||
<div className="relative w-full flex items-start border-b py-2 px-4">
|
||||
<Carousel
|
||||
className="w-full"
|
||||
opts={{
|
||||
@@ -39,23 +28,23 @@ export function CategoriesCarousel({ onSelect, selectedCategory }: Props) {
|
||||
>
|
||||
<CarouselContent className="-ml-2">
|
||||
<CarouselItem className="basis-auto pl-2">
|
||||
<CategoryPill active={!selectedCategory} onClick={() => onSelect(null)}>
|
||||
<CategoryPill active={!selectedCategory} onClick={() => setSelectedCategory(null)}>
|
||||
All
|
||||
</CategoryPill>
|
||||
</CarouselItem>
|
||||
<Show
|
||||
fallback={Array.from({ length: PLACEHOLDER_COUNT }).map((_, index) => (
|
||||
fallback={Array.from({ length: 10 }).map((_, index) => (
|
||||
<CarouselItem className="basis-auto pl-2" key={`category-skeleton-${index}`}>
|
||||
<Skeleton className="h-8 w-20 rounded-full bg-muted/70" />
|
||||
</CarouselItem>
|
||||
))}
|
||||
when={isLoading && categories.length > 0}
|
||||
when={!isLoading && data}
|
||||
>
|
||||
{categories.map((category) => (
|
||||
<CarouselItem className="basis-auto pl-2" key={category.id}>
|
||||
<CategoryPill
|
||||
active={selectedCategory === category.id}
|
||||
onClick={() => onSelect(category.id)}
|
||||
onClick={() => setSelectedCategory(category.id)}
|
||||
>
|
||||
{category.name}
|
||||
</CategoryPill>
|
||||
@@ -63,8 +52,6 @@ export function CategoriesCarousel({ onSelect, selectedCategory }: Props) {
|
||||
))}
|
||||
</Show>
|
||||
</CarouselContent>
|
||||
<CarouselPrevious className="hidden md:flex" size="icon" />
|
||||
<CarouselNext className="hidden md:flex" size="icon" />
|
||||
</Carousel>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -14,7 +14,7 @@ type Props = {
|
||||
|
||||
export function PageHeader({ title }: Props) {
|
||||
return (
|
||||
<header className="w-full flex justify-between items-center border-b py-2 px-6 h-14">
|
||||
<header className="w-full flex justify-between items-center border-b py-2 px-4">
|
||||
<div className="flex items-center gap-2">
|
||||
<SidebarTrigger className="-ml-1" />
|
||||
<Breadcrumb>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { cn } from "@basango/ui/lib/utils";
|
||||
import React from "react";
|
||||
|
||||
import { PageHeader } from "#dashboard/components/shell/page-header";
|
||||
@@ -6,15 +7,42 @@ interface PageProps {
|
||||
children: React.ReactNode;
|
||||
title?: string | React.ReactNode;
|
||||
header?: React.ReactNode;
|
||||
headersNumber?: 1 | 2;
|
||||
}
|
||||
|
||||
const isEmptyHeader = (header: React.ReactNode | undefined): boolean => {
|
||||
if (!header) return true;
|
||||
|
||||
if (React.isValidElement(header) && header.type === React.Fragment) {
|
||||
const props = header.props as { children?: React.ReactNode };
|
||||
|
||||
if (!props.children) return true;
|
||||
|
||||
if (Array.isArray(props.children) && props.children.length === 0) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
const height = {
|
||||
1: "h-[calc(100svh-40px)] lg:h-[calc(100svh-56px)]",
|
||||
2: "h-[calc(100svh-80px)] lg:h-[calc(100svh-96px)]",
|
||||
};
|
||||
|
||||
export const PageLayout = (props: React.PropsWithChildren<PageProps>) => {
|
||||
const { title, header = <PageHeader title={title} />, children } = props;
|
||||
const { title, header = <PageHeader title={title} />, headersNumber = 1, children } = props;
|
||||
return (
|
||||
<div className="h-svh overflow-hidden lg:p-2 w-full">
|
||||
<div className="lg:border lg:rounded-md overflow-hidden flex flex-col items-center justify-start h-full w-full">
|
||||
{header}
|
||||
<div className="overflow-auto w-full h-[calc(100svh-40px)] lg:h-[calc(100svh-56px)] p-4 space-y-6">
|
||||
<div
|
||||
className={cn(
|
||||
"overflow-auto w-full py-2 px-6",
|
||||
isEmptyHeader(header) ? "h-full" : height[headersNumber as keyof typeof height],
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
import { parseAsString, useQueryState } from "nuqs";
|
||||
|
||||
export function useCategoryFilterParams(paramKey = "category") {
|
||||
const [selectedCategory, setSelectedCategory] = useQueryState(paramKey, parseAsString);
|
||||
|
||||
return {
|
||||
selectedCategory,
|
||||
setSelectedCategory,
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user