From 1eb6c9c29d44f5a3707779b5589dd3354d6c134c Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Thu, 26 Oct 2023 19:48:36 +0600 Subject: [PATCH] refactor sidebar and stuff --- .../{SidebarRouter => SubmitBarRouter}/index.tsx | 4 ++-- src/layouts/BorisLayout/index.tsx | 4 ++-- src/layouts/FlowLayout/index.tsx | 13 +++++++++---- src/layouts/LabLayout/index.tsx | 4 ++-- src/layouts/MainLayout/index.tsx | 2 -- src/layouts/NodeLayout/index.tsx | 11 ++++------- src/layouts/RoomLayout/styles.module.scss | 1 + src/pages/_app.tsx | 1 + 8 files changed, 21 insertions(+), 19 deletions(-) rename src/containers/main/{SidebarRouter => SubmitBarRouter}/index.tsx (78%) diff --git a/src/containers/main/SidebarRouter/index.tsx b/src/containers/main/SubmitBarRouter/index.tsx similarity index 78% rename from src/containers/main/SidebarRouter/index.tsx rename to src/containers/main/SubmitBarRouter/index.tsx index b557b5b7..260db992 100644 --- a/src/containers/main/SidebarRouter/index.tsx +++ b/src/containers/main/SubmitBarRouter/index.tsx @@ -8,10 +8,10 @@ interface IProps { isLab?: boolean; } -const SidebarRouter: FC = ({ isLab }) => ( +const SubmitBarRouter: FC = ({ isLab }) => ( ); -export { SidebarRouter }; +export { SubmitBarRouter }; diff --git a/src/layouts/BorisLayout/index.tsx b/src/layouts/BorisLayout/index.tsx index 59ae398a..29102458 100644 --- a/src/layouts/BorisLayout/index.tsx +++ b/src/layouts/BorisLayout/index.tsx @@ -10,7 +10,7 @@ import { BorisComments } from '~/containers/boris/BorisComments'; import { BorisSidebar } from '~/containers/boris/BorisSidebar'; import { BorisSuperPowersSSR } from '~/containers/boris/BorisSuperpowers/ssr'; import { Container } from '~/containers/main/Container'; -import { SidebarRouter } from '~/containers/main/SidebarRouter'; +import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter'; import { BorisUsageStats } from '~/types/boris'; import { useAuthProvider } from '~/utils/providers/AuthProvider'; @@ -65,7 +65,7 @@ const BorisLayout: FC = observer(({ title, stats, isLoadingStats }) => { - + ); }); diff --git a/src/layouts/FlowLayout/index.tsx b/src/layouts/FlowLayout/index.tsx index 3a36033f..8b6da3de 100644 --- a/src/layouts/FlowLayout/index.tsx +++ b/src/layouts/FlowLayout/index.tsx @@ -5,7 +5,7 @@ import classNames from 'classnames'; import { FlowGrid } from '~/components/flow/FlowGrid'; import { FlowSwiperHero } from '~/components/flow/FlowSwiperHero'; import { FlowStamp } from '~/containers/flow/FlowStamp'; -import { SidebarRouter } from '~/containers/main/SidebarRouter'; +import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter'; import { useUser } from '~/hooks/auth/useUser'; import { useInfiniteLoader } from '~/hooks/dom/useInfiniteLoader'; import { useFlowContext } from '~/utils/providers/FlowProvider'; @@ -15,7 +15,8 @@ import styles from './styles.module.scss'; interface Props {} const FlowLayout: FC = () => { - const { heroes, nodes, onChangeCellView, loadMore, isSyncing } = useFlowContext(); + const { heroes, nodes, onChangeCellView, loadMore, isSyncing } = + useFlowContext(); const { user } = useUser(); useInfiniteLoader(loadMore, isSyncing); @@ -31,10 +32,14 @@ const FlowLayout: FC = () => { - + - + ); }; diff --git a/src/layouts/LabLayout/index.tsx b/src/layouts/LabLayout/index.tsx index 02a42b1d..cc0f5e53 100644 --- a/src/layouts/LabLayout/index.tsx +++ b/src/layouts/LabLayout/index.tsx @@ -7,7 +7,7 @@ import { LabGrid } from '~/containers/lab/LabGrid'; import { LabLoading } from '~/containers/lab/LabLoading'; import { LabStats } from '~/containers/lab/LabStats'; import { Container } from '~/containers/main/Container'; -import { SidebarRouter } from '~/containers/main/SidebarRouter'; +import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter'; import { useLabContext } from '~/utils/context/LabContextProvider'; import styles from './styles.module.scss'; @@ -39,7 +39,7 @@ const LabLayout: FC = () => { - + ); }; diff --git a/src/layouts/MainLayout/index.tsx b/src/layouts/MainLayout/index.tsx index 596181a8..8211e423 100644 --- a/src/layouts/MainLayout/index.tsx +++ b/src/layouts/MainLayout/index.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { LoadingProgress } from '~/components/common/LoadingProgress'; import { HeaderSSR } from '~/containers/main/Header/ssr'; -import { SidebarRouter } from '~/containers/main/SidebarRouter'; import styles from './styles.module.scss'; @@ -14,7 +13,6 @@ export const MainLayout = ({ children }) => ( {children} - ); diff --git a/src/layouts/NodeLayout/index.tsx b/src/layouts/NodeLayout/index.tsx index 61de0fea..427b6954 100644 --- a/src/layouts/NodeLayout/index.tsx +++ b/src/layouts/NodeLayout/index.tsx @@ -1,4 +1,4 @@ -import React, { FC } from 'react'; +import React from 'react'; import { observer } from 'mobx-react-lite'; @@ -8,8 +8,7 @@ import { Card } from '~/components/containers/Card'; import { Footer } from '~/components/main/Footer'; import { NodeTitle } from '~/components/node/NodeTitle'; import { Container } from '~/containers/main/Container'; -import { SidebarRouter } from '~/containers/main/SidebarRouter'; -import { NodeBacklinks } from '~/containers/node/NodeBacklinks'; +import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter'; import { NodeBottomBlock } from '~/containers/node/NodeBottomBlock'; import { useNodeActions } from '~/hooks/node/useNodeActions'; import { useNodeBlocks } from '~/hooks/node/useNodeBlocks'; @@ -19,9 +18,7 @@ import { useNodeContext } from '~/utils/context/NodeContextProvider'; import styles from './styles.module.scss'; -type IProps = {}; - -const NodeLayout: FC = observer(() => { +const NodeLayout = observer(() => { const { node, isLoading, update } = useNodeContext(); const { head, block } = useNodeBlocks(node, isLoading); const [canEdit, canLike, canStar] = useNodePermissions(node); @@ -66,7 +63,7 @@ const NodeLayout: FC = observer(() => { - + diff --git a/src/layouts/RoomLayout/styles.module.scss b/src/layouts/RoomLayout/styles.module.scss index 0f4c59a0..17b6a067 100644 --- a/src/layouts/RoomLayout/styles.module.scss +++ b/src/layouts/RoomLayout/styles.module.scss @@ -4,6 +4,7 @@ height: 100vh; width: 100%; margin-top: -$header_height; + margin-bottom: -$header_height; } .room { diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 477d18f7..337b0f83 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -63,6 +63,7 @@ export default class MyApp extends App { +