diff --git a/src/ui/menu/menuView.tsx b/src/ui/menu/menuView.tsx index 640d25d4bd..70656bff1d 100644 --- a/src/ui/menu/menuView.tsx +++ b/src/ui/menu/menuView.tsx @@ -96,10 +96,6 @@ function renderProfileActions(user: Session) { {plural('nbFriendsOnline', friendsApi.count())} -
  • - - {plural('nbFollowers', user.nbFollowers || 0)} -
  • {i18n('logOut')} diff --git a/src/ui/user/related/RelatedCtrl.ts b/src/ui/user/related/RelatedCtrl.ts index 2c68a0628f..f23e77c9fe 100644 --- a/src/ui/user/related/RelatedCtrl.ts +++ b/src/ui/user/related/RelatedCtrl.ts @@ -62,13 +62,7 @@ export default class RelatedCtrl { } private getData(userId: string, page: number): Promise { - return this.currentTab === 0 ? - xhr.followers(userId, page) - .then(d => { - this.followers = (this.followers || []).concat(d.paginator.currentPageResults) - this.followersPaginator = d.paginator - }) : - xhr.following(userId, page) + return xhr.following(userId, page) .then(d => { this.following = (this.following || []).concat(d.paginator.currentPageResults) this.followingPaginator = d.paginator diff --git a/src/ui/user/related/related.ts b/src/ui/user/related/related.ts index 5af65b455c..3252b46b0c 100644 --- a/src/ui/user/related/related.ts +++ b/src/ui/user/related/related.ts @@ -8,6 +8,8 @@ import { dropShadowHeader, backButton } from '../../shared/common' import RelatedCtrl from './RelatedCtrl' import { renderBody } from './relatedView' +import i18n from '../../../i18n' + interface Attrs { id: string tab?: string @@ -28,13 +30,10 @@ export default { safeStringToNum(vnode.attrs.tab) ) }, - view({ attrs }) { - const name = attrs.username ? h('div.title', [ - h('span', [ - ...(attrs.title ? [h('span.userTitle', attrs.title), ' '] : []), - attrs.username - ]) - ]) : attrs.id + view() { + const name = h('div.title', [ + h('span', i18n('friends')) + ]) return layout.free( dropShadowHeader(null, backButton(name)), diff --git a/src/ui/user/related/relatedView.tsx b/src/ui/user/related/relatedView.tsx index ae0d8f0e2a..5c58e8c371 100644 --- a/src/ui/user/related/relatedView.tsx +++ b/src/ui/user/related/relatedView.tsx @@ -1,36 +1,21 @@ import h from 'mithril/hyperscript' import router from '../../../router' import { gameIcon } from '../../../utils' -import i18n, { plural } from '../../../i18n' +import i18n from '../../../i18n' import spinner from '../../../spinner' import { Related } from '../../../lichess/interfaces/user' import { Paginator } from '../../../lichess/interfaces' import * as helper from '../../helper' -import TabNavigation from '../../shared/TabNavigation' import TabView from '../../shared/TabView' - +import challengeForm from '../../challengeForm' import RelatedCtrl from './RelatedCtrl' export function renderBody(ctrl: RelatedCtrl) { const tabsContent = [ - { id: 'followers', f: () => renderContent(ctrl, ctrl.followers, ctrl.followersPaginator) }, { id: 'following', f: () => renderContent(ctrl, ctrl.following, ctrl.followingPaginator) }, ] - const nbFollowers = ctrl.followersPaginator && ctrl.followersPaginator.nbResults - const nbFollowing = ctrl.followingPaginator && ctrl.followingPaginator.nbResults - return [ - h('div.tabs-nav-header.subHeader', - h(TabNavigation, { - buttons: [ - { label: plural('nbFollowers', nbFollowers || 0, nbFollowers ? undefined : '') }, - { label: plural('nbFollowing', nbFollowing || 0, nbFollowing ? undefined : '') }, - ], - selectedIndex: ctrl.currentTab, - onTabChange: ctrl.onTabChange - }), - ), h(TabView, { selectedIndex: ctrl.currentTab, tabs: tabsContent, @@ -98,6 +83,19 @@ function renderPlayer(ctrl: RelatedCtrl, obj: Related, i: number) { {perf.rating} : null } +
    + { + e.stopPropagation() + close() + challengeForm.open(obj.user) + })} /> + {' '} + { + e.stopPropagation() + close() + router.set(`/inbox/new/${obj.user}`) + })} /> +
    {obj.followable ?
    diff --git a/src/ui/user/userView.tsx b/src/ui/user/userView.tsx index 723b83ca96..d71deb13ff 100644 --- a/src/ui/user/userView.tsx +++ b/src/ui/user/userView.tsx @@ -248,7 +248,7 @@ function renderActions(ctrl: IUserCtrl, user: ProfileUser) {
    - {plural('nbFollowers', user.nbFollowers)} + {i18n('friends')}
    { !ctrl.isMe() ?