Skip to content

C
canifa_note
Commit 1dc4f02b authored by Steven's avatar Steven
Browse files
Options

chore: update memo requests

parent 8db90a04
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
web/src/pages/Explore.tsx
View file @ 1dc4f02b
...@@ -24,6 +24,7 @@ const Explore = () => { ...@@ -24,6 +24,7 @@ const Explore = () => {
useEffect(() => { useEffect(() => {
nextPageTokenRef.current = undefined; nextPageTokenRef.current = undefined;
memoList.reset();
fetchMemos(); fetchMemos();
}, [tagQuery, textQuery]); }, [tagQuery, textQuery]);
...@@ -58,8 +59,9 @@ const Explore = () => { ...@@ -58,8 +59,9 @@ const Explore = () => {
<MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showCreator /> <MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showCreator />
))} ))}
{isRequesting ? ( {isRequesting ? (
<div className="flex flex-col justify-start items-center w-full my-4"> <div className="flex flex-row justify-center items-center w-full my-4 text-gray-400">
<p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p> <Icon.Loader className="w-4 h-auto animate-spin mr-1" />
<p className="text-sm italic">{t("memo.fetching-data")}</p>
</div> </div>
) : !nextPageTokenRef.current ? ( ) : !nextPageTokenRef.current ? (
sortedMemos.length === 0 && ( sortedMemos.length === 0 && (
......
web/src/pages/Home.tsx
View file @ 1dc4f02b
...@@ -34,6 +34,7 @@ const Home = () => { ...@@ -34,6 +34,7 @@ const Home = () => {
useEffect(() => { useEffect(() => {
nextPageTokenRef.current = undefined; nextPageTokenRef.current = undefined;
memoList.reset();
fetchMemos(); fetchMemos();
}, [tagQuery, textQuery]); }, [tagQuery, textQuery]);
...@@ -75,8 +76,9 @@ const Home = () => { ...@@ -75,8 +76,9 @@ const Home = () => {
<MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showVisibility showPinned /> <MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showVisibility showPinned />
))} ))}
{isRequesting ? ( {isRequesting ? (
<div className="flex flex-col justify-start items-center w-full my-4"> <div className="flex flex-row justify-center items-center w-full my-4 text-gray-400">
<p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p> <Icon.Loader className="w-4 h-auto animate-spin mr-1" />
<p className="text-sm italic">{t("memo.fetching-data")}</p>
</div> </div>
) : !nextPageTokenRef.current ? ( ) : !nextPageTokenRef.current ? (
sortedMemos.length === 0 && ( sortedMemos.length === 0 && (
......
web/src/pages/Timeline.tsx
View file @ 1dc4f02b
...@@ -60,6 +60,7 @@ const Timeline = () => { ...@@ -60,6 +60,7 @@ const Timeline = () => {
useEffect(() => { useEffect(() => {
nextPageTokenRef.current = undefined; nextPageTokenRef.current = undefined;
memoList.reset();
fetchMemos(); fetchMemos();
}, [selectedDay, tagQuery, textQuery]); }, [selectedDay, tagQuery, textQuery]);
...@@ -180,8 +181,9 @@ const Timeline = () => { ...@@ -180,8 +181,9 @@ const Timeline = () => {
</Fragment> </Fragment>
))} ))}
{isRequesting ? ( {isRequesting ? (
<div className="flex flex-col justify-start items-center w-full my-4"> <div className="flex flex-row justify-center items-center w-full my-4 text-gray-400">
<p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p> <Icon.Loader className="w-4 h-auto animate-spin mr-1" />
<p className="text-sm italic">{t("memo.fetching-data")}</p>
</div> </div>
) : !nextPageTokenRef.current ? ( ) : !nextPageTokenRef.current ? (
sortedMemos.length === 0 && ( sortedMemos.length === 0 && (
......
web/src/pages/UserProfile.tsx
View file @ 1dc4f02b
...@@ -55,6 +55,7 @@ const UserProfile = () => { ...@@ -55,6 +55,7 @@ const UserProfile = () => {
} }
nextPageTokenRef.current = undefined; nextPageTokenRef.current = undefined;
memoList.reset();
fetchMemos(); fetchMemos();
}, [user, tagQuery, textQuery]); }, [user, tagQuery, textQuery]);
...@@ -109,8 +110,9 @@ const UserProfile = () => { ...@@ -109,8 +110,9 @@ const UserProfile = () => {
<MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showVisibility showPinned /> <MemoView key={`${memo.id}-${memo.displayTime}`} memo={memo} showVisibility showPinned />
))} ))}
{isRequesting ? ( {isRequesting ? (
<div className="flex flex-col justify-start items-center w-full my-4"> <div className="flex flex-row justify-center items-center w-full my-4 text-gray-400">
<p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p> <Icon.Loader className="w-4 h-auto animate-spin mr-1" />
<p className="text-sm italic">{t("memo.fetching-data")}</p>
</div> </div>
) : !nextPageTokenRef.current ? ( ) : !nextPageTokenRef.current ? (
sortedMemos.length === 0 && ( sortedMemos.length === 0 && (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment