Merge pull request #2218 from Thorium-Sim/develop

Release
Thorium-Sim · May 25, 2019 · 397ef2c · 397ef2c
2 parents faab947 + 5dfafad
commit 397ef2c
Show file tree

Hide file tree

Showing 42 changed files with 1,375 additions and 90 deletions.
diff --git a/client/public/cardIcons/Interface.svg b/client/public/cardIcons/Interface.svg
diff --git a/client/src/components/client/simulatorData.js b/client/src/components/client/simulatorData.js
@@ -75,6 +75,7 @@ class SimulatorData extends Component {
           const { simulators } = data;
           if (loading || !simulators) return null;
           if (!simulators[0]) return <div>No Simulator</div>;
+          console.log(simulators[0].stations);
           const station = simulators[0].stations.find(s => s.name === name);
           return (
             <SubscriptionHelper
@@ -90,13 +91,11 @@ class SimulatorData extends Component {
                 })
               }
             >
-              {
-                <Client
-                  {...this.props}
-                  simulator={simulators[0]}
-                  station={station || this.props.station}
-                />
-              }
+              <Client
+                {...this.props}
+                simulator={simulators[0]}
+                station={station || this.props.station}
+              />
             </SubscriptionHelper>
           );
         }}

diff --git a/client/src/components/core/menubar/DynamicPicker.js b/client/src/components/core/menubar/DynamicPicker.js
@@ -68,11 +68,43 @@ class DynamicPicker extends Component {
     if (value === "change") {
       return this.setState({ modal: true });
     }
+    if (value === "export") {
+      const href = `${window.location.protocol}//${
+        window.location.hostname
+      }:${parseInt(window.location.port, 10) + 1}/exportCoreLayout/${
+        this.state.layout
+      }`;
+      window.open(href);
+      return;
+    }
+    if (value === "import") {
+      this.fileRef.current.click();
+      return;
+    }
     this.setState({ layout: value });
     this.props.onChange(
       JSON.parse(coreLayouts.find(l => l.id === value).config)
     );
   };
+  handleImport = evt => {
+    const data = new FormData();
+    Array.from(evt.target.files).forEach((f, index) =>
+      data.append(`files[${index}]`, f)
+    );
+    fetch(
+      `${window.location.protocol}//${window.location.hostname}:${parseInt(
+        window.location.port,
+        10
+      ) + 1}/importCoreLayout`,
+      {
+        method: "POST",
+        body: data
+      }
+    ).then(() => {
+      window.location.reload();
+    });
+  };
+  fileRef = React.createRef();
   render() {
     const { modal } = this.state;
     const {
@@ -93,6 +125,13 @@ class DynamicPicker extends Component {
             })
           }
         />
+        <input
+          hidden
+          type="file"
+          ref={this.fileRef}
+          value=""
+          onChange={this.handleImport}
+        />
         <select
           value={this.state.layout}
           className="btn btn-warning btn-sm"
