mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-24 20:36:40 +07:00
fixed boris image and layout
This commit is contained in:
parent
b4099a6c45
commit
e465f72034
6 changed files with 19 additions and 55 deletions
|
@ -56,6 +56,7 @@
|
||||||
"ts-check": "tsc -p tsconfig.json --noEmit",
|
"ts-check": "tsc -p tsconfig.json --noEmit",
|
||||||
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
|
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
|
||||||
"prepare": "husky install",
|
"prepare": "husky install",
|
||||||
|
"next:dev": "next dev",
|
||||||
"next:build": "next build",
|
"next:build": "next build",
|
||||||
"next:start": "next start -p 80"
|
"next:start": "next start -p 80"
|
||||||
},
|
},
|
||||||
|
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
@ -7,7 +7,7 @@ import styles from './styles.module.scss';
|
||||||
interface LoadingProgressProps {}
|
interface LoadingProgressProps {}
|
||||||
|
|
||||||
const LoadingProgress: VFC<LoadingProgressProps> = () => {
|
const LoadingProgress: VFC<LoadingProgressProps> = () => {
|
||||||
const shown = useSSRLoadingIndicator(300);
|
const shown = useSSRLoadingIndicator(700);
|
||||||
|
|
||||||
return shown ? (
|
return shown ? (
|
||||||
<>
|
<>
|
||||||
|
|
|
@ -10,8 +10,6 @@ import { CommentContextProvider, useCommentContext } from '~/utils/context/Comme
|
||||||
import { useNodeContext } from '~/utils/context/NodeContextProvider';
|
import { useNodeContext } from '~/utils/context/NodeContextProvider';
|
||||||
import { useUserContext } from '~/utils/context/UserContextProvider';
|
import { useUserContext } from '~/utils/context/UserContextProvider';
|
||||||
|
|
||||||
import styles from './styles.module.scss';
|
|
||||||
|
|
||||||
interface IProps {}
|
interface IProps {}
|
||||||
|
|
||||||
const BorisComments: FC<IProps> = () => {
|
const BorisComments: FC<IProps> = () => {
|
||||||
|
@ -30,29 +28,27 @@ const BorisComments: FC<IProps> = () => {
|
||||||
const { node } = useNodeContext();
|
const { node } = useNodeContext();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<CommentContextProvider
|
||||||
<Group className={styles.grid}>
|
onSaveComment={onSaveComment}
|
||||||
|
comments={comments}
|
||||||
|
hasMore={hasMore}
|
||||||
|
onDeleteComment={onDeleteComment}
|
||||||
|
onLoadMoreComments={onLoadMoreComments}
|
||||||
|
onShowImageModal={onShowImageModal}
|
||||||
|
isLoading={isLoading}
|
||||||
|
>
|
||||||
|
<Group>
|
||||||
{isUser && <NodeCommentForm user={user} nodeId={node.id} saveComment={onSaveComment} />}
|
{isUser && <NodeCommentForm user={user} nodeId={node.id} saveComment={onSaveComment} />}
|
||||||
|
|
||||||
{isLoading ? (
|
{isLoading || !comments?.length ? (
|
||||||
<NodeNoComments is_loading count={7} />
|
<NodeNoComments is_loading count={7} />
|
||||||
) : (
|
) : (
|
||||||
<CommentContextProvider
|
<NodeComments order="ASC" />
|
||||||
onSaveComment={onSaveComment}
|
|
||||||
comments={comments}
|
|
||||||
hasMore={hasMore}
|
|
||||||
onDeleteComment={onDeleteComment}
|
|
||||||
onLoadMoreComments={onLoadMoreComments}
|
|
||||||
onShowImageModal={onShowImageModal}
|
|
||||||
isLoading={isLoading}
|
|
||||||
>
|
|
||||||
<NodeComments order="ASC" />
|
|
||||||
</CommentContextProvider>
|
|
||||||
)}
|
)}
|
||||||
</Group>
|
|
||||||
|
|
||||||
<Footer />
|
<Footer />
|
||||||
</>
|
</Group>
|
||||||
|
</CommentContextProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
@import "src/styles/variables.scss";
|
|
||||||
|
|
||||||
.content {
|
|
||||||
flex: 4;
|
|
||||||
z-index: 2;
|
|
||||||
border-radius: $radius;
|
|
||||||
padding: $gap;
|
|
||||||
background: $node_bg;
|
|
||||||
box-shadow: inset transparentize(mix($wisegreen, white, 60%), 0.6) 0 1px;
|
|
||||||
|
|
||||||
@include desktop {
|
|
||||||
flex: 2.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media(max-width: 1024px) {
|
|
||||||
flex: 2;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,16 +1,12 @@
|
||||||
import React, { FC } from 'react';
|
import React, { FC } from 'react';
|
||||||
|
|
||||||
import { BorisSidebar } from '~/components/boris/BorisSidebar';
|
import { BorisSidebar } from '~/components/boris/BorisSidebar';
|
||||||
import { BorisUIDemo } from '~/components/boris/BorisUIDemo';
|
|
||||||
import { Superpower } from '~/components/boris/Superpower';
|
|
||||||
import { Card } from '~/components/containers/Card';
|
import { Card } from '~/components/containers/Card';
|
||||||
import { Group } from '~/components/containers/Group';
|
import { Group } from '~/components/containers/Group';
|
||||||
import { Sticky } from '~/components/containers/Sticky';
|
import { Sticky } from '~/components/containers/Sticky';
|
||||||
import { Tabs } from '~/components/dialogs/Tabs';
|
|
||||||
import { BorisComments } from '~/containers/boris/BorisComments';
|
import { BorisComments } from '~/containers/boris/BorisComments';
|
||||||
import { Container } from '~/containers/main/Container';
|
import { Container } from '~/containers/main/Container';
|
||||||
import { SidebarRouter } from '~/containers/main/SidebarRouter';
|
import { SidebarRouter } from '~/containers/main/SidebarRouter';
|
||||||
import boris from '~/sprites/boris_robot.svg';
|
|
||||||
import { BorisUsageStats } from '~/types/boris';
|
import { BorisUsageStats } from '~/types/boris';
|
||||||
import { useAuthProvider } from '~/utils/providers/AuthProvider';
|
import { useAuthProvider } from '~/utils/providers/AuthProvider';
|
||||||
|
|
||||||
|
@ -37,23 +33,12 @@ const BorisLayout: FC<IProps> = ({ title, setIsBetaTester, isTester, stats, isLo
|
||||||
<div className={styles.caption_text}>{title}</div>
|
<div className={styles.caption_text}>{title}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<img src={boris} alt="Борис" />
|
<img src="/images/boris_robot.svg" alt="Борис" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.container}>
|
<div className={styles.container}>
|
||||||
<Card className={styles.content}>
|
<Card className={styles.content}>
|
||||||
<Tabs>
|
<BorisComments />
|
||||||
<Superpower>
|
|
||||||
<Tabs.List items={['Комментарии', 'ЮАЙ ПЛЭЙГРАУНД']} />
|
|
||||||
</Superpower>
|
|
||||||
|
|
||||||
<Tabs.Content>
|
|
||||||
<BorisComments />
|
|
||||||
<Superpower>
|
|
||||||
<BorisUIDemo />
|
|
||||||
</Superpower>
|
|
||||||
</Tabs.Content>
|
|
||||||
</Tabs>
|
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<Group className={styles.stats}>
|
<Group className={styles.stats}>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue