fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-25 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

User details ui fix (#1032)

Browse source 
* User details ui fix

* User details ui fix
This commit is contained in:
ernestwisniewski 2020-07-28 02:05:29 +02:00 committed by GitHub
parent 5ada39f39c
commit aaa4361158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/src/components/comment-node.tsx vendored
View file

@ -64,6 +64,7 @@ interface CommentNodeState {
interface CommentNodeProps {
node: CommentNodeI;
noBorder?: boolean;
noIndent?: boolean;
viewOnly?: boolean;
locked?: boolean;
@ -136,9 +137,9 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
>
<div
id={`comment-${node.comment.id}`}
className={`details comment-node border-top border-light py-2 ${
this.isCommentNew ? 'mark' : ''
}`}
className={`details comment-node py-2 ${
!this.props.noBorder ? 'border-top border-light' : ''
} ${this.isCommentNew ? 'mark' : ''}`}
style={
!this.props.noIndent &&
this.props.node.comment.parent_id &&

2
ui/src/components/comment-nodes.tsx vendored
View file

@ -16,6 +16,7 @@ interface CommentNodesProps {
moderators?: Array<CommunityUser>;
admins?: Array<UserView>;
postCreatorId?: number;
noBorder?: boolean;
noIndent?: boolean;
viewOnly?: boolean;
locked?: boolean;
@ -42,6 +43,7 @@ export class CommentNodes extends Component<
<CommentNode
key={node.comment.id}
node={node}
noBorder={this.props.noBorder}
noIndent={this.props.noIndent}
viewOnly={this.props.viewOnly}
locked={this.props.locked}

61
ui/src/components/user-details.tsx vendored
View file

@ -146,25 +146,30 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
return (
<div>
{combined.map(i => (
<div>
{i.type === 'posts' ? (
<PostListing
post={i.data as Post}
admins={this.props.admins}
showCommunity
enableDownvotes={this.props.enableDownvotes}
enableNsfw={this.props.enableNsfw}
/>
) : (
<CommentNodes
nodes={[{ comment: i.data as Comment }]}
admins={this.props.admins}
noIndent
showContext
enableDownvotes={this.props.enableDownvotes}
/>
)}
</div>
<>
<div>
{i.type === 'posts' ? (
<PostListing
post={i.data as Post}
admins={this.props.admins}
showCommunity
enableDownvotes={this.props.enableDownvotes}
enableNsfw={this.props.enableNsfw}
/>
) : (
<CommentNodes
nodes={[{ comment: i.data as Comment }]}
admins={this.props.admins}
noBorder
noIndent
showCommunity
showContext
enableDownvotes={this.props.enableDownvotes}
/>
)}
</div>
<hr class="my-3" />
</>
))}
</div>
);
@ -177,6 +182,7 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
nodes={commentsToFlatNodes(this.state.comments)}
admins={this.props.admins}
noIndent
showCommunity
showContext
enableDownvotes={this.props.enableDownvotes}
/>
@ -188,13 +194,16 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
return (
<div>
{this.state.posts.map(post => (
<PostListing
post={post}
admins={this.props.admins}
showCommunity
enableDownvotes={this.props.enableDownvotes}
enableNsfw={this.props.enableNsfw}
/>
<>
<PostListing
post={post}
admins={this.props.admins}
showCommunity
enableDownvotes={this.props.enableDownvotes}
enableNsfw={this.props.enableNsfw}
/>
<hr class="my-3" />
</>
))}
</div>
);