Skip to content

Commit

Permalink
Restructured with PageBody and PageHeading components
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaeling committed Oct 24, 2023
1 parent 85acfb3 commit 3a88ad0
Show file tree
Hide file tree
Showing 10 changed files with 130 additions and 65 deletions.
31 changes: 20 additions & 11 deletions src/app/(pages)/experience/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
import FadeIn from '@/components/root/FadeIn';
import ExperienceHeading from '@/components/experience/ExperienceHeading';
import ExperienceBody from '@/components/experience/ExperienceBody';
import PageHeading from '@/components/root/PageHeading';
import PageBody from '@/components/root/PageBody';
import Link from 'next/link';
import { Fragment } from 'react';

export default function Experience(): JSX.Element {
return (
<div>
<FadeIn>
<ExperienceHeading />
</FadeIn>
<FadeIn order={1}>
<ExperienceBody />
</FadeIn>
</div>
<Fragment>
<PageHeading title='Experience.'>
<h2 className='text-2xl text-light font-thin pb-8'>
Things I did.
</h2>
</PageHeading>
<PageBody>
<p>
More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
Refer to my resume for now
</Link>
&nbsp;:)
</p>
</PageBody>
</Fragment>
);
}
26 changes: 26 additions & 0 deletions src/app/(pages)/more/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import PageBody from '@/components/root/PageBody';
import PageHeading from '@/components/root/PageHeading';
import Link from 'next/link';
import { Fragment } from 'react';

// Future: talk about design, leadership, and favorites (music, movies, books, food, games)
export default function More(): JSX.Element {
return (
<Fragment>
<PageHeading title='More of me.'>
<h2 className='text-2xl text-light font-thin pb-8'>
Other things I do!
</h2>
</PageHeading>
<PageBody>
<p>
More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
Refer to my resume for now
</Link>
&nbsp;:)
</p>
</PageBody>
</Fragment>
);
}
2 changes: 1 addition & 1 deletion src/app/(pages)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Hero from '../../components/home/hero';
import Hero from '../../components/home/Hero';

export default function Home() {
return (
Expand Down
36 changes: 20 additions & 16 deletions src/app/(pages)/projects/page.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import FadeIn from '@/components/root/FadeIn';
import PageBody from '@/components/root/PageBody';
import PageHeading from '@/components/root/PageHeading';
import Link from 'next/link';
import { Fragment } from 'react';

export default function Skills(): JSX.Element {
export default function Projects(): JSX.Element {
return (
<FadeIn>
<div className='max-w-2xl'>
<div className='font-display'>
<h1 className='text-4xl pb-2'>Projects.</h1>
<h2 className='text-2xl text-light font-thin pb-8'>
Things I made.
</h2>
</div>
<div className='font-thin'>
<p>More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>Refer to my resume for now</Link> :)</p>
</div>
</div>
</FadeIn>
<Fragment>
<PageHeading title='Projects.'>
<h2 className='text-2xl text-light font-thin pb-8'>
Things I made.
</h2>
</PageHeading>
<PageBody>
<p>
More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
Refer to my resume for now
</Link>
&nbsp;:)
</p>
</PageBody>
</Fragment>
);
}
34 changes: 19 additions & 15 deletions src/app/(pages)/skills/page.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import FadeIn from '@/components/root/FadeIn';
import PageHeading from '@/components/root/PageHeading';
import PageBody from '@/components/root/PageBody';
import Link from 'next/link';
import { Fragment } from 'react';

export default function Skills(): JSX.Element {
return (
<FadeIn>
<div className='max-w-2xl'>
<div className='font-display'>
<h1 className='text-4xl pb-2'>Skills.</h1>
<h2 className='text-2xl text-light font-thin pb-8'>
Things I know.
</h2>
</div>
<div className='font-thin'>
<p>More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>Refer to my resume for now</Link> :)</p>
</div>
</div>
</FadeIn>
<Fragment>
<PageHeading title='Skills.'>
<h2 className='text-2xl text-light font-thin pb-8'>
Things I know.
</h2>
</PageHeading>
<PageBody>
<p>
More functionality coming soon!&nbsp;
<Link href='assets/resume.pdf' className='transition font-bold text-light hover:text-lighter'>
Refer to my resume for now
</Link>
&nbsp;:)
</p>
</PageBody>
</Fragment>
);
}
10 changes: 0 additions & 10 deletions src/components/experience/ExperienceBody.tsx

This file was deleted.

6 changes: 6 additions & 0 deletions src/components/experience/ExperienceCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default function ExperienceCard(): JSX.Element {
return (
<div className='font-thin'>
</div>
);
}
12 changes: 0 additions & 12 deletions src/components/experience/ExperienceHeading.tsx

This file was deleted.

15 changes: 15 additions & 0 deletions src/components/root/PageBody.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import FadeIn from './FadeIn';

export default function PageBody({
children,
}: {
children: React.ReactNode
}): JSX.Element {
return (
<FadeIn order={2}>
<div className='font-thin'>
{children}
</div>
</FadeIn>
);
}
23 changes: 23 additions & 0 deletions src/components/root/PageHeading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import FadeIn from './FadeIn';

export default function PageHeading({
children,
title,
}: {
children: React.ReactNode,
title: string,
}): JSX.Element {
return (
<div className='max-w-2xl font-display'>
<FadeIn>
<h1 className='text-4xl pb-2'>{title}</h1>
</FadeIn>
<FadeIn order={1}>
<span>{children}</span>
</FadeIn>
{/* <h2 className='text-2xl text-light font-thin pb-8'>
Things I made.
</h2> */}
</div>
);
}

0 comments on commit 3a88ad0

Please sign in to comment.