Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 325eef3

Browse files
Refactored Trends page and components
1 parent 4e42549 commit 325eef3

File tree

4 files changed

+36
-25
lines changed

4 files changed

+36
-25
lines changed

‎frontend/src/pages/Trends/Trends.tsx‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,25 @@
1-
import React, { FC, ReactElement, useEffect } from "react";
2-
import { useDispatch, useSelector } from "react-redux";
1+
import React, { FC, ReactElement } from "react";
32
import { List } from "@material-ui/core";
43

5-
import TrendsItem from "./TrendsItem/TrendsItem";
6-
import { selectIsTrendsLoading, selectTrendsItems, selectTrendsPagesCount } from "../../store/ducks/tags/selectors";
7-
import { fetchTrends, resetTrendsState } from "../../store/ducks/tags/actionCreators";
4+
import TrendsItem from "./TrendsItem";
85
import Spinner from "../../components/Spinner/Spinner";
96
import { withDocumentTitle } from "../../hoc/withDocumentTitle";
107
import InfiniteScrollWrapper from "../../components/InfiniteScrollWrapper/InfiniteScrollWrapper";
118
import PageWrapper from "../../components/PageWrapper/PageWrapper";
9+
import { useTrends } from "./useTrends";
1210

1311
const Trends: FC = (): ReactElement => {
14-
const dispatch = useDispatch();
15-
const isLoading = useSelector(selectIsTrendsLoading);
16-
const trends = useSelector(selectTrendsItems);
17-
const pagesCount = useSelector(selectTrendsPagesCount);
18-
19-
useEffect(() => {
20-
window.scrollTo(0, 0);
21-
loadTrends(0);
22-
23-
return () => {
24-
dispatch(resetTrendsState());
25-
};
26-
}, []);
27-
28-
const loadTrends = (page: number): void => {
29-
dispatch(fetchTrends(page));
30-
};
12+
const { isTrendsLoading, trends, pagesCount, loadTrends } = useTrends();
3113

3214
return (
33-
<PageWrapper translationKey={"TRENDS"} defaultValue={"Trends"}>
15+
<PageWrapper translationKey="TRENDS" defaultValue="Trends">
3416
<InfiniteScrollWrapper dataLength={trends.length} pagesCount={pagesCount} loadItems={loadTrends}>
35-
{isLoading && !trends.length ? (
17+
{isTrendsLoading && !trends.length ? (
3618
<Spinner paddingTop={80} />
3719
) : (
3820
<List style={{ paddingTop: 48 }}>
3921
{trends.map((trend) => <TrendsItem key={trend.id} tag={trend} />)}
40-
{isLoading && <Spinner />}
22+
{isTrendsLoading && <Spinner />}
4123
</List>
4224
)}
4325
</InfiniteScrollWrapper>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from "./TrendsItem";

‎frontend/src/pages/Trends/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from "./Trends";
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { useEffect } from "react";
2+
import { useDispatch, useSelector } from "react-redux";
3+
4+
import { selectIsTrendsLoading, selectTrendsItems, selectTrendsPagesCount } from "../../store/ducks/tags/selectors";
5+
import { fetchTrends, resetTrendsState } from "../../store/ducks/tags/actionCreators";
6+
7+
export const useTrends = () => {
8+
const dispatch = useDispatch();
9+
const isTrendsLoading = useSelector(selectIsTrendsLoading);
10+
const trends = useSelector(selectTrendsItems);
11+
const pagesCount = useSelector(selectTrendsPagesCount);
12+
13+
const loadTrends = (page: number): void => {
14+
dispatch(fetchTrends(page));
15+
};
16+
17+
useEffect(() => {
18+
window.scrollTo(0, 0);
19+
loadTrends(0);
20+
21+
return () => {
22+
dispatch(resetTrendsState());
23+
};
24+
}, [dispatch]);
25+
26+
return { isTrendsLoading, trends, pagesCount, loadTrends };
27+
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /