Skip to content

Commit

Permalink
#39 apply sorting also on first load of contributions
Browse files Browse the repository at this point in the history
  • Loading branch information
xeronimus committed Feb 7, 2022
1 parent 9d72b68 commit 7c597d1
Showing 1 changed file with 30 additions and 29 deletions.
59 changes: 30 additions & 29 deletions src/pages/Contributions/Contributions.tsx
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
import './Contributions.scss';
import React, {useState} from 'react';
import React, {useState, useEffect} from 'react';
import RepoTile from "../../components/RepoTile/RepoTile";
import TileGrid from "../../components/TileGrid/TileGrid";
import {RepoModel} from "../../common/model";
import SearchBar from "../../components/SearchBar/SearchBar";

type Props = {
repos: RepoModel[]
externalRepos: RepoModel[];
displayedRepos: RepoModel[];
repos: RepoModel[]
externalRepos: RepoModel[];
displayedRepos: RepoModel[];
}

const byText = (text: string) => (repo: RepoModel) => repo.name.toUpperCase().includes(text.toUpperCase())
|| repo.description?.toUpperCase().includes(text.toUpperCase())
const byText = (text: string) => (repo: RepoModel) => text ? repo.name.toUpperCase().includes(text.toUpperCase())
|| repo.description?.toUpperCase().includes(text.toUpperCase()) : true;

const byStargazersCount = (a: RepoModel, b: RepoModel) => b.stargazers_count - a.stargazers_count;

const Contributions = (props: Props) => {

const [displayedRepos, setDisplayedRepos] = useState(props.displayedRepos);

const searchContributions = (text: string) => {
setDisplayedRepos(
props.repos.concat(props.externalRepos)
.filter(byText(text))
.sort(byStargazersCount)
);
};

return (
<div className="Contributions">
<div className="container">
<h1 className="title">Contributions</h1>
<div className="search-bar-container">
<div className={'search-bar'}>
<SearchBar placeholder={'Search contributions...'} onChangeText={searchContributions}/>
const [displayedRepos, setDisplayedRepos] = useState(props.displayedRepos);
const [searchQuery, setSearchQuery] = useState('');

useEffect(() => {
setDisplayedRepos(
props.repos.concat(props.externalRepos)
.filter(byText(searchQuery))
.sort(byStargazersCount)
);
}, [props.displayedRepos, searchQuery]);

return (
<div className="Contributions">
<div className="container">
<h1 className="title">Contributions</h1>
<div className="search-bar-container">
<div className={'search-bar'}>
<SearchBar placeholder={'Search contributions...'} onChangeText={setSearchQuery}/>
</div>
</div>
<TileGrid>
{displayedRepos.map((repo: RepoModel) => <RepoTile key={repo.html_url} repo={repo}/>)}
</TileGrid>
</div>
</div>
<TileGrid>
{displayedRepos.map((repo: RepoModel) => <RepoTile key={repo.html_url} repo={repo}/>)}
</TileGrid>
</div>
</div>
);
);
};

export default Contributions;

0 comments on commit 7c597d1

Please # to comment.