Skip to content

feat: added loading spinner on /dashboard when filtering #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Klakurka merged 3 commits into from
Dec 23, 2025
Merged

feat: added loading spinner on /dashboard when filtering #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d5a44
Added loading spinner on /dashboard when filtering
Klakurka Dec 21, 2025
feb8793
Less jarring loading spinner bg
Klakurka Dec 21, 2025
1c79b5d
Added bg overlay on loading spinner
Klakurka Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/Loading/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function Loading ({ size = 60, color }: LoadingProps): React.Reac
}, [color])

return (
<div className={style.loading_container}>
<div className={style.loading_overlay}>
<DotLoader
color={accentColor}
size={size}
Expand Down
12 changes: 9 additions & 3 deletions components/Loading/loading.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
.loading_container {
.loading_overlay {
--z-overlay-loading: 999999;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
display: flex;
justify-content: center;
align-items: center;
min-height: 50vh;
width: 100%;
background-color: rgba(0, 0, 0, 0.4);
z-index: var(--z-overlay-loading);
}
8 changes: 6 additions & 2 deletions pages/dashboard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
const [selectedButtonIds, setSelectedButtonIds] = useState<any[]>([])
const [showFilters, setShowFilters] = useState<boolean>(false)
const [buttons, setButtons] = useState<any[]>([])
const [isLoading, setIsLoading] = useState<boolean>(false)

const setPeriodFromString = (data?: DashboardData, periodString?: PeriodString): void => {
if (data === undefined) return
Expand Down Expand Up @@ -118,6 +119,7 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen

useEffect(() => {
const fetchData = async (): Promise<void> => {
setIsLoading(true)
let url = 'api/dashboard'
if (selectedButtonIds.length > 0) {
url += `?buttonIds=${selectedButtonIds.join(',')}`
Expand All @@ -129,6 +131,7 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
})
const json = await res.json()
setDashboardData(json)
setIsLoading(false)
}
fetchData().catch(console.error)
const savedActivePeriodString = loadStateFromCookie(COOKIE_NAMES.DASHBOARD_FILTER, undefined) as (PeriodString | undefined)
Expand All @@ -152,15 +155,16 @@ export default function Dashboard ({ user }: PaybuttonsProps): React.ReactElemen
if (dashboardData === undefined || activePeriod === undefined) {
return (
<>
<TopBar title="Dashboard" user={user.stUser?.email} />
<TopBar title="Dashboard" user={user?.stUser?.email} />
<Loading />
</>
)
}

return (
<>
<TopBar title="Dashboard" user={user.stUser?.email} />
<TopBar title="Dashboard" user={user?.stUser?.email} />
{isLoading && <Loading />}
<div className={style.filter_btns}>
<div
onClick={() => setShowFilters(!showFilters)}
Expand Down