Skip to content

Commit 96d8d07

Browse files
committed
refactor(header.tsx): adjust padding and gap for better layout consistency
refactor(stars-count.tsx): use unstable_cache for caching GitHub stargazer count to improve performance and error handling
1 parent c929c5b commit 96d8d07

File tree

2 files changed

+40
-31
lines changed

2 files changed

+40
-31
lines changed

apps/web/src/components/header.tsx

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Separator } from "./ui/separator";
1313

1414
export function Header() {
1515
return (
16-
<header className="sticky top-0 z-50 flex h-16 items-center border-b bg-background/90 px-4 backdrop-blur-md">
16+
<header className="sticky top-0 z-50 flex h-16 items-center border-b bg-background/90 pr-2 pl-4 backdrop-blur-md">
1717
<BrandContextMenu>
1818
<Link
1919
className="mr-2 flex items-center gap-2 text-lg leading-none font-bold tracking-tight lg:mr-8"
@@ -28,20 +28,18 @@ export function Header() {
2828

2929
<div className="flex-1" />
3030

31-
<div className="flex items-center gap-1">
31+
<div className="flex items-center gap-2">
3232
<a
3333
href="https://shadcnstudio.com?utm_source=chanhdai&utm_medium=banner&utm_campaign=github"
3434
target="_blank"
3535
rel="noopener"
36-
className="mr-1 flex items-center gap-2.5 rounded-md bg-zinc-50 px-2.5 py-2 transition-colors duration-300 hover:bg-zinc-100 dark:bg-zinc-900 dark:hover:bg-zinc-800"
36+
className="flex items-center gap-2.5 rounded-md bg-zinc-50 px-2.5 py-2 transition-colors duration-300 hover:bg-zinc-100 dark:bg-zinc-900 dark:hover:bg-zinc-800"
3737
>
3838
<svg
39-
width="1em"
40-
height="1em"
4139
viewBox="0 0 328 329"
4240
fill="none"
4341
xmlns="http://www.w3.org/2000/svg"
44-
className="size-5 shrink-0 sm:size-7"
42+
className="size-4 shrink-0 sm:size-7"
4543
>
4644
<rect
4745
y="0.5"
@@ -111,25 +109,20 @@ export function Header() {
111109
</div>
112110
</a>
113111

114-
<Button
115-
className="gap-1.5 has-[>svg]:px-2"
116-
variant="ghost"
117-
size="sm"
118-
asChild
119-
>
112+
<Button className="gap-2 px-2" variant="ghost" size="sm" asChild>
120113
<a href={SOURCE_CODE_GITHUB_URL} target="_blank" rel="noopener">
121-
<svg className="-translate-y-px" viewBox="0 0 438.549 438.549">
114+
<svg viewBox="0 0 24 24">
122115
<path
116+
d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
123117
fill="currentColor"
124-
d="M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z"
125118
/>
126119
</svg>
127120
<StarsCount />
128121
</a>
129122
</Button>
130123

131124
<Separator
132-
className="data-[orientation=vertical]:h-4"
125+
className="data-[orientation=vertical]:h-4.5"
133126
orientation="vertical"
134127
/>
135128

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,40 @@
1+
import { unstable_cache } from "next/cache";
12
import React from "react";
23

3-
export async function StarsCount() {
4-
const data = await fetch(
5-
`https://api.github.com/repos/ncdai/react-wheel-picker`,
6-
{
7-
headers: {
8-
Accept: "application/vnd.github+json",
9-
Authorization: `Bearer ${process.env.GITHUB_API_TOKEN}`,
10-
"X-GitHub-Api-Version": "2022-11-28",
11-
},
12-
next: { revalidate: 86400 }, // Cache for 1 day (86400 seconds)
13-
},
14-
);
15-
const json = await data.json();
4+
const getStargazerCount = unstable_cache(
5+
async () => {
6+
try {
7+
const response = await fetch(
8+
"https://api.github.com/repos/ncdai/react-wheel-picker",
9+
{
10+
headers: {
11+
Accept: "application/vnd.github+json",
12+
Authorization: `Bearer ${process.env.GITHUB_API_TOKEN}`,
13+
"X-GitHub-Api-Version": "2022-11-28",
14+
},
15+
},
16+
);
17+
18+
if (!response.ok) {
19+
return 0;
20+
}
1621

17-
const count = json?.stargazers_count ?? -1;
22+
const json = (await response.json()) as { stargazers_count?: number };
23+
return Number(json?.stargazers_count) || 0;
24+
} catch {
25+
return 0;
26+
}
27+
},
28+
["github-stargazer-count"],
29+
{ revalidate: 86400 }, // Cache for 1 day (86400 seconds)
30+
);
31+
32+
export async function StarsCount() {
33+
const stargazersCount = await getStargazerCount();
1834

1935
return (
20-
<span className="font-mono text-[13px] text-muted-foreground tabular-nums">
21-
{count.toLocaleString()}
36+
<span className="translate-y-px font-mono text-[13px] leading-none text-muted-foreground tabular-nums">
37+
{stargazersCount.toLocaleString()}
2238
</span>
2339
);
2440
}

0 commit comments

Comments
 (0)