Merge branch 'main' of github.com:NTNU-SmallSat-Lab/outreach-website

NTNU-SmallSatLab · Apr 10, 2024 · 74fc343 · 74fc343
2 parents d65c3bc + 7087333
commit 74fc343
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/frontend/src/app/blog/[articleSlug]/page.tsx b/frontend/src/app/blog/[articleSlug]/page.tsx
@@ -92,7 +92,7 @@ export default async function Page({
                 <div className="flex flex-1 justify-start gap-1">
                     {avatarURL && (
                         <Avatar className="">
-                            <AvatarImageFix src={avatarURL} />
+                            <AvatarImageFix src={avatarURL} alt="Avatar" />
                             <AvatarFallback>
                                 {// Get initials from author name
                                 authorName

diff --git a/frontend/src/components/AvatarImageFix.tsx b/frontend/src/components/AvatarImageFix.tsx
@@ -1,16 +1,15 @@
 import React from "react";
-import * as AvatarPrimitive from "@radix-ui/react-avatar";
 import { cn } from "@/lib/utils";
-const STRAPI_URL = process.env.STRAPI_URL;
+import Image from "next/image";
 
 const AvatarImageFix = React.forwardRef<
-    React.ElementRef<typeof AvatarPrimitive.Image>,
-    React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
+    React.ElementRef<typeof Image>,
+    React.ComponentPropsWithoutRef<typeof Image>
 >(({ className, src, ...props }, ref) => (
-    <AvatarPrimitive.Image
+    <Image
         ref={ref}
         className={cn("aspect-square h-full w-full", className)}
-        src={STRAPI_URL + "/_next/image?url=" + src + "&w=100&q=100"}
+        src={src}
         {...props}
     />
 ));