@ -40,6 +40,7 @@ const messages = defineMessages({
const mapStateToProps = state => ( {
const mapStateToProps = state => ( {
myAccount : state . getIn ( [ 'accounts' , me ] ) ,
myAccount : state . getIn ( [ 'accounts' , me ] ) ,
columns : state . getIn ( [ 'settings' , 'columns' ] ) ,
unreadFollowRequests : state . getIn ( [ 'user_lists' , 'follow_requests' , 'items' ] , ImmutableList ( ) ) . size ,
unreadFollowRequests : state . getIn ( [ 'user_lists' , 'follow_requests' , 'items' ] , ImmutableList ( ) ) . size ,
} ) ;
} ) ;
@ -89,60 +90,66 @@ class GettingStarted extends ImmutablePureComponent {
}
}
render ( ) {
render ( ) {
const { intl , myAccount , multiColumn , unreadFollowRequests } = this . props ;
const { intl , myAccount , columns , multiColumn , unreadFollowRequests } = this . props ;
const navItems = [ ] ;
const navItems = [ ] ;
let i = 1 ;
let height = ( multiColumn ) ? 0 : 60 ;
let height = ( multiColumn ) ? 0 : 60 ;
if ( multiColumn ) {
if ( multiColumn ) {
navItems . push (
navItems . push (
< ColumnSubheading key = { i ++ } text = { intl . formatMessage ( messages . discover ) } / > ,
< ColumnSubheading key = 'header-discover' text = { intl . formatMessage ( messages . discover ) } / > ,
< ColumnLink key = { i ++ } icon = 'users' text = { intl . formatMessage ( messages . community _timeline ) } to = '/timelines/public/local' / > ,
< ColumnLink key = 'community_timeline' icon = 'users' text = { intl . formatMessage ( messages . community _timeline ) } to = '/timelines/public/local' / > ,
< ColumnLink key = { i ++ } icon = 'globe' text = { intl . formatMessage ( messages . public _timeline ) } to = '/timelines/public' / > ,
< ColumnLink key = 'public_timeline' icon = 'globe' text = { intl . formatMessage ( messages . public _timeline ) } to = '/timelines/public' / > ,
) ;
) ;
height += 34 + 48 * 2 ;
height += 34 + 48 * 2 ;
if ( profile _directory ) {
if ( profile _directory ) {
navItems . push (
navItems . push (
< ColumnLink key = { i ++ } icon = 'address-book' text = { intl . formatMessage ( messages . profile _directory ) } to = '/directory' / > ,
< ColumnLink key = 'directory' icon = 'address-book' text = { intl . formatMessage ( messages . profile _directory ) } to = '/directory' / > ,
) ;
) ;
height += 48 ;
height += 48 ;
}
}
navItems . push (
navItems . push (
< ColumnSubheading key = { i ++ } text = { intl . formatMessage ( messages . personal ) } / > ,
< ColumnSubheading key = 'header-personal' text = { intl . formatMessage ( messages . personal ) } / > ,
) ;
) ;
height += 34 ;
height += 34 ;
} else if ( profile _directory ) {
} else if ( profile _directory ) {
navItems . push (
navItems . push (
< ColumnLink key = { i ++ } icon = 'address-book' text = { intl . formatMessage ( messages . profile _directory ) } to = '/directory' / > ,
< ColumnLink key = 'directory' icon = 'address-book' text = { intl . formatMessage ( messages . profile _directory ) } to = '/directory' / > ,
) ;
) ;
height += 48 ;
height += 48 ;
}
}
if ( multiColumn && ! columns . find ( item => item . get ( 'id' ) === 'HOME' ) ) {
navItems . push (
< ColumnLink key = 'home' icon = 'home' text = { intl . formatMessage ( messages . home _timeline ) } to = '/timelines/home' / > ,
) ;
height += 48 ;
}
navItems . push (
navItems . push (
< ColumnLink key = { i ++ } icon = 'envelope' text = { intl . formatMessage ( messages . direct ) } to = '/timelines/direct' / > ,
< ColumnLink key = 'direct' icon = 'envelope' text = { intl . formatMessage ( messages . direct ) } to = '/timelines/direct' / > ,
< ColumnLink key = { i ++ } icon = 'bookmark' text = { intl . formatMessage ( messages . bookmarks ) } to = '/bookmarks' / > ,
< ColumnLink key = 'bookmark' icon = 'bookmark' text = { intl . formatMessage ( messages . bookmarks ) } to = '/bookmarks' / > ,
< ColumnLink key = { i ++ } icon = 'star' text = { intl . formatMessage ( messages . favourites ) } to = '/favourites' / > ,
< ColumnLink key = 'favourites' icon = 'star' text = { intl . formatMessage ( messages . favourites ) } to = '/favourites' / > ,
< ColumnLink key = { i ++ } icon = 'list-ul' text = { intl . formatMessage ( messages . lists ) } to = '/lists' / > ,
< ColumnLink key = 'lists' icon = 'list-ul' text = { intl . formatMessage ( messages . lists ) } to = '/lists' / > ,
) ;
) ;
height += 48 * 4 ;
height += 48 * 4 ;
if ( myAccount . get ( 'locked' ) || unreadFollowRequests > 0 ) {
if ( myAccount . get ( 'locked' ) || unreadFollowRequests > 0 ) {
navItems . push ( < ColumnLink key = { i ++ } icon = 'user-plus' text = { intl . formatMessage ( messages . follow _requests ) } badge = { badgeDisplay ( unreadFollowRequests , 40 ) } to = '/follow_requests' / > ) ;
navItems . push ( < ColumnLink key = 'follow_requests' icon = 'user-plus' text = { intl . formatMessage ( messages . follow _requests ) } badge = { badgeDisplay ( unreadFollowRequests , 40 ) } to = '/follow_requests' / > ) ;
height += 48 ;
height += 48 ;
}
}
if ( ! multiColumn ) {
if ( ! multiColumn ) {
navItems . push (
navItems . push (
< ColumnSubheading key = { i ++ } text = { intl . formatMessage ( messages . settings _subheading ) } / > ,
< ColumnSubheading key = 'header-settings' text = { intl . formatMessage ( messages . settings _subheading ) } / > ,
< ColumnLink key = { i ++ } icon = 'gears' text = { intl . formatMessage ( messages . preferences ) } href = '/settings/preferences' / > ,
< ColumnLink key = 'preferences' icon = 'gears' text = { intl . formatMessage ( messages . preferences ) } href = '/settings/preferences' / > ,
) ;
) ;
height += 34 + 48 ;
height += 34 + 48 ;