Skip to content

Commit a7e1763

Browse files
committed
solve some design issues
1 parent 6863ffa commit a7e1763

7 files changed

Lines changed: 14 additions & 11 deletions

File tree

src/components/ReposList/ReposList.jsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,25 @@ class ReposList extends Component {
2121
if (repos.data[0]) {
2222
const self = this;
2323
var reposList = repos.data.map(function(repo){
24-
return <a key={repo.id} href="#" onClick={ e => self.selectRepo(repo.owner.login, repo.name) } className="list-group-item">{repo.name}</a>;
24+
return (<a key={repo.id} href="#" onClick={ e => self.selectRepo(repo.owner.login, repo.name) } className="list-group-item">
25+
{repo.name}
26+
<span className="text-color-white badge">{repo.stargazers_count} <Icon name="star"/></span>
27+
</a>);
2528
})
2629
}
2730

28-
console.log(this.props)
2931
return (
3032
<div className="reposlist-wrapper">
3133
<div>
3234
<h4 className="lightslategray-color"><b>Repositories</b></h4>
33-
{ repos.fetching ? <h4 className="lightslategray-color text-center"><b><Icon spin name="spinner" /> Loading...</b></h4> :
35+
{
36+
repos.fetching ? <h4 className="lightslategray-color text-center"><b><Icon spin name="circle-o-notch" /> Loading...</b></h4> :
3437
repos.fetched ?
3538
<ul className="list-group">
3639
{reposList}
3740
</ul>:
38-
<h6 className="lightslategray-color text-center"><b>Your repos will load here.</b></h6> }
41+
<h6 className="lightslategray-color text-center"><b>Your repos will load here.</b></h6>
42+
}
3943
</div>
4044
</div>
4145
);

src/components/SearchSideBar/SearchSideBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class SearchSideBar extends Component {
4646
{usersList}
4747
</datalist>
4848
<h5>
49-
{this.props.users.fetching ? <span><Icon spin name="spinner" /> Loading...</span>: ""}
49+
{this.props.users.fetching ? <span><Icon spin name="circle-o-notch" /> Loading...</span>: ""}
5050
</h5>
5151
<button className="btn btn-primary" onClick={ e => this.handleClick(this.state.value) }>Submit</button>
5252
</from>

src/components/UserDetailsContainer/UserDetailsContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class UserDetailsContainer extends Component {
4545
<div>
4646
<br/><br/>
4747
<h2 className="lightslategray-color text-center">
48-
<Icon spin name="spinner" />
48+
<Icon spin name="circle-o-notch" />
4949
<b> Loading...</b>
5050
</h2>
5151
</div>

src/components/UserEventsList/UserEventsList.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ class UserEventsList extends Component {
206206
<label><input onChange={(e) => this.handleFilterChange('PullRequestEvent', e)} type="checkbox" value="" />PR</label>
207207
</div>
208208
<div className="checkbox-inline disabled">
209-
<label><input onChange={(e) => this.handleFilterChange('CreateEvent', e)} type="checkbox" value="" />create</label>
209+
<label><input onChange={(e) => this.handleFilterChange('CreateEvent', e)} type="checkbox" value="" />Create</label>
210210
</div>
211211
<div className="checkbox-inline disabled">
212-
<label><input onChange={(e) => this.handleFilterChange('ForkEvent', e)} type="checkbox" value="" />forks</label>
212+
<label><input onChange={(e) => this.handleFilterChange('ForkEvent', e)} type="checkbox" value="" />Forks</label>
213213
</div>
214214
</form>
215215
</div>

src/components/UserSummary/UserSummary.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class UserSummary extends Component {
99
return (
1010
<div>
1111
{
12-
user.fetching ? <h4 className="text-center lightslategray-color"><b>Loading...</b></h4> :
12+
user.fetching ? <h4 className="text-center lightslategray-color"><b><Icon spin name="circle-o-notch" /> Loading...</b></h4> :
1313
user.fetched ?
1414
<div>
1515
<div><img src={user.data.avatar_url} className="img-responsive" alt=""/></div>

src/containers/App/App.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import UserSummary from '../../components/UserSummary/UserSummary.jsx';
77
import ReposList from '../../components/ReposList/ReposList.jsx';
88
import UserDetailsContainer from '../../components/UserDetailsContainer/UserDetailsContainer.jsx';
99

10-
1110
class App extends Component {
1211
render() {
1312
return (

src/redux/actions/singleUserActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export function fetchUserSummary(user) {
1010
export function fetchUserEvents(user) {
1111
return {
1212
type: "FETCH_USER_EVENTS",
13-
payload: axios.get(`https://api.github.com/users/${user}/events`),
13+
payload: axios.get(`https://api.github.com/users/${user}/events?page=1&per_page=50`),
1414
}
1515
}
1616

0 commit comments

Comments
 (0)