Skip to content

Commit b8c1a59

Browse files
GizmotronnGizmotronn
committed
🏒🎺 ↝ Reverting sector progress for frontend, added more context for creation of sectors
1 parent 745d710 commit b8c1a59

File tree

2 files changed

+96
-154
lines changed

2 files changed

+96
-154
lines changed

‎components/Content/Planets/Activities/SectorSetup.tsx

+17-32
Original file line numberDiff line numberDiff line change
@@ -39,54 +39,39 @@ export default function CreateBasePlanetSector() {
3939
if (session) {
4040
fetchUserPlanet();
4141

42-
// Array of available resources
43-
const resources = ["Silicates", "Alloy", "Iron", "Fuel", "Water", "Coal"];
44-
45-
// Randomly choose a resource
46-
const chosenResource = resources[Math.floor(Math.random() * resources.length)];
47-
48-
// Get the corresponding row from inventoryITEMS
49-
let depositRowId;
50-
if (chosenResource === "Coal") {
51-
depositRowId = 11; // Row ID for Coal
52-
} else if (chosenResource === "Silicates") {
53-
depositRowId = 13; // Row ID for Silicates
54-
} else {
55-
// You can add similar conditions for other resources if needed
56-
// depositRowId = 1; // Default to a row ID (you may want to adjust this)
57-
depositRowId = 13;
58-
}
42+
// Map resource names to corresponding inventoryITEMS ids
43+
const resourceToIdMap = {
44+
"Silicates": 13,
45+
"Alloy": 12,
46+
"Iron": 11,
47+
"Fuel": 10,
48+
"Water": 9,
49+
"Coal": 11,
50+
};
5951

60-
// Fetch the corresponding row from inventoryITEMS
61-
const { data: depositData, error: depositError } = await supabase
62-
.from('inventoryITEMS')
63-
.select('name, icon_url')
64-
.eq('id', depositRowId)
65-
.single();
52+
// Choose between Silicates and Coal for testing
53+
const depositResource = Math.random() < 0.5 ? "Silicates" : "Coal";
6654

67-
if (depositError) {
68-
console.error(depositError);
69-
return;
70-
}
55+
// Get the corresponding id from the map
56+
const depositRowId = resourceToIdMap[depositResource];
7157

72-
// Set the deposit and coverUrl based on the chosen resource
7358
const response = await supabase.from('basePlanetSectors').upsert([
7459
{
7560
anomaly: userPlanet,
7661
owner: session?.user?.id,
77-
deposit: depositData?.name || "Unknown Resource",
78-
coverUrl: depositData?.icon_url || "https://example.com/default-image.jpg",
62+
deposit: depositRowId, // Use the id instead of the resource name
63+
coverUrl: "https://mars.nasa.gov/mars2020-raw-images/pub/ods/surface/sol/00090/ids/edr/browse/edl/EBE_0090_0674952393_193ECM_N0040048EDLC00090_0030LUJ01_1200.jpg",
7964
explored: false,
8065
},
8166
]);
8267

8368
if (response.error) {
8469
console.error(response.error);
8570
} else {
86-
// Handle success if needed
71+
// Handle success
8772
}
8873
}
89-
};
74+
};
9075

