format
This commit is contained in:
+30
-45
@@ -1,40 +1,26 @@
|
||||
import "website/src/styles/globals.css";
|
||||
import type { LinksFunction } from "react-router";
|
||||
import { Route } from "./+types/root";
|
||||
import {
|
||||
isRouteErrorResponse,
|
||||
Links,
|
||||
Meta,
|
||||
Outlet,
|
||||
Scripts,
|
||||
ScrollRestoration,
|
||||
} from "react-router";
|
||||
import 'website/src/styles/globals.css'
|
||||
import type { LinksFunction } from 'react-router'
|
||||
import { Route } from './+types/root'
|
||||
import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router'
|
||||
|
||||
export const links: LinksFunction = () => [
|
||||
{ rel: "icon", type: "image/png", href: "/favicon-32.png", sizes: "32x32" },
|
||||
{ rel: "icon", type: "image/png", href: "/favicon-16.png", sizes: "16x16" },
|
||||
];
|
||||
{ rel: 'icon', type: 'image/png', href: '/favicon-32.png', sizes: '32x32' },
|
||||
{ rel: 'icon', type: 'image/png', href: '/favicon-16.png', sizes: '16x16' },
|
||||
]
|
||||
|
||||
export function Layout({ children }: { children: React.ReactNode }) {
|
||||
return (
|
||||
<html lang="en">
|
||||
<html lang='en'>
|
||||
<head>
|
||||
<meta charSet="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link
|
||||
rel="preconnect"
|
||||
href="https://fonts.gstatic.com"
|
||||
crossOrigin=""
|
||||
/>
|
||||
<meta charSet='utf-8' />
|
||||
<meta name='viewport' content='width=device-width, initial-scale=1' />
|
||||
<link rel='preconnect' href='https://fonts.googleapis.com' />
|
||||
<link rel='preconnect' href='https://fonts.gstatic.com' crossOrigin='' />
|
||||
{/* Inter from rsms (same source as next/font) for weight fidelity */}
|
||||
<link href='https://rsms.me/inter/inter.css' rel='stylesheet' />
|
||||
<link
|
||||
href="https://rsms.me/inter/inter.css"
|
||||
rel="stylesheet"
|
||||
/>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Newsreader:ital,opsz,wght@0,6..72,300..700;1,6..72,300..700&display=swap"
|
||||
rel="stylesheet"
|
||||
href='https://fonts.googleapis.com/css2?family=Newsreader:ital,opsz,wght@0,6..72,300..700;1,6..72,300..700&display=swap'
|
||||
rel='stylesheet'
|
||||
/>
|
||||
<Meta />
|
||||
<Links />
|
||||
@@ -45,40 +31,39 @@ export function Layout({ children }: { children: React.ReactNode }) {
|
||||
<Scripts />
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
|
||||
if (isRouteErrorResponse(error)) {
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center min-h-screen p-8 text-center">
|
||||
<h1 className="text-4xl font-bold mb-4">
|
||||
<div className='flex flex-col items-center justify-center min-h-screen p-8 text-center'>
|
||||
<h1 className='text-4xl font-bold mb-4'>
|
||||
{error.status} {error.statusText}
|
||||
</h1>
|
||||
<p className="text-lg text-gray-600">{error.data}</p>
|
||||
<p className='text-lg text-gray-600'>{error.data}</p>
|
||||
</div>
|
||||
);
|
||||
)
|
||||
} else if (error instanceof Error) {
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center min-h-screen p-8 text-center max-w-4xl mx-auto">
|
||||
<h1 className="text-4xl font-bold mb-4">Error</h1>
|
||||
<p className="text-lg text-gray-600 mb-6">{error.message}</p>
|
||||
<p className="text-sm text-gray-500 mb-2">The stack trace is:</p>
|
||||
<pre className="bg-gray-100 p-4 rounded-lg text-xs text-left overflow-auto max-w-full border">
|
||||
<div className='flex flex-col items-center justify-center min-h-screen p-8 text-center max-w-4xl mx-auto'>
|
||||
<h1 className='text-4xl font-bold mb-4'>Error</h1>
|
||||
<p className='text-lg text-gray-600 mb-6'>{error.message}</p>
|
||||
<p className='text-sm text-gray-500 mb-2'>The stack trace is:</p>
|
||||
<pre className='bg-gray-100 p-4 rounded-lg text-xs text-left overflow-auto max-w-full border'>
|
||||
{error.stack}
|
||||
</pre>
|
||||
</div>
|
||||
);
|
||||
)
|
||||
} else {
|
||||
return (
|
||||
<div className="flex items-center justify-center min-h-screen">
|
||||
<h1 className="text-4xl font-bold text-center">Unknown Error</h1>
|
||||
<div className='flex items-center justify-center min-h-screen'>
|
||||
<h1 className='text-4xl font-bold text-center'>Unknown Error</h1>
|
||||
</div>
|
||||
);
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
export default function App() {
|
||||
return <Outlet />;
|
||||
return <Outlet />
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user