Skip to content

Commit

Permalink
fix: Satellite page for satellites without NORAD ID (#451)
Browse files Browse the repository at this point in the history
  • Loading branch information
Thibault authored and GitHub committed Jun 17, 2025
1 parent 92b9870 commit db7ab77
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 48 deletions.
Binary file modified backend/dbLocation.sqlite
View file
Binary file not shown.
93 changes: 45 additions & 48 deletions frontend/src/app/satellites/[satelliteSlug]/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ export default async function SatelliteInfoPage({
// Get the satellite attributes
let satAttributes = graphqlData?.data?.satellites?.data[0]?.attributes;

// If the satellite is not found return a message
if (!satAttributes?.catalogNumberNORAD) {
return <div className="flex justify-center">Satellite not found</div>;
}

// Get the NORAD ID
let noradId = Number(satAttributes?.catalogNumberNORAD) as SatelliteNumber;

Expand All @@ -89,56 +84,58 @@ export default async function SatelliteInfoPage({
</PageHeaderAndSubtitle>

{/* Container for satname, stats and sat image */}
{noradId ? (
<div className="flex w-full flex-col border-2 border-gray-600 xl:flex-row">
{/* Stats Container */}
<div className="z-10 flex w-full flex-col border-gray-600 xl:border-r-2">
<div className="border-b border-gray-600 bg-black p-5">

<div className="flex w-full flex-col border-2 border-gray-600 xl:flex-row">
{/* Stats Container */}
<div className="z-10 flex w-full flex-col border-gray-600 xl:border-r-2">
<div className="border-b border-gray-600 bg-black p-5">
<div className="flex flex-row">
<p>NORAD ID: </p>
{noradId ? (
<div className="flex flex-row">
<p>NORAD ID: </p>
<a
href={`https://www.n2yo.com/satellite/?s=${noradId}`}
target="_blank"
className="ml-2 underline"
>
{noradId}
</a>
</div>
) : null}
<p className="text-gray-400">
{satAttributes?.massKg
? "Mass: " +
satAttributes?.massKg +
" kg"
: null}
</p>
<a
href={`https://www.n2yo.com/satellite/?s=${noradId}`}
target="_blank"
className="ml-2 underline"
>
{noradId}
</a>
) : (
<span className="ml-2">
No NORAD ID has been assigned yet{" "}
</span>
)}
</div>
{satAttributes.missionStatus === "IN ORBIT" ? (
<div>
<SatelliteDataHome satelliteNum={noradId} />
</div>
) : null}

<p className="text-gray-400">
{satAttributes?.massKg
? "Mass: " + satAttributes?.massKg + " kg"
: null}
</p>
</div>
{/* Image container */}
<div className="w-full border-t-2 border-gray-600 xl:border-t-0">
<div className="flex h-full w-full items-center justify-center bg-black">
{imageURL ? (
<Image
src={imageURL}
alt={satAttributes?.name ?? ""}
width={1600} // Set according to the aspect ratio of the image
height={0}
className="p-2"
/>
) : null}
{satAttributes?.missionStatus === "IN ORBIT" ? (
<div>
<SatelliteDataHome satelliteNum={noradId} />
</div>
) : null}
</div>
{/* Image container */}
<div className="w-full border-t-2 border-gray-600 xl:border-t-0">
<div className="flex h-full w-full items-center justify-center bg-black">
{imageURL ? (
<Image
src={imageURL}
alt={satAttributes?.name ?? ""}
width={1600} // Set according to the aspect ratio of the image
height={0}
className="p-2"
/>
) : null}
</div>
</div>
) : null}
</div>

{/* Container for launch date */}
{satAttributes?.launchDate ? (
{noradId && satAttributes?.launchDate ? (
<div className="w-full">
<LaunchDateCountDown
launchDate={satAttributes?.launchDate}
Expand All @@ -151,7 +148,7 @@ export default async function SatelliteInfoPage({
) : null}

{/* Container for map */}
{noradId && satAttributes.missionStatus === "IN ORBIT" ? (
{noradId && satAttributes?.missionStatus === "IN ORBIT" ? (
<div className="mt-6 w-full">
<Map2d satNum={noradId} />
</div>
Expand Down

0 comments on commit db7ab77

Please sign in to comment.