Skip to content

Commit 619fa6d

Browse files
GizmotronnGizmotronn
authored
🍩🧩 ↝ [SSG-78 SSG-69]: Merge pull request #166 from Signal-K/SSG-78
🫥🍩 ↝ [SSG-78 SSG-69]: A lot of cleanup
2 parents 4758ea7 + 25b8f8a commit 619fa6d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2422
-385
lines changed

‎app/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import GlobeView from "./scenes/globe/page";
3131
import { EarthScene } from "./scenes/earth/scene";
3232
import StructuresOnPlanet, { AtmosphereStructuresOnPlanet, OrbitalStructuresOnPlanet } from "@/components/Structures/Structures";
33-
import EnhancedWeatherEvents from "@/components/enhanced-weather-events";
33+
import EnhancedWeatherEvents from '@/components/(scenes)/mining/enhanced-weather-events';
3434
import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
3535
import { EarthViewLayout } from "@/components/(scenes)/planetScene/layout";
3636
import Onboarding from "./scenes/onboarding/page";

‎app/scenes/earth/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import StructuresOnPlanet, {
1212
} from "@/components/Structures/Structures";
1313
import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
1414
import InventoryPage from "@/components/Inventory/Grid/Grid";
15-
import EnhancedWeatherEventsComponent from "@/components/enhanced-weather-events";
15+
import EnhancedWeatherEvents from '@/components/(scenes)/mining/enhanced-weather-events';
1616
// import TopographicMap from "@/components/topographic-map";
1717

1818
const EarthView: React.FC = () => {
@@ -50,7 +50,7 @@ export default EarthView;
5050
const EarthStructures: React.FC = () => {
5151
return (
5252
<EarthViewLayout>
53-
<EnhancedWeatherEventsComponent />
53+
<EnhancedWeatherEvents />
5454
<div className="w-full">
5555
<div className="py-2">
5656
<center>

‎app/scenes/mars/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import StructuresOnPlanet, { AtmosphereStructuresOnPlanet, OrbitalStructuresOnPl
1010
import { InventoryStructureItem } from "@/types/Items";
1111
import { PlanetarySystem } from "@/components/(scenes)/planetScene/orbitals/system";
1212
import AllAutomatonsOnActivePlanet from "@/components/Structures/Auto/AllAutomatons";
13-
import { MiningComponentComponent } from "@/components/mining-component";
13+
import { MiningComponentComponent } from "@/components/(scenes)/mining/mining-component";
1414
import StructureMissionGuide from "@/components/Layout/Guide";
1515

1616
const MarsView: React.FC = () => {

‎app/scenes/mining/page.tsx

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
"use client";
22

3-
import React, { useState } from "react";
4-
import { useActivePlanet } from "@/context/ActivePlanet";
5-
import MineralsInventoryGrid from "@/components/Inventory/mineralsPanel";
6-
import StarnetLayout from "@/components/Layout/Starnet";
3+
import React from "react";
74
import { EarthActionSceneLayout, EarthViewLayout } from "@/components/(scenes)/planetScene/layout";
85
import StructureMissionGuide from "@/components/Layout/Guide";
9-
import { MiningComponentComponent } from "@/components/mining-component";
10-
11-
enum Step {
12-
MineralDeposits = "MINERAL_DEPOSITS",
13-
MineralDetails = "MINERAL_DETAILS",
14-
};
6+
import { MiningComponentComponent } from "@/components/(scenes)/mining/mining-component";
157

168
export default function Mining() {
179
return (

‎app/scenes/onboarding/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react";
22
import { EarthScene } from "../earth/scene";
33
import InventoryPage from "@/components/Inventory/Grid/Grid";
4-
import EnhancedWeatherEvents from "@/components/enhanced-weather-events";
5-
import MissionSelector from "@/components/mission-selector";
4+
import EnhancedWeatherEvents from '@/components/(scenes)/mining/enhanced-weather-events';
5+
import MissionSelector from "@/components/Missions/mission-selector";
66
import VerticalToolbar from "@/components/Layout/Toolbar";
77

88
export default function Onboarding () {

‎app/tests/page.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22

33
import React from "react";
44
import StarnetLayout from "@/components/Layout/Starnet";
5-
import { MiningComponentComponent } from "@/components/mining-component";
5+
import { MiningComponentComponent } from "@/components/(scenes)/mining/mining-component";
6+
import Greenhouse from "@/page.test";
7+
import BigMap from "@/components/(scenes)/planetScene/bigMap";
8+
import DiscoveriesPage from "@/content/Classifications/minimalDiscoveries";
69
// import { TopographicMap } from "@/components/topographic-map";
710

811
export default function TestPage() {
912
return (
1013
// <StarnetLayout>
1114
<>
12-
<MiningComponentComponent />
15+
{/* <Greenhouse /> */}
16+
{/* <BigMap /> */}
17+
<DiscoveriesPage />
1318
{/* <MiningComponent /> */}
1419
</>
1520
// {/* </StarnetLayout> */}

‎citizen

Submodule citizen updated 56 files

‎components/Inventory.tsx ‎components/(scenes)/mining/Inventory.tsx

File renamed without changes.

‎components/enhanced-weather-events.jsx ‎components/(scenes)/mining/enhanced-weather-events.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Button } from '@/components/ui/button'
99
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
1010
import { Textarea } from '@/components/ui/textarea'
1111
import { Cloud, Sun, Zap, Droplets, Bird, Mountain, Star, Settings } from 'lucide-react'
12-
import { PlanetarySystem } from './(scenes)/planetScene/orbitals/system'
12+
import { PlanetarySystem } from '../planetScene/orbitals/system'
1313

1414
const cloudTypes = ['cumulus', 'vortex', 'turbulent', 'bands', 'martian']
1515

‎components/mineral-deposit-list.tsx ‎components/(scenes)/mining/mineral-deposit-list.tsx

File renamed without changes.

0 commit comments

Comments
 (0)