Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ export const useGetApplication = (clubId: string) => {
queryKey: ['applicationForm', clubId],
queryFn: () => getApplication(clubId),
retry: false,
enabled: !!clubId,
});
};
2 changes: 1 addition & 1 deletion frontend/src/hooks/useTrackPageView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const useTrackPageView = (pageName: string, clubName?: string) => {
window.removeEventListener('beforeunload', trackPageDuration);
document.removeEventListener('visibilitychange', trackPageDuration);
};
}, [location.pathname, clubName]);
}, [location.pathname]);
};

export default useTrackPageView;
22 changes: 14 additions & 8 deletions frontend/src/pages/ApplicationFormPage/ApplicationFormPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { PageContainer } from '@/styles/PageContainer.styles';
import Header from '@/components/common/Header/Header';
import { useNavigate, useParams } from 'react-router-dom';
import { useGetClubDetail } from '@/hooks/queries/club/useGetClubDetail';
import useTrackPageView from '@/hooks/useTrackPageView';
import { useAnswers } from '@/hooks/useAnswers';
import QuestionAnswerer from '@/pages/ApplicationFormPage/components/QuestionAnswerer/QuestionAnswerer';
import { useGetApplication } from '@/hooks/queries/application/useGetApplication';
Expand All @@ -20,6 +21,19 @@ const ApplicationFormPage = () => {
const questionRefs = useRef<Array<HTMLDivElement | null>>([]);
const [invalidQuestionIds, setInvalidQuestionIds] = useState<number[]>([]);

const { data: clubDetail, error: clubError } = useGetClubDetail(clubId!);
const {
data: formData,
isLoading,
isError,
error: applicationError,
} = useGetApplication(clubId!);

useTrackPageView(
'ApplicationFormPage',
clubDetail?.name ?? `club:${clubId ?? 'unknown'}`,
);

if (!clubId) return null;

const STORAGE_KEY = `applicationAnswers_${clubId}`;
Expand All @@ -32,14 +46,6 @@ const ApplicationFormPage = () => {
answers,
} = useAnswers(initialAnswers);

const { data: clubDetail, error: clubError } = useGetClubDetail(clubId);
const {
data: formData,
isLoading,
isError,
error: applicationError,
} = useGetApplication(clubId);

useEffect(() => {
localStorage.setItem(STORAGE_KEY, JSON.stringify(answers));
}, [answers]);
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/pages/ClubUnionPage/ClubUnionPage.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import Header from '@/components/common/Header/Header';
import * as Styled from './ClubUnionPage.styles';
import useTrackPageView from '@/hooks/useTrackPageView';
import { CLUB_UNION_MEMBERS } from '@/constants/CLUB_UNION_INFO';
import { PageContainer } from '@/styles/PageContainer.styles';
import Footer from '@/components/common/Footer/Footer';

const ClubUnionPage = () => {
useTrackPageView('ClubUnionPage');

return (
<>
<Header />
Expand Down