diff --git a/citizen b/citizen index 7e3df29b..4438a882 160000 --- a/citizen +++ b/citizen @@ -1 +1 @@ -Subproject commit 7e3df29bba9cfa4eedf67ba9ebb014829b8f9683 +Subproject commit 4438a8821e06b5f385785eab26bc39c59e1c39c1 diff --git a/components/Projects/(classifications)/Annotating/Annotator.tsx b/components/Projects/(classifications)/Annotating/Annotator.tsx index a4ea9617..adb33068 100644 --- a/components/Projects/(classifications)/Annotating/Annotator.tsx +++ b/components/Projects/(classifications)/Annotating/Annotator.tsx @@ -22,6 +22,7 @@ import { SciFiPanel } from '@/components/ui/styles/sci-fi/panel'; interface ImageAnnotatorProps { initialImageUrl: string; + otherAssets?: string[]; anomalyType: string; anomalyId: string; missionNumber: number; @@ -29,7 +30,7 @@ interface ImageAnnotatorProps { structureItemId?: number; parentPlanetLocation?: string; annotationType: 'AI4M' | 'P4' | 'PH' | 'Custom'; -}; +} export default function ImageAnnotator({ initialImageUrl, @@ -37,6 +38,7 @@ export default function ImageAnnotator({ anomalyId, missionNumber, assetMentioned, + otherAssets, parentPlanetLocation, structureItemId, annotationType, @@ -54,14 +56,15 @@ export default function ImageAnnotator({ const [uploads, setUploads] = useState([]); const canvasRef = useRef(null); const imageRef = useRef(null); + const CATEGORY_CONFIG: Record = - annotationType === 'AI4M' - ? AI4MCATEGORIES - : annotationType === 'P4' - ? P4CATEGORIES - : annotationType === 'PH' - ? PHCATEGORIES - : {} as Record; + annotationType === 'AI4M' + ? AI4MCATEGORIES + : annotationType === 'P4' + ? P4CATEGORIES + : annotationType === 'PH' + ? PHCATEGORIES + : {} as Record; const addMedia = async () => { if (!canvasRef.current || !session) return; @@ -74,8 +77,9 @@ export default function ImageAnnotator({ const { data, error } = await supabase.storage .from('media') .upload(fileName, blob, { contentType: 'image/png' }); - if (error) console.error('Upload error:', error.message); - else if (data) { + if (error) { + console.error('Upload error:', error.message); + } else if (data) { const url = `${process.env.NEXT_PUBLIC_SUPABASE_URL}/storage/v1/object/public/media/${data.path}`; setUploads((prev) => [...prev, url]); } @@ -83,7 +87,7 @@ export default function ImageAnnotator({ console.error('Unexpected error during canvas upload:', err); } finally { setIsUploading(false); - }; + } }; useEffect(() => { @@ -118,22 +122,22 @@ export default function ImageAnnotator({ {selectedImage && (
- + + {otherAssets && ( + + {otherAssets.map((url, index) => ( +
+ {`Anomaly +
+ ))} +
+ )} typeof item === 'string')} structureItemId={structureItemId} /> diff --git a/components/Projects/Telescopes/Transiting.tsx b/components/Projects/Telescopes/Transiting.tsx index 88652992..f0c83a38 100644 --- a/components/Projects/Telescopes/Transiting.tsx +++ b/components/Projects/Telescopes/Transiting.tsx @@ -108,7 +108,7 @@ export function StarterTelescopeTess({ anomalyid }: SelectedAnomProps) { return (
- {imageUrls.length > 0 && ( + {/* {imageUrls.length > 0 && (
{imageUrls.map((url, index) => ( @@ -131,15 +131,24 @@ export function StarterTelescopeTess({ anomalyid }: SelectedAnomProps) { ))}
- )} + )} */} {selectedAnomaly && ( - + // )}