🏜️🍇 ↝ [SSG-96 SSG-123 SSG-124 SSC-83]: Showing user automatons along …

…with the pickplanet
Signal-K · Feb 9, 2025 · ffd3033 · ffd3033
1 parent 9d2f935
commit ffd3033
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 20 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/api/gameplay/inventory/route.ts b/app/api/gameplay/inventory/route.ts
@@ -46,6 +46,16 @@ const inventoryItems: InventoryItem[] = [
     itemLevel: 1, 
     gif: "/assets/Items/Roover.gif", },  // https://cdn.dribbble.com/users/107759/screenshots/4248752/rover.gif
 
+  {
+    id: 24,
+    name: 'Satellite 1',
+    description: '',
+    cost: 1,
+    icon_url: '/assets/Automatons/Sat.png',
+    ItemCategory: 'Automaton',
+    itemLevel: 1,
+  },
+
 
   // Structures
   {

diff --git a/app/page.tsx b/app/page.tsx
@@ -16,6 +16,7 @@ import Onboarding from "./scenes/onboarding/page";
 import VerticalToolbar from "@/components/Layout/Toolbar";
 import SimpleeMissionGuide from "./tests/singleMissionGuide";
 import Navbar from "@/components/Layout/Navbar";
+import AllSatellitesOnActivePlanet from "@/components/Structures/Auto/AllSatellites";
 
 export default function Home() {
   const session = useSession();
@@ -54,6 +55,7 @@ export default function Home() {
       <div className="w-full">
         <div className="py-2">
           <center>
+            <AllSatellitesOnActivePlanet />
             <AtmosphereStructuresOnPlanet />
           </center>
         </div>
@@ -100,6 +102,7 @@ export default function Home() {
       <div className="w-full">
         <div className="py-2">
           <center>
+            <AllSatellitesOnActivePlanet />
             <AtmosphereStructuresOnPlanet />
           </center>
         </div>

diff --git a/app/tests/page.tsx b/app/tests/page.tsx
@@ -1,15 +1,11 @@
 "use client";
 
-import { BasicPopupModal } from "@/components/Layout/Modal";
-import PlanetTempCalculator from "@/components/Structures/Missions/Astronomers/PlanetHunters/TemperatureCalc";
-
 export default function TestPage() {
 
     return (
         // <StarnetLayout>
           <>
-            <BasicPopupModal />
-            <PlanetTempCalculator />
+
           </>
         // {/* </StarnetLayout> */}
     );

diff --git a/components/Account/ProfileSetup.tsx b/components/Account/ProfileSetup.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState, type ChangeEvent } from "react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
+import { useActivePlanet } from "@/context/ActivePlanet";
 
 interface ProfileSetupFormProps {
   onProfileUpdate: () => void | null;
@@ -10,7 +11,9 @@ interface ProfileSetupFormProps {
 export default function ProfileSetupForm({ onProfileUpdate }: ProfileSetupFormProps) {
   const supabase = useSupabaseClient();
   const session = useSession();
-  const router = useRouter(); 
+
+  const { activePlanet } = useActivePlanet();
+  const router = useRouter();
 
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -20,6 +23,8 @@ export default function ProfileSetupForm({ onProfileUpdate }: ProfileSetupFormPr
   const [avatar, setAvatar] = useState<File | null>(null);
   const [avatarPreview, setAvatarPreview] = useState<string | null>(null);
 
+  const [inventoryItems, setInventoryItems] = useState<{ item: number }[] | null>(null);
+
   useEffect(() => {
     let ignore = false;
     async function getProfile() {
@@ -45,13 +50,32 @@ export default function ProfileSetupForm({ onProfileUpdate }: ProfileSetupFormPr
 
     if (session?.user?.id) {
       getProfile();
-    };
+    }
 
     return () => {
       ignore = true;
     };
   }, [session, supabase]);
 
+  useEffect(() => {
+    async function fetchInventory() {
+      if (!session?.user?.id) return;
+      const { data, error } = await supabase
+        .from("inventory")
+        .select("item")
+        .eq("owner", session?.user?.id)
+        .in("item", [23, 24]);
+
+      if (error) {
+        console.warn(error);
+      } else {
+        setInventoryItems(data);
+      }
+    }
+
+    fetchInventory();
+  }, [session, supabase]);
+
   const handleAvatarChange = (e: ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (file) {
@@ -69,11 +93,50 @@ export default function ProfileSetupForm({ onProfileUpdate }: ProfileSetupFormPr
     if (!username || !session?.user?.email) {
       setError("Username and email are required.");
       return;
-    };
+    }
 
     setLoading(true);
     setError(null);
 
+    // Check and add missing items to inventory
+    if (inventoryItems) {
+      const userHasItem23 = inventoryItems.some(item => item.item === 23);
+      const userHasItem24 = inventoryItems.some(item => item.item === 24);
+
+      const itemsToAdd = [];
+
+      if (!userHasItem23) {
+        itemsToAdd.push({
+          item: 23,
+          owner: session?.user?.id,
+          anomay: activePlanet?.id,
+          quantity: 1,
+          time_of_deploy: new Date(),
+        });
+      }
+
+      if (!userHasItem24) {
+        itemsToAdd.push({
+          item: 24,
+          owner: session?.user?.id,
+          anomay: activePlanet?.id,
+          quantity: 1,
+          time_of_deploy: new Date(),
+        });
+      }
+
+      // Insert missing items into the inventory
+      if (itemsToAdd.length > 0) {
+        const { error: insertError } = await supabase.from("inventory").insert(itemsToAdd);
+
+        if (insertError) {
+          setError(insertError.message);
+          setLoading(false);
+          return;
+        }
+      }
+    }
+
     let avatar_url = avatarPreview;
 
     if (avatar) {
@@ -106,12 +169,12 @@ export default function ProfileSetupForm({ onProfileUpdate }: ProfileSetupFormPr
     if (error) {
       alert(error.message);
     } else {
-      router.push("/"); 
+      router.push("/");
       onProfileUpdate();
     }
 
     setLoading(false);
-  };
+  }
 
   return (
     <div className="min-h-screen flex items-center justify-center bg-[#1D2833] p-4 bg-[url('/game-background.jpg')] bg-cover bg-center">

diff --git a/components/Projects/(classifications)/Annotating/Annotator.tsx b/components/Projects/(classifications)/Annotating/Annotator.tsx
@@ -25,10 +25,10 @@ import { SciFiPanel } from '@/components/ui/styles/sci-fi/panel';
 interface ImageAnnotatorProps {
   initialImageUrl: string;
   otherAssets?: string[];
-  anomalyType: string;
-  anomalyId: string;
-  missionNumber: number;
-  assetMentioned: string | string[];
+  anomalyType?: string;
+  anomalyId?: string;
+  missionNumber?: number;
+  assetMentioned?: string | string[];
   structureItemId?: number;
   parentPlanetLocation?: string;
   annotationType: 'AI4M' | 'P4' | 'PH' | 'CoM' | 'Custom';
@@ -216,7 +216,8 @@ export default function ImageAnnotator({
           )}
           {isFormVisible && (
             <SciFiPanel className="p-4">
-              <ClassificationForm
+              {anomalyId && anomalyType && missionNumber && (
+                <ClassificationForm
                 anomalyId={anomalyId}
                 anomalyType={anomalyType}
                 missionNumber={missionNumber}
@@ -229,6 +230,7 @@ export default function ImageAnnotator({
                 structureItemId={structureItemId}
                 annotationOptions={annotationOptions}
               />
+              )}
             </SciFiPanel>
           )}
         </div>

diff --git a/components/Projects/(classifications)/FreeForm.tsx b/components/Projects/(classifications)/FreeForm.tsx
@@ -9,6 +9,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Upload, ChevronRight, Camera, ChevronDown } from 'lucide-react';
+import ImageAnnotator from './Annotating/Annotator';
 
 const STRUCTURE_OPTIONS: Record<string, string[]> = {
     Telescope: ["Sunspot", "Asteroid", "Planet", "Star", "Nebula", "Crater"],
@@ -175,7 +176,8 @@ const FreeformUploadData = () => {
                     <form onSubmit={handleSubmitClassification} className="space-y-4 h-full flex flex-col">
                         <div className="bg-[#5FCBC3] rounded-lg p-4 h-40 mb-4">
                             {captureImage && (
-                                <img src={captureImage} alt="Captured" className="w-full h-full object-cover rounded" />
+                                // <img src={captureImage} alt="Captured" className="w-full h-full object-cover rounded" /> 
+                                <ImageAnnotator initialImageUrl={captureImage} annotationType='Custom' /> 
                             )}
                         </div>
                         <Input

diff --git a/components/Projects/Zoodex/Upload/Camera.tsx b/components/Projects/Zoodex/Upload/Camera.tsx
@@ -9,6 +9,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Upload, ChevronRight } from "lucide-react";
+import ImageAnnotator from '../../(classifications)/Annotating/Annotator';
 
 const CameraComponent = () => {
     const supabase = useSupabaseClient();
@@ -190,7 +191,7 @@ const CameraComponent = () => {
             </>
           ) : (
             <form onSubmit={handleSubmitClassification} className="space-y-4">
-              <img src={captureImage || undefined} alt="Captured" className="w-full h-full object-cover rounded" />
+              {captureImage && ( <ImageAnnotator initialImageUrl={captureImage} annotationType='Custom' />  )}
               <Input
                 type="text"
                 placeholder="Add a comment (optional)"

diff --git a/components/Structures/Auto/AllAutomatons.tsx b/components/Structures/Auto/AllAutomatons.tsx
@@ -13,11 +13,13 @@ interface InventoryItem {
 export default function AllAutomatonsOnActivePlanet() {
     const supabase = useSupabaseClient();
     const session = useSession();
+
     const { activePlanet } = useActivePlanet();
 
     const [automatons, setAutomatons] = useState<{ id: number; iconUrl: string }[]>([]);
     const [inventoryItems, setInventoryItems] = useState<InventoryItem[]>([]);
     const [loading, setLoading] = useState(true);
+
     const [isModalVisible, setIsModalVisible] = useState(false);
 
     const handleAutomatonClick = () => {
@@ -75,7 +77,7 @@ export default function AllAutomatonsOnActivePlanet() {
 
                 setAutomatons(automatonsWithIcons);
             } catch (error) {
-                console.error("Error fetching automatons:", error);
+                console.error("Error fetching automatons: ", error);
             } finally {
                 setLoading(false);
             }
@@ -103,7 +105,7 @@ export default function AllAutomatonsOnActivePlanet() {
                 ))}
             </div>
 
-            {isModalVisible && (
+            {/* {isModalVisible && (
                 <div 
                     className="fixed inset-0 bg-black bg-opacity-50 flex justify-center items-center z-50"
                     onClick={handleOverlayClick}
@@ -119,7 +121,7 @@ export default function AllAutomatonsOnActivePlanet() {
                         <MiningComponentComponent />
                     </div>
                 </div>
-            )}
+            )} */}
         </div>
     );
 };