From 233ffa0c7657983dcf72425478ce3bbec1f1b857 Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sun, 15 Jun 2025 11:53:26 +0200 Subject: [PATCH] Fix types and imports across the board --- src/App.tsx | 4 ++-- src/components/CleanModeToggle.tsx | 2 -- src/components/Header.tsx | 2 -- src/components/RegionMap.tsx | 2 -- src/components/SignatureCard.tsx | 17 +++------------ src/components/SignatureListItem.tsx | 26 +++++------------------ src/components/SystemTracker.tsx | 20 +++++++----------- src/pages/Index.tsx | 3 +-- src/pages/RegionPage.tsx | 4 +--- src/pages/SystemView.tsx | 31 +++++++++------------------- src/utils/signatureParser.ts | 13 ++---------- 11 files changed, 32 insertions(+), 92 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 3b4f8f2..44ce9fc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,8 +3,8 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { Toaster } from "@/components/ui/toaster"; import Index from "./pages/Index"; -import RegionPage from "./pages/RegionPage"; -import SystemView from "./pages/SystemView"; +import { RegionPage } from "./pages/RegionPage"; +import { SystemView } from "./pages/SystemView"; import NotFound from "./pages/NotFound"; import "./App.css"; diff --git a/src/components/CleanModeToggle.tsx b/src/components/CleanModeToggle.tsx index 414f940..d7c801d 100644 --- a/src/components/CleanModeToggle.tsx +++ b/src/components/CleanModeToggle.tsx @@ -21,5 +21,3 @@ export const CleanModeToggle = ({ cleanMode, onToggle }: CleanModeToggleProps) = ); }; - -export default CleanModeToggle; diff --git a/src/components/Header.tsx b/src/components/Header.tsx index e293cf2..da4a726 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -57,5 +57,3 @@ export const Header = ({ title, breadcrumbs = [] }: HeaderProps) => { ); }; - -export default Header; diff --git a/src/components/RegionMap.tsx b/src/components/RegionMap.tsx index 800804b..8b7b0e3 100644 --- a/src/components/RegionMap.tsx +++ b/src/components/RegionMap.tsx @@ -324,5 +324,3 @@ export const RegionMap = ({ regionName, focusSystem, isCompact = false }: Region ); }; - -export default RegionMap; diff --git a/src/components/SignatureCard.tsx b/src/components/SignatureCard.tsx index 0596784..e8a8c92 100644 --- a/src/components/SignatureCard.tsx +++ b/src/components/SignatureCard.tsx @@ -2,22 +2,13 @@ import { Card, CardContent } from "@/components/ui/card"; import { Badge } from "@/components/ui/badge"; import { Zap, Shield, Coins, HelpCircle } from "lucide-react"; - -interface SignatureItem { - collectionId: string; - collectionName: string; - id: string; - signame: string; - sysid: string; - system: string; - type: string; -} +import { Signature } from "./SystemTracker"; interface SignatureCardProps { - signature: SignatureItem; + signature: Signature; } -const SignatureCard = ({ signature }: SignatureCardProps) => { +export const SignatureCard = ({ signature }: SignatureCardProps) => { const getTypeIcon = (type: string) => { const lowerType = type.toLowerCase(); if (lowerType.includes('combat')) return ; @@ -73,5 +64,3 @@ const SignatureCard = ({ signature }: SignatureCardProps) => { ); }; - -export default SignatureCard; diff --git a/src/components/SignatureListItem.tsx b/src/components/SignatureListItem.tsx index 4106d76..561d91d 100644 --- a/src/components/SignatureListItem.tsx +++ b/src/components/SignatureListItem.tsx @@ -1,25 +1,12 @@ import { Badge } from "@/components/ui/badge"; import { Zap, Shield, Coins, HelpCircle, Clock, AlertTriangle, Skull } from "lucide-react"; - -interface SignatureItem { - collectionId: string; - collectionName: string; - id: string; - identifier: string; - signame: string; - sysid: string; - system: string; - type: string; - updated?: string; - created?: string; - dangerous?: boolean; -} +import { Signature } from "@/components/SystemTracker"; interface SignatureListItemProps { - signature: SignatureItem; + signature: Signature; } -const SignatureListItem = ({ signature }: SignatureListItemProps) => { +export const SignatureListItem = ({ signature }: SignatureListItemProps) => { const getTypeIcon = (type: string) => { const lowerType = type.toLowerCase(); if (lowerType.includes("combat")) return ; @@ -80,9 +67,8 @@ const SignatureListItem = ({ signature }: SignatureListItemProps) => { return (
{/* Type Badge - Most Important */} @@ -132,5 +118,3 @@ const SignatureListItem = ({ signature }: SignatureListItemProps) => {
); }; - -export default SignatureListItem; diff --git a/src/components/SystemTracker.tsx b/src/components/SystemTracker.tsx index 48220ab..6a5b8fc 100644 --- a/src/components/SystemTracker.tsx +++ b/src/components/SystemTracker.tsx @@ -5,13 +5,13 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { RefreshCw, AlertCircle, Radar } from "lucide-react"; -import SignatureListItem from "./SignatureListItem"; +import { SignatureListItem } from "@/components/SignatureListItem"; import { toast } from "@/hooks/use-toast"; -interface SignatureItem { - collectionId: string; - collectionName: string; - id: string; +export interface Signature { + collectionId?: string; + collectionName?: string; + id?: string; identifier: string; signame: string; sysid: string; @@ -20,20 +20,18 @@ interface SignatureItem { updated?: string; created?: string; dangerous?: boolean; + scanned?: string; } interface ApiResponse { - items: SignatureItem[]; + items: Signature[]; } interface SystemTrackerProps { system: string; } -const SystemTracker = ({ system }: SystemTrackerProps) => { - const queryClient = useQueryClient(); - - // Query to get signatures for the current system with polling +export const SystemTracker = ({ system }: SystemTrackerProps) => { const { data: signaturesData, refetch: refetchSignatures, @@ -178,5 +176,3 @@ const SystemTracker = ({ system }: SystemTrackerProps) => {
); }; - -export default SystemTracker; diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx index 8f1c277..5c59676 100644 --- a/src/pages/Index.tsx +++ b/src/pages/Index.tsx @@ -1,6 +1,5 @@ - import { GalaxyMap } from '../components/GalaxyMap'; -import Header from '../components/Header'; +import { Header } from '../components/Header'; const Index = () => { return ( diff --git a/src/pages/RegionPage.tsx b/src/pages/RegionPage.tsx index 3872d9c..9ed0692 100644 --- a/src/pages/RegionPage.tsx +++ b/src/pages/RegionPage.tsx @@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button'; import { ArrowLeft } from 'lucide-react'; import { useNavigate } from 'react-router-dom'; -const RegionPage = () => { +export const RegionPage = () => { const { region } = useParams<{ region: string }>(); const navigate = useNavigate(); @@ -29,5 +29,3 @@ const RegionPage = () => { return ; }; - -export default RegionPage; diff --git a/src/pages/SystemView.tsx b/src/pages/SystemView.tsx index 91aa3a8..85de328 100644 --- a/src/pages/SystemView.tsx +++ b/src/pages/SystemView.tsx @@ -10,18 +10,9 @@ import { Header } from "@/components/Header"; import { parseSignature, parseScannedPercentage } from "@/utils/signatureParser"; import { getSystemId } from "@/utils/systemApi"; import pb from "@/lib/pocketbase"; +import { Signature } from "@/components/SystemTracker"; -interface Signature { - identifier: string; - type: string; - name: string; - system: string; - sysid: string; - dangerous?: boolean; - scanned?: string; -} - -const SystemView = () => { +export const SystemView = () => { const { system, region } = useParams(); const navigate = useNavigate(); const queryClient = useQueryClient(); @@ -48,7 +39,7 @@ const SystemView = () => { if (newScannedPercentage > existingScannedPercentage) { await pb.collection('signature').update(existingRecord.id, { - name: signature.name, + name: signature.signame, type: signature.type, dangerous: signature.dangerous, scanned: signature.scanned @@ -62,7 +53,7 @@ const SystemView = () => { await pb.collection('signature').create({ system: signature.system, identifier: signature.identifier, - name: signature.name, + name: signature.signame, type: signature.type, dangerous: signature.dangerous, scanned: signature.scanned @@ -132,7 +123,7 @@ const SystemView = () => { if (signaturesToDelete.length > 0) { console.log(`Deleted ${signaturesToDelete.length} signatures not in pasted data`); } - + // Turn off clean mode after use setCleanMode(false); } @@ -177,7 +168,7 @@ const SystemView = () => {
- + {/* Controls */}
@@ -185,14 +176,14 @@ const SystemView = () => {
- +
{/* Main content - signatures */}
- + {/* Regional overview map */}
{region ? ( @@ -202,8 +193,8 @@ const SystemView = () => {

Click systems to navigate • Current: {system}

- @@ -224,5 +215,3 @@ const SystemView = () => {
); }; - -export default SystemView; diff --git a/src/utils/signatureParser.ts b/src/utils/signatureParser.ts index 1a216d7..8c5709c 100644 --- a/src/utils/signatureParser.ts +++ b/src/utils/signatureParser.ts @@ -1,13 +1,4 @@ - -interface Signature { - identifier: string; - type: string; - name: string; - system: string; - sysid: string; - dangerous?: boolean; - scanned?: string; -} +import { Signature } from "@/components/SystemTracker"; export const parseSignature = (text: string): Omit | null => { const parts = text.split('\t'); @@ -22,7 +13,7 @@ export const parseSignature = (text: string): Omit 4 ? parts[4] : undefined, dangerous: false // TODO: Implement dangerous signature detection };