Skip to content

Commit

Permalink
Merge branch 'v2024'
Browse files Browse the repository at this point in the history
  • Loading branch information
josephdburdick committed Jun 5, 2024
2 parents fa36824 + 479c9da commit 0758de2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { DeviceProvider } from "@/lib/providers/DeviceContext"
import { DataProvider } from "@/lib/providers/DataProvider"
import getData from "@/data/index"
import Intro from "./_content/Intro"

export default async function Home() {
const data = await getData()

Expand Down
5 changes: 3 additions & 2 deletions src/components/global/LogoMarquee.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useData } from "@/lib/providers/DataProvider"
import { cn } from "@/lib/utils"
import { Job } from "@/lib/types/experience"
type MarqueeProps = {
itemWidth?: string;
};
Expand All @@ -8,8 +9,8 @@ const logoPath = "/j0e/assets/images/logos/"
export default function LogoMarquee(props: MarqueeProps) {
const { itemWidth = "200px" } = props
const { data } = useData()
const jobs = data.experience.attributes.experience.filter(
(job) => !!job.logo,
const jobs: Job[] = data.experience.attributes.experience.filter(
(job: Job) => !!job.logo,
)

return (
Expand Down
18 changes: 18 additions & 0 deletions src/lib/types/experience.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export interface Role {
title: string;
type: string;
start_date: string;
end_date: string | null;
duration: string;
location?: string;
description: string;
skills: string[];
}

export interface Job {
company: string;
location: string;
logo?: string;
visible?: boolean;
roles: Role[];
}

0 comments on commit 0758de2

Please sign in to comment.