From 4e5a6d727a79e4fff181628f63334d078a842ac9 Mon Sep 17 00:00:00 2001 From: Fedor Katurov <gotham48@gmail.com> Date: Thu, 3 Mar 2022 20:00:46 +0700 Subject: [PATCH] fixed semantic markup --- src/components/main/Footer/index.tsx | 4 ++-- src/components/node/NodeTitle/index.tsx | 4 ++-- src/containers/main/Header/index.tsx | 8 ++++---- src/containers/node/NodeBottomBlock/index.tsx | 16 +++++++++------- src/layouts/NodeLayout/index.tsx | 5 +++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/components/main/Footer/index.tsx b/src/components/main/Footer/index.tsx index 1ddddd96..505ed9b3 100644 --- a/src/components/main/Footer/index.tsx +++ b/src/components/main/Footer/index.tsx @@ -5,10 +5,10 @@ import styles from './styles.module.scss'; interface IProps {} const Footer: FC<IProps> = memo(() => ( - <div className={styles.footer}> + <footer className={styles.footer}> <div className={styles.slogan}>Уделяй больше времени тишине. Спасибо</div> <div className={styles.copy}>2009 - {new Date().getFullYear()}</div> - </div> + </footer> )); export { Footer }; diff --git a/src/components/node/NodeTitle/index.tsx b/src/components/node/NodeTitle/index.tsx index 38af78e7..876633b9 100644 --- a/src/components/node/NodeTitle/index.tsx +++ b/src/components/node/NodeTitle/index.tsx @@ -64,13 +64,13 @@ const NodeTitle: VFC<IProps> = memo( </div> {!!username && ( - <div className={styles.name}> + <aside className={styles.name}> {isLoading ? ( <Placeholder width="100px" /> ) : ( `~${username.toLocaleLowerCase()}, ${getPrettyDate(createdAt)}` )} - </div> + </aside> )} </div> diff --git a/src/containers/main/Header/index.tsx b/src/containers/main/Header/index.tsx index 01a3bffe..009f2d84 100644 --- a/src/containers/main/Header/index.tsx +++ b/src/containers/main/Header/index.tsx @@ -60,7 +60,7 @@ const Header: FC<HeaderProps> = observer(() => { }, [top]); return ( - <div className={classNames(styles.wrap, { [styles.is_scrolled]: isScrolled })}> + <header className={classNames(styles.wrap, { [styles.is_scrolled]: isScrolled })}> <div className={styles.container}> <div className={styles.logo_wrapper}> <Logo /> @@ -68,7 +68,7 @@ const Header: FC<HeaderProps> = observer(() => { <Filler className={styles.filler} /> - <div className={styles.plugs}> + <nav className={styles.plugs}> <Authorized> <Anchor className={classNames(styles.item, { @@ -97,7 +97,7 @@ const Header: FC<HeaderProps> = observer(() => { БОРИС </Anchor> </Authorized> - </div> + </nav> {isUser && <UserButton user={user} onLogout={logout} authOpenProfile={openProfile} />} @@ -107,7 +107,7 @@ const Header: FC<HeaderProps> = observer(() => { </Button> )} </div> - </div> + </header> ); }); diff --git a/src/containers/node/NodeBottomBlock/index.tsx b/src/containers/node/NodeBottomBlock/index.tsx index cb646da7..a2bbdc94 100644 --- a/src/containers/node/NodeBottomBlock/index.tsx +++ b/src/containers/node/NodeBottomBlock/index.tsx @@ -42,18 +42,20 @@ const NodeBottomBlock: FC<IProps> = ({ commentsOrder }) => { <Group className={styles.comments}> {inline && <div className={styles.inline}>{inline}</div>} - {isLoading || isLoadingComments || (!comments.length && !inline) ? ( - <NodeNoComments is_loading={isLoadingComments || isLoading} /> - ) : ( - <NodeComments order={commentsOrder} /> - )} + <article> + {isLoading || isLoadingComments || (!comments.length && !inline) ? ( + <NodeNoComments is_loading={isLoadingComments || isLoading} /> + ) : ( + <NodeComments order={commentsOrder} /> + )} + </article> {isUser && !isLoading && ( <NodeCommentForm nodeId={node.id} saveComment={onSaveComment} user={user} /> )} </Group> - <div className={styles.panel}> + <aside className={styles.panel}> <div className={styles.left}> <Sticky> <div className={styles.left_item}> @@ -68,7 +70,7 @@ const NodeBottomBlock: FC<IProps> = ({ commentsOrder }) => { </div> </Sticky> </div> - </div> + </aside> </Group> </Padder> </Group> diff --git a/src/layouts/NodeLayout/index.tsx b/src/layouts/NodeLayout/index.tsx index e7b9c585..0e600c8b 100644 --- a/src/layouts/NodeLayout/index.tsx +++ b/src/layouts/NodeLayout/index.tsx @@ -16,7 +16,6 @@ import { useNodeContext } from '~/utils/context/NodeContextProvider'; import styles from './styles.module.scss'; - type IProps = {}; const NodeLayout: FC<IProps> = () => { @@ -56,7 +55,9 @@ const NodeLayout: FC<IProps> = () => { /> </div> - <NodeBottomBlock commentsOrder="DESC" /> + <section> + <NodeBottomBlock commentsOrder="DESC" /> + </section> <Footer /> </Card>