Skip to content

Commit 7768587

Browse files
authored
Merge pull request #85 from HackDavis/feat/judge-progress
fixed auth barrier problem
2 parents fb2dc17 + 08912ea commit 7768587

File tree

4 files changed

+38
-20
lines changed

4 files changed

+38
-20
lines changed

app/(pages)/judges/layout.tsx

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
'use client';
21
import { AuthProvider } from '../_contexts/AuthContext';
3-
4-
import ProtectedDisplay from '@components/ProtectedDisplay/ProtectedDisplay';
5-
import LoginPage from './_components/LoginPage/LoginPage';
2+
import { Metadata } from 'next';
63

74
type Props = {
85
children: React.ReactNode;
96
};
107

8+
export const metadata: Metadata = {
9+
title: 'HackDavis Judge Portal',
10+
};
11+
1112
export default function JudgesLayout({ children }: Props) {
12-
return (
13-
<AuthProvider>
14-
<ProtectedDisplay
15-
loadingDisplay={'loading...'}
16-
failDisplay={<LoginPage />}
17-
>
18-
{children}
19-
</ProtectedDisplay>
20-
</AuthProvider>
21-
);
13+
return <AuthProvider>{children}</AuthProvider>;
2214
}

app/(pages)/judges/page.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
'use client';
22
import JudgingHub from './_components/JudgingHub/JudgingHub';
3+
import ProtectedDisplay from '@components/ProtectedDisplay/ProtectedDisplay';
4+
import LoginPage from './_components/LoginPage/LoginPage';
35

46
export default function Judges() {
5-
return <JudgingHub />;
7+
return (
8+
<ProtectedDisplay loadingDisplay={'loading...'} failDisplay={<LoginPage />}>
9+
<JudgingHub />
10+
</ProtectedDisplay>
11+
);
612
}

app/(pages)/judges/projects/page.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
import { useState } from 'react';
44
import ProjectsHeader from './_components/ProjectsHeader';
55
import ProjectsList from './_components/ProjectsList';
6+
import ProtectedDisplay from '@components/ProtectedDisplay/ProtectedDisplay';
7+
import LoginPage from '../_components/LoginPage/LoginPage';
68
// import SearchBar from './_components/SearchBar';
79

810
export default function Judges() {
911
const [activeTab, setActiveTab] = useState(0);
1012
return (
11-
<div>
12-
<ProjectsHeader activeTab={activeTab} setActiveTab={setActiveTab} />
13-
{/* <SearchBar /> */}
14-
<ProjectsList activeTab={activeTab} />
15-
</div>
13+
<ProtectedDisplay loadingDisplay={'loading...'} failDisplay={<LoginPage />}>
14+
<div>
15+
<ProjectsHeader activeTab={activeTab} setActiveTab={setActiveTab} />
16+
{/* <SearchBar /> */}
17+
<ProjectsList activeTab={activeTab} />
18+
</div>
19+
</ProtectedDisplay>
1620
);
1721
}

app/(pages)/judges/scoring/layout.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use client';
2+
3+
import ProtectedDisplay from '@components/ProtectedDisplay/ProtectedDisplay';
4+
import LoginPage from '../_components/LoginPage/LoginPage';
5+
6+
type Props = {
7+
children: React.ReactNode;
8+
};
9+
10+
export default function ScoringLayout({ children }: Props) {
11+
return (
12+
<ProtectedDisplay loadingDisplay={'loading...'} failDisplay={<LoginPage />}>
13+
{children}
14+
</ProtectedDisplay>
15+
);
16+
}

0 commit comments

Comments
 (0)