Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ export default tseslint.config(
allowList: {
props: true,
prop: true,
Props: true,
Prop: true,
ref: true,
refs: true,
Ref: true,
Refs: true,
},
},
],
Expand Down
71 changes: 70 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
},
"dependencies": {
"react": "^19.1.0",
"react-dom": "^19.1.0"
"react-dom": "^19.1.0",
"react-router-dom": "^7.5.3"
},
"devDependencies": {
"@eslint/js": "^9.25.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "^14.6.1",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2",
"@vitejs/plugin-react": "^4.4.1",
Expand Down
11 changes: 0 additions & 11 deletions src/app.test.ts

This file was deleted.

8 changes: 7 additions & 1 deletion src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import { BrowserRouter } from 'react-router-dom';
import './app.css';
import { Router } from './router';

function App() {
return <>Hello World</>;
return (
<BrowserRouter>
<Router />
</BrowserRouter>
);
}

export default App;
18 changes: 18 additions & 0 deletions src/lib/layouts/main/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Link, Outlet } from 'react-router-dom';

export const MainLayout: React.FC = () => {
return (
<div className="main-layout">
<header>
<nav role="navigation" aria-label="Main navigation">
<Link to="/">Home</Link>
<span aria-hidden="true"> | </span>
<Link to="about">About</Link>
</nav>
</header>
<main role="main">
<Outlet />
</main>
</div>
);
};
48 changes: 48 additions & 0 deletions src/lib/layouts/main/main.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { act, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {
createBrowserRouter,
RouterProvider,
type RouteObject,
} from 'react-router-dom';
import { beforeEach, describe, expect, test } from 'vitest';
import { HomePage } from '../../../pages/home/index.tsx';
import { MainLayout } from './index.tsx';

const mockRoutes: RouteObject[] = [
{
path: '/',
element: <MainLayout />,
children: [
{ index: true, element: <HomePage /> },
{
path: 'about',
element: <div>About Page</div>,
},
],
},
];
let user: ReturnType<typeof userEvent.setup>;

describe('MainLayout with Router', () => {
beforeEach(() => {
user = userEvent.setup();
});

test('renders layout with Home route', async () => {
const router = createBrowserRouter(mockRoutes);
render(<RouterProvider router={router} />);

expect(screen.getByText('Home')).toBeInTheDocument();
expect(screen.getByText('About')).toBeInTheDocument();
expect(screen.getByText('Home Page')).toBeInTheDocument();

// Navigate to About page
const aboutLink = screen.getByRole('link', { name: 'About' });
await act(async () => {
await user.click(aboutLink);
});
expect(screen.getByText('About Page')).toBeInTheDocument();
expect(screen.queryByText('Home Page')).not.toBeInTheDocument();
});
});
3 changes: 3 additions & 0 deletions src/pages/errors/not-found.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function NotFound() {
return <div>not-found</div>;
}
Empty file added src/pages/home/home.css
Empty file.
10 changes: 10 additions & 0 deletions src/pages/home/home.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { render, screen } from '@testing-library/react';
import { describe, expect, test } from 'vitest';
import { HomePage } from './index.tsx';

describe('HomePage', () => {
test('renders successfully', () => {
render(<HomePage />);
expect(screen.getByText('Home Page')).toBeInTheDocument();
});
});
5 changes: 5 additions & 0 deletions src/pages/home/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import './home.css';

export function HomePage() {
return <>Home Page</>;
}
19 changes: 19 additions & 0 deletions src/router/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Route, Routes } from 'react-router-dom';
import { MainLayout } from '../lib/layouts/main';
import { NotFound } from '../pages/errors/not-found';
import { HomePage } from '../pages/home';

export function Router() {
return (
<Routes>
<Route path="/" element={<MainLayout />}>
<Route index element={<HomePage />} />
<Route path="about" element={<div>About Page</div>} />
</Route>

<Route path="auth" element={<div>Auth Page</div>} />

<Route path="*" element={<NotFound />} />
</Routes>
);
}
2 changes: 1 addition & 1 deletion tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["src"]
"include": ["src", "vitest.setup.ts"]
}
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
setupFiles: ['./vitest.setup.ts'],
},
});
File renamed without changes.