1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00

refactor sidebar and stuff

This commit is contained in:
Fedor Katurov 2023-10-26 19:48:36 +06:00
parent 7698d17ed3
commit 1eb6c9c29d
8 changed files with 21 additions and 19 deletions

View file

@ -8,10 +8,10 @@ interface IProps {
isLab?: boolean; isLab?: boolean;
} }
const SidebarRouter: FC<IProps> = ({ isLab }) => ( const SubmitBarRouter: FC<IProps> = ({ isLab }) => (
<Authorized> <Authorized>
<SubmitBarSSR isLab={isLab} /> <SubmitBarSSR isLab={isLab} />
</Authorized> </Authorized>
); );
export { SidebarRouter }; export { SubmitBarRouter };

View file

@ -10,7 +10,7 @@ import { BorisComments } from '~/containers/boris/BorisComments';
import { BorisSidebar } from '~/containers/boris/BorisSidebar'; import { BorisSidebar } from '~/containers/boris/BorisSidebar';
import { BorisSuperPowersSSR } from '~/containers/boris/BorisSuperpowers/ssr'; import { BorisSuperPowersSSR } from '~/containers/boris/BorisSuperpowers/ssr';
import { Container } from '~/containers/main/Container'; import { Container } from '~/containers/main/Container';
import { SidebarRouter } from '~/containers/main/SidebarRouter'; import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter';
import { BorisUsageStats } from '~/types/boris'; import { BorisUsageStats } from '~/types/boris';
import { useAuthProvider } from '~/utils/providers/AuthProvider'; import { useAuthProvider } from '~/utils/providers/AuthProvider';
@ -65,7 +65,7 @@ const BorisLayout: FC<IProps> = observer(({ title, stats, isLoadingStats }) => {
</div> </div>
</div> </div>
<SidebarRouter prefix="/" /> <SubmitBarRouter prefix="/" />
</Container> </Container>
); );
}); });

View file

@ -5,7 +5,7 @@ import classNames from 'classnames';
import { FlowGrid } from '~/components/flow/FlowGrid'; import { FlowGrid } from '~/components/flow/FlowGrid';
import { FlowSwiperHero } from '~/components/flow/FlowSwiperHero'; import { FlowSwiperHero } from '~/components/flow/FlowSwiperHero';
import { FlowStamp } from '~/containers/flow/FlowStamp'; 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 { useUser } from '~/hooks/auth/useUser';
import { useInfiniteLoader } from '~/hooks/dom/useInfiniteLoader'; import { useInfiniteLoader } from '~/hooks/dom/useInfiniteLoader';
import { useFlowContext } from '~/utils/providers/FlowProvider'; import { useFlowContext } from '~/utils/providers/FlowProvider';
@ -15,7 +15,8 @@ import styles from './styles.module.scss';
interface Props {} interface Props {}
const FlowLayout: FC<Props> = () => { const FlowLayout: FC<Props> = () => {
const { heroes, nodes, onChangeCellView, loadMore, isSyncing } = useFlowContext(); const { heroes, nodes, onChangeCellView, loadMore, isSyncing } =
useFlowContext();
const { user } = useUser(); const { user } = useUser();
useInfiniteLoader(loadMore, isSyncing); useInfiniteLoader(loadMore, isSyncing);
@ -31,10 +32,14 @@ const FlowLayout: FC<Props> = () => {
<FlowStamp isFluid={false} onToggleLayout={console.warn} /> <FlowStamp isFluid={false} onToggleLayout={console.warn} />
</div> </div>
<FlowGrid nodes={nodes} user={user} onChangeCellView={onChangeCellView} /> <FlowGrid
nodes={nodes}
user={user}
onChangeCellView={onChangeCellView}
/>
</div> </div>
<SidebarRouter prefix="" /> <SubmitBarRouter prefix="" />
</div> </div>
); );
}; };

View file

