Skip to content

Commit 46b1ba2

Browse files
committed
Fixed spinner, disabled GC (why did I set it?!)
1 parent 49065e3 commit 46b1ba2

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

frontend/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ setupIonicReact({
5656
const queryClient = new QueryClient({
5757
defaultOptions: {
5858
queries: {
59-
gcTime: 1000 * 60 * 60 * 24 * 24, // 24 days, the theoretical max
59+
gcTime: Infinity,
6060
},
6161
},
6262
})

frontend/src/components/Fullpage.tsx

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,26 @@ import "./Fullpage.css"
44
const FullpageLoading: React.FC<{
55
loadingProgress?: number
66
loadingComplete?: number
7-
}> = ({ loadingProgress = undefined, loadingComplete = undefined }) => (
8-
<div className="fullpage-container">
9-
<IonSpinner></IonSpinner>
10-
{loadingProgress && loadingComplete && (
11-
<IonProgressBar value={loadingProgress / loadingComplete} color="light" />
12-
)}
13-
</div>
14-
)
7+
}> = ({ loadingProgress = undefined, loadingComplete = undefined }) => {
8+
const calculateProgress = (progress: number, complete: number): number => {
9+
return complete === 0 ? 0 : progress / complete
10+
}
11+
12+
if (loadingProgress && loadingComplete) {
13+
return (
14+
<div className="fullpage-container">
15+
<IonSpinner />
16+
<IonProgressBar value={calculateProgress(loadingProgress, loadingComplete)} color="light" />
17+
</div>
18+
)
19+
}
20+
21+
return (
22+
<div className="fullpage-container">
23+
<IonSpinner />
24+
</div>
25+
)
26+
}
1527

1628
const FullpageInfo: React.FC<{ text: string }> = ({ text }) => (
1729
<div className="fullpage-container">

frontend/src/pages/Collection.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ const filterActionButtons = [
6262
const CollectionPage: React.FC = () => {
6363
const queryClient = useQueryClient()
6464
const [present] = useIonActionSheet()
65-
const [imageQuality, setImageQuality, clearImagequality] = useSettings<boolean>("ImagesAreHQ", false)
66-
const [filter, setFilter] = useState<"release" | "label" | "artist" | "none">("none")
67-
const [layout, setLayout] = useState<"grid" | "list">("grid")
65+
const [imageQuality] = useSettings<boolean>("ImagesAreHQ", false)
66+
const [filter, setFilter] = useSettings<"release" | "label" | "artist" | "none">("collectionFilter", "none")
67+
const [layout, setLayout] = useSettings<"grid" | "list">("collectionLayout", "grid")
6868
const [modalInfo, setModalInfo] = useState<IReleases | undefined>(undefined)
6969
const [loading, setLoading] = useState<{ page: number; pages: number }>({ page: 0, pages: 0 })
7070
const [viewState, setViewState] = useState<"collection" | "want">("collection")
@@ -123,7 +123,7 @@ const CollectionPage: React.FC = () => {
123123
getCollectionReleases(username, token ?? "", imageQuality, (page, pages) =>
124124
setLoading({ page: page, pages: pages })
125125
),
126-
staleTime: 1000 * 60 * 60 * 24, // 24 hours
126+
staleTime: Infinity,
127127
})
128128

129129
const wantData = useQuery<IReleases[]>({
@@ -132,7 +132,7 @@ const CollectionPage: React.FC = () => {
132132
getCollectionWants(username, token ?? "", imageQuality, (page, pages) =>
133133
setLoading({ page: page, pages: pages })
134134
),
135-
staleTime: 1000 * 60 * 60 * 24, // 24 hours
135+
staleTime: Infinity,
136136
})
137137

138138
useEffect(() => {

frontend/src/pages/Search.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface IReleaseCollective {
2323
}
2424

2525
const SearchPage: React.FC = () => {
26-
const [imageQuality, setImageQuality, clearImagequality] = useSettings<boolean>("ImagesAreHQ", false)
26+
const [imageQuality] = useSettings<boolean>("ImagesAreHQ", false)
2727
const [searchTerm, setSearchTerm] = useState<string>("")
2828
const [modalInfo, setModalInfo] = useState<{ data: IReleases; type: "collection" | "want" } | undefined>(undefined)
2929
const [filterData, setFilterData] = useState<IReleaseCollective>({ collection: [], want: [] })
@@ -45,13 +45,13 @@ const SearchPage: React.FC = () => {
4545
const collectionData = useQuery<IReleases[]>({
4646
queryKey: [`${username}collection`],
4747
queryFn: () => getCollectionReleases(username, token ?? "", imageQuality),
48-
staleTime: 1000 * 60 * 60 * 24, // 24 hours
48+
staleTime: Infinity,
4949
})
5050

5151
const wantData = useQuery<IReleases[]>({
5252
queryKey: [`${username}want`],
5353
queryFn: () => getCollectionWants(username, token ?? "", imageQuality),
54-
staleTime: 1000 * 60 * 60 * 24, // 24 hours
54+
staleTime: Infinity,
5555
})
5656

5757
const searchData = (search: string) => {

0 commit comments

Comments
 (0)