Skip to content

Commit 5d74eff

Browse files
GizmotronnGizmotronn
committed
🧳🌲 ↝ Fix feed/index for unauthenticated users
1 parent c89f92d commit 5d74eff

File tree

2 files changed

+123
-81
lines changed

2 files changed

+123
-81
lines changed

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

+121-80
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@ import RoverImageGallery, { RoverImage, RoverImageNoHandle } from "../PlanetData
66
import axios from "axios";
77
import { RoverContentPostForm } from "../../CreatePostForm";
88

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
9+
// Rover image data -> place inside BasePlanetSector
1910
// useEffect(() => {
2011
// // const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/${rover}/photos?sol=${date}&api_key=${apiKey}`;
2112
// const apiUrl = `https://api.nasa.gov/mars-photos/api/v1/rovers/opportunity/photos?sol=181&api_key=${apiKey}`;
@@ -42,80 +33,115 @@ export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
4233
// });
4334
// }, [session]);
4435

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);
36+
export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
37+
const router = useRouter();
38+
const { id: sectorId } = router.query;
39+
40+
const supabase = useSupabaseClient();
41+
42+
const [planetData, setPlanetData] = useState(null);
43+
const [sectorData, setSectorData] = useState(null);
44+
const [depositData, setDepositData] = useState(null);
45+
46+
const getPlanetData = async () => {
47+
if (!sectorData) {
48+
return null;
49+
}
50+
51+
try {
52+
const { data, error } = await supabase
53+
.from("basePlanets")
54+
.select("*")
55+
.eq("id", sectorData.id)
56+
.single();
57+
58+
if (data) {
59+
setPlanetData(data);
60+
}
61+
62+
if (error) {
63+
throw error;
64+
}
65+
} catch (error) {
66+
console.error(error.message);
67+
}
6868
};
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);
69+
70+
const getSectorData = async () => {
71+
try {
72+
const { data, error } = await supabase
73+
.from("basePlanetSectors")
74+
.select("*")
75+
.eq("id", sectorId)
76+
.single();
77+
78+
if (data) {
79+
setSectorData(data);
80+
}
81+
82+
if (error) {
83+
throw error;
84+
}
85+
} catch (error) {
86+
console.error(error.message);
8187
}
82-
83-
if (error) {
84-
throw error;
88+
};
89+
90+
const getDepositData = async () => {
91+
if (!sectorData || !sectorData.deposit) {
92+
return null;
93+
console.log('Fuck, nothing detected');
94+
}
95+
96+
try {
97+
const { data, error } = await supabase
98+
.from("inventoryITEMS")
99+
.select("*")
100+
.eq("id", sectorData.deposit)
101+
.single();
102+
103+
if (data) {
104+
setDepositData(data);
105+
}
106+
107+
console.log(sectorData);
108+
109+
if (error) {
110+
throw error;
111+
}
112+
} catch (error) {
113+
console.error(error.message);
85114
}
86-
} catch (error) {
87-
console.error(error.message);
88-
}
89-
};
90-
91-
useEffect(() => {
92-
const fetchData = async () => {
93-
if (sectorId) {
94-
await getSectorData();
95-
await getPlanetData();
96-
};
97115
};
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 || {};
116+
117+
useEffect(() => {
118+
const fetchData = async () => {
119+
if (sectorId) {
120+
await getSectorData();
121+
await getPlanetData();
122+
await getDepositData();
123+
}
124+
};
125+
126+
fetchData();
127+
}, [sectorId]);
128+
129+
if (!sectorData || !depositData) {
130+
return <div>Loading...</div>;
131+
}
132+
133+
const {
134+
id,
135+
created_at,
136+
anomaly,
137+
owner,
138+
deposit,
139+
coverUrl,
140+
exploration_start_data,
141+
explored,
142+
} = sectorData;
143+
const { content } = planetData || {};
144+
const { name, icon_url } = depositData;
119145

120146
// const [imageUrl, setImageUrl] = useState('');
121147
// const [metadata, setMetadata] = useState('');
@@ -188,6 +214,21 @@ export default function BasePlanetSector({ sectorid }: { sectorid: string }) {
188214
</div>
189215
</div>
190216
</div>
217+
<div className="flex flex-col items-center justify-start gap-4">
218+
<div className="text-center text-slate-300 text-opacity-70 text-[21.73px] font-medium font-['Inter'] uppercase tracking-[3.48px]">
219+
Mineral deposit
220+
</div>
221+
<div className="text-center text-white text-opacity-90 text-[27.17px] font-medium font-['Inter']">
222+
{name}
223+
</div>
224+
{icon_url && (
225+
<img
226+
src={icon_url}
227+
alt={`Icon for ${name}`}
228+
className="w-16 h-16 object-contain"
229+
/>
230+
)}
231+
</div>
191232
{/* {deposit && typeof deposit === "string" ? (
192233
<div>{deposit}</div>
193234
) : (

‎pages/feed/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
22
import React, { useEffect, useState } from "react";
33
import Layout from "../../components/Section/Layout";
44
import ClassificationFeed, { ClassificationFeedDemo } from "../../components/Content/ClassificationFeed";
5+
import Login from "../login";
56

67
export default function Home() {
78
const session = useSession();
@@ -43,6 +44,6 @@ export default function Home() {
4344
}
4445

4546
return (
46-
<Layout>Hello</Layout>
47+
<Layout><Login /></Layout>
4748
);
4849
}

0 commit comments

Comments
 (0)