Fix type errors

Author: hasparus

.gitignore

@@ -61,3 +61,5 @@ src/__generated__/
 .next/
 public/sitemap.xml
 out/
+
+tsconfig.tsbuildinfo

src/app/conf/2023/speakers/page.tsx

@@ -10,7 +10,7 @@ export default function Page() {
   return (
     <>
       <div className="flex w-full justify-center">
-        <div className="xs:px-0 prose px-2 py-20 md:container lg:prose-lg">
+        <div className="prose px-2 py-20 md:container lg:prose-lg">
           <h1 className="text-white">GraphQLConf 2023 Speakers</h1>
           <p className="text-white sm:w-2/3">
             Meet the unique lineup of insightful speakers we've carefully
@@ -22,7 +22,7 @@ export default function Page() {
       <div className="bg-white">
         <section className="conf-block container flex flex-wrap justify-center gap-8 lg:justify-between">
           {speakers.map(speaker => (
-            <Speaker key={speaker.username} {...speaker} year="2023" />
+            <Speaker key={speaker.username} {...speaker} year={2023} />
           ))}
         </section>
       </div>

src/app/conf/2023/types.d.ts

@@ -1,27 +1 @@
-export type ScheduleSession = {
-  id: string
-  audience: string
-  description: string
-  event_end: string
-  event_start: string
-  event_subtype: string
-  event_type: string
-  name: string
-  venue: string
-  speakers?: SchedSpeaker[]
-  files?: { name: string; path: string }[]
-}
-
-export type SchedSpeaker = {
-  username: string
-  name: string
-  about: string
-  company?: string
-  position?: string
-  avatar?: string
-  url?: string
-  role: string
-  location?: string
-  socialurls: { service: string; url: string }[]
-  year: "2024" | "2023"
-}
+export * from "../_api/sched-types"

src/app/conf/2024/speakers/page.tsx

@@ -10,7 +10,7 @@ export default function Page() {
   return (
     <div className='bg-[url("/img/conf/golden-gate-bridge.png")] bg-contain bg-no-repeat'>
       <div className="flex w-full justify-center">
-        <div className="xs:px-0 prose px-2 py-20 md:container lg:prose-lg">
+        <div className="prose px-2 py-20 md:container lg:prose-lg xs:px-0">
           <h1 className="text-white">GraphQLConf 2024 Speakers</h1>
           <p className="text-white sm:w-2/3">
             Meet the unique lineup of insightful speakers we've carefully
@@ -22,7 +22,7 @@ export default function Page() {
       <div className="bg-white">
         <section className="conf-block container flex flex-wrap justify-center gap-8 lg:justify-between">
           {speakers.map(speaker => (
-            <Speaker key={speaker.username} {...speaker} year="2024" />
+            <Speaker key={speaker.username} {...speaker} year={2024} />
           ))}
         </section>
       </div>

src/app/conf/_components/speakers/speaker.tsx

@@ -1,7 +1,12 @@
-import { Avatar } from "./avatar"
-import { SocialMediaIcon, SocialMediaIconServiceType } from "./social-media"
-import { SchedSpeaker } from "@/app/conf/2023/types"
 import NextLink from "next/link"
+import { ConferenceYear, SchedSpeaker } from "@/app/conf/_api/sched-types"
+
+import { SocialMediaIcon, SocialMediaIconServiceType } from "./social-media"
+import { Avatar } from "./avatar"
+
+export interface SpeakerProps extends SchedSpeaker {
+  year: ConferenceYear
+}
 
 export function Speaker({
   name,
@@ -11,7 +16,7 @@ export function Speaker({
   username,
   socialurls,
   year,
-}: SchedSpeaker) {
+}: SpeakerProps) {
   return (
     <div className="flex flex-col items-center">
       <NextLink href={`/conf/${year}/speakers/${username}`} className="group">