diff options
author | Dessalines <tyhou13@gmx.com> | 2019-04-09 14:21:19 -0700 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2019-04-09 14:21:19 -0700 |
commit | 4bfb32c6658d3547ea7728fcf0927b187685658e (patch) | |
tree | 2c4f2fa5c61f1e1fd2d5b2c26996fa78f83927f2 /ui/src/components | |
parent | 92670d1a5eea86e277d958467684b0632131d6c4 (diff) |
Styling, sidebar message.
Diffstat (limited to 'ui/src/components')
-rw-r--r-- | ui/src/components/communities.tsx | 2 | ||||
-rw-r--r-- | ui/src/components/main.tsx | 30 | ||||
-rw-r--r-- | ui/src/components/navbar.tsx | 6 | ||||
-rw-r--r-- | ui/src/components/post.tsx | 6 | ||||
-rw-r--r-- | ui/src/components/sidebar.tsx | 2 |
5 files changed, 30 insertions, 16 deletions
diff --git a/ui/src/components/communities.tsx b/ui/src/components/communities.tsx index cf42238e..268aa115 100644 --- a/ui/src/components/communities.tsx +++ b/ui/src/components/communities.tsx @@ -45,7 +45,7 @@ export class Communities extends Component<any, CommunitiesState> { render() { return ( - <div class="container-fluid"> + <div class="container"> {this.state.loading ? <h4 class=""><svg class="icon icon-spinner spin"><use xlinkHref="#icon-spinner"></use></svg></h4> : <div> diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx index 477eec65..8faf858a 100644 --- a/ui/src/components/main.tsx +++ b/ui/src/components/main.tsx @@ -5,7 +5,7 @@ import { retryWhen, delay, take } from 'rxjs/operators'; import { UserOperation, CommunityUser, GetFollowedCommunitiesResponse } from '../interfaces'; import { WebSocketService, UserService } from '../services'; import { PostListings } from './post-listings'; -import { msgOp } from '../utils'; +import { msgOp, repoUrl } from '../utils'; interface State { subscribedCommunities: Array<CommunityUser>; @@ -46,17 +46,15 @@ export class Main extends Component<any, State> { return ( <div class="container"> <div class="row"> - <div class="col-12 col-md-9"> + <div class="col-12 col-md-8"> <PostListings /> </div> - <div class="col-12 col-md-3"> - <h4>A Landing message</h4> - {UserService.Instance.loggedIn && + <div class="col-12 col-md-4"> + {UserService.Instance.loggedIn ? <div> {this.state.loading ? - <h4 class="mt-3"><svg class="icon icon-spinner spin"><use xlinkHref="#icon-spinner"></use></svg></h4> : + <h4><svg class="icon icon-spinner spin"><use xlinkHref="#icon-spinner"></use></svg></h4> : <div> - <hr /> <h4>Subscribed forums</h4> <ul class="list-unstyled"> {this.state.subscribedCommunities.map(community => @@ -65,7 +63,8 @@ export class Main extends Component<any, State> { </ul> </div> } - </div> + </div> : + this.landing() } </div> </div> @@ -73,6 +72,21 @@ export class Main extends Component<any, State> { ) } + landing() { + return ( + <div> + <h4>Welcome to + <svg class="icon mx-2"><use xlinkHref="#icon-mouse"></use></svg> + <a href={repoUrl}>Lemmy<sup>Beta</sup></a> + </h4> + <p>Lemmy is a <a href="https://en.wikipedia.org/wiki/Link_aggregation">link aggregator</a> / reddit alternative, intended to work in the <a href="https://en.wikipedia.org/wiki/Fediverse">fediverse</a>.</p> + <p>Its self-hostable, has live-updating comment threads, and is tiny (<code>~80kB</code>). Federation into the ActivityPub network is on the roadmap.</p> + <p>This is a <b>very early beta version</b>, and a lot of features are currently broken or missing.</p> + <p>Suggest new features or report bugs <a href={repoUrl}>here.</a></p> + <p>Made with <a href="https://www.rust-lang.org">Rust</a>, <a href="https://actix.rs/">Actix</a>, <a href="https://www.infernojs.org">Inferno</a>, <a href="https://www.typescriptlang.org/">Typescript</a>.</p> + </div> + ) + } parseMessage(msg: any) { console.log(msg); diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index ca0c5a2a..a9d95362 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -25,7 +25,7 @@ export class Navbar extends Component<any, NavbarState> { // Subscribe to user changes UserService.Instance.sub.subscribe(user => { - let loggedIn: boolean = user !== null; + let loggedIn: boolean = user !== undefined; this.setState({isLoggedIn: loggedIn}); }); } @@ -40,7 +40,7 @@ export class Navbar extends Component<any, NavbarState> { // TODO toggle css collapse navbar() { return ( - <nav class="navbar navbar-expand-sm navbar-light bg-light p-0 px-3 shadow"> + <nav class="container navbar navbar-expand-sm navbar-light navbar-bg p-0 px-3"> <a title={version} class="navbar-brand" href="#"> <svg class="icon mr-2"><use xlinkHref="#icon-mouse"></use></svg> Lemmy @@ -74,7 +74,7 @@ export class Navbar extends Component<any, NavbarState> { <a role="button" class="dropdown-item pointer" onClick={ linkEvent(this, this.handleLogoutClick) }>Logout</a> </div> </li> : - <Link class="nav-link" to="/login">Login</Link> + <Link class="nav-link" to="/login">Login / Sign up</Link> } </ul> </div> diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx index f36893f6..5ca3f770 100644 --- a/ui/src/components/post.tsx +++ b/ui/src/components/post.tsx @@ -101,17 +101,17 @@ export class Post extends Component<any, PostState> { sortRadios() { return ( <div class="btn-group btn-group-toggle mb-3"> - <label className={`btn btn-sm btn-secondary ${this.state.commentSort === CommentSortType.Hot && 'active'}`}>Hot + <label className={`btn btn-sm btn-secondary pointer ${this.state.commentSort === CommentSortType.Hot && 'active'}`}>Hot <input type="radio" value={CommentSortType.Hot} checked={this.state.commentSort === CommentSortType.Hot} onChange={linkEvent(this, this.handleCommentSortChange)} /> </label> - <label className={`btn btn-sm btn-secondary ${this.state.commentSort === CommentSortType.Top && 'active'}`}>Top + <label className={`btn btn-sm btn-secondary pointer ${this.state.commentSort === CommentSortType.Top && 'active'}`}>Top <input type="radio" value={CommentSortType.Top} checked={this.state.commentSort === CommentSortType.Top} onChange={linkEvent(this, this.handleCommentSortChange)} /> </label> - <label className={`btn btn-sm btn-secondary ${this.state.commentSort === CommentSortType.New && 'active'}`}>New + <label className={`btn btn-sm btn-secondary pointer ${this.state.commentSort === CommentSortType.New && 'active'}`}>New <input type="radio" value={CommentSortType.New} checked={this.state.commentSort === CommentSortType.New} onChange={linkEvent(this, this.handleCommentSortChange)} /> diff --git a/ui/src/components/sidebar.tsx b/ui/src/components/sidebar.tsx index 6fd2bb5c..68fc458b 100644 --- a/ui/src/components/sidebar.tsx +++ b/ui/src/components/sidebar.tsx @@ -56,7 +56,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> { } </ul> } - <ul class="list-inline"> + <ul class="mt-1 list-inline"> <li className="list-inline-item"><Link className="badge badge-light" to="/communities">{community.category_name}</Link></li> <li className="list-inline-item badge badge-light">{community.number_of_subscribers} Subscribers</li> <li className="list-inline-item badge badge-light">{community.number_of_posts} Posts</li> |