@ -7,7 +7,7 @@ import { LabGrid } from '~/containers/lab/LabGrid';
import { LabLoading } from '~/containers/lab/LabLoading'; import { LabLoading } from '~/containers/lab/LabLoading';
import { LabStats } from '~/containers/lab/LabStats'; import { LabStats } from '~/containers/lab/LabStats';
import { Container } from '~/containers/main/Container'; 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 { useLabContext } from '~/utils/context/LabContextProvider';
import styles from './styles.module.scss'; import styles from './styles.module.scss';
@ -39,7 +39,7 @@ const LabLayout: FC<IProps> = () => {
</div> </div>
</div> </div>
<SidebarRouter prefix="/lab" isLab /> <SubmitBarRouter prefix="/lab" isLab />
</Container> </Container>
); );
}; };

View file

@ -2,7 +2,6 @@ import React from 'react';
import { LoadingProgress } from '~/components/common/LoadingProgress'; import { LoadingProgress } from '~/components/common/LoadingProgress';
import { HeaderSSR } from '~/containers/main/Header/ssr'; import { HeaderSSR } from '~/containers/main/Header/ssr';
import { SidebarRouter } from '~/containers/main/SidebarRouter';
import styles from './styles.module.scss'; import styles from './styles.module.scss';
@ -14,7 +13,6 @@ export const MainLayout = ({ children }) => (
{children} {children}
<LoadingProgress /> <LoadingProgress />
<SidebarRouter />
</div> </div>
</div> </div>
); );

View file

@ -1,4 +1,4 @@
import React, { FC } from 'react'; import React from 'react';
import { observer } from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
@ -8,8 +8,7 @@ import { Card } from '~/components/containers/Card';
import { Footer } from '~/components/main/Footer'; import { Footer } from '~/components/main/Footer';
import { NodeTitle } from '~/components/node/NodeTitle'; import { NodeTitle } from '~/components/node/NodeTitle';
import { Container } from '~/containers/main/Container'; import { Container } from '~/containers/main/Container';
import { SidebarRouter } from '~/containers/main/SidebarRouter'; import { SubmitBarRouter } from '~/containers/main/SubmitBarRouter';
import { NodeBacklinks } from '~/containers/node/NodeBacklinks';
import { NodeBottomBlock } from '~/containers/node/NodeBottomBlock'; import { NodeBottomBlock } from '~/containers/node/NodeBottomBlock';
import { useNodeActions } from '~/hooks/node/useNodeActions'; import { useNodeActions } from '~/hooks/node/useNodeActions';
import { useNodeBlocks } from '~/hooks/node/useNodeBlocks'; import { useNodeBlocks } from '~/hooks/node/useNodeBlocks';
@ -19,9 +18,7 @@ import { useNodeContext } from '~/utils/context/NodeContextProvider';
import styles from './styles.module.scss'; import styles from './styles.module.scss';
type IProps = {}; const NodeLayout = observer(() => {
const NodeLayout: FC<IProps> = observer(() => {
const { node, isLoading, update } = useNodeContext(); const { node, isLoading, update } = useNodeContext();
const { head, block } = useNodeBlocks(node, isLoading); const { head, block } = useNodeBlocks(node, isLoading);
const [canEdit, canLike, canStar] = useNodePermissions(node); const [canEdit, canLike, canStar] = useNodePermissions(node);
@ -66,7 +63,7 @@ const NodeLayout: FC<IProps> = observer(() => {
</Card> </Card>
</Container> </Container>
<SidebarRouter prefix="/post:id" /> <SubmitBarRouter prefix="/post:id" isLab={!node.is_promoted} />
<Superpower> <Superpower>
<ScrollHelperBottom /> <ScrollHelperBottom />

View file

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

View file

@ -63,6 +63,7 @@ export default class MyApp extends App {
<Sprites /> <Sprites />
<Component {...pageProps} /> <Component {...pageProps} />
</MainLayout> </MainLayout>
<BottomContainer /> <BottomContainer />
</SidebarProvider> </SidebarProvider>
</NotificationProvider> </NotificationProvider>