From 59a34329faf181f09df0b5e3283c3783b48c4730 Mon Sep 17 00:00:00 2001
From: Graulitard <127958528+Graulitard@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:26:00 +0200
Subject: [PATCH] Fix featured projects preview image bug, prettier checked
 (#422)

* Fetching data from Space-Track, fixing some bugs, adding cron tasks for updating database with tool functions

* Orbital chart done, using backend data without refetching from the backend server

* Clean code of orbitalDataGraph, restore strapi files, adding cronTask to the 3rd of each month.

* Adding package*.json files

* ESLint fixed

* Updating strapi env

* Reseting frontend/package.json

* Prettier checked

* Updating for ESlint check

* Try fixing cron job, error caused by Strapi reloading after updating db

* Fix cron jobs issue and update Footer info

* Fixing not available satellites

* Fix FeaturedProjects preview images bug

* Prettier updated
---
 .../app/_homeComponents/FeaturedProjects.tsx  | 17 +++++++-------
 .../satellites/SatelliteResponsiveTable.tsx   | 22 ++++++++++++-------
 .../[satelliteSlug]/orbitDataGraph.tsx        |  9 ++++++--
 frontend/src/components/layout/Footer.tsx     |  7 +++++-
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/_homeComponents/FeaturedProjects.tsx b/frontend/src/app/_homeComponents/FeaturedProjects.tsx
index 11af6d0..69fff6b 100644
--- a/frontend/src/app/_homeComponents/FeaturedProjects.tsx
+++ b/frontend/src/app/_homeComponents/FeaturedProjects.tsx
@@ -19,14 +19,6 @@ export default async function FeaturedProjects() {
         featuredProjects?.featuredProject3,
     ];
 
-    let image_url = undefined;
-    if (STRAPI_URL) {
-        image_url =
-            STRAPI_URL +
-            featuredProjects?.featuredProject1?.data?.attributes?.previewImage
-                ?.data?.attributes?.url;
-    }
-
     return (
         <PagePaddingOnlyHorizontal>
             <div className="mb-16 flex w-full flex-col justify-center gap-2">
@@ -50,6 +42,13 @@ export default async function FeaturedProjects() {
                             if (!project?.data?.attributes?.title) {
                                 return null;
                             }
+                            let previewImage =
+                                project?.data?.attributes?.previewImage?.data
+                                    ?.attributes?.url;
+
+                            if (STRAPI_URL && previewImage != undefined) {
+                                previewImage = STRAPI_URL + previewImage;
+                            }
                             return (
                                 <CardWithContent
                                     key={index.toString()}
@@ -58,7 +57,7 @@ export default async function FeaturedProjects() {
                                         "/projects/" +
                                         project?.data?.attributes?.slug
                                     }
-                                    imageURL={image_url}
+                                    imageURL={previewImage}
                                 ></CardWithContent>
                             );
                         })}
diff --git a/frontend/src/app/satellites/SatelliteResponsiveTable.tsx b/frontend/src/app/satellites/SatelliteResponsiveTable.tsx
index 484472e..8010028 100644
--- a/frontend/src/app/satellites/SatelliteResponsiveTable.tsx
+++ b/frontend/src/app/satellites/SatelliteResponsiveTable.tsx
@@ -99,14 +99,20 @@ export default function SatelliteResponsiveTable({
                               />
                           ))
                         : (satellites ?? []).map((satellite) => (
-                                <TableRow
-                                    className="cursor-pointer hover:bg-white hover:text-black"
-                                    key={satellite.attributes?.catalogNumberNORAD}
-                                    {...(satellite.attributes?.catalogNumberNORAD ? {
-                                    onClick: () =>
-                                        handleRowClick(satellite.attributes?.slug ?? "")
-                                    } : {})}
-                                >
+                              <TableRow
+                                  className="cursor-pointer hover:bg-white hover:text-black"
+                                  key={satellite.attributes?.catalogNumberNORAD}
+                                  {...(satellite.attributes?.catalogNumberNORAD
+                                      ? {
+                                            onClick: () =>
+                                                handleRowClick(
+                                                    satellite.attributes
+                                                        ?.slug ?? "",
+                                                ),
+                                        }
+                                      : {})}
+                              >
+
                                   <TableCell className="px-6">
                                       {satellite.attributes?.name}
                                   </TableCell>
diff --git a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
index b97b3b9..3d368be 100644
--- a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
+++ b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
@@ -194,9 +194,14 @@ const OrbitDataGraph: React.FC<OrbitDataProps> = ({
         <>
             {orbitalData && (
                 <div ref={svgContainer} className="flex w-full flex-col">
-                    <div className="flex mb-5">
+                    <div className="mb-5 flex">
                         <p>Orbital parameters history (source :</p>
-                        <a className="hover:underline" href="https://www.space-track.org/">Space Track</a>
+                        <a
+                            className="hover:underline"
+                            href="https://www.space-track.org/"
+                        >
+                            Space Track
+                        </a>
                         <p>)</p>
                     </div>
                     <div className="zoom-container mb-5 flex items-center">
diff --git a/frontend/src/components/layout/Footer.tsx b/frontend/src/components/layout/Footer.tsx
index 87b85a0..bdb23f9 100644
--- a/frontend/src/components/layout/Footer.tsx
+++ b/frontend/src/components/layout/Footer.tsx
@@ -53,7 +53,12 @@ export default function Footer() {
 
                 <div className="flex flex-1 justify-end">
                     <div className="flex flex-col text-center lg:text-right">
-                        <a className="hover:underline" href="http://ntnu.edu/smallsat">NTNU Small Satellite Lab</a>
+                        <a
+                            className="hover:underline"
+                            href="http://ntnu.edu/smallsat"
+                        >
+                            NTNU Small Satellite Lab
+                        </a>
                         <span className="">Trondheim, Norway</span>
                         <p>Norwegian University of Science and Technology</p>
                         <p className="lg:hidden">