🪁🐹 ↝ [SSG-64 SSG-58]: Bridging & Merge pull request #164 from Signal-…

…K/SSG-64 🍯🪁 ↝ [SSG-64 SSG-58]: Bridging between #Create & Expedition sprints
Signal-K · Nov 16, 2024 · c81717b · c81717b
2 parents d03796a + 98228cd
commit c81717b
Show file tree

Hide file tree

Showing 61 changed files with 2,237 additions and 2,621 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,5 +10,5 @@
   "jira-plugin.workingProject": "",
   "liveServer.settings.port": 5501,
   "solidity.compileUsingRemoteVersion": "v0.8.11+commit.d7f03943",
-  "solidity.defaultCompiler": "localFile"
+  "solidity.defaultCompiler": "localFile",
 }
diff --git a/app/api/gameplay/communityStations/projects/31011/route.ts b/app/api/gameplay/communityStations/projects/31011/route.ts
diff --git a/app/api/gameplay/communityStations/projects/route.ts b/app/api/gameplay/communityStations/projects/route.ts
diff --git a/app/api/gameplay/missions/pathways/route.rb b/app/api/gameplay/missions/pathways/route.rb
diff --git a/app/page.tsx b/app/page.tsx
@@ -3,7 +3,6 @@
 import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
 import { useEffect, useState } from "react";
 import LoginPage from "./auth/LoginModal";
-import OnboardingWindow from "../components/(scenes)/chapters/(onboarding)/window";
 import { useActivePlanet } from "@/context/ActivePlanet";
 import {
   EarthView,
@@ -29,7 +28,6 @@ import {
   VenusView
 } from './scenes';
 import GlobeView from "./scenes/globe/page";
-import InitialiseChapterOneUser from "@/components/(scenes)/chapters/one/InitialiseUser";
 import { EarthScene } from "./scenes/earth/scene";
 import StructuresOnPlanet, { AtmosphereStructuresOnPlanet, OrbitalStructuresOnPlanet } from "@/components/Structures/Structures";
 import EnhancedWeatherEvents from "@/components/enhanced-weather-events";

diff --git a/app/scenes/earth/page.tsx b/app/scenes/earth/page.tsx
@@ -11,7 +11,6 @@ import StructuresOnPlanet, {
   OrbitalStructuresOnPlanet,
 } from "@/components/Structures/Structures";
 import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
-import InitialiseChapterOneUser from "@/components/(scenes)/chapters/one/InitialiseUser";
 import InventoryPage from "@/components/Inventory/Grid/Grid";
 import EnhancedWeatherEventsComponent from "@/components/enhanced-weather-events";
 import TopographicMap from "@/components/topographic-map";

diff --git a/app/scenes/onboarding/page.tsx b/app/scenes/onboarding/page.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { EarthScene } from "../earth/scene";
-import InitialiseChapterOneUser from "@/components/(scenes)/chapters/one/InitialiseUser";
 import InventoryPage from "@/components/Inventory/Grid/Grid";
 import EnhancedWeatherEvents from "@/components/enhanced-weather-events";
 import MissionSelector from "@/components/mission-selector";

diff --git a/app/scenes/planet/page.tsx b/app/scenes/planet/page.tsx
@@ -6,7 +6,6 @@ import { useActivePlanet } from "@/context/ActivePlanet";
 import PlanetViewLayout from "@/components/(scenes)/planetScene/layout";
 import StructuresOnPlanet, { AtmosphereStructuresOnPlanet, OrbitalStructuresOnPlanet } from "@/components/Structures/Structures";
 import { InventoryStructureItem } from "@/types/Items";
-import ChapterOneIntroduction from "@/components/(scenes)/chapters/one/ChapterOneIntro";
 import { PlanetarySystem } from "@/components/(scenes)/planetScene/orbitals/system";
 // import { BottomMenuBar } from "@/app/components/sections/bottomMenuBar";
 import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
@@ -81,7 +80,6 @@ export default function PlanetViewPage() {
                 <div></div>
                 <div></div>
                 <div></div>
-                <div><ChapterOneIntroduction /></div>
             </PlanetViewLayout>
         );
     }
@@ -102,7 +100,6 @@ export default function PlanetViewPage() {
             <PlanetStructures />
             {isGuidePopupVisible && (
                 <div className="fixed inset-0 flex items-center justify-center z-50">
-                    <ChapterOneIntroduction />
                     <button
                         onClick={() => setIsGuidePopupVisible(false)}
                         className="absolute top-4 right-4 bg-red-500 text-white p-2 rounded-full hover:bg-red-600 focus:outline-none"

diff --git a/app/scenes/research/page.tsx b/app/scenes/research/page.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import React from "react";
-import { AdvancedTechTreeComponent } from "@/components/Structures/Research/TechTree";
+import ModernTechTree from "@/components/Structures/Research/TechTree";
+import { AdvancedTechTreeComponent } from "@/components/Structures/Research/OldTechTree";
 
 export default function ResearchPage() {
     return ( 

diff --git a/app/starnet/consensus/page.tsx b/app/starnet/consensus/page.tsx
@@ -3,7 +3,6 @@
 import React, { useEffect, useState } from "react";
 import StarnetLayout from "@/components/Layout/Starnet";
 import { ExoplanetTransitHunter } from "@/components/Projects/Telescopes/ExoplanetC23";
-import MissionPathway from "@/components/Missions/Pathway";
 import ProfileCardModal from "@/components/profile/form";
 import { CommunityScienceStation } from "@/components/Structures/Community/StationModal";
 import { CreateCommunityStation } from "@/components/Structures/Build/MakeCommunityStation";