9176
return (
9277
<div>

‎components/Content/Planets/Base/IndividualBasePlanetSector.tsx

+79-122
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,17 @@ import Card from "../../../Card";
55
import RoverImageGallery, { RoverImage, RoverImageNoHandle } from "../PlanetData/RandomRoverImage";
66
import axios from "axios";
77
import { RoverContentPostForm } from "../../CreatePostForm";
8-
import StructureComponent from "../Activities/StructureCreate";
98

10-
// Rover image data -> place inside BasePlanetSector
9+
export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
10+
const router = useRouter();
11+
const { id: sectorId } = router.query;
12+
13+
const supabase = useSupabaseClient();
14+
15+
const [planetData, setPlanetData] = useState(null);
16+
const [sectorData, setSectorData] = useState(null);
17+
18+
// Rover image data
1119
// useEffect(() => {
1220
// // const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/${rover}/photos?sol=${date}&api_key=${apiKey}`;
1321
// const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/opportunity/photos?sol=181&api_key=${apiKey}`;
@@ -34,115 +42,80 @@ import StructureComponent from "../Activities/StructureCreate";
3442
// });
3543
// }, [session]);
3644

37-
export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
38-
const router = useRouter();
39-
const { id: sectorId } = router.query;
40-
41-
const supabase = useSupabaseClient();
42-
43-
const [planetData, setPlanetData] = useState(null);
44-
const [sectorData, setSectorData] = useState(null);
45-
const [depositData, setDepositData] = useState(null);
46-
47-
const getPlanetData = async () => {
48-
if (!sectorData) {
49-
return null;
50-
}
51-
52-
try {
53-
const { data, error } = await supabase
54-
.from("basePlanets")
55-
.select("*")
56-
.eq("id", sectorData.id)
57-
.single();
58-
59-
if (data) {
60-
setPlanetData(data);
61-
}
62-
63-
if (error) {
64-
throw error;
65-
}
66-
} catch (error) {
67-
console.error(error.message);
68-
}
69-
};
70-
71-
const getSectorData = async () => {
72-
try {
73-
const { data, error } = await supabase
74-
.from("basePlanetSectors")
75-
.select("*")
76-
.eq("id", sectorId)
77-
.single();
78-
79-
if (data) {
80-
setSectorData(data);
81-
}
82-
83-
if (error) {
84-
throw error;
85-
}
86-
} catch (error) {
87-
console.error(error.message);
88-
}
45+
const getPlanetData = async () => {
46+
if (!sectorData) {
47+
return null;
48+
}
49+
50+
try {
51+
const { data, error } = await supabase
52+
.from("basePlanets")
53+
.select("*")
54+
.eq("id", sectorData.id)
55+
.single();
56+
57+
if (data) {
58+
setPlanetData(data);
59+
};
60+
61+
console.log(data);
62+
63+
if (error) {
64+
throw error;
65+
};
66+
} catch (error) {
67+
console.error(error.message);
8968
};
90-
91-
const getDepositData = async () => {
92-
if (!sectorData || !sectorData.deposit) {
93-
return null;
94-
console.log('Fuck, nothing detected');
69+
};
70+
71+
const getSectorData = async () => {
72+
try {
73+
const { data, error } = await supabase
74+
.from("basePlanetSectors")
75+
.select("*")
76+
.eq("id", sectorId)
77+
.single();
78+
79+
if (data) {
80+
setSectorData(data);
9581
}
96-
97-
try {
98-
const { data, error } = await supabase
99-
.from("inventoryITEMS")
100-
.select("*")
101-
.eq("id", sectorData.deposit)
102-
.single();
103-
104-
if (data) {
105-
setDepositData(data);
106-
}
10782

108-
console.log(sectorData);
109-
110-
if (error) {
111-
throw error;
112-
}
113-
} catch (error) {
114-
console.error(error.message);
83+
if (error) {
84+
throw error;
11585
}
116-
};
117-
118-
useEffect(() => {
119-
const fetchData = async () => {
120-
if (sectorId) {
121-
await getSectorData();
122-
await getPlanetData();
123-
await getDepositData();
124-
}
125-
};
126-
127-
fetchData();
128-
}, [sectorId]);
129-
130-
if (!sectorData || !depositData) {
131-
return <div>Loading...</div>;
86+
} catch (error) {
87+
console.error(error.message);
13288
}
133-
134-
const {
135-
id,
136-
created_at,
137-
anomaly,
138-
owner,
139-
deposit,
140-
coverUrl,
141-
exploration_start_data,
142-
explored,
143-
} = sectorData;
144-
const { content } = planetData || {};
145-
const { name, icon_url } = depositData;
89+
};
90+
91+
useEffect(() => {
92+
const fetchData = async () => {
93+
if (sectorId) {
94+
await getSectorData();
95+
await getPlanetData();
96+
};
97+
};
98+
99+
fetchData();
100+
}, [sectorId]);
101+
102+
if (!sectorData) {
103+
return (
104+
<div>Loading...</div>
105+
);
106+
};
107+
108+
const {
109+
id,
110+
created_at,
111+
anomaly,
112+
owner,
113+
deposit,
114+
coverUrl,
115+
exploration_start_data,
116+
explored,
117+
} = sectorData;
118+
const { content } = planetData || {};
146119

147120
// const [imageUrl, setImageUrl] = useState('');
148121
// const [metadata, setMetadata] = useState('');
@@ -215,22 +188,6 @@ export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
215188
</div>
216189
</div>
217190
</div>
218-
<div className="flex flex-col items-center justify-start gap-4">
219-
<StructureComponent />
220-
{/* <div className="text-center text-slate-300 text-opacity-70 text-[21.73px] font-medium font-['Inter'] uppercase tracking-[3.48px]">
221-
Mineral deposit
222-
</div>
223-
<div className="text-center text-white text-opacity-90 text-[27.17px] font-medium font-['Inter']">
224-
{name}
225-
</div>
226-
{icon_url && (
227-
<img
228-
src={icon_url}
229-
alt={`Icon for ${name}`}
230-
className="w-16 h-16 object-contain"
231-
/>
232-
)} */}
233-
</div>
234191
{/* {deposit && typeof deposit === "string" ? (
235192
<div>{deposit}</div>
236193
) : (

0 commit comments

Comments
 (0)