Skip to content

Commit

Permalink
🎏🦗 ↝ [SSC-21 SSC-16]: Fixing plankton portal & updating ui for planet…
Browse files Browse the repository at this point in the history
… switcher
  • Loading branch information
Gizmotronn committed Oct 7, 2024
1 parent 275aa74 commit bdb5f52
Show file tree
Hide file tree
Showing 14 changed files with 738 additions and 477 deletions.
9 changes: 8 additions & 1 deletion app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
VenusView
} from './scenes';
import GlobeView from "./scenes/globe/page";
import InitialiseChapterOneUser from "@/components/(scenes)/chapters/one/InitialiseUser";

export default function Home() {
const session = useSession();
Expand Down Expand Up @@ -68,12 +69,18 @@ export default function Home() {
return <LoginPage />;
};

if (activePlanet?.id === null || activePlanet?.id == 69) {
if (activePlanet?.id === 69) {
return (
<EarthView />
);
};

if (activePlanet?.id === null) {
return (
<InitialiseChapterOneUser />
);
};

if (activePlanet?.id == 35) {
return (
<GlobeView />
Expand Down
8 changes: 0 additions & 8 deletions app/scenes/earth/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ import InitialiseChapterOneUser from "@/components/(scenes)/chapters/one/Initial
const EarthView: React.FC = () => {
const supabase = useSupabaseClient();
const session = useSession();

const { activePlanet, updatePlanetLocation } = useActivePlanet();

if (activePlanet?.id !== 69 || 35) {
return (
<InitialiseChapterOneUser />
);
};

return (
<div className="relative min-h-screen">
Expand Down
11 changes: 4 additions & 7 deletions app/tests/page.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
"use client";

import React, { useEffect, useState, useCallback } from "react";
import Camera from "@/components/Projects/Zoodex/Upload/Camera";
import CloudUploadEarthCameraComponent from "@/components/Projects/Lidar/Upload/CloudCamera";
import React from "react";
import SwitchPlanet from "@/components/(scenes)/travel/SolarSystem";

export default function TestPage() {
return (
<div>
<CloudUploadEarthCameraComponent />
<SwitchPlanet />
</div>
);
};


};
Loading

0 comments on commit bdb5f52

Please sign in to comment.