Fix type issues

jonaschlegel · Oct 1, 2024 · de7b7e4 · de7b7e4
1 parent 30a0717
commit de7b7e4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/app/components/SocialItem.tsx b/app/components/SocialItem.tsx
@@ -3,8 +3,16 @@ import type { FC } from 'react';
 import type { SocialType } from '../../types/global';
 
 const SocialItem: FC<SocialType> = ({ Icon, href }) => {
-  return (
-    <Link href={href} target="_blank">
+  const isExternal = typeof href === 'string';
+
+  return isExternal ? (
+    <a href={href} target="_blank" rel="noopener noreferrer">
+      <span className="inline-block rounded-full border p-2">
+        <Icon />
+      </span>
+    </a>
+  ) : (
+    <Link href={href}>
       <span className="inline-block rounded-full border p-2">
         <Icon />
       </span>

diff --git a/app/projects/[slug]/page.tsx b/app/projects/[slug]/page.tsx
@@ -6,17 +6,26 @@ import type { ProjectType } from '../../../types/global';
 import { projectsData } from '../../data/content';
 
 interface ProjectPageProps {
-  params: { slug: string };
+  params: Promise<{ slug: string }>;
+}
+
+export function generateStaticParams(): Array<{ slug: string }> {
+  return projectsData.projectsList.map((project) => ({
+    slug: project.slug,
+  }));
 }
 
 export default async function ProjectPage({ params }: ProjectPageProps) {
+  const resolvedParams = await params;
   const project: ProjectType | undefined = projectsData.projectsList.find(
-    (proj) => proj.slug === params.slug,
+    (proj) => proj.slug === resolvedParams.slug,
   );
 
   if (!project) {
     notFound();
+    return null;
   }
+
   const MDXContent = (
     (await import(`../../data/projects/${project.slug}.mdx`)) as {
       default: (props: {
@@ -32,6 +41,7 @@ export default async function ProjectPage({ params }: ProjectPageProps) {
           src={project.image}
           alt={project.name}
           width={2000}
+          height={1000}
           className="object-cover"
         />
       </div>

diff --git a/types/global.d.ts b/types/global.d.ts
@@ -1,4 +1,4 @@
-import type { UrlObject } from 'node:url';
+import { UrlObject } from 'node:url';
 import type { StaticImageData } from 'next/image';
 import type { JSX } from 'react';
 
@@ -39,7 +39,7 @@ type StatType = {
 
 type SocialType = {
   Icon: React.ComponentType;
-  href: UrlObject;
+  href: string | UrlObject;
 };
 
 declare module '*.mdx' {