@@ -111,6 +150,10 @@ class DynamicPicker extends Component {
             Delete Core Layout
           </option>
           <option value="change">Reorder Core Layouts</option>
+          <option value="export" disabled={this.state.layout === "nothing"}>
+            Export Core Layout
+          </option>
+          <option value="import">Import Core Layout</option>
         </select>
         {modal && (
           <MosaicConfig

diff --git a/client/src/components/layouts/LayoutBlack/cardSwitcher.js b/client/src/components/layouts/LayoutBlack/cardSwitcher.js
@@ -2,7 +2,7 @@ import React, { Component, Fragment } from "react";
 import { Tooltip } from "reactstrap";
 
 const spregex = /.*.{8}-.{4}-.{4}-.{4}-.{12}/gi;
-const intregex = /interface-.{8}-.{4}-.{4}-.{4}-.{12}/gi;
+const intregex = /interface-id:.{8}-.{4}-.{4}-.{4}-.{12}/gi;
 class CardButton extends Component {
   state = {};
   card = React.createRef();

diff --git a/client/src/components/layouts/LayoutCorners/CardSwitcher.js b/client/src/components/layouts/LayoutCorners/CardSwitcher.js
@@ -26,7 +26,7 @@ class CardSwitcher extends Component {
   }
 }
 
-const intregex = /interface-.{8}-.{4}-.{4}-.{4}-.{12}/gi;
+const intregex = /interface-id:.{8}-.{4}-.{4}-.{4}-.{12}/gi;
 const spregex = /.*.{8}-.{4}-.{4}-.{4}-.{12}/gi;
 
 const CardButton = props => {

diff --git a/client/src/components/layouts/LayoutEpsilon/cardSwitcher.js b/client/src/components/layouts/LayoutEpsilon/cardSwitcher.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 
 const spregex = /.*.{8}-.{4}-.{4}-.{4}-.{12}/gi;
-const intregex = /interface-.{8}-.{4}-.{4}-.{4}-.{12}/gi;
+const intregex = /interface-id:.{8}-.{4}-.{4}-.{4}-.{12}/gi;
 class CardSwitcher extends Component {
   state = {};
   render() {

diff --git a/client/src/components/layouts/LayoutLine/cardSwitcher.js b/client/src/components/layouts/LayoutLine/cardSwitcher.js
@@ -2,7 +2,7 @@ import React, { Component, Fragment } from "react";
 import { Tooltip } from "reactstrap";
 
 const spregex = /.*.{8}-.{4}-.{4}-.{4}-.{12}/gi;
-const intregex = /interface-.{8}-.{4}-.{4}-.{4}-.{12}/gi;
+const intregex = /interface-id:.{8}-.{4}-.{4}-.{4}-.{12}/gi;
 class CardButton extends Component {
   state = {};
   card = React.createRef();

diff --git a/client/src/components/layouts/cardRenderer.js b/client/src/components/layouts/cardRenderer.js
@@ -30,7 +30,7 @@ export default function renderCards(props) {
   function getCompName(name) {
     const cleanedName = name
       .replace("software-panel-", "")
-      .replace("interface-", "");
+      .replace("interface-id:", "");
     if (props.simulator.panels.includes(cleanedName)) {
       return "SoftwarePanels";
     }
@@ -60,7 +60,7 @@ export default function renderCards(props) {
           return (
             <CardHolder
               component={Views.Interface}
-              interfaceId={card.component.replace("interface-", "")}
+              interfaceId={card.component.replace("interface-id:", "")}
               {...props}
               key={card.name}
             />

diff --git a/client/src/components/views/DamageControl/core.js b/client/src/components/views/DamageControl/core.js
@@ -184,6 +184,17 @@ class DamageControlCore extends Component {
     });
     //this.toggleDamage(e, s, true)
   };
+  renderEngineSpeed = system => {
+    if (system.type !== "Engine") return null;
+    const engines = this.props.data.engines;
+    const engine = engines.find(e => e.id === system.id);
+    const speedIndex =
+      system.power.powerLevels.filter(p => p <= system.power.power).length - 1;
+    const maxSpeed = engine.speeds[speedIndex]
+      ? engine.speeds[speedIndex].number
+      : 0;
+    return `(${maxSpeed})`;
+  };
   damageOption = (e, option) => {
     const { system } = this.state.context;
     if (option === "destroy") {
@@ -287,7 +298,7 @@ class DamageControlCore extends Component {
                         onContextMenu={e => this.setContext(e, s)}
                         style={this.systemStyle(s)}
                       >
-                        {this.systemName(s)}
+                        {this.systemName(s)} {this.renderEngineSpeed(s)}
                       </td>
                       <td>
                         {(s.power.power || s.power.power === 0) && (
@@ -418,6 +429,12 @@ const SYSTEMS_QUERY = gql`
     reactors(simulatorId: $simulatorId) {
       ...PowerData
     }
+    engines(simulatorId: $simulatorId) {
+      id
+      speeds {
+        number
+      }
+    }
     systems(simulatorId: $simulatorId) {
       id
       name

diff --git a/client/src/components/views/Interfaces/interfaces.js b/client/src/components/views/Interfaces/interfaces.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-
+import "./style.scss";
 import * as comps from "./components";
 
 function parseComponents({ components, config, values }) {
@@ -23,6 +23,7 @@ class Interfaces extends Component {
     const components = parseComponents(iFace);
     return (
       <div
+        className="interface-card"
         style={{
           backgroundColor: "black",
           width: deviceWidth,

diff --git a/client/src/components/views/Interfaces/style.scss b/client/src/components/views/Interfaces/style.scss
@@ -0,0 +1,5 @@
+.cardContainer .interface-card {
+  max-width: 100%;
+  max-height: 100%;
+  border: solid 1px rgba(255, 255, 255, 0.5);
+}
diff --git a/client/src/components/views/TractorBeam/core.js b/client/src/components/views/TractorBeam/core.js
@@ -1,5 +1,4 @@
 import React, { Component } from "react";
-import { Container } from "reactstrap";
 import gql from "graphql-tag.macro";
 import { graphql, withApollo } from "react-apollo";
 import { InputField, OutputField } from "../../generic/core";
@@ -93,7 +92,7 @@ class TractorBeamCore extends Component {
     const tractorBeam = this.props.data.tractorBeam[0];
     if (!tractorBeam) return <p>No Tractor Beam</p>;
     return (
-      <Container className="tractor-beam-core">
+      <div className="tractor-beam-core">
         <SubscriptionHelper
           subscribe={() =>
             this.props.data.subscribeToMore({
@@ -133,21 +132,23 @@ class TractorBeamCore extends Component {
             {tractorBeam.targetLabel}
           </InputField>
         </div>
-        <label>Strength: {Math.round(tractorBeam.strength * 100)}</label>
-        <label>
-          Stress: {Math.round(tractorBeam.stress * 100)}{" "}
-          <input
-            style={{ width: "50%", float: "right" }}
-            onChange={this.setStress}
-            onMouseUp={this.updateStress}
-            defaultValue={tractorBeam.stress}
-            type="range"
-            min="0"
-            max="1"
-            step="0.01"
-          />
-        </label>
-      </Container>
+        <div>
+          <label>Strength: {Math.round(tractorBeam.strength * 100)}</label>
+          <label>
+            Stress: {Math.round(tractorBeam.stress * 100)}{" "}
+            <input
+              style={{ width: "50%", float: "right" }}
+              onChange={this.setStress}
+              onMouseUp={this.updateStress}
+              defaultValue={tractorBeam.stress}
+              type="range"
+              min="0"
+              max="1"
+              step="0.01"
+            />
+          </label>
+        </div>
+      </div>
     );
   }
 }

diff --git a/client/src/components/views/TractorBeam/style.scss b/client/src/components/views/TractorBeam/style.scss
@@ -75,9 +75,8 @@
 }
 .tractor-beam-core {
   label {
-    display: block;
-    float: left;
-    width: 100%;
+    width: 90%;
+    margin-right: 20px;
   }
 }