mirror of
https://github.com/astuto/astuto.git
synced 2025-12-16 03:37:56 +01:00
Improve style pt. 4 (post and comments)
This commit is contained in:
@@ -6,6 +6,8 @@ import { MutedText } from '../shared/CustomTexts';
|
||||
|
||||
import { CommentRepliesState } from '../../reducers/commentRepliesReducer';
|
||||
|
||||
import friendlyDate from '../../helpers/friendlyDate';
|
||||
|
||||
interface Props {
|
||||
id: number;
|
||||
body: string;
|
||||
@@ -39,8 +41,11 @@ const Comment = ({
|
||||
</div>
|
||||
<p className="commentBody">{body}</p>
|
||||
<div className="commentFooter">
|
||||
<a className="commentReplyButton" onClick={handleToggleCommentReply}>Reply</a>
|
||||
<MutedText>{updatedAt}</MutedText>
|
||||
<a className="commentReplyButton" onClick={handleToggleCommentReply}>
|
||||
{ reply.isOpen ? 'Cancel' : 'Reply' }
|
||||
</a>
|
||||
•
|
||||
<MutedText>{friendlyDate(updatedAt)}</MutedText>
|
||||
</div>
|
||||
{
|
||||
reply.isOpen ?
|
||||
|
||||
@@ -4,7 +4,7 @@ import { FormEvent } from 'react';
|
||||
import NewComment from './NewComment';
|
||||
import CommentList from './CommentList';
|
||||
import Spinner from '../shared/Spinner';
|
||||
import { DangerText } from '../shared/CustomTexts';
|
||||
import { DangerText, UppercaseText } from '../shared/CustomTexts';
|
||||
|
||||
import IComment from '../../interfaces/IComment';
|
||||
import { CommentRepliesState } from '../../reducers/commentRepliesReducer';
|
||||
@@ -56,9 +56,7 @@ class CommentsP extends React.Component<Props> {
|
||||
} = this.props;
|
||||
|
||||
return (
|
||||
<div className="comments">
|
||||
<h2>Comments</h2>
|
||||
|
||||
<div className="commentsContainer">
|
||||
<NewComment
|
||||
body={replies.find(reply => reply.commentId === -1) && replies.find(reply => reply.commentId === -1).body}
|
||||
parentId={null}
|
||||
@@ -73,6 +71,10 @@ class CommentsP extends React.Component<Props> {
|
||||
{ areLoading ? <Spinner /> : null }
|
||||
{ error ? <DangerText>{error}</DangerText> : null }
|
||||
|
||||
<span className="commentsTitle">
|
||||
activity • {comments.length} comments
|
||||
</span>
|
||||
|
||||
<CommentList
|
||||
comments={comments}
|
||||
replies={replies}
|
||||
|
||||
@@ -20,9 +20,14 @@ const NewComment = ({
|
||||
<textarea
|
||||
value={body}
|
||||
onChange={handleChange}
|
||||
placeholder="Leave a comment"
|
||||
className="newCommentBody"
|
||||
/>
|
||||
<Button onClick={() => handleSubmit(body, parentId)}>Submit</Button>
|
||||
<Button
|
||||
onClick={() => handleSubmit(body, parentId)}
|
||||
className="submitCommentButton">
|
||||
Submit
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user