diff --git a/src/components/CodeBox/CodeBox.tsx b/src/components/CodeBox.tsx similarity index 100% rename from src/components/CodeBox/CodeBox.tsx rename to src/components/CodeBox.tsx diff --git a/src/components/CodeBox/index.tsx b/src/components/CodeBox/index.tsx deleted file mode 100644 index 76867764..00000000 --- a/src/components/CodeBox/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import CodeBox from "./CodeBox"; - -export default CodeBox; \ No newline at end of file diff --git a/src/components/Collapse/Collapse.tsx b/src/components/Collapse.tsx similarity index 100% rename from src/components/Collapse/Collapse.tsx rename to src/components/Collapse.tsx diff --git a/src/components/Collapse/index.tsx b/src/components/Collapse/index.tsx deleted file mode 100644 index 2b5b0a3b..00000000 --- a/src/components/Collapse/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import Collapse from './Collapse'; - -export default Collapse; diff --git a/src/components/Comment/Comment.tsx b/src/components/Comment.tsx similarity index 100% rename from src/components/Comment/Comment.tsx rename to src/components/Comment.tsx diff --git a/src/components/Comment/index.tsx b/src/components/Comment/index.tsx deleted file mode 100644 index dad9bfdc..00000000 --- a/src/components/Comment/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import Comment from './Comment'; - -export default Comment; diff --git a/src/components/Container/Container.tsx b/src/components/Container.tsx similarity index 100% rename from src/components/Container/Container.tsx rename to src/components/Container.tsx diff --git a/src/components/Container/index.tsx b/src/components/Container/index.tsx deleted file mode 100644 index 2418286d..00000000 --- a/src/components/Container/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import Container from './Container'; - -export default Container; diff --git a/src/components/Heading/Heading.tsx b/src/components/Heading.tsx similarity index 97% rename from src/components/Heading/Heading.tsx rename to src/components/Heading.tsx index 9afcc502..0954bb9a 100644 --- a/src/components/Heading/Heading.tsx +++ b/src/components/Heading.tsx @@ -1,6 +1,6 @@ import type { HTMLAttributes } from 'react'; import cn from '@/utils/cn'; -import Link from '../Link'; +import Link from './Link'; type HTMLHeadingProps = HTMLAttributes; diff --git a/src/components/Heading/index.tsx b/src/components/Heading/index.tsx deleted file mode 100644 index 418cd969..00000000 --- a/src/components/Heading/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Heading from './Heading'; - -export * from './Heading'; - -export default Heading; diff --git a/src/components/Image/Image.tsx b/src/components/Image.tsx similarity index 100% rename from src/components/Image/Image.tsx rename to src/components/Image.tsx diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx deleted file mode 100644 index 8954dae5..00000000 --- a/src/components/Image/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import Image from "./Image"; - -export default Image; diff --git a/src/components/Link/Link.tsx b/src/components/Link.tsx similarity index 100% rename from src/components/Link/Link.tsx rename to src/components/Link.tsx diff --git a/src/components/Link/index.tsx b/src/components/Link/index.tsx deleted file mode 100644 index 18a19536..00000000 --- a/src/components/Link/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import Link from './Link'; - -export default Link; diff --git a/src/components/List/List.tsx b/src/components/List.tsx similarity index 100% rename from src/components/List/List.tsx rename to src/components/List.tsx diff --git a/src/components/List/index.tsx b/src/components/List/index.tsx deleted file mode 100644 index 1e2ddb43..00000000 --- a/src/components/List/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import List from './List'; - -export default List; diff --git a/src/components/TableOfContents/TableOfContents.tsx b/src/components/TableOfContents.tsx similarity index 97% rename from src/components/TableOfContents/TableOfContents.tsx rename to src/components/TableOfContents.tsx index a0a71a36..3c4b2995 100644 --- a/src/components/TableOfContents/TableOfContents.tsx +++ b/src/components/TableOfContents.tsx @@ -4,8 +4,8 @@ import { useEffect, useLayoutEffect, useState } from 'react'; import useIntersectionObserver from '@/hooks/useIntersectionObserver'; import cn from '@/utils/cn'; -import Collapse from '../Collapse'; -import Link from '../Link'; +import Collapse from './Collapse'; +import Link from './Link'; type TableOfContentsProps = { targetId: `#${string}`; diff --git a/src/components/TableOfContents/index.tsx b/src/components/TableOfContents/index.tsx deleted file mode 100644 index 70ced778..00000000 --- a/src/components/TableOfContents/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import TableOfContents from "./TableOfContents"; - -export default TableOfContents; diff --git a/src/components/ThemeSwitcher/ThemeSwitcher.tsx b/src/components/ThemeSwitcher.tsx similarity index 100% rename from src/components/ThemeSwitcher/ThemeSwitcher.tsx rename to src/components/ThemeSwitcher.tsx diff --git a/src/components/ThemeSwitcher/index.tsx b/src/components/ThemeSwitcher/index.tsx deleted file mode 100644 index ab35c909..00000000 --- a/src/components/ThemeSwitcher/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import ThemeSwitcher from './ThemeSwitcher'; - -export default ThemeSwitcher; diff --git a/src/utils/__tests__/cn.test.ts b/src/utils/__tests__/cn.test.ts deleted file mode 100644 index c4647f00..00000000 --- a/src/utils/__tests__/cn.test.ts +++ /dev/null @@ -1,14 +0,0 @@ -import cn from '../cn'; - -describe('TailwindCSS className merge function', () => { - it('should return current className', () => { - // Arrange - const baseClassName = 'bg-blue-500 text-white/90'; - const mergeClassName = { 'bg-red-500': true }; - const expected = 'text-white/90 bg-red-500'; - // Act - const className = cn(baseClassName, mergeClassName); - // Assert - expect(className).toBe(expected); - }); -}); diff --git a/src/app/[lang]/__tests__/card.test.tsx b/tests/app/[lang]/card.test.tsx similarity index 94% rename from src/app/[lang]/__tests__/card.test.tsx rename to tests/app/[lang]/card.test.tsx index b0a57475..f83a76eb 100644 --- a/src/app/[lang]/__tests__/card.test.tsx +++ b/tests/app/[lang]/card.test.tsx @@ -1,11 +1,10 @@ import { render, screen } from '@testing-library/react'; import { formatDate } from '@/utils/date'; -import Article from '../Article'; +import Article from '@/app/[lang]/Article'; describe('Article component', () => { it('should render correct element', () => { - // Arrange const data: DataFrontmatter = { id: 'test_id', title: 'title test', @@ -22,7 +21,7 @@ describe('Article component', () => { const article = screen.getByRole('article'); const image = screen.getByRole('img'); const heading = screen.getByRole('heading'); - // Assert + expect(article).toBeInTheDocument(); expect(image).toHaveAttribute('src', data.image); expect(image).toHaveAttribute('alt', `${data.title} cover`); diff --git a/src/app/[lang]/__tests__/footer.test.tsx b/tests/app/[lang]/footer.test.tsx similarity index 86% rename from src/app/[lang]/__tests__/footer.test.tsx rename to tests/app/[lang]/footer.test.tsx index f64fe575..1b44a157 100644 --- a/src/app/[lang]/__tests__/footer.test.tsx +++ b/tests/app/[lang]/footer.test.tsx @@ -1,13 +1,11 @@ import { render, screen } from '@testing-library/react'; -import Footer from '../Footer'; +import Footer from '@/app/[lang]/Footer'; describe('Footer component', () => { it('should render correct element', () => { - // Arrange const footerCopyright = 'footer copyright'; render(