Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍯🪁 ↝ [SSG-64 SSG-58]: Bridging between #Create & Expedition sprints #164

Merged
merged 12 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"jira-plugin.workingProject": "",
"liveServer.settings.port": 5501,
"solidity.compileUsingRemoteVersion": "v0.8.11+commit.d7f03943",
"solidity.defaultCompiler": "localFile"
"solidity.defaultCompiler": "localFile",
}
60 changes: 0 additions & 60 deletions app/api/gameplay/communityStations/projects/31011/route.ts

This file was deleted.

110 changes: 0 additions & 110 deletions app/api/gameplay/communityStations/projects/route.ts

This file was deleted.

13 changes: 0 additions & 13 deletions app/api/gameplay/missions/pathways/route.rb

This file was deleted.

2 changes: 0 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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";
Expand Down
1 change: 0 additions & 1 deletion app/scenes/earth/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion app/scenes/onboarding/page.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
3 changes: 0 additions & 3 deletions app/scenes/planet/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -81,7 +80,6 @@ export default function PlanetViewPage() {
<div></div>
<div></div>
<div></div>
<div><ChapterOneIntroduction /></div>
</PlanetViewLayout>
);
}
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion app/scenes/research/page.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
1 change: 0 additions & 1 deletion app/starnet/consensus/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading
Loading