diff --git a/src/components/flow/TestGrid/index.tsx b/src/components/flow/TestGrid/index.tsx index 62546cc5..3439ca7b 100644 --- a/src/components/flow/TestGrid/index.tsx +++ b/src/components/flow/TestGrid/index.tsx @@ -6,31 +6,10 @@ import * as styles from './styles.scss'; export const TestGrid = () => (
-
- HERO -
-
-
- STAMP -
+
HERO
+ +
STAMP
{range(1, 20).map(el => ( = ({ username, is_user, showDialog }) => { const onOpenEditor = useCallback(() => showDialog(DIALOGS.EDITOR), [showDialog]); return ( -
+
diff --git a/src/components/main/Header/style.scss b/src/components/main/Header/style.scss index 3cdbe687..2e96d1da 100644 --- a/src/components/main/Header/style.scss +++ b/src/components/main/Header/style.scss @@ -4,6 +4,7 @@ justify-content: flex-end; font-weight: 500; height: 96px; + margin-top: -20px; } .spacer { diff --git a/src/containers/App.tsx b/src/containers/App.tsx index 1f65381e..68b6b4fe 100644 --- a/src/containers/App.tsx +++ b/src/containers/App.tsx @@ -1,11 +1,8 @@ -import * as React from 'react'; +import React, { FC } from 'react'; import { connect } from 'react-redux'; -import { bindActionCreators } from 'redux'; import { hot } from 'react-hot-loader'; import { ConnectedRouter } from 'connected-react-router'; -import { - NavLink, Switch, Route, Redirect -} from 'react-router-dom'; +import { Switch, Route, Redirect } from 'react-router-dom'; import { history } from '~/redux/store'; import { FlowLayout } from '~/containers/flow/FlowLayout'; import { MainLayout } from '~/containers/main/MainLayout'; @@ -23,29 +20,28 @@ const mapDispatchToProps = {}; type IProps = typeof mapDispatchToProps & ReturnType & {}; -class Component extends React.Component { - render() { - return ( - - - - - +const Component: FC = ({ is_shown }) => ( + + + + - - - - - + + - - - - - - ); - } -} + + + + + + + + + + + + +); export default connect( mapStateToProps, diff --git a/src/containers/examples/ImageExample/index.tsx b/src/containers/examples/ImageExample/index.tsx index 500f3188..db13af26 100644 --- a/src/containers/examples/ImageExample/index.tsx +++ b/src/containers/examples/ImageExample/index.tsx @@ -10,17 +10,16 @@ import { NodeRelated } from '~/components/node/NodeRelated'; import { Tags } from '~/components/node/Tags'; import { MenuButton } from '~/components/node/MenuButton'; import { NodeNoComments } from '~/components/node/NodeNoComments'; -import { InputText } from '~/components/input/InputText'; interface IProps {} const ImageExample: FC = () => ( -
@@ -41,11 +40,7 @@ const ImageExample: FC = () => ( - + @@ -59,7 +54,7 @@ const ImageExample: FC = () => ( { title: 'Плейлист', feature: 'green' }, { title: 'Просто' }, { title: '+ фото', feature: 'black' }, - { title: '+ с музыкой', feature: 'black' } + { title: '+ с музыкой', feature: 'black' }, ]} /> diff --git a/src/containers/flow/FlowLayout/index.tsx b/src/containers/flow/FlowLayout/index.tsx index fff9250e..71f89f4d 100644 --- a/src/containers/flow/FlowLayout/index.tsx +++ b/src/containers/flow/FlowLayout/index.tsx @@ -1,8 +1,11 @@ import * as React from 'react'; import { TestGrid } from '~/components/flow/TestGrid'; +import * as styles from './styles.scss'; +import { Header } from '~/components/main/Header'; export const FlowLayout = () => ( -
+
+
); diff --git a/src/containers/flow/FlowLayout/styles.scss b/src/containers/flow/FlowLayout/styles.scss new file mode 100644 index 00000000..d2dd77c6 --- /dev/null +++ b/src/containers/flow/FlowLayout/styles.scss @@ -0,0 +1,6 @@ +.wrap { + max-width: 2000px; + padding: 0 40px 40px 40px; + display: flex; + flex-direction: column; +} diff --git a/src/redux/node/reducer.ts b/src/redux/node/reducer.ts index 33f7ac30..8841d404 100644 --- a/src/redux/node/reducer.ts +++ b/src/redux/node/reducer.ts @@ -17,19 +17,7 @@ const INITIAL_STATE: INodeState = { ...EMPTY_NODE, type: 'image', blocks: [{ ...EMPTY_BLOCK, type: 'image' }], - files: [ - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - // { ...EMPTY_FILE, id: uuid() }, - ], + files: [], }, is_loading: false, error: null,