Skip to content

Commit

Permalink
Blah, things are probably broken, especially with OBJLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderson1993 committed Feb 11, 2025
1 parent 126aacd commit fe22bbb
Show file tree
Hide file tree
Showing 68 changed files with 946 additions and 11,495 deletions.
9,606 changes: 619 additions & 8,987 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.13.1",
"description": "Starship Simulator Controls",
"private": true,
"type": "module",
"type": "commonjs",
"repository": {
"type": "git",
"url": "https://github.com/Thorium-Sim/thorium.git"
Expand Down Expand Up @@ -350,7 +350,6 @@
"react-dom": "^16.13.0",
"react-draggable": "^4.0.3",
"react-icons": "^3.7.0",
"react-intl": "^4.5.5",
"react-intl-translations-manager": "^5.0.3",
"react-konami": "^0.6.2",
"react-measure": "^2.3.0",
Expand Down Expand Up @@ -378,13 +377,15 @@
"stylelint-scss": "^3.12.0",
"svg-to-jsx": "^1.0.2",
"three-obj-loader": "^1.1.3",
"ts-eager": "^2.0.2",
"ts-jest": "^26.0.0",
"ts-node-dev": "^1.0.0-pre.44",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"typescript": "^5.4.0",
"typescript-plugin-tw-template": "^2.0.1",
"vite": "^5.4.6",
"vite-plugin-babel-macros": "^1.0.6",
"vite-plugin-commonjs": "^0.10.4",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^5.0.1",
"wait-on": "^5.0.0",
Expand Down
98 changes: 0 additions & 98 deletions scripts/manageTranslations.js

This file was deleted.

6 changes: 3 additions & 3 deletions server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"module": "nodenext",
"module": "NodeNext",
"esModuleInterop": true,
"allowJs": true,
"allowSyntheticDefaultImports": true,
Expand All @@ -10,7 +10,7 @@

// TODO: Turn this on when we get enough coverage
"noImplicitAny": false,
"moduleResolution": "node",
"moduleResolution": "nodenext",
"resolveJsonModule": true,
"sourceMap": false,
"outDir": "../tempServer",
Expand All @@ -20,5 +20,5 @@
"~*": ["./*"]
}
},
"include": ["./**/*"]
"include": ["./**/*"],
}
11 changes: 4 additions & 7 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ import client from "./helpers/graphqlClient";
import Routes from "./containers/routes";
import ErrorBoundary from "./helpers/errorBoundary";
import EasterEgg from "./helpers/easter-egg";
import IntlProvider from "./helpers/intl";
import "./app.scss";
import "./fonts.scss";

