Skip to content

Commit 434343e

Browse files
jfmath04jfmath04
authored
Merge pull request #47 from HoagieClub/preview
Merge to main 02/02/26
2 parents bc6edd6 + adf8671 commit 434343e

File tree

15 files changed

+865
-928
lines changed

15 files changed

+865
-928
lines changed

‎app/Content.tsx‎

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import React, { ReactNode } from 'react';
44

55
import { useUser } from '@auth0/nextjs-auth0/client';
6-
import { Pane, Text, Paragraph } from 'evergreen-ui';
76
import { Metadata } from 'next';
87

98
import Layout from '@/lib/hoagie-ui/Layout';
@@ -17,59 +16,6 @@ export const metadata: Metadata = {
1716
title: 'Stuff by Hoagie',
1817
};
1918

20-
const RainbowLogo = () => (
21-
<Pane whiteSpace='nowrap'>
22-
<Text
23-
is='h2'
24-
display='inline-block'
25-
className='hoagie logo'
26-
color='grey900'
27-
>
28-
hoagie
29-
</Text>
30-
<Paragraph
31-
is='h2'
32-
display='inline-block'
33-
color='blue500'
34-
className='hoagie logo rainbow-text'
35-
>
36-
stuff
37-
</Paragraph>
38-
</Pane>
39-
);
40-
41-
const RainbowHeader = () => (
42-
<Pane
43-
width='100%'
44-
height={20}
45-
display='flex'
46-
flexDirection='row'
47-
style={{
48-
backgroundImage: `linear-gradient(
49-
90deg,
50-
hsl(0deg 73% 75%) 0%,
51-
hsl(12deg 94% 76%) 19%,
52-
hsl(22deg 100% 75%) 27%,
53-
hsl(33deg 100% 74%) 34%,
54-
hsl(44deg 82% 72%) 41%,
55-
hsl(69deg 51% 70%) 47%,
56-
hsl(107deg 44% 75%) 53%,
57-
hsl(149deg 45% 73%) 59%,
58-
hsl(175deg 52% 64%) 66%,
59-
hsl(190deg 77% 57%) 73%,
60-
hsl(201deg 97% 62%) 81%,
61-
hsl(225deg 100% 76%) 100%
62-
)`,
63-
}}
64-
>
65-
{/* <Pane width="20%" height={20} background="red500" />
66-
<Pane width="20%" height={20} background="yellow300" />
67-
<Pane width="20%" height={20} background="green300" />
68-
<Pane width="20%" height={20} background="teal300" />
69-
<Pane width="20%" height={20} background="rblue300" /> */}
70-
</Pane>
71-
);
72-
7319
export default function Content({
7420
children,
7521
}: {
@@ -86,13 +32,7 @@ export default function Content({
8632
return (
8733
<Theme palette='gray'>
8834
<Layout>
89-
<Nav
90-
name='stuff'
91-
tabs={tabs}
92-
user={user?.user}
93-
LogoComponent={RainbowLogo}
94-
HeaderComponent={RainbowHeader}
95-
/>
35+
<Nav name='stuff' tabs={tabs} user={user?.user} />
9636
{children}
9737
</Layout>
9838
</Theme>

‎app/all/[pid]/page.tsx‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
type Params = {
8-
params: { pid: string };
9-
};
10-
11-
export default withPageAuthRequired(({ params }: Params) => {
12-
const { pid } = params;
13-
const pageNumber = pid ? parseInt(pid, 10) : 1;
14-
return <PostPage pageNumber={pageNumber} />;
7+
export default withPageAuthRequired(() => {
8+
return <PostPage />;
159
});

‎app/all/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
55
import PostPage from '@/components/PostPage';
66

77
export default withPageAuthRequired(() => {
8-
return <PostPage pageNumber={1} />;
8+
return <PostPage />;
99
});

‎app/api/hoagie/[...path]/route.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const handler = withApiAuthRequired(async (request: NextRequest, ctx) => {
3232
}
3333

3434
return await proxyRequest(
35-
`${process.env.HOAGIE_API_URL}${path}?${queryString}`,
35+
`${process.env.HOAGIE_API_URL}${path}/?${queryString}`,
3636
fetchReq
3737
);
3838
});

‎app/bulletins/[pid]/page.tsx‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
type Params = {
8-
params: { pid: string };
9-
};
10-
11-
export default withPageAuthRequired(({ params }: Params) => {
12-
const { pid } = params;
13-
const pageNumber = pid ? parseInt(pid, 10) : 1;
14-
return <PostPage pageNumber={pageNumber} category='bulletin' />;
7+
export default withPageAuthRequired(() => {
8+
return <PostPage category='bulletin' />;
159
});

‎app/bulletins/page.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
export default withPageAuthRequired(() => (
8-
<PostPage pageNumber={1} category='bulletin' />
9-
));
7+
export default withPageAuthRequired(() => <PostPage category='bulletin' />);

‎app/lost/[pid]/page.tsx‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
type Params = {
8-
params: { pid: string };
9-
};
10-
11-
export default withPageAuthRequired(({ params }: Params) => {
12-
const { pid } = params;
13-
const pageNumber = pid ? parseInt(pid, 10) : 1;
14-
return <PostPage pageNumber={pageNumber} category='lost' />;
7+
export default withPageAuthRequired(() => {
8+
return <PostPage category='lost' />;
159
});

‎app/lost/page.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
export default withPageAuthRequired(() => (
8-
<PostPage pageNumber={1} category='lost' />
9-
));
7+
export default withPageAuthRequired(() => <PostPage category='lost' />);

‎app/marketplace/[pid]/page.tsx‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
type Params = {
8-
params: { pid: string };
9-
};
10-
11-
export default withPageAuthRequired(({ params }: Params) => {
12-
const { pid } = params;
13-
const pageNumber = pid ? parseInt(pid, 10) : 1;
14-
return <PostPage pageNumber={pageNumber} category='marketplace' />;
7+
export default withPageAuthRequired(() => {
8+
return <PostPage category='marketplace' />;
159
});

‎app/marketplace/page.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
44

55
import PostPage from '@/components/PostPage';
66

7-
export default withPageAuthRequired(() => (
8-
<PostPage pageNumber={1} category='marketplace' />
9-
));
7+
export default withPageAuthRequired(() => <PostPage category='marketplace' />);

0 commit comments

Comments
 (0)