LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-27 06:41:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding user dropdown.

Browse source 
- Fixes #54.
- Fixed some styling.
This commit is contained in:
Dessalines 2019-04-08 17:04:03 -07:00
parent 8ebed4e945
commit 894a2e4586
7 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/src/components/comment-node.tsx
View file

@ -46,7 +46,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
<div className="details ml-4">
<ul class="list-inline mb-0 text-muted small">
<li className="list-inline-item">
<Link to={`/user/${node.comment.creator_id}`}>{node.comment.creator_name}</Link>
<Link className="text-info" to={`/user/${node.comment.creator_id}`}>{node.comment.creator_name}</Link>
</li>
<li className="list-inline-item">
<span>(

2
ui/src/components/community.tsx
View file

@ -63,7 +63,7 @@ export class Community extends Component<any, State> {
<h4><svg class="icon icon-spinner spin"><use xlinkHref="#icon-spinner"></use></svg></h4> :
<div class="row">
<div class="col-12 col-lg-9">
<h4>/f/{this.state.community.name}</h4>
<h4>{this.state.community.title}</h4>
<PostListings communityId={this.state.communityId} />
</div>
<div class="col-12 col-lg-3">

4
ui/src/components/main.tsx
View file

@ -46,10 +46,10 @@ export class Main extends Component<any, State> {
return (
<div class="container">
<div class="row">
<div class="col-12 col-lg-9">
<div class="col-12 col-md-9">
<PostListings />
</div>
<div class="col-12 col-lg-3">
<div class="col-12 col-md-3">
<h4>A Landing message</h4>
{UserService.Instance.loggedIn &&
<div>

49
ui/src/components/navbar.tsx
View file

@ -3,11 +3,24 @@ import { Link } from 'inferno-router';
import { repoUrl } from '../utils';
import { UserService } from '../services';
export class Navbar extends Component<any, any> {
interface NavbarState {
isLoggedIn: boolean;
expanded: boolean;
expandUserDropdown: boolean;
}
export class Navbar extends Component<any, NavbarState> {
emptyState: NavbarState = {
isLoggedIn: UserService.Instance.loggedIn,
expanded: false,
expandUserDropdown: false
}
constructor(props: any, context: any) {
super(props, context);
this.state = {isLoggedIn: UserService.Instance.loggedIn, expanded: false};
this.state = this.emptyState;
this.handleOverviewClick = this.handleOverviewClick.bind(this);
// Subscribe to user changes
UserService.Instance.sub.subscribe(user => {
@ -50,24 +63,44 @@ export class Navbar extends Component<any, any> {
</li>
</ul>
<ul class="navbar-nav ml-auto mr-2">
<li class="nav-item">
{this.state.isLoggedIn ?
<a role="button" class="nav-link pointer" onClick={ linkEvent(this, this.handleLogoutClick) }>Logout</a> :
{this.state.isLoggedIn ?
<li className={`nav-item dropdown ${this.state.expandUserDropdown && 'show'}`}>
<a class="pointer nav-link dropdown-toggle" onClick={linkEvent(this, this.expandUserDropdown)} role="button">
{UserService.Instance.user.username}
</a>
<div className={`dropdown-menu dropdown-menu-right ${this.state.expandUserDropdown && 'show'}`}>
<a role="button" class="dropdown-item pointer" onClick={linkEvent(this, this.handleOverviewClick)}>Overview</a>
<a role="button" class="dropdown-item pointer" onClick={ linkEvent(this, this.handleLogoutClick) }>Logout</a>
</div>
</li> :
<Link class="nav-link" to="/login">Login</Link>
}
</li>
}
</ul>
</div>
</nav>
);
}
handleLogoutClick() {
expandUserDropdown(i: Navbar) {
i.state.expandUserDropdown = !i.state.expandUserDropdown;
i.setState(i.state);
}
handleLogoutClick(i: Navbar) {
i.state.expandUserDropdown = false;
UserService.Instance.logout();
}
handleOverviewClick(i: Navbar) {
i.state.expandUserDropdown = false;
i.setState(i.state);
let userPage = `/user/${UserService.Instance.user.id}`;
i.context.router.history.push(userPage);
}
expandNavbar(i: Navbar) {
i.state.expanded = !i.state.expanded;
i.setState(i.state);
}
}

4
ui/src/components/post-listing.tsx
View file

@ -79,7 +79,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<ul class="list-inline mb-0 text-muted small">
<li className="list-inline-item">
<span>by </span>
<Link to={`/user/${post.creator_id}`}>{post.creator_name}</Link>
<Link className="text-info" to={`/user/${post.creator_id}`}>{post.creator_name}</Link>
{this.props.showCommunity &&
<span>
<span> to </span>
@ -99,7 +99,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</span>
</li>
<li className="list-inline-item">
<Link to={`/post/${post.id}`}>{post.number_of_comments} Comments</Link>
<Link className="text-muted" to={`/post/${post.id}`}>{post.number_of_comments} Comments</Link>
</li>
</ul>
{this.myPost &&

3
ui/src/components/sidebar.tsx
View file

@ -42,7 +42,8 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
let community = this.props.community;
return (
<div>
<h4>{community.title}</h4>
<h4 className="mb-0">{community.title}</h4>
<Link className="text-muted" to={`/community/${community.id}`}>/f/{community.name}</Link>
{this.amMod &&
<ul class="list-inline mb-1 text-muted small font-weight-bold">
<li className="list-inline-item">

4
ui/src/components/user.tsx
View file

@ -77,7 +77,7 @@ export class User extends Component<any, UserState> {
return (
<div class="container">
<div class="row">
<div class="col-12 col-lg-9">
<div class="col-12 col-md-9">
<h4>/u/{this.state.user.name}</h4>
{this.selects()}
{this.state.view == View.Overview &&
@ -90,7 +90,7 @@ export class User extends Component<any, UserState> {
this.posts()
}
</div>
<div class="col-12 col-lg-3">
<div class="col-12 col-md-3">
{this.userInfo()}
{this.moderates()}
{this.follows()}