Merge branch 'fe/develop' of https://lab.ssafy.com/s11-s-project/S11P21S002 into fe/refactor/admin-page

This commit is contained in:
정현조 2024-09-23 09:15:18 +09:00
commit 5304fae9e0
3 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,13 @@
export default function NotFound() {
return (
<div className="flex h-full w-full flex-col items-center justify-center">
<h1 className="animate-weight-loop text-[64px] text-gray-900"> .</h1>
<button
className="body text-primary hover:underline"
onClick={() => window.history.back()}
>
</button>
</div>
);
}

View File

@ -17,6 +17,7 @@ import AdminIndex from '@/pages/AdminIndex';
import LabelCanvas from '@/pages/LabelCanvas';
import ReviewDetail from '@/pages/ReviewDetail';
import ImageFolderUploadTest from '@/pages/ImageFolderUploadTest';
import NotFound from '@/pages/NotFound';
export const webPath = {
home: () => '/',
@ -36,13 +37,17 @@ const router = createBrowserRouter([
index: true,
element: <Home />,
},
{
path: '*',
element: <NotFound />,
},
],
},
{
// FIXME: index에서 오류나지 않게 수정
path: webPath.browse(),
element: (
<Suspense fallback={<div></div>}>
<Suspense fallback={<PageLayout />}>
<WorkspaceBrowseLayout />
</Suspense>
),

View File

@ -67,10 +67,16 @@ export default {
from: { height: 'var(--radix-accordion-content-height)' },
to: { height: '0' },
},
'weight-loop': {
'0%': { 'font-weight': '100' },
'50%': { 'font-weight': '900' },
'100%': { 'font-weight': '100' },
},
},
animation: {
'accordion-down': 'accordion-down 0.2s ease-out',
'accordion-up': 'accordion-up 0.2s ease-out',
'weight-loop': 'weight-loop 5s infinite',
},
},
},