Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ✨ created 404 - page not found #2970

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7e24e98
feat: :sparkles: save package manager used and save touchpoints
flixlix Jan 9, 2024
ab47a7c
Merge branch 'shadcn-ui:main' into main
flixlix Feb 9, 2024
c1ee28b
fix: :bug: breadcrumbs some examples not showing code
flixlix Mar 8, 2024
033ea28
Merge branch 'main' of https://github.com/flixlix/shadcn-ui
flixlix Mar 8, 2024
733486d
feat: :sparkles: save package manager used and save touchpoints
flixlix Jan 9, 2024
44c0f98
Merge branch 'main' of https://github.com/flixlix/shadcn-ui
flixlix Mar 8, 2024
9034311
feat: :sparkles: created 404 - page not found
flixlix Mar 10, 2024
d21335e
Merge branch 'main' into 404-page-not-found
flixlix Mar 13, 2024
fe3de63
Merge branch 'shadcn-ui:main' into main
flixlix Mar 15, 2024
f52c1ce
feat: :sparkles: save package manager used and save touchpoints
flixlix Jan 9, 2024
b1f043d
Merge branch 'main' of https://github.com/flixlix/shadcn-ui
flixlix Mar 19, 2024
7936440
Merge branch 'shadcn-ui:main' into main
flixlix Apr 3, 2024
c405cdb
Merge branch 'shadcn-ui:main' into main
flixlix Apr 6, 2024
5bec19e
Merge remote-tracking branch 'origin/404-page-not-found'
flixlix Apr 6, 2024
9bec726
fix: include imports form header & footer
flixlix Apr 6, 2024
1fb3992
feat: :sparkles: save package manager used and save touchpoints
flixlix Jan 9, 2024
7add82d
feat: :sparkles: created 404 - page not found
flixlix Mar 10, 2024
5b58624
Merge branch '404-page-not-found' of https://github.com/flixlix/shadc…
flixlix Apr 6, 2024
362b583
Revert "feat: :sparkles: save package manager used and save touchpoints"
flixlix Apr 8, 2024
1d32e7f
refactor: :recycle: remove unused import and update layout structure
flixlix Apr 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/www/app/(app)/sink/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ export default function SinkLayout({ children }: SinkLayoutProps) {
<div className="container">
<div className="flex space-x-2 px-2 py-4">
{styles.map((style) => (
<Link href={`/sink/${style.name}`} key={style.name}>
<Link
href={`/sink/${style.name === "default" ? "" : style.name}`}
key={style.name}
>
{style.label}
</Link>
))}
Expand Down
2 changes: 2 additions & 0 deletions apps/www/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { fontSans } from "@/lib/fonts"
import { cn } from "@/lib/utils"
import { Analytics } from "@/components/analytics"
import { ThemeProvider } from "@/components/providers"
import { SiteFooter } from "@/components/site-footer"
import { SiteHeader } from "@/components/site-header"
import { TailwindIndicator } from "@/components/tailwind-indicator"
import { ThemeSwitcher } from "@/components/theme-switcher"
import { Toaster as DefaultToaster } from "@/registry/default/ui/toaster"
Expand Down
23 changes: 23 additions & 0 deletions apps/www/app/not-found.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from "react"
import Link from "next/link"

import { Button } from "@/registry/default/ui/button"

export default function NotFoundPage() {
return (
<div className="container mt-auto flex h-full min-h-full flex-1 flex-col items-center justify-center gap-4">
<h1 className="text-8xl font-bold tracking-tight text-muted-foreground">
404
</h1>
<p className="text-xg font-semibold">Page not found</p>
<div className="mt-8 flex gap-2">
<Button asChild>
<Link href="/">Go home</Link>
</Button>
<Button asChild variant="outline">
<Link href="/docs/components">Components</Link>
</Button>
</div>
</div>
)
}