const ApolloApp = () => (
<React.Suspense fallback="Loading...">
<ApolloProvider client={client}>
<IntlProvider>
<ErrorBoundary>
<Routes />
<EasterEgg />
</ErrorBoundary>
</IntlProvider>
<ErrorBoundary>
<Routes />
<EasterEgg />
</ErrorBoundary>
</ApolloProvider>
</React.Suspense>
);
Expand Down
3 changes: 1 addition & 2 deletions src/components/client/soundPlayer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from "react";
import {FormattedMessage} from "react-intl";
import {useSounds} from "../generic/SoundPlayer";
import Reset from "./reset";
import {useApolloClient} from "@apollo/client";
Expand Down Expand Up @@ -39,7 +38,7 @@ const SoundPlayer: React.FC<{
return (
<div className="keyboard-holder">
<Reset clientId={clientId} station={station} />
<FormattedMessage id="sound-player" defaultMessage="Sound Player" />
Sound Player
<ClientLighting simulator={simulator} clientId={clientId} />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/layouts/LayoutCorners/CardSwitcher.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const CardButton = props => {
return (
<div className="card-icon-item">
<div
onClick={props.changeCard && props.changeCard.bind(this, props.name)}
onClick={() => props.changeCard?.(props.name)}
className={props.name === props.currentCard ? "active" : ""}
>
<div className="card-button-mask">
Expand Down
51 changes: 8 additions & 43 deletions src/components/views/Armory/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,73 +14,38 @@ import {
Button,
} from "helpers/reactstrap";
import "./style.scss";
import {FormattedMessage} from "react-intl";

import Tour from "helpers/tourHelper";
import SubscriptionHelper from "helpers/subscriptionHelper";

const trainingSteps = [
{
selector: ".nothing",
content: (
<FormattedMessage
id="armory-training-1"
defaultMessage="Officers will sometimes need equipment to complete whatever tasks they have been assigned. You can use this screen to see the available equipment and assign it to members of your crew."
/>
),
content: "Officers will sometimes need equipment to complete whatever tasks they have been assigned. You can use this screen to see the available equipment and assign it to members of your crew.",
},
{
selector: ".officer-selector",
content: (
<FormattedMessage
id="armory-training-2"
defaultMessage="This button will allow you to change between the officers you have assigned to specific teams, and unassigned crew members without current orders."
/>
),
content: "This button will allow you to change between the officers you have assigned to specific teams, and unassigned crew members without current orders.",
},
{
selector: ".officer-list",
content: (
<FormattedMessage
id="armory-training-3"
defaultMessage="This list shows you the officers on the team you selected above, or any unassigned officers. Officers whose names are white have not been assigned any equipment. Those highlighted in red are carrying items."
/>
),
content: "This list shows you the officers on the team you selected above, or any unassigned officers. Officers whose names are white have not been assigned any equipment. Those highlighted in red are carrying items.",
},
{
selector: ".deck-selector",
content: (
<FormattedMessage
id="armory-training-4"
defaultMessage="You are authorized to access equipment from the rooms listed in this area. Click to select different rooms from a drop down list."
/>
),
content: "You are authorized to access equipment from the rooms listed in this area. Click to select different rooms from a drop down list.",
},
{
selector: ".room-inventory",
content: (
<FormattedMessage
id="armory-training-5"
defaultMessage="When you select a room the equipment within will be displayed in this area. The number in parentheses represents how many there are of that item. By clicking on an item you will transfer it to the ready area."
/>
),
content: "When you select a room the equipment within will be displayed in this area. The number in parentheses represents how many there are of that item. By clicking on an item you will transfer it to the ready area.",
},
{
selector: ".ready-inventory",
content: (
<FormattedMessage
id="armory-training-6"
defaultMessage="This is the ready area. Once you have selected all of the equipment you need to assign you can select the name of the officer from the area on the right and click “Transfer to Officer.” If you need to return an item to a room click on the item and it will return to the room it came from."
/>
),
content: "This is the ready area. Once you have selected all of the equipment you need to assign you can select the name of the officer from the area on the right and click “Transfer to Officer.” If you need to return an item to a room click on the item and it will return to the room it came from.",
},
{
selector: ".officer-inventory",
content: (
<FormattedMessage
id="armory-training-7"
defaultMessage="Officer items will be displayed in the Equipment field. Pressing the “Remove Inventory” button will transfer all items to the ready area."
/>
),
content: "Officer items will be displayed in the Equipment field. Pressing the “Remove Inventory” button will transfer all items to the ready area.",
},
];
export const ARMORY_CREW_SUB = gql`
Expand Down
9 changes: 2 additions & 7 deletions src/components/views/BridgeMap/bridgeMap.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component} from "react";
import {Container, Row, Col, Card, CardBody} from "helpers/reactstrap";
import Tour from "helpers/tourHelper";
import {FormattedMessage} from "react-intl";


import svgToJSX from "svg-to-jsx";
import "./style.scss";
Expand Down Expand Up @@ -36,12 +36,7 @@ class BridgeMap extends Component {
return [
{
selector: ".bridgeMap",
content: (
<FormattedMessage
id="bridge-map-training-1"
defaultMessage="This screen shows a map of the bridge. You can use it to see what each station on the bridge does. Hover your mouse over or tap on a station to see a description on the right side of the screen."
/>
),
content: "This screen shows a map of the bridge. You can use it to see what each station on the bridge does. Hover your mouse over or tap on a station to see a description on the right side of the screen.",
},
];
};
Expand Down
Loading

0 comments on commit fe22bbb

Please sign in to comment.