Skip to content

Commit

Permalink
Merge pull request #785 from woowacourse-teams/hotfix/#784
Browse files Browse the repository at this point in the history
다락방 초대 코드로 들어오는 분기처리 변경
  • Loading branch information
jaeml06 authored Oct 24, 2024
2 parents f1b6745 + 9e3ad6b commit 3d607db
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
16 changes: 8 additions & 8 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import { Global, ThemeProvider } from '@emotion/react';
import { useEffect, useMemo } from 'react';
import { useMemo } from 'react';

import BackgroundShadow from '@_components/BackgroundShadow/BackgroundShadow';
import { QueryClientProvider } from '@tanstack/react-query';
import { RouterProvider } from 'react-router-dom';
import createQueryClient from './queryClient';
import fonts from '@_common/font.style';
import { removeInviteCode } from '@_common/inviteCodeManager';
// import { removeInviteCode } from '@_common/inviteCodeManager';
import reset from './common/reset.style';
import router from '@_routes/router';
import { theme } from '@_common/theme/theme.style';

export default function App() {
const queryClient = useMemo(createQueryClient, []);

useEffect(() => {
window.addEventListener('beforeunload', removeInviteCode);
return () => {
window.removeEventListener('beforeunload', removeInviteCode);
};
}, []);
// useEffect(() => {
// window.addEventListener('beforeunload', removeInviteCode);
// return () => {
// window.removeEventListener('beforeunload', removeInviteCode);
// };
// }, []);

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ import SelectLayout from '@_layouts/SelectLayout/SelectLayout';
import { useNavigate } from 'react-router-dom';
import { useTheme } from '@emotion/react';
import SelectBar from '../components/SelectBar/SelectBar';
import { getInviteCode } from '@_common/inviteCodeManager';
import { useEffect } from 'react';

export default function DarakbangSelectOptionPage() {
const navigate = useNavigate();
const theme = useTheme();

useEffect(() => {
if (getInviteCode() !== null) {
navigate(ROUTES.darakbangInvitationRoute);
}
}, [navigate]);

return (
<SelectLayout>
<SelectLayout.Header>
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/Navigator/DarakbangInvitationRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export default function DarakbangInvitationRoute() {
const navigate = useNavigate();

const code = searchParam.get('code');
if (code) setInviteCode(code);

const { darakbangName } = useDarakbangNameByCode(code || '');
const { myDarakbangs } = useMyDarakbangs();
const isRightCode = darakbangName && darakbangName !== '';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/routes/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ const routesConfig = [
{
path: ROUTES.darakbangInvitationRoute,
element: <DarakbangInvitationRoute />,
requiresAuth: true,
requiresAuth: false,
},
{
path: ROUTES.darakbangLanding,
Expand Down

0 comments on commit 3d607db

Please sign in to comment.