aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/organisms/layout
diff options
context:
space:
mode:
authorArmand Philippot <git@armandphilippot.com>2023-09-19 18:13:57 +0200
committerArmand Philippot <git@armandphilippot.com>2023-09-19 19:12:31 +0200
commit2faf2e34331703b3bdea3eb487cb8799c8d65377 (patch)
treededc6557ddaa8fedd42d9bdf77950f8f9168ebcb /src/components/organisms/layout
parentd1fe9e2164fc5c8fd767b456eecc2a4eb929a33f (diff)
refactor(build): replace paths aliases with relative paths
Using paths aliases starting with "@" can be confusing and can lead to conflict with existings modules. I prefer to use relative paths to avoid extra configuration in tools because of these aliases.
Diffstat (limited to 'src/components/organisms/layout')
-rw-r--r--src/components/organisms/layout/cards-list.module.scss4
-rw-r--r--src/components/organisms/layout/cards-list.test.tsx2
-rw-r--r--src/components/organisms/layout/cards-list.tsx7
-rw-r--r--src/components/organisms/layout/comment.fixture.tsx5
-rw-r--r--src/components/organisms/layout/comment.module.scss4
-rw-r--r--src/components/organisms/layout/comment.test.tsx2
-rw-r--r--src/components/organisms/layout/comment.tsx10
-rw-r--r--src/components/organisms/layout/comments-list.fixture.tsx2
-rw-r--r--src/components/organisms/layout/comments-list.module.scss2
-rw-r--r--src/components/organisms/layout/comments-list.test.tsx2
-rw-r--r--src/components/organisms/layout/comments-list.tsx6
-rw-r--r--src/components/organisms/layout/footer.module.scss3
-rw-r--r--src/components/organisms/layout/footer.test.tsx2
-rw-r--r--src/components/organisms/layout/footer.tsx12
-rw-r--r--src/components/organisms/layout/header.module.scss4
-rw-r--r--src/components/organisms/layout/header.test.tsx2
-rw-r--r--src/components/organisms/layout/header.tsx4
-rw-r--r--src/components/organisms/layout/no-results.test.tsx2
-rw-r--r--src/components/organisms/layout/no-results.tsx6
-rw-r--r--src/components/organisms/layout/overview.module.scss4
-rw-r--r--src/components/organisms/layout/overview.test.tsx2
-rw-r--r--src/components/organisms/layout/overview.tsx6
-rw-r--r--src/components/organisms/layout/posts-list.module.scss6
-rw-r--r--src/components/organisms/layout/posts-list.test.tsx2
-rw-r--r--src/components/organisms/layout/posts-list.tsx18
-rw-r--r--src/components/organisms/layout/summary.module.scss4
-rw-r--r--src/components/organisms/layout/summary.test.tsx2
-rw-r--r--src/components/organisms/layout/summary.tsx20
28 files changed, 69 insertions, 76 deletions
diff --git a/src/components/organisms/layout/cards-list.module.scss b/src/components/organisms/layout/cards-list.module.scss
index 6274b93..ff79f33 100644
--- a/src/components/organisms/layout/cards-list.module.scss
+++ b/src/components/organisms/layout/cards-list.module.scss
@@ -1,5 +1,5 @@
-@use "@styles/abstracts/mixins" as mix;
-@use "@styles/abstracts/placeholders";
+@use "../../../styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/placeholders";
.wrapper {
display: grid;
diff --git a/src/components/organisms/layout/cards-list.test.tsx b/src/components/organisms/layout/cards-list.test.tsx
index f77ee83..6a0ff7c 100644
--- a/src/components/organisms/layout/cards-list.test.tsx
+++ b/src/components/organisms/layout/cards-list.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import CardsList, { type CardsListItem } from './cards-list';
const items: CardsListItem[] = [
diff --git a/src/components/organisms/layout/cards-list.tsx b/src/components/organisms/layout/cards-list.tsx
index f6cb6ed..12ec7d9 100644
--- a/src/components/organisms/layout/cards-list.tsx
+++ b/src/components/organisms/layout/cards-list.tsx
@@ -1,9 +1,6 @@
-import List, {
- type ListItem,
- type ListProps,
-} from '@components/atoms/lists/list';
-import Card, { type CardProps } from '@components/molecules/layout/card';
import { FC } from 'react';
+import List, { type ListItem, type ListProps } from '../../atoms/lists/list';
+import Card, { type CardProps } from '../../molecules/layout/card';
import styles from './cards-list.module.scss';
export type CardsListItem = Omit<CardProps, 'className' | 'titleLevel'> & {
diff --git a/src/components/organisms/layout/comment.fixture.tsx b/src/components/organisms/layout/comment.fixture.tsx
index 0118139..57a4389 100644
--- a/src/components/organisms/layout/comment.fixture.tsx
+++ b/src/components/organisms/layout/comment.fixture.tsx
@@ -1,4 +1,7 @@
-import { getFormattedDate, getFormattedTime } from '@utils/helpers/dates';
+import {
+ getFormattedDate,
+ getFormattedTime,
+} from '../../../utils/helpers/dates';
import { CommentProps } from './comment';
export const author = {
diff --git a/src/components/organisms/layout/comment.module.scss b/src/components/organisms/layout/comment.module.scss
index d2b68e1..f645354 100644
--- a/src/components/organisms/layout/comment.module.scss
+++ b/src/components/organisms/layout/comment.module.scss
@@ -1,5 +1,5 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/functions" as fun;
+@use "../../../styles/abstracts/mixins" as mix;
.wrapper {
padding: var(--spacing-md);
diff --git a/src/components/organisms/layout/comment.test.tsx b/src/components/organisms/layout/comment.test.tsx
index 7290c6c..5ea8c6f 100644
--- a/src/components/organisms/layout/comment.test.tsx
+++ b/src/components/organisms/layout/comment.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import Comment from './comment';
import {
author,
diff --git a/src/components/organisms/layout/comment.tsx b/src/components/organisms/layout/comment.tsx
index 3b58a79..23073ad 100644
--- a/src/components/organisms/layout/comment.tsx
+++ b/src/components/organisms/layout/comment.tsx
@@ -1,13 +1,13 @@
-import Button from '@components/atoms/buttons/button';
-import Link from '@components/atoms/links/link';
-import Meta from '@components/molecules/layout/meta';
-import { type SingleComment } from '@ts/types/app';
-import useSettings from '@utils/hooks/use-settings';
import Image from 'next/image';
import Script from 'next/script';
import { FC, useCallback, useState } from 'react';
import { useIntl } from 'react-intl';
import { type Comment as CommentSchema, type WithContext } from 'schema-dts';
+import { type SingleComment } from '../../../types/app';
+import useSettings from '../../../utils/hooks/use-settings';
+import Button from '../../atoms/buttons/button';
+import Link from '../../atoms/links/link';
+import Meta from '../../molecules/layout/meta';
import CommentForm, { type CommentFormProps } from '../forms/comment-form';
import styles from './comment.module.scss';
diff --git a/src/components/organisms/layout/comments-list.fixture.tsx b/src/components/organisms/layout/comments-list.fixture.tsx
index f2a1d26..5842129 100644
--- a/src/components/organisms/layout/comments-list.fixture.tsx
+++ b/src/components/organisms/layout/comments-list.fixture.tsx
@@ -1,4 +1,4 @@
-import { SingleComment } from '@ts/types/app';
+import { SingleComment } from '../../../types/app';
export const comments: SingleComment[] = [
{
diff --git a/src/components/organisms/layout/comments-list.module.scss b/src/components/organisms/layout/comments-list.module.scss
index 803a418..f7a0cf0 100644
--- a/src/components/organisms/layout/comments-list.module.scss
+++ b/src/components/organisms/layout/comments-list.module.scss
@@ -1,4 +1,4 @@
-@use "@styles/abstracts/placeholders";
+@use "../../../styles/abstracts/placeholders";
.list {
@extend %reset-ordered-list;
diff --git a/src/components/organisms/layout/comments-list.test.tsx b/src/components/organisms/layout/comments-list.test.tsx
index 72c7eb9..ef4b4af 100644
--- a/src/components/organisms/layout/comments-list.test.tsx
+++ b/src/components/organisms/layout/comments-list.test.tsx
@@ -1,4 +1,4 @@
-import { render } from '@tests/utils';
+import { render } from '../../../../tests/utils';
import { saveComment } from './comment.fixture';
import CommentsList from './comments-list';
import { comments } from './comments-list.fixture';
diff --git a/src/components/organisms/layout/comments-list.tsx b/src/components/organisms/layout/comments-list.tsx
index deb0776..227f715 100644
--- a/src/components/organisms/layout/comments-list.tsx
+++ b/src/components/organisms/layout/comments-list.tsx
@@ -1,8 +1,6 @@
-import Comment, {
- type CommentProps,
-} from '@components/organisms/layout/comment';
-import { SingleComment } from '@ts/types/app';
import { FC } from 'react';
+import { SingleComment } from '../../../types/app';
+import Comment, { type CommentProps } from '../../organisms/layout/comment';
import styles from './comments-list.module.scss';
export type CommentsListProps = Pick<CommentProps, 'Notice' | 'saveComment'> & {
diff --git a/src/components/organisms/layout/footer.module.scss b/src/components/organisms/layout/footer.module.scss
index c180e86..a8bcd61 100644
--- a/src/components/organisms/layout/footer.module.scss
+++ b/src/components/organisms/layout/footer.module.scss
@@ -1,5 +1,4 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/mixins" as mix;
.wrapper {
display: flex;
diff --git a/src/components/organisms/layout/footer.test.tsx b/src/components/organisms/layout/footer.test.tsx
index 1d451c7..0ba1a57 100644
--- a/src/components/organisms/layout/footer.test.tsx
+++ b/src/components/organisms/layout/footer.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import Footer, { type FooterProps } from './footer';
const copyright: FooterProps['copyright'] = {
diff --git a/src/components/organisms/layout/footer.tsx b/src/components/organisms/layout/footer.tsx
index c60afec..f67ad7d 100644
--- a/src/components/organisms/layout/footer.tsx
+++ b/src/components/organisms/layout/footer.tsx
@@ -1,12 +1,10 @@
-import Copyright, {
- type CopyrightProps,
-} from '@components/atoms/layout/copyright';
-import BackToTop, {
- type BackToTopProps,
-} from '@components/molecules/buttons/back-to-top';
-import Nav, { type NavItem } from '@components/molecules/nav/nav';
import { FC } from 'react';
import { useIntl } from 'react-intl';
+import Copyright, { type CopyrightProps } from '../../atoms/layout/copyright';
+import BackToTop, {
+ type BackToTopProps,
+} from '../../molecules/buttons/back-to-top';
+import Nav, { type NavItem } from '../../molecules/nav/nav';
import styles from './footer.module.scss';
export type FooterProps = {
diff --git a/src/components/organisms/layout/header.module.scss b/src/components/organisms/layout/header.module.scss
index a98cf45..573d455 100644
--- a/src/components/organisms/layout/header.module.scss
+++ b/src/components/organisms/layout/header.module.scss
@@ -1,5 +1,5 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/functions" as fun;
+@use "../../../styles/abstracts/mixins" as mix;
.wrapper {
display: grid;
diff --git a/src/components/organisms/layout/header.test.tsx b/src/components/organisms/layout/header.test.tsx
index 1ef79e0..c7819c0 100644
--- a/src/components/organisms/layout/header.test.tsx
+++ b/src/components/organisms/layout/header.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import Header from './header';
const nav = [
diff --git a/src/components/organisms/layout/header.tsx b/src/components/organisms/layout/header.tsx
index f6212c3..4e5e0f2 100644
--- a/src/components/organisms/layout/header.tsx
+++ b/src/components/organisms/layout/header.tsx
@@ -1,7 +1,5 @@
-import Branding, {
- type BrandingProps,
-} from '@components/molecules/layout/branding';
import { FC } from 'react';
+import Branding, { type BrandingProps } from '../../molecules/layout/branding';
import Toolbar, { type ToolbarProps } from '../toolbar/toolbar';
import styles from './header.module.scss';
diff --git a/src/components/organisms/layout/no-results.test.tsx b/src/components/organisms/layout/no-results.test.tsx
index 5576117..551b82f 100644
--- a/src/components/organisms/layout/no-results.test.tsx
+++ b/src/components/organisms/layout/no-results.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import NoResults from './no-results';
describe('NoResults', () => {
diff --git a/src/components/organisms/layout/no-results.tsx b/src/components/organisms/layout/no-results.tsx
index 2245dbf..1b563da 100644
--- a/src/components/organisms/layout/no-results.tsx
+++ b/src/components/organisms/layout/no-results.tsx
@@ -1,8 +1,8 @@
-import SearchForm, {
- type SearchFormProps,
-} from '@components/organisms/forms/search-form';
import { FC } from 'react';
import { useIntl } from 'react-intl';
+import SearchForm, {
+ type SearchFormProps,
+} from '../../organisms/forms/search-form';
export type NoResultsProps = Pick<SearchFormProps, 'searchPage'>;
diff --git a/src/components/organisms/layout/overview.module.scss b/src/components/organisms/layout/overview.module.scss
index 5620513..e4f6a6a 100644
--- a/src/components/organisms/layout/overview.module.scss
+++ b/src/components/organisms/layout/overview.module.scss
@@ -1,5 +1,5 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/functions" as fun;
+@use "../../../styles/abstracts/mixins" as mix;
.wrapper {
padding: var(--spacing-sm) var(--spacing-md);
diff --git a/src/components/organisms/layout/overview.test.tsx b/src/components/organisms/layout/overview.test.tsx
index c096bad..72e4cc0 100644
--- a/src/components/organisms/layout/overview.test.tsx
+++ b/src/components/organisms/layout/overview.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import Overview, { type OverviewMeta } from './overview';
const cover = {
diff --git a/src/components/organisms/layout/overview.tsx b/src/components/organisms/layout/overview.tsx
index 04ec79a..e539731 100644
--- a/src/components/organisms/layout/overview.tsx
+++ b/src/components/organisms/layout/overview.tsx
@@ -1,8 +1,8 @@
+import { FC } from 'react';
import ResponsiveImage, {
type ResponsiveImageProps,
-} from '@components/molecules/images/responsive-image';
-import Meta, { type MetaData } from '@components/molecules/layout/meta';
-import { FC } from 'react';
+} from '../../molecules/images/responsive-image';
+import Meta, { type MetaData } from '../../molecules/layout/meta';
import styles from './overview.module.scss';
export type OverviewMeta = Pick<
diff --git a/src/components/organisms/layout/posts-list.module.scss b/src/components/organisms/layout/posts-list.module.scss
index b09bb12..64ad33f 100644
--- a/src/components/organisms/layout/posts-list.module.scss
+++ b/src/components/organisms/layout/posts-list.module.scss
@@ -1,6 +1,6 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
-@use "@styles/abstracts/placeholders";
+@use "../../../styles/abstracts/functions" as fun;
+@use "../../../styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/placeholders";
.section {
&:not(:last-of-type) {
diff --git a/src/components/organisms/layout/posts-list.test.tsx b/src/components/organisms/layout/posts-list.test.tsx
index 571c421..1d6bbcb 100644
--- a/src/components/organisms/layout/posts-list.test.tsx
+++ b/src/components/organisms/layout/posts-list.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import PostsList from './posts-list';
import { posts, searchPage } from './posts-list.fixture';
diff --git a/src/components/organisms/layout/posts-list.tsx b/src/components/organisms/layout/posts-list.tsx
index e3788c7..dede7b6 100644
--- a/src/components/organisms/layout/posts-list.tsx
+++ b/src/components/organisms/layout/posts-list.tsx
@@ -1,14 +1,14 @@
-import Button from '@components/atoms/buttons/button';
-import Heading, { type HeadingLevel } from '@components/atoms/headings/heading';
-import ProgressBar from '@components/atoms/loaders/progress-bar';
-import Spinner from '@components/atoms/loaders/spinner';
-import Pagination, {
- type PaginationProps,
-} from '@components/molecules/nav/pagination';
-import useIsMounted from '@utils/hooks/use-is-mounted';
-import useSettings from '@utils/hooks/use-settings';
import { FC, Fragment, useRef } from 'react';
import { useIntl } from 'react-intl';
+import useIsMounted from '../../../utils/hooks/use-is-mounted';
+import useSettings from '../../../utils/hooks/use-settings';
+import Button from '../../atoms/buttons/button';
+import Heading, { type HeadingLevel } from '../../atoms/headings/heading';
+import ProgressBar from '../../atoms/loaders/progress-bar';
+import Spinner from '../../atoms/loaders/spinner';
+import Pagination, {
+ type PaginationProps,
+} from '../../molecules/nav/pagination';
import NoResults, { NoResultsProps } from './no-results';
import styles from './posts-list.module.scss';
import Summary, { type SummaryProps } from './summary';
diff --git a/src/components/organisms/layout/summary.module.scss b/src/components/organisms/layout/summary.module.scss
index 62dfc0e..9530312 100644
--- a/src/components/organisms/layout/summary.module.scss
+++ b/src/components/organisms/layout/summary.module.scss
@@ -1,5 +1,5 @@
-@use "@styles/abstracts/functions" as fun;
-@use "@styles/abstracts/mixins" as mix;
+@use "../../../styles/abstracts/functions" as fun;
+@use "../../../styles/abstracts/mixins" as mix;
.wrapper {
display: grid;
diff --git a/src/components/organisms/layout/summary.test.tsx b/src/components/organisms/layout/summary.test.tsx
index bc69f3b..73f6df8 100644
--- a/src/components/organisms/layout/summary.test.tsx
+++ b/src/components/organisms/layout/summary.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@tests/utils';
+import { render, screen } from '../../../../tests/utils';
import Summary from './summary';
import { cover, intro, meta, title, url } from './summary.fixture';
diff --git a/src/components/organisms/layout/summary.tsx b/src/components/organisms/layout/summary.tsx
index 5d27862..f2031d5 100644
--- a/src/components/organisms/layout/summary.tsx
+++ b/src/components/organisms/layout/summary.tsx
@@ -1,15 +1,15 @@
-import ButtonLink from '@components/atoms/buttons/button-link';
-import Heading, { type HeadingLevel } from '@components/atoms/headings/heading';
-import Arrow from '@components/atoms/icons/arrow';
-import Link from '@components/atoms/links/link';
-import ResponsiveImage, {
- type ResponsiveImageProps,
-} from '@components/molecules/images/responsive-image';
-import Meta, { type MetaData } from '@components/molecules/layout/meta';
-import { type Article, type Meta as MetaType } from '@ts/types/app';
-import useReadingTime from '@utils/hooks/use-reading-time';
import { FC, ReactNode } from 'react';
import { useIntl } from 'react-intl';
+import { type Article, type Meta as MetaType } from '../../../types/app';
+import useReadingTime from '../../../utils/hooks/use-reading-time';
+import ButtonLink from '../../atoms/buttons/button-link';
+import Heading, { type HeadingLevel } from '../../atoms/headings/heading';
+import Arrow from '../../atoms/icons/arrow';
+import Link from '../../atoms/links/link';
+import ResponsiveImage, {
+ type ResponsiveImageProps,
+} from '../../molecules/images/responsive-image';
+import Meta, { type MetaData } from '../../molecules/layout/meta';
import styles from './summary.module.scss';
export type Cover = Pick<