Skip to content

Commit 3a88ad0

Browse files
committed
Restructured with PageBody and PageHeading components
1 parent 85acfb3 commit 3a88ad0

File tree

10 files changed

+130
-65
lines changed

10 files changed

+130
-65
lines changed

src/app/(pages)/experience/page.tsx

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
import FadeIn from '@/components/root/FadeIn';
2-
import ExperienceHeading from '@/components/experience/ExperienceHeading';
3-
import ExperienceBody from '@/components/experience/ExperienceBody';
1+
import PageHeading from '@/components/root/PageHeading';
2+
import PageBody from '@/components/root/PageBody';
3+
import Link from 'next/link';
4+
import { Fragment } from 'react';
45

56
export default function Experience(): JSX.Element {
67
return (
7-
<div>
8-
<FadeIn>
9-
<ExperienceHeading />
10-
</FadeIn>
11-
<FadeIn order={1}>
12-
<ExperienceBody />
13-
</FadeIn>
14-
</div>
8+
<Fragment>
9+
<PageHeading title='Experience.'>
10+
<h2 className='text-2xl text-light font-thin pb-8'>
11+
Things I did.
12+
</h2>
13+
</PageHeading>
14+
<PageBody>
15+
<p>
16+
More functionality coming soon!&nbsp;
17+
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
18+
Refer to my resume for now
19+
</Link>
20+
&nbsp;:)
21+
</p>
22+
</PageBody>
23+
</Fragment>
1524
);
1625
}

src/app/(pages)/more/page.tsx

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import PageBody from '@/components/root/PageBody';
2+
import PageHeading from '@/components/root/PageHeading';
3+
import Link from 'next/link';
4+
import { Fragment } from 'react';
5+
6+
// Future: talk about design, leadership, and favorites (music, movies, books, food, games)
7+
export default function More(): JSX.Element {
8+
return (
9+
<Fragment>
10+
<PageHeading title='More of me.'>
11+
<h2 className='text-2xl text-light font-thin pb-8'>
12+
Other things I do!
13+
</h2>
14+
</PageHeading>
15+
<PageBody>
16+
<p>
17+
More functionality coming soon!&nbsp;
18+
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
19+
Refer to my resume for now
20+
</Link>
21+
&nbsp;:)
22+
</p>
23+
</PageBody>
24+
</Fragment>
25+
);
26+
}

src/app/(pages)/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Hero from '../../components/home/hero';
1+
import Hero from '../../components/home/Hero';
22

33
export default function Home() {
44
return (

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
import FadeIn from '@/components/root/FadeIn';
1+
import PageBody from '@/components/root/PageBody';
2+
import PageHeading from '@/components/root/PageHeading';
23
import Link from 'next/link';
4+
import { Fragment } from 'react';
35

4-
export default function Skills(): JSX.Element {
6+
export default function Projects(): JSX.Element {
57
return (
6-
<FadeIn>
7-
<div className='max-w-2xl'>
8-
<div className='font-display'>
9-
<h1 className='text-4xl pb-2'>Projects.</h1>
10-
<h2 className='text-2xl text-light font-thin pb-8'>
11-
Things I made.
12-
</h2>
13-
</div>
14-
<div className='font-thin'>
15-
<p>More functionality coming soon!&nbsp;
16-
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>Refer to my resume for now</Link> :)</p>
17-
</div>
18-
</div>
19-
</FadeIn>
8+
<Fragment>
9+
<PageHeading title='Projects.'>
10+
<h2 className='text-2xl text-light font-thin pb-8'>
11+
Things I made.
12+
</h2>
13+
</PageHeading>
14+
<PageBody>
15+
<p>
16+
More functionality coming soon!&nbsp;
17+
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
18+
Refer to my resume for now
19+
</Link>
20+
&nbsp;:)
21+
</p>
22+
</PageBody>
23+
</Fragment>
2024
);
2125
}

src/app/(pages)/skills/page.tsx

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
import FadeIn from '@/components/root/FadeIn';
1+
import PageHeading from '@/components/root/PageHeading';
2+
import PageBody from '@/components/root/PageBody';
23
import Link from 'next/link';
4+
import { Fragment } from 'react';
35

46
export default function Skills(): JSX.Element {
57
return (
6-
<FadeIn>
7-
<div className='max-w-2xl'>
8-
<div className='font-display'>
9-
<h1 className='text-4xl pb-2'>Skills.</h1>
10-
<h2 className='text-2xl text-light font-thin pb-8'>
11-
Things I know.
12-
</h2>
13-
</div>
14-
<div className='font-thin'>
15-
<p>More functionality coming soon!&nbsp;
16-
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>Refer to my resume for now</Link> :)</p>
17-
</div>
18-
</div>
19-
</FadeIn>
8+
<Fragment>
9+
<PageHeading title='Skills.'>
10+
<h2 className='text-2xl text-light font-thin pb-8'>
11+
Things I know.
12+
</h2>
13+
</PageHeading>
14+
<PageBody>
15+
<p>
16+
More functionality coming soon!&nbsp;
17+
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
18+
Refer to my resume for now
19+
</Link>
20+
&nbsp;:)
21+
</p>
22+
</PageBody>
23+
</Fragment>
2024
);
2125
}

src/components/experience/ExperienceBody.tsx

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default function ExperienceCard(): JSX.Element {
2+
return (
3+
<div className='font-thin'>
4+
</div>
5+
);
6+
}

src/components/experience/ExperienceHeading.tsx

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/components/root/PageBody.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import FadeIn from './FadeIn';
2+
3+
export default function PageBody({
4+
children,
5+
}: {
6+
children: React.ReactNode
7+
}): JSX.Element {
8+
return (
9+
<FadeIn order={2}>
10+
<div className='font-thin'>
11+
{children}
12+
</div>
13+
</FadeIn>
14+
);
15+
}

src/components/root/PageHeading.tsx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import FadeIn from './FadeIn';
2+
3+
export default function PageHeading({
4+
children,
5+
title,
6+
}: {
7+
children: React.ReactNode,
8+
title: string,
9+
}): JSX.Element {
10+
return (
11+
<div className='max-w-2xl font-display'>
12+
<FadeIn>
13+
<h1 className='text-4xl pb-2'>{title}</h1>
14+
</FadeIn>
15+
<FadeIn order={1}>
16+
<span>{children}</span>
17+
</FadeIn>
18+
{/* <h2 className='text-2xl text-light font-thin pb-8'>
19+
Things I made.
20+
</h2> */}
21+
</div>
22+
);
23+
}

0 commit comments

Comments
 (0)