refactor sidebar and stuff

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<IProps> = observer(({ title, stats, isLoadingStats }) => {
         </div>
       </div>
 
-      <SidebarRouter prefix="/" />
+      <SubmitBarRouter prefix="/" />
     </Container>
   );
 });

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<Props> = () => {
-  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<Props> = () => {
           <FlowStamp isFluid={false} onToggleLayout={console.warn} />
         </div>
 
-        <FlowGrid nodes={nodes} user={user} onChangeCellView={onChangeCellView} />
+        <FlowGrid
+          nodes={nodes}
+          user={user}
+          onChangeCellView={onChangeCellView}
+        />
       </div>
 
-      <SidebarRouter prefix="" />
+      <SubmitBarRouter prefix="" />
     </div>
   );
 };

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<IProps> = () => {
         </div>
       </div>
 
-      <SidebarRouter prefix="/lab" isLab />
+      <SubmitBarRouter prefix="/lab" isLab />
     </Container>
   );
 };

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}
 
       <LoadingProgress />
-      <SidebarRouter />
     </div>
   </div>
 );

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<IProps> = 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<IProps> = observer(() => {
         </Card>
       </Container>
 
-      <SidebarRouter prefix="/post:id" />
+      <SubmitBarRouter prefix="/post:id" isLab={!node.is_promoted} />
 
       <Superpower>
         <ScrollHelperBottom />

src/layouts/RoomLayout/styles.module.scss

@@ -4,6 +4,7 @@
   height: 100vh;
   width: 100%;
   margin-top: -$header_height;
+  margin-bottom: -$header_height;
 }
 
 .room {