random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated profile components to display loading placeholders

Browse Source 
• Updated:
- profile components to display loading placeholders instead of error message on load
This commit is contained in:
mgabdev 2020-07-29 15:49:18 -05:00
parent 13127960c4
commit 60f6900df7
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/gabsocial/components/profile_header.js
View File

@ -142,7 +142,7 @@ class ProfileHeader extends ImmutablePureComponent {
} }
const headerSrc = !!account ? account.get('header') : undefined const headerSrc = !!account ? account.get('header') : undefined
const headerMissing = headerSrc.indexOf(PLACEHOLDER_MISSING_HEADER_SRC) > -1 || !headerSrc const headerMissing = !headerSrc ? true : headerSrc.indexOf(PLACEHOLDER_MISSING_HEADER_SRC) > -1
const avatarSize = headerMissing ? 75 : 150 const avatarSize = headerMissing ? 75 : 150
const top = headerMissing ? -46 : -380 const top = headerMissing ? -46 : -380

3
app/javascript/gabsocial/features/account_timeline.js
View File

@ -20,7 +20,7 @@ const mapStateToProps = (state, { account, commentsOnly = false }) => {
accountId, accountId,
statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList), statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
featuredStatusIds: commentsOnly ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList), featuredStatusIds: commentsOnly ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList),
isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']), isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading'], true),
hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']), hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
} }
} }
@ -87,6 +87,7 @@ class AccountTimeline extends ImmutablePureComponent {
statusIds={statusIds} statusIds={statusIds}
featuredStatusIds={featuredStatusIds} featuredStatusIds={featuredStatusIds}
isLoading={isLoading} isLoading={isLoading}
showLoading={isLoading}
hasMore={hasMore} hasMore={hasMore}
onLoadMore={this.handleLoadMore} onLoadMore={this.handleLoadMore}
emptyMessage={intl.formatMessage(messages.empty)} emptyMessage={intl.formatMessage(messages.empty)}

2
app/javascript/gabsocial/features/followers.js
View File

@ -19,7 +19,7 @@ const mapStateToProps = (state, { account }) => {
accountId, accountId,
accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']), accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']), hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading']), isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
} }
} }

2
app/javascript/gabsocial/features/following.js
View File

@ -19,7 +19,7 @@ const mapStateToProps = (state, { account }) => {
accountId, accountId,
accountIds: state.getIn(['user_lists', 'following', accountId, 'items']), accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']), hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading']), isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
} }
} }