muerwre/vault-frontend
1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 21:06:42 +07:00
Code Packages Activity Actions

comment locking initial

Browse source
This commit is contained in:
Fedor Katurov 2019-11-29 12:21:11 +07:00
parent 6eafc227da
commit 59d544c5f4
10 changed files with 139 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/containers/node/BorisLayout/index.tsx
View file

@ -1,29 +1,25 @@
import React, { FC, useEffect } from "react";
import { RouteComponentProps } from "react-router";
import * as NODE_ACTIONS from "~/redux/node/actions";
import { selectNode } from "~/redux/node/selectors";
import { selectUser } from "~/redux/auth/selectors";
import { connect } from "react-redux";
import { NodeComments } from "~/components/node/NodeComments";
import styles from "./styles.scss";
import { CommentForm } from "~/components/node/CommentForm";
import { Group } from "~/components/containers/Group";
import boris from "~/sprites/boris_robot.svg";
import { NodeNoComments } from "~/components/node/NodeNoComments";
import { getRandomPhrase } from "~/constants/phrases";
import React, { FC, useEffect } from 'react';
import { RouteComponentProps } from 'react-router';
import * as NODE_ACTIONS from '~/redux/node/actions';
import { selectNode } from '~/redux/node/selectors';
import { selectUser } from '~/redux/auth/selectors';
import { connect } from 'react-redux';
import { NodeComments } from '~/components/node/NodeComments';
import styles from './styles.scss';
import { CommentForm } from '~/components/node/CommentForm';
import { Group } from '~/components/containers/Group';
import boris from '~/sprites/boris_robot.svg';
import { NodeNoComments } from '~/components/node/NodeNoComments';
import { getRandomPhrase } from '~/constants/phrases';
const mapStateToProps = state => ({
node: selectNode(state),
user: selectUser(state)
user: selectUser(state),
});
const mapDispatchToProps = {
nodeLoadNode: NODE_ACTIONS.nodeLoadNode,
nodeUpdateTags: NODE_ACTIONS.nodeUpdateTags,
nodeSetCoverImage: NODE_ACTIONS.nodeSetCoverImage,
nodeEdit: NODE_ACTIONS.nodeEdit,
nodeLike: NODE_ACTIONS.nodeLike,
nodeStar: NODE_ACTIONS.nodeStar
nodeLockComment: NODE_ACTIONS.nodeLockComment,
};
type IProps = ReturnType<typeof mapStateToProps> &
@ -33,21 +29,17 @@ type IProps = ReturnType<typeof mapStateToProps> &
const id = 696;
const BorisLayoutUnconnected: FC<IProps> = ({
node: {
is_loading,
is_loading_comments,
comments = [],
current: node,
related
},
node: { is_loading, is_loading_comments, comments = [] },
user,
user: { is_user },
nodeLoadNode
nodeLoadNode,
nodeLockComment,
}) => {
const title = getRandomPhrase("BORIS_TITLE");
const title = getRandomPhrase('BORIS_TITLE');
useEffect(() => {
if (is_loading) return;
nodeLoadNode(id, "DESC");
nodeLoadNode(id, 'DESC');
}, [nodeLoadNode, id]);
return (
@ -90,7 +82,7 @@ const BorisLayoutUnconnected: FC<IProps> = ({
{is_loading_comments && !comments.length ? (
<NodeNoComments is_loading />
) : (
<NodeComments comments={comments} />
<NodeComments comments={comments} user={user} onDelete={nodeLockComment} />
)}
</Group>
</div>

7
src/containers/node/NodeLayout/index.tsx
View file

@ -20,6 +20,7 @@ import { selectUser } from '~/redux/auth/selectors';
import pick from 'ramda/es/pick';
import { NodeRelatedPlaceholder } from '~/components/node/NodeRelated/placeholder';
import { NodeDeletedBadge } from '~/components/node/NodeDeletedBadge';
import { IComment } from '~/redux/types';
const mapStateToProps = state => ({
node: selectNode(state),
@ -34,6 +35,7 @@ const mapDispatchToProps = {
nodeLike: NODE_ACTIONS.nodeLike,
nodeStar: NODE_ACTIONS.nodeStar,
nodeLock: NODE_ACTIONS.nodeLock,
nodeLockComment: NODE_ACTIONS.nodeLockComment,
};
type IProps = ReturnType<typeof mapStateToProps> &
@ -55,9 +57,8 @@ const NodeLayoutUnconnected: FC<IProps> = memo(
nodeStar,
nodeLock,
nodeSetCoverImage,
nodeLockComment,
}) => {
// const is_loading = true;
const [layout, setLayout] = useState({});
const updateLayout = useCallback(() => setLayout({}), []);
@ -130,7 +131,7 @@ const NodeLayoutUnconnected: FC<IProps> = memo(
{is_loading || is_loading_comments || (!comments.length && !inline_block) ? (
<NodeNoComments is_loading={is_loading_comments || is_loading} />
) : (
<NodeComments comments={comments} />
<NodeComments comments={comments} user={user} onDelete={nodeLockComment} />
)}
{is_user && !is_loading && <CommentForm id={0} />}