diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx index a212c3bd..9a27c582 100644 --- a/src/components/main/Header/index.tsx +++ b/src/components/main/Header/index.tsx @@ -31,13 +31,13 @@ const HeaderUnconnected: FC = ({ username, is_user, showDialog }) => {
- flow - image
editor
+ flow
{is_user && ( +
{username}
)} diff --git a/src/components/node/Comment/index.tsx b/src/components/node/Comment/index.tsx index 19b02f8a..c56f431d 100644 --- a/src/components/node/Comment/index.tsx +++ b/src/components/node/Comment/index.tsx @@ -27,8 +27,8 @@ const Comment: FC = ({ comment, is_empty, is_loading, className, photo, {comment.files && comment.files.length > 0 && (
{comment.files.map(file => ( -
- +
+ {file.name}
))}
diff --git a/src/components/node/Comment/styles.scss b/src/components/node/Comment/styles.scss index 44c9c035..0aafa63c 100644 --- a/src/components/node/Comment/styles.scss +++ b/src/components/node/Comment/styles.scss @@ -15,6 +15,6 @@ @include flexbin(150px, 10px); img { - border-radius: 4px; + border-radius: $radius; } } diff --git a/src/components/node/NodePanel/index.tsx b/src/components/node/NodePanel/index.tsx index fb1a980f..cdec1c87 100644 --- a/src/components/node/NodePanel/index.tsx +++ b/src/components/node/NodePanel/index.tsx @@ -2,16 +2,19 @@ import React, { FC } from 'react'; import * as styles from './styles.scss'; import { Group } from '~/components/containers/Group'; import { Filler } from '~/components/containers/Filler'; -import {Icon} from "~/components/input/Icon"; +import { Icon } from '~/components/input/Icon'; +import { INode } from '~/redux/types'; -interface IProps {} +interface IProps { + node: INode; +} -const NodePanel: FC = () => ( +const NodePanel: FC = ({ node: { title, user } }) => (
-
Node title
-
~author
+
{title || '...'}
+ {user && user.username &&
~ {user.username}
}
diff --git a/src/components/node/NodePanel/styles.scss b/src/components/node/NodePanel/styles.scss index b1632ff8..6f346c11 100644 --- a/src/components/node/NodePanel/styles.scss +++ b/src/components/node/NodePanel/styles.scss @@ -19,7 +19,7 @@ } .name { - font: $font_12_regular; + font: $font_14_regular; color: transparentize(white, 0.5); } diff --git a/src/containers/dialogs/ScrollDialog/styles.scss b/src/containers/dialogs/ScrollDialog/styles.scss index def6c1fb..2d5740a2 100644 --- a/src/containers/dialogs/ScrollDialog/styles.scss +++ b/src/containers/dialogs/ScrollDialog/styles.scss @@ -111,7 +111,7 @@ .children { background: $content_bg; - border-radius: $radius; + border-radius: $radius $radius 0 0; } .top_cap { @@ -124,7 +124,7 @@ &::after { position: absolute; - content: " "; + content: ' '; width: 100%; height: $radius; background: linear-gradient($content_bg, transparentize($content_bg, 1)); @@ -207,4 +207,4 @@ &::before { animation: spin_2 0.5s forwards; } -} \ No newline at end of file +} diff --git a/src/containers/node/NodeLayout/index.tsx b/src/containers/node/NodeLayout/index.tsx index 78b2ec5c..abc69b4c 100644 --- a/src/containers/node/NodeLayout/index.tsx +++ b/src/containers/node/NodeLayout/index.tsx @@ -58,7 +58,7 @@ const NodeLayoutUnconnected: FC = ({ {block && createElement(block, { node, is_loading })} - + diff --git a/src/redux/node/constants.ts b/src/redux/node/constants.ts index 106e1417..ae60f7aa 100644 --- a/src/redux/node/constants.ts +++ b/src/redux/node/constants.ts @@ -31,7 +31,7 @@ export const EMPTY_BLOCK: IBlock = { export const EMPTY_NODE: INode = { id: null, - user_id: null, + user: null, title: '', files: [], diff --git a/src/redux/types.ts b/src/redux/types.ts index e28eabd8..561b7379 100644 --- a/src/redux/types.ts +++ b/src/redux/types.ts @@ -93,7 +93,7 @@ export interface IBlock { export interface INode { id?: number; - user_id: UUID; + user: Partial; title: string; files: IFile[]; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 983ccc2f..69e64a89 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -7,7 +7,7 @@ $gap: 10px; $spc: $gap * 2; $radius: 6px; -$cell_radius: 4px; +$cell_radius: 6px; $panel_radius: $radius; $input_height: 36px;