Fix lints for sidebarwidget and sidebaruser (#4418) [ci skip]

This commit is contained in:
Karin Hendrikse 2019-10-14 20:43:26 +02:00 committed by Mac Siri
parent 293ba5231b
commit 0575648407
3 changed files with 26 additions and 23 deletions

View file

@ -5,7 +5,7 @@ HTMLDocument.prototype.ready = new Promise(resolve => {
if (document.readyState !== 'loading') {
return resolve();
}
document.addEventListener('DOMContentLoaded', () => resolve());
return document.addEventListener('DOMContentLoaded', () => resolve());
});
if (document.getElementById('widget-00001') === null) {

View file

@ -28,16 +28,14 @@ class SidebarWidget extends Component {
}
getSuggestedUsers() {
fetch(
`/api/users?state=sidebar_suggestions&tag=${this.state.tagInfo.name}`,
{
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
credentials: 'same-origin',
const { tagInfo } = this.state;
fetch(`/api/users?state=sidebar_suggestions&tag=${tagInfo.name}`, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
)
credentials: 'same-origin',
})
.then(response => response.json())
.then(json => {
this.setState({ suggestedUsers: json });
@ -48,9 +46,10 @@ class SidebarWidget extends Component {
}
followUser(user) {
const { suggestedUsers } = this.state;
const updatedUser = user;
const updatedSuggestedUsers = this.state.suggestedUsers;
const userIndex = this.state.suggestedUsers.indexOf(user);
const updatedSuggestedUsers = suggestedUsers;
const userIndex = suggestedUsers.indexOf(user);
const followBtn = document.getElementById(
`widget-list-item__follow-button-${updatedUser.username}`,
@ -66,7 +65,8 @@ class SidebarWidget extends Component {
}
render() {
const users = this.state.suggestedUsers.map((user, index) => (
const { suggestedUsers } = this.state;
const users = suggestedUsers.map((user, index) => (
<SidebarUser
key={user.id}
user={user}
@ -75,7 +75,7 @@ class SidebarWidget extends Component {
/>
));
if (this.state.suggestedUsers.length > 0) {
if (suggestedUsers.length > 0) {
return (
<div className="widget" id="widget-00001">
<div className="widget-suggested-follows-container">

View file

@ -1,5 +1,6 @@
import { h, Component } from 'preact';
import PropTypes from 'prop-types';
import userPropTypes from '../src/components/common-prop-types/user-prop-types';
class SidebarUser extends Component {
constructor(props) {
@ -8,31 +9,33 @@ class SidebarUser extends Component {
}
onClick() {
this.props.followUser(this.props.user);
const { followUser, user } = this.props;
followUser(user);
}
render() {
const { user, index } = this.props;
return (
<div className="widget-list-item__suggestions">
<div className="widget-list-item__content">
<a href={`/${this.props.user.username}`}>
<a href={`/${user.username}`}>
<img
src={this.props.user.profile_image_url}
alt={this.props.user.name}
src={user.profile_image_url}
alt={user.name}
className="widget-list-item__profile-pic"
/>
{this.props.user.name}
{user.name}
</a>
<button
className="widget-list-item__follow-button"
type="button"
onClick={this.onClick}
id={`widget-list-item__follow-button-${this.props.user.username}`}
id={`widget-list-item__follow-button-${user.username}`}
>
{this.props.user.following ? '✓ FOLLOWING' : '+ FOLLOW'}
{user.following ? '✓ FOLLOWING' : '+ FOLLOW'}
</button>
</div>
{this.props.index === 2 ? <br /> : <hr />}
{index === 2 ? <br /> : <hr />}
</div>
);
}
@ -40,7 +43,7 @@ class SidebarUser extends Component {
SidebarUser.propTypes = {
followUser: PropTypes.func.isRequired,
user: PropTypes.object.isRequired,
user: PropTypes.objectOf(userPropTypes).isRequired,
index: PropTypes.number.isRequired,
};