Migrate changes of 87fc3b6cbb

.babelrc

@@ -7,8 +7,6 @@
     "@babel/plugin-syntax-dynamic-import",
     "@babel/plugin-syntax-import-meta",
     ["@babel/plugin-proposal-class-properties", { "loose": true }],
-    "@babel/plugin-proposal-do-expressions",
-    "@babel/plugin-proposal-function-bind",
     "@babel/plugin-proposal-json-strings",
     [
       "@babel/plugin-proposal-decorators",
@@ -30,7 +28,7 @@
       }
     ],
     "@babel/plugin-proposal-nullish-coalescing-operator",
-    ["@babel/plugin-proposal-private-methods", { "loose": true }],
+    "@babel/plugin-proposal-do-expressions",
-    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
+    "@babel/plugin-proposal-function-bind"
   ]
 }

.dockerignore

@@ -1,7 +1,77 @@
-Dockerfile
-.dockerignore
-.gitignore
-README.md
-
-build
 node_modules
+npm-debug.log
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+

.gitattributes

@@ -1,14 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set, in order to prevent line ending inconsistency.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.jsx text
-*.js text
-
-# Declare files that will always have CRLF line endings on checkout.
-# *.sln text eol=crlf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary

.gitignore

@@ -10,3 +10,4 @@ env
 .project
 .vscode/
 docs/
+package-lock.json

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+image: docker:stable
+services:
+  - docker:dind
+
+stages:
+  - Build image
+
+docker build:
+  stage: Build image
+  script:
+  - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME .
+  - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin
+  - img push edcd/coriolis:$CI_COMMIT_REF_NAME

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -0,0 +1,16 @@
+language: node_js
+notifications:
+  email: false
+sudo: false
+node_js:
+  - "4.8.1"
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - git clone https://github.com/EDCD/coriolis-data.git ../coriolis-data
+
+script:
+  - npm run lint
+  - npm test

Dockerfile

@@ -1,25 +1,35 @@
-#syntax=docker/dockerfile:1.4
+### STAGE 1: Build ###
-# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
+FROM node:9.11.1-alpine as builder
-# docker buildx build --build-context data=../coriolis-data --tag coriolis .
+ARG branch=develop
+ENV BRANCH=$branch
+WORKDIR /src/app
+RUN mkdir -p /src/app/coriolis
+RUN mkdir -p /src/app/coriolis-data
 
-FROM node:18-alpine
+RUN apk add --update git
 
-# TODO: For a production build, we may want to just build the bundle and copy that in. No need for local copy of source.
+COPY . /src/app/coriolis
-WORKDIR /app
-ADD . .
-COPY --from=data . /coriolis-data/
 
-# Git is required before install if any modules (like coriolis-data) are loaded from github
+RUN npm i -g npm
-RUN apk update
-RUN apk add git
 
-WORKDIR /app/coriolis-data
+# Set up coriolis-data
-RUN npm install
+WORKDIR /src/app/coriolis-data
-WORKDIR /app
+RUN git clone https://github.com/EDCD/coriolis-data.git .
-RUN npm install
+RUN git checkout ${BRANCH}
-# Bundle for production config with webpack & log
+RUN npm install --no-package-lock
-RUN npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)
+RUN npm start
 
-# Optimally, this will start a static asset server like nginx/apache. Currently, this will start dev webpack server.
+# Set up coriolis
-CMD ["npm", "start"]
+WORKDIR /src/app/coriolis
-EXPOSE 3300
+RUN git checkout ${BRANCH}
+RUN npm install --no-package-lock
+RUN npm run build
+
+
+### STAGE 2: Production Environment ###
+FROM fholzer/nginx-brotli as web
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html
+WORKDIR /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]

Dockerfile-dev

@@ -1,23 +0,0 @@
-#syntax=docker/dockerfile:1.4
-# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
-# docker buildx build --build-context data=../coriolis-data --tag coriolis -f ./Dockerfile-dev .
-
-FROM node:18-alpine
-
-WORKDIR /app
-ADD . .
-COPY --from=data . /coriolis-data/
-
-# Install git & any other desired in-container dev tools
-# Git is required before install if any modules (like coriolis-data) are loaded from github
-RUN apk update
-RUN apk add git
-
-WORKDIR /app/coriolis-data
-RUN npm install
-WORKDIR /app
-RUN npm install
-
-
-CMD ["npm", "start"]
-EXPOSE 3300

Dockerfile-local-prod

@@ -1,32 +0,0 @@
-#syntax=docker/dockerfile:1.4
-# Run this from within this directory. Change the location of coriolis-data repo and image name/tag as needed.
-# docker buildx build --build-context data=../coriolis-data --tag coriolis:0.0.7-local-prod -f Dockerfile-local-prod .
-# docker run -d -p 80:8080 coriolis:0.0.7-local-prod
-
-FROM node:18-alpine
-
-# TODO: For a production build, we may want to just build the bundle and copy that in. No need for local copy of source.
-WORKDIR /app
-ADD . .
-# COPY --from=data . /coriolis-data/
-
-# Git is required before install if any modules (like coriolis-data is now referenced in the package.json) are loaded from github
-RUN apk update
-RUN apk add git
-
-# WORKDIR /app/coriolis-data
-# RUN npm install
-# WORKDIR /app
-# RUN npm install
-# Bundle for production config with webpack & log
-# In this version of the dockerfile, I'm deferring automated webpack build so I can monitor a manual build
-# RUN npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)
-
-RUN npm install -g http-server
-
-# Optimally, this will start a static asset server like nginx/apache. Currently, this will start dev webpack server.
-# CMD ["http-server", "/app/build", "-c-1"]
-CMD ["/bin/ash"]
-# CMD [""]
-
-EXPOSE 8080

README.md

@@ -1,57 +1,60 @@
-[![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w)
+![Latest Release](https://img.shields.io/github/release/EDCD/coriolis.svg) [![Build Status](https://travis-ci.org/EDCD/coriolis.svg?branch=master)](https://travis-ci.org/EDCD/coriolis) [![Chat to us on Discord](https://img.shields.io/badge/Discord-EDCD%20%23coriolis-blue.svg?style=social)](https://discord.gg/0uwCh6R62aPRjk9w)
 
 ## About
 
-The Coriolis project was inspired by E:D Shipyard and, of course, [Elite Dangerous](http://www.elitedangerous.com). The ultimate goal of Coriolis is to provide rich features to support in-game play and planning while engaging the E:D community to support its development.
+The Coriolis project was inspired by [E:D Shipyard](http://www.edshipyard.com/) and, of course, [Elite Dangerous](http://www.elitedangerous.com). The ultimate goal of Coriolis is to provide rich features to support in-game play and planning while engaging the E:D community to support its development.
 
 Coriolis was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments and no employee of Frontier Developments was involved in the making of it.
 
 ## Contributing
 
-- [Submit issues](https://github.com/EDCD/coriolis/issues)
+Please [submit issues](https://github.com/EDCD/coriolis/issues), or better yet [pull requests](https://github.com/EDCD/coriolis/pulls) for any corrections or additions to the database or the code.
-- [Submit pull requests](https://github.com/EDCD/coriolis/pulls) targetting `develop` branch
+
-- Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!
+### Translations
+
+Please use the OneSky translation site to suggest new translations: http://edcd-coriolis.oneskyapp.com  
+These will be merged regularly by the project manager.
+
+### Feature Requests, Suggestions & Bugs
+
+Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!
 
 ## Development
 
-This release includes the ability to run the app as a Docker container.
+See the [Developer's Guide](https://github.com/EDCD/coriolis/wiki/Developing-for-Coriolis) in the wiki.
-```sh
-> git clone https://github.com/EDCD/coriolis.git
-> git clone https://github.com/EDCD/coriolis-data.git
-> cd coriolis
-> docker buildx build --build-context data=../coriolis-data --tag coriolis .
-> docker run -d -p 3300:3300 coriolis
-```
 
-Or to run an instance of coriolis without Docker Desktop, perform the following steps in a shell:
+Also see [the documentation site.](https://coriolis.willb.info/)
-```sh
-> git clone https://github.com/EDCD/coriolis.git
-> git clone https://github.com/EDCD/coriolis-data.git
-> cd ./coriolis-data
-> npm install
-> cd ../coriolis
-> npm install
-> npm start
-```
-
-You will then have a development server running on `localhost:3300`.
 
 ### Ship and Module Database
 
-See the [Data wiki](https://github.com/EDCD/coriolis-data/wiki) for details on structure, etc.
+See the [Data wiki](https://github.com/cmmcleod/coriolis-data/wiki) for details on structure, etc.
 
-## Deployment
+You can find hosted and compiled versions of these data-jsons under https://coriolis.io/data/ and https://beta.coriolis.io/data/.
+You might want to load these as depedency instead of reyling on the npm-dependency.
 
-Follow the steps for [Development](#development) as above, but instead
+## License
-of `npm start` you'll want to:
 
-```sh
+All Data and [associated JSON](https://github.com/EDCD/coriolis-data) files are intellectual property and copyright of Frontier Developments plc ('Frontier', 'Frontier Developments') and are subject to their
-> npm run build
+[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).
-```
 
-this will result in a `build/` directory being created containing all the necessary files.
+The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.
 
-After this you need to serve the files in some manner.
+Copyright (c) 2015 Coriolis.io, Colin McLeod
-Either configure your webserver to make the actual `build/` directory
+
-visible on the web, or alternatively copy it to somewhere to serve it
+Permission is hereby granted, free of charge, to any person obtaining a copy
-from.
+of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

__tests__/fixtures/expected-builds.json

@@ -1,50 +1,50 @@
 {
   "type_6_transporter": {
-    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101-.Iw18UA==.Aw18UA==.",
+    "Cargo": "A0p0tdFal8d8s8f4-----04040303430101.Iw1/kA==.Aw1/kA==.",
-    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101-.Iw18UA==.Aw18UA==.",
+    "Miner": "A0p5tdFal8d8s8f42l2l---040403451q0101.Iw1/kA==.Aw1/kA==.",
-    "Hopper": "A0p0tdFal8d0s8f41717---030302024300--.Iw18UA==.Aw18UA==."
+    "Hopper": "A0p0tdFal8d0s8f41717---030302024300-.Iw1/kA==.Aw1/kA==."
   },
   "type_7_transport": {
-    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101--.Iw18eQ==.Aw18eQ==.",
+    "Cargo": "A0p0tiFfliddsdf5--------0505040403480101.Iw18aQ==.Aw18aQ==.",
-    "Miner": "A0pdtiFflid8sdf5--2l2l----0505041v03450000--.Iw18eQ==.Aw18eQ==."
+    "Miner": "A0pdtiFflid8sdf5--2l2l----0505041v03450000.Iw18aQ==.Aw18aQ==."
   },
   "federal_dropship": {
-    "Cargo": "A0pdtiFflnddsif4-1717------05040448--020201-.Iw18RQ==.Aw18RQ==."
+    "Cargo": "A0pdtiFflnddsif4-1717------05040448--020201.Iw18eQ==.Aw18eQ==."
   },
   "asp": {
-    "Miner": "A2pftfFflidfskf50s0s24242l2l---04054a1q02022o27-.Iw18eQ==.Aw18eQ==."
+    "Miner": "A2pftfFflidfskf50s0s24242l2l---04054a1q02022o27.Iw18WQ==.Aw18WQ==."
   },
   "imperial_clipper": {
-    "Cargo": "A0p5tiFflndisnf4--0s0s----0605450302020101-.Iw18WQ==.Aw18WQ==.",
+    "Cargo": "A0p5tiFflndisnf4--0s0s----0605450302020101.Iw18aQ==.Aw18aQ==.",
-    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o--.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA.",
+    "Dream": "A2pktkFflndpskf40v0v0s0s0404040n4k5n5d2b29292o-.AwRj4yWU1I==.CwBhCYy6YRigzLIA.",
-    "Current": "A0patkFflndfskf4-----------------.AwRj4yWU1Yg=.CwBhCYy6YRigzPIA."
+    "Current": "A0patkFflndfskf4----------------.AwRj4yWU1I==.CwBhCYy6YRigzLIA."
   },
   "type_9_heavy": {
-    "Current": "A0patsFklndnsif6---------0706054a0303020224--.AwRj4yo5iA==.EwBhEYy6d6g=."
+    "Current": "A0patsFklndnsif6---------0706054a0303020224.AwRj4yoo.EwBhEYy6dsg=."
   },
   "python": {
-    "Cargo": "A0patnFflidsssf5---------050505040448020201-.Iw18eAMQ.Aw18RQ==.",
+    "Cargo": "A0patnFflidsssf5---------050505040448020201.Iw18eQ==.Aw18eQ==.",
-    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o-.Iw18eAMQ.IwBhBYy6dkCYRA==.",
+    "Miner": "A0pktkFflidpspf50v0v0v2m2m0404--050505Ce4a1v02022o.Iw18eQ==.IwBhBYy6dkCYg===.",
-    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201-.Iw1+gDByUA==.EwBhEYy6e0VEA===.",
+    "Dream": "A2pptkFfliduspf50v0v0v27270404040m5n5n4f2d2d032t0201.Iw1+gDBxA===.EwBhEYy6e0WEA===.",
-    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---00--.Iw18eAMQ.Aw18RQ==."
+    "Missile": "A0pttoFjljdystf52f2g2d2ePh----04044j03---002h.Iw18eQ==.Aw18eQ==."
   },
   "anaconda": {
-    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b-.AwRj4yo5dzhA.MwBhCYy6duvARhEA.",
+    "Dream": "A4putpFklndzsuf52c0o0o0o1m1m0q0q0404040l0b0100004k5n5n112d2d04-0303326b.AwRj4yo5dyg=.MwBhCYy6duvARiA=.",
-    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301-.Iw18ZUAxA===.Aw18ZXEA.",
+    "Cargo": "A0patnFklndnsxf5----------------06050505040404-45030301.Iw18ZVA=.Aw18ZVA=.",
-    "Current": "A0patnFklndksxf5----------------06050505040404-03034524-.Iw18ZUAxA===.Aw18ZXEA.",
+    "Current": "A0patnFklndksxf5----------------06050505040404-03034524.Iw18ZVA=.Aw18ZVA=.",
-    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37--2i4524-.AwRj4yVKJ9jCA===.AwhMIyumQRgkA===.",
+    "Explorer": "A0patnFklndksxf5--------0202------f7050505040s37-2f2i4524.AwRj4yVKJ9hA.AwhMIyumQRhEA===.",
-    "Test": "A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.Iw18ZUAxA===.Aw18ZXEA."
+    "Test": "A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.Iw18ZVA=.Aw18ZVA=."
   },
   "diamondback_explorer": {
-    "Explorer": "A0p0tdFfldddsdf5---0202--320p432i----.AwRj4zTZaA==.AwiMIyqo."
+    "Explorer": "A0p0tdFfldddsdf5---0202--320p432i2f-.AwRj4zTYg===.AwiMIyoo."
   },
   "vulture": {
-    "Bounty Hunter": "A3patcFalddksff31e1e0404-0l4a-5d27662j--.AwRj4z2Gg===.MwBhBYy6oJmAjLMQ."
+    "Bounty Hunter": "A3patcFalddksff31e1e0404-0l4a-5d27662j.AwRj4z2I.MwBhBYy6oJmAjLIA."
   },
   "fer_de_lance": {
-    "Attack": "A2pfthFalidpsff31r0s0s0s0s000404-04-4a-5d27--.Iw18aAMQ.CwBhrSu8EZxEA===."
+    "Attack": "A2pfthFalidpsff31r0s0s0s0s000404-04-4a-5d27-.Iw18aQ==.CwBhrSu8EZyA."
   },
   "eagle": {
-    "Figther": "A4p0t5F5l3d5s5f20p0p24-4053-2j---.Iw18gDJQ.Aw19kA==."
+    "Figther": "A4p0t5F5l3d5s5f20p0p24-4053-2j-.Iw18kA==.Aw18kA==."
   }
 }

__tests__/fixtures/slef-multiple-builds.json

@@ -1,366 +0,0 @@
-[
-  {
-    "header": {
-      "appName": "Inara",
-      "appVersion": "1.0",
-      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
-      "appCustomProperties": {
-        "inaraCommanderID": 123,
-        "inaraShipID": 123
-      }
-    },
-    "data": {
-      "Ship": "krait_mkii",
-      "ShipID": 7,
-      "ShipName": "pancake hammer",
-      "ShipIdent": "PH-01",
-      "HullValue": 44160710,
-      "ModulesValue": 111274094,
-      "Rebuy": 7771743,
-      "Modules": [
-        {
-          "Slot": "largehardpoint1",
-          "Item": "hpt_mininglaser_fixed_small",
-          "On": true
-        },
-        {
-          "Slot": "largehardpoint2",
-          "Item": "hpt_cannon_gimbal_large",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_overcharged",
-            "Level": 2,
-            "Quality": 1,
-            "ExperimentalEffect": "special_auto_loader"
-          }
-        },
-        {
-          "Slot": "largehardpoint3",
-          "Item": "hpt_cannon_gimbal_large",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_overcharged",
-            "Level": 2,
-            "Quality": 1,
-            "ExperimentalEffect": "special_auto_loader"
-          }
-        },
-        {
-          "Slot": "mediumhardpoint1",
-          "Item": "hpt_basicmissilerack_fixed_medium",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_highcapacity",
-            "Level": 5,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "mediumhardpoint2",
-          "Item": "hpt_basicmissilerack_fixed_medium",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint1",
-          "Item": "hpt_heatsinklauncher_turret_tiny",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint2",
-          "Item": "hpt_cloudscanner_size0_class3",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint3",
-          "Item": "hpt_shieldbooster_size0_class5",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint4",
-          "Item": "hpt_shieldbooster_size0_class5",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot01_size6",
-          "Item": "int_cargorack_size6_class1",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot02_size6",
-          "Item": "int_cargorack_size6_class1",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot03_size5",
-          "Item": "int_guardianfsdbooster_size5",
-          "On": true
-        },
-        {
-          "Slot": "slot04_size5",
-          "Item": "int_fighterbay_size5_class1",
-          "On": true
-        },
-        {
-          "Slot": "slot05_size4",
-          "Item": "int_shieldgenerator_size4_class5",
-          "On": true
-        },
-        {
-          "Slot": "slot06_size3",
-          "Item": "int_dronecontrol_collection_size3_class4",
-          "On": true
-        },
-        {
-          "Slot": "slot07_size3",
-          "Item": "int_dronecontrol_collection_size3_class4",
-          "On": true
-        },
-        {
-          "Slot": "slot08_size2",
-          "Item": "int_refinery_size2_class2",
-          "On": true
-        },
-        {
-          "Slot": "slot09_size1",
-          "Item": "int_dronecontrol_prospector_size1_class4",
-          "On": true
-        },
-        {
-          "Slot": "powerplant",
-          "Item": "int_powerplant_size7_class5",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "mainengines",
-          "Item": "int_engine_size6_class5",
-          "On": true
-        },
-        {
-          "Slot": "frameshiftdrive",
-          "Item": "int_hyperdrive_size5_class5",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "fsd_longrange",
-            "Level": 2,
-            "Quality": 0.861
-          }
-        },
-        {
-          "Slot": "lifesupport",
-          "Item": "int_lifesupport_size4_class2",
-          "On": true,
-          "Priority": 3
-        },
-        {
-          "Slot": "powerdistributor",
-          "Item": "int_powerdistributor_size7_class5",
-          "On": true
-        },
-        {
-          "Slot": "radar",
-          "Item": "int_sensors_size6_class2",
-          "On": true
-        },
-        {
-          "Slot": "fueltank",
-          "Item": "int_fueltank_size5_class3",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "armour",
-          "Item": "krait_mkii_armour_grade3",
-          "On": true,
-          "Priority": 1,
-          "Engineering": {
-            "BlueprintName": "armour_heavyduty",
-            "Level": 5,
-            "Quality": 1
-          }
-        }
-      ]
-    }
-  },
-  {
-    "header": {
-      "appName": "Inara",
-      "appVersion": "1.0",
-      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
-      "appCustomProperties": {
-        "inaraCommanderID": 123,
-        "inaraShipID": 123
-      }
-    },
-    "data": {
-      "Ship": "diamondbackxl",
-      "ShipID": 11,
-      "ShipName": "star Hopper",
-      "ShipIdent": "PH-02",
-      "HullValue": 1615649,
-      "ModulesValue": 16981039,
-      "Rebuy": 929837,
-      "Modules": [
-        {
-          "Slot": "tinyhardpoint1",
-          "Item": "hpt_heatsinklauncher_turret_tiny",
-          "On": true,
-          "Value": 3072
-        },
-        {
-          "Slot": "slot01_size4",
-          "Item": "int_fuelscoop_size4_class5",
-          "On": true,
-          "Priority": 3,
-          "Value": 2862364
-        },
-        {
-          "Slot": "slot02_size4",
-          "Item": "int_guardianfsdbooster_size4",
-          "On": true,
-          "Value": 2847499
-        },
-        {
-          "Slot": "slot03_size3",
-          "Item": "int_shieldgenerator_size3_class2",
-          "On": true,
-          "Value": 18812,
-          "Engineering": {
-            "BlueprintName": "shieldgenerator_thermic",
-            "Level": 3,
-            "Quality": 1,
-            "ExperimentalEffect": "special_shield_health"
-          }
-        },
-        {
-          "Slot": "slot04_size3",
-          "Item": "int_repairer_size3_class5",
-          "On": true,
-          "Value": 2302911
-        },
-        {
-          "Slot": "slot05_size2",
-          "Item": "int_buggybay_size2_class2",
-          "On": true,
-          "Priority": 3,
-          "Value": 21600
-        },
-        {
-          "Slot": "slot06_size2",
-          "Item": "int_cargorack_size2_class1",
-          "On": true,
-          "Priority": 1,
-          "Value": 2852
-        },
-        {
-          "Slot": "slot07_size1",
-          "Item": "int_supercruiseassist",
-          "On": true,
-          "Priority": 3,
-          "Value": 9121
-        },
-        {
-          "Slot": "slot08_size1",
-          "Item": "int_detailedsurfacescanner_tiny",
-          "On": true,
-          "Value": 250000,
-          "Engineering": {
-            "BlueprintName": "sensor_expanded",
-            "Level": 5,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "powerplant",
-          "Item": "int_powerplant_size4_class5",
-          "On": true,
-          "Priority": 1,
-          "Value": 1441233,
-          "Engineering": {
-            "BlueprintName": "powerplant_boosted",
-            "Level": 1,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "mainengines",
-          "Item": "int_engine_size4_class5",
-          "On": true,
-          "Value": 1610080,
-          "Engineering": {
-            "BlueprintName": "engine_dirty",
-            "Level": 5,
-            "Quality": 1,
-            "ExperimentalEffect": "special_engine_lightweight"
-          }
-        },
-        {
-          "Slot": "frameshiftdrive",
-          "Item": "int_hyperdrive_size5_class5",
-          "On": true,
-          "Value": 5103953,
-          "Engineering": {
-            "BlueprintName": "fsd_longrange",
-            "Level": 5,
-            "Quality": 1,
-            "ExperimentalEffect": "special_fsd_lightweight"
-          }
-        },
-        {
-          "Slot": "lifesupport",
-          "Item": "int_lifesupport_size3_class2",
-          "On": true,
-          "Value": 10133,
-          "Engineering": {
-            "BlueprintName": "misc_lightweight",
-            "Level": 3,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "powerdistributor",
-          "Item": "int_powerdistributor_size4_class5",
-          "On": true,
-          "Value": 389022,
-          "Engineering": {
-            "BlueprintName": "powerdistributor_highfrequency",
-            "Level": 4,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "radar",
-          "Item": "int_sensors_size3_class2",
-          "On": true,
-          "Value": 10133,
-          "Engineering": {
-            "BlueprintName": "sensor_lightweight",
-            "Level": 5,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "fueltank",
-          "Item": "int_fueltank_size5_class3",
-          "On": true,
-          "Priority": 1,
-          "Value": 97754
-        },
-        {
-          "Slot": "armour",
-          "Item": "diamondbackxl_armour_grade1",
-          "On": true,
-          "Priority": 1,
-          "Engineering": {
-            "BlueprintName": "armour_heavyduty",
-            "Level": 5,
-            "Quality": 1
-          }
-        }
-      ]
-    }
-  }
-]

__tests__/fixtures/slef-multiple-expected-builds.json

@@ -1,8 +0,0 @@
-{
-      "krait_mkii": {
-        "Imported pancake hammer": "A2pptkFflidussf52l1o1o2g2g020g040405051Ofr45C9C91oP3.Iw18eQ==.AwRgzKIkA===."
-  },
-      "diamondback_explorer": {
-        "Imported star Hopper": "A0pataFflddfsdf5---02---321P430iv6013w2i.Iw18SQ==.AwRm44GYpKg=."
-  }
-}

__tests__/fixtures/slef-single-build.json

@@ -1,188 +0,0 @@
-[
-  {
-    "header": {
-      "appName": "Inara",
-      "appVersion": "1.0",
-      "appURL": "https:\/\/inara.cz\/cmdr-fleet\/123\/123\/",
-      "appCustomProperties": {
-        "inaraCommanderID": 123,
-        "inaraShipID": 123
-      }
-    },
-    "data": {
-      "Ship": "krait_mkii",
-      "ShipID": 7,
-      "ShipName": "pancake hammer",
-      "ShipIdent": "PH-01",
-      "HullValue": 44160710,
-      "ModulesValue": 111274094,
-      "Rebuy": 7771743,
-      "Modules": [
-        {
-          "Slot": "largehardpoint1",
-          "Item": "hpt_mininglaser_fixed_small",
-          "On": true
-        },
-        {
-          "Slot": "largehardpoint2",
-          "Item": "hpt_cannon_gimbal_large",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_overcharged",
-            "Level": 2,
-            "Quality": 1,
-            "ExperimentalEffect": "special_auto_loader"
-          }
-        },
-        {
-          "Slot": "largehardpoint3",
-          "Item": "hpt_cannon_gimbal_large",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_overcharged",
-            "Level": 2,
-            "Quality": 1,
-            "ExperimentalEffect": "special_auto_loader"
-          }
-        },
-        {
-          "Slot": "mediumhardpoint1",
-          "Item": "hpt_basicmissilerack_fixed_medium",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "weapon_highcapacity",
-            "Level": 5,
-            "Quality": 1
-          }
-        },
-        {
-          "Slot": "mediumhardpoint2",
-          "Item": "hpt_basicmissilerack_fixed_medium",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint1",
-          "Item": "hpt_heatsinklauncher_turret_tiny",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint2",
-          "Item": "hpt_cloudscanner_size0_class3",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint3",
-          "Item": "hpt_shieldbooster_size0_class5",
-          "On": true
-        },
-        {
-          "Slot": "tinyhardpoint4",
-          "Item": "hpt_shieldbooster_size0_class5",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot01_size6",
-          "Item": "int_cargorack_size6_class1",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot02_size6",
-          "Item": "int_cargorack_size6_class1",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "slot03_size5",
-          "Item": "int_guardianfsdbooster_size5",
-          "On": true
-        },
-        {
-          "Slot": "slot04_size5",
-          "Item": "int_fighterbay_size5_class1",
-          "On": true
-        },
-        {
-          "Slot": "slot05_size4",
-          "Item": "int_shieldgenerator_size4_class5",
-          "On": true
-        },
-        {
-          "Slot": "slot06_size3",
-          "Item": "int_dronecontrol_collection_size3_class4",
-          "On": true
-        },
-        {
-          "Slot": "slot07_size3",
-          "Item": "int_dronecontrol_collection_size3_class4",
-          "On": true
-        },
-        {
-          "Slot": "slot08_size2",
-          "Item": "int_refinery_size2_class2",
-          "On": true
-        },
-        {
-          "Slot": "slot09_size1",
-          "Item": "int_dronecontrol_prospector_size1_class4",
-          "On": true
-        },
-        {
-          "Slot": "powerplant",
-          "Item": "int_powerplant_size7_class5",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "mainengines",
-          "Item": "int_engine_size6_class5",
-          "On": true
-        },
-        {
-          "Slot": "frameshiftdrive",
-          "Item": "int_hyperdrive_size5_class5",
-          "On": true,
-          "Engineering": {
-            "BlueprintName": "fsd_longrange",
-            "Level": 2,
-            "Quality": 0.861
-          }
-        },
-        {
-          "Slot": "lifesupport",
-          "Item": "int_lifesupport_size4_class2",
-          "On": true,
-          "Priority": 3
-        },
-        {
-          "Slot": "powerdistributor",
-          "Item": "int_powerdistributor_size7_class5",
-          "On": true
-        },
-        {
-          "Slot": "radar",
-          "Item": "int_sensors_size6_class2",
-          "On": true
-        },
-        {
-          "Slot": "fueltank",
-          "Item": "int_fueltank_size5_class3",
-          "On": true,
-          "Priority": 1
-        },
-        {
-          "Slot": "armour",
-          "Item": "krait_mkii_armour_grade3",
-          "On": true,
-          "Priority": 1,
-          "Engineering": {
-            "BlueprintName": "armour_heavyduty",
-            "Level": 5,
-            "Quality": 1
-          }
-        }
-      ]
-    }
-  }
-]

__tests__/test-import.js

@@ -18,13 +18,13 @@ describe('Import Modal', function() {
   const mockContext = {
     language: getLanguage('en'),
     sizeRatio: 1,
-    openMenu: jest.fn(),
+    openMenu: jest.genMockFunction(),
-    closeMenu: jest.fn(),
+    closeMenu: jest.genMockFunction(),
-    showModal: jest.fn(),
+    showModal: jest.genMockFunction(),
-    hideModal: jest.fn(),
+    hideModal: jest.genMockFunction(),
-    tooltip: jest.fn(),
+    tooltip: jest.genMockFunction(),
-    termtip: jest.fn(),
+    termtip: jest.genMockFunction(),
-    onWindowResize: jest.fn()
+    onWindowResize: jest.genMockFunction()
   };
 
   let modal, render, ContextProvider = Utils.createContextProvider(mockContext);
@@ -110,25 +110,21 @@ describe('Import Modal', function() {
     it('catches an invalid backup', function() {
       const importData = require('./fixtures/valid-backup');
       let invalidImportData = Object.assign({}, importData);
-      // Remove Asp Miner build used in comparison
+      //invalidImportData.builds.asp = null;   // Remove Asp Miner build used in comparison
       delete(invalidImportData.builds.asp);
 
       pasteText('"this is not valid"');
       expect(modal.state.importValid).toBeFalsy();
       expect(modal.state.errorMsg).toEqual('Must be an object or array!');
-
       pasteText('{ "builds": "Should not be a string" }');
       expect(modal.state.importValid).toBeFalsy();
       expect(modal.state.errorMsg).toEqual('builds must be an object!');
-
+      pasteText(JSON.stringify(importData).replace('anaconda', 'invalid_ship'));
-      pasteText(JSON.stringify(importData).replace(/anaconda/g, 'invalid_ship'));
       expect(modal.state.importValid).toBeFalsy();
-      expect(Object.keys(modal.state.builds)).not.toContain('anaconda');
+      expect(modal.state.errorMsg).toEqual('"invalid_ship" is not a valid Ship Id!');
-
       pasteText(JSON.stringify(importData).replace('Dream', ''));
       expect(modal.state.importValid).toBeFalsy();
-      expect(Object.keys(modal.state.builds.imperial_clipper).length).toEqual(3);
+      expect(modal.state.errorMsg).toEqual('Imperial Clipper build "" must be a string at least 1 character long!');
-
       pasteText(JSON.stringify(invalidImportData));
       expect(modal.state.importValid).toBeFalsy();
       expect(modal.state.errorMsg).toEqual('asp build "Miner" data is missing!');
@@ -148,7 +144,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.AwRj4zNLeI%3D%3D.CwBhCYzBGW9qCTSqq5JA.&bn=Test%20My%20Ship');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.&bn=Test%20My%20Ship');
     });
 
     it('catches an invalid build', function() {
@@ -173,7 +169,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b-.AwRj4zNLeI%3D%3D.CwBhCYzBGW9qCTSqq5JA.H4sIAAAAAAAAE2MUe8HMwPD%2FPwMAAGvB0AkAAAA%3D&bn=Test%20My%20Ship');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/anaconda?code=A4putkFklkdzsuf52c0o0o0o1m1m0q0q0404-0l0b0100034k5n052d04---0303326b.AwRj4zNLaA%3D%3D.CwBhCYzBGW9qCTSqq5xA.H4sIAAAAAAAAA2MUe8HMwPD%2FPwMAAGvB0AkAAAA%3D&bn=Test%20My%20Ship');
     });
   });
 
@@ -190,7 +186,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v6-2i-.AwRj4yvYg%3D%3D%3D.CwRgDBldHn5A.H4sIAAAAAAAAE2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FA7kMAExxqlSAAAAA&bn=Multi-purpose%20Asp%20Explorer');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/asp?code=A0pftiFflfddsnf5------020202033c044002v62f2i.AwRj4yvI.CwRgDBldHnJA.H4sIAAAAAAAAA2P858DAwPCXEUhwHPvx%2F78YG5AltB7I%2F8%2F0TwImJboDSPJ%2F%2B%2Ff%2Fv%2FKlX%2F%2F%2Fi3AwMTBIfARK%2FGf%2BJwVSxArStVAYqOjvz%2F%2F%2FJVo5GRhE2IBc4SKQSSz%2FDGEmCa398P8%2F%2F2%2BgTf%2F%2FA7kMAExxqlSAAAAA&bn=Multi-purpose%20Asp%20Explorer');
     });
 
     it('imports a valid v4 build with modifications', function() {
@@ -202,11 +198,11 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101----.AwRj4zOYg%3D%3D%3D.CwRgDBldLuZA.H4sIAAAAAAAAE12OPUvDYBSFT1OTfkRJjUkbbC3Yj8mlODgUISAtdOlety5ODv0Vgji7O7kJ%2FgzBQX%2BEY7Gg0NKhfY%2FnHQLFDBdynufe9%2BRMCmCb06g29oCgacjiRx6gY6oWKUT8UgLaszqQfHmSnpVFN1uSeXNsJVcj%2FA2EHlZkspIUpUc6UjTXGT85qwHuSEuVc%2F16r99kDQeSSjvSbSjpyUpNK10uJJ3aYqk6smwm1lQ9bOxw71TMm8VanEqq9JW1r3Qo%2BREOLnQHvbWmb7rZIu5VLIyGQGOukPv%2F0WQk5LeEAjPOUDwtAP6bShy2HKAz0HPO%2B5KsP25I79O2I7LvD%2Bz4Il1XAQAA&bn=Multi-purpose%20Imperial%20Courier');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/imperial_courier?code=A0patzF5l0das8f31a1a270202000e402t0101-2f.AwRj4zKA.CwRgDBldLiQ%3D.H4sIAAAAAAAAA12OPUvDYBSFT1OTfkRJjUkbbC3Yj8mlODgUISAtdOlety5ODv0Vgji7O7kJ%2FgzBQX%2BEY7Gg0NKhfY%2FnHQLFDBdynufe9%2BRMCmCb06g29oCgacjiRx6gY6oWKUT8UgLaszqQfHmSnpVFN1uSeXNsJVcj%2FA2EHlZkspIUpUc6UjTXGT85qwHuSEuVc%2F16r99kDQeSSjvSbSjpyUpNK10uJJ3aYqk6smwm1lQ9bOxw71TMm8VanEqq9JW1r3Qo%2BREOLnQHvbWmb7rZIu5VLIyGQGOukPv%2F0WQk5LeEAjPOUDwtAP6bShy2HKAz0HPO%2B5KsP25I79O2I7LvD%2Bz4Il1XAQAA&bn=Multi-purpose%20Imperial%20Courier');
     });
   });
 
-  describe('Import Detailed Builds Array', function() {
+  describe('Import Detaild Builds Array', function() {
 
     beforeEach(reset);
 
@@ -244,7 +240,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g--.AwRj4zNapI%3D%3D.CwRgDBldUExuBiIlWIA%3D.&bn=Imported%20Federal%20Corvette');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA12STy8DURTFb1szU53Ga8dg2qqqDmJDIoKFxJImumYjVrVqfAALC4lNbcUnkLCoDbEQu0bSlQVhI8JHsJBIQ73rXMkwMYuT9%2Bb87nl%2F7ovoRSL6ikD6TYNINZg5XsWUo7pfrBikr2USlRyXyDuLAhr6ZHanNLOzD5tjOiskysk5dOBvfTB7bjeRW0MNG3ohSBq1bKKxKwyLLUAjmwjpPu4wJx4xVbNI57heDfbUKUAy2xaRUQZpllHoHMHxKqjhhF4LgjtJiFHDmqbrEeVnUJOax7%2FSdRfRwBNotv9wo5kAuZMD2egKyDYcdYl1OBki6z%2BZQjaFnBPyFCM1LefF%2BcgrY0es9FKwbW8ZYj9gmBbxRVRdglMh6BNqnwsk4ouoO4HSIehNoBuBRHwR1QOmsBvHmk6IfMbd2fdCEka%2BjNSexPWGoEkcyX6CnxbxRZQtd%2BPpym%2B31xFtn0iSFPkf%2BBkttZlzB9KDFyBuFRfAGV0Ogoff8SSsCfjjD5hGWtLIwZB%2FgX5Zt%2BLHMI9My7sp6nzgZzekswTxVvCOkq%2FSXqb%2F3zfLxh6HrwIAAA%3D%3D&bn=Imported%20Federal%20Corvette');
     });
 
     it('imports a valid companion API build', function() {
@@ -256,7 +252,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i--.AwRj4yusg%3D%3D%3D.CwRgDBldHi8IWIA%3D.&bn=Imported%20Beluga%20Liner');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i2f.AwRj4yukg%3D%3D%3D.CwRgDBldHi8IUA%3D%3D.H4sIAAAAAAAAA2P8Z8%2FAwPCXEUiIKTMxMPCv%2F%2Ff%2FP8cFIPGf6Z8YTEr0GjMDg%2FJWICERBOTzn%2Fn7%2F7%2FIO5Ai5n9SIEWsQEIoSxAolfbt%2F3%2BJPk4GBhE7YQYGYVmgcuVnf4Aq%2FwOVAAAyiFctbgAAAA%3D%3D&bn=Imported%20Beluga%20Liner');
     });
 
     it('imports a valid companion API build', function() {
@@ -268,7 +264,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/type_7_transport?code=A0patfFflidasdf5----0404040005050504044d2402--.AwRj4yoo.CwRgDBlVK7HjEA%3D%3D.&bn=Imported%20Type-7%20Transporter');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/type_7_transport?code=A0patfFflidasdf5----0404040005050504044d2402.AwRj4yrI.CwRgDBlVK7EiA%3D%3D%3D.&bn=Imported%20Type-7%20Transporter');
     });
 
     it('imports a valid companion API build', function() {
@@ -280,7 +276,7 @@ describe('Import Modal', function() {
       expect(modal.state.singleBuild).toBe(true);
       clickProceed();
       expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34----2i--.AwRj4yqA.CwRgDMYExrezBig%3D.&bn=Imported%20Cobra%20Mk%20III');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/cobra_mk_iii?code=A0p0tdFaldd3sdf4------34---2f2i.AwRj4yKA.CwRgDMYExrezBUg%3D.&bn=Imported%20Cobra%20Mk%20III');
     });
   });
 
@@ -328,41 +324,4 @@ describe('Import Modal', function() {
     });
   });
 
-  describe('Imports SLEF data', () => {
-    beforeEach(reset);
-
-    it('imports a single valid SLEF build', () => {
-      const importData = require('./fixtures/slef-single-build.json');
-      pasteText(JSON.stringify(importData));
-
-      expect(modal.state.importValid).toBeTruthy();
-      expect(modal.state.errorMsg).toEqual(null);
-      expect(modal.state.singleBuild).toBe(true);
-      clickProceed();
-      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/krait_mkii?code=A2pptkFflidussf52l1o1o2g2g020g040405051Ofr45C9C91oP3.Iw18eQ%3D%3D.AwRgzKIkA%3D%3D%3D.&bn=Imported%20pancake%20hammer');
-    });
-
-    it('imports multiple SLEF builds', () => {
-      const importData = require('./fixtures/slef-multiple-builds.json');
-      const expectedBuilds = require('./fixtures/slef-multiple-expected-builds.json');
-      pasteText(JSON.stringify(importData));
-
-      expect(modal.state.importValid).toBeTruthy();
-      expect(modal.state.errorMsg).toEqual(null);
-      expect(modal.state.singleBuild).toBe(false);
-      clickProceed();
-      expect(modal.state.processed).toBeTruthy();
-      clickImport();
-
-      const builds = Persist.getBuilds();
-
-      for (const shipModel in builds) {
-        for (const buildName in builds[shipModel]) {
-          expect(builds[shipModel][buildName])
-            .toEqual(expectedBuilds[shipModel][buildName]);
-        }
-      }
-    });
-  });
 });

devServer.js

@@ -3,13 +3,24 @@ var WebpackDevServer = require("webpack-dev-server");
 var config = require('./webpack.config.dev');
 
 new WebpackDevServer(webpack(config), {
+  publicPath: config.output.publicPath,
   hot: true,
+  disableHostCheck: true,
   headers: { "Access-Control-Allow-Origin": "*" },
   historyApiFallback: {
     rewrites: [
       // For some reason connect-history-api-fallback does not allow '.' in the URL for history fallback...
       { from: /\/outfit\//, to: '/index.html' }
     ]
+  },
+  stats: {
+    assets: true,
+    colors: true,
+    version: false,
+    hash: false,
+    timings: true,
+    chunks: false,
+    chunkModules: false
   }
 }).listen(3300, "0.0.0.0", function (err, result) {
   if (err) {

docker-compose.yml

@@ -0,0 +1,56 @@
+version: '2.2'
+
+services:
+  coriolis_prod:
+    image: edcd/coriolis:master
+    build:
+      dockerfile: Dockerfile
+      args:
+        branch: master
+    restart: always
+    volumes:
+    - ./nginx.conf:/etc/nginx/nginx.conf
+    networks:
+    - web
+    labels:
+    - "traefik.docker.network=web"
+    - "traefik.enable=true"
+    - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io"
+    - "traefik.basic.port=80"
+    - "traefik.basic.protocol=http"
+
+  coriolis_dev:
+    image: edcd/coriolis:develop
+    build:
+      dockerfile: Dockerfile
+      args:
+        branch: develop
+    restart: always
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    networks:
+    - web
+    labels:
+    - "traefik.docker.network=web"
+    - "traefik.enable=true"
+    - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io"
+    - "traefik.basic.port=80"
+    - "traefik.basic.protocol=http"
+
+  coriolis_dw2:
+    image: edcd/coriolis:dw2
+    restart: always
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    networks:
+    - web
+    labels:
+    - "traefik.docker.network=web"
+    - "traefik.enable=true"
+    - "traefik.basic.frontend.rule=Host:dw2.coriolis.io"
+    - "traefik.basic.port=80"
+    - "traefik.basic.protocol=http"
+
+networks:
+  web:
+    external: true

nginx.conf

@@ -0,0 +1,96 @@
+worker_processes 1;
+user nobody nobody;
+error_log /tmp/error.log;
+pid /tmp/nginx.pid;
+
+events {
+
+	worker_connections 1024;
+}
+
+http {
+
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    sendfile on;
+    client_body_temp_path /tmp/client_body;
+    fastcgi_temp_path /tmp/fastcgi_temp;
+    proxy_temp_path /tmp/proxy_temp;
+    scgi_temp_path /tmp/scgi_temp;
+    uwsgi_temp_path /tmp/uwsgi_temp;
+    access_log /tmp/access.log;
+    error_log /tmp/error.log;
+
+    # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
+    # Enable gzip compression.
+    # Default: off
+    gzip off;
+
+    # Compression level (1-9).
+    # 5 is a perfect compromise between size and CPU usage, offering about
+    # 75% reduction for most ASCII files (almost identical to level 9).
+    # Default: 1
+    gzip_comp_level 5;
+
+    # Don't compress anything that's already small and unlikely to shrink much
+    # if at all (the default is 20 bytes, which is bad as that usually leads to
+    # larger files after gzipping).
+    # Default: 20
+    gzip_min_length 256;
+
+    # Compress data even for clients that are connecting to us via proxies,
+    # identified by the "Via" header (required for CloudFront).
+    # Default: off
+    gzip_proxied any;
+
+    # Tell proxies to cache both the gzipped and regular version of a resource
+    # whenever the client's Accept-Encoding capabilities header varies;
+    # Avoids the issue where a non-gzip capable client (which is extremely rare
+    # today) would display gibberish if their proxy gave them the gzipped version.
+    # Default: off
+    gzip_vary on;
+
+    # Compress all output labeled with one of the following MIME-types.
+    # text/html is always compressed by gzip module.
+    # Default: text/html
+    gzip_types *;
+    brotli on;
+    # brotli_static on;
+    brotli_types *;
+    # This should be turned on if you are going to have pre-compressed copies (.gz) of
+    # static files available. If not it should be left off as it will cause extra I/O
+    # for the check. It is best if you enable this in a location{} block for
+    # a specific directory, or on an individual server{} level.
+    # gzip_static on;
+	keepalive_timeout 3000;
+	server {
+		listen 80;
+		listen [::]:80;
+        index index.html;
+		server_name localhost;
+		root /usr/share/nginx/html;
+		autoindex on;
+
+		location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ {
+			add_header Access-Control-Allow-Origin *;
+			add_header Access-Control-Allow-Credentials true;
+			add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+			add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+			access_log off;
+		}
+		location /service-worker.js {
+		    expires -1;
+		    add_header Access-Control-Allow-Origin *;
+            add_header Access-Control-Allow-Credentials true;
+            add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+            add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+            access_log off;
+		}
+		location / {
+            try_files $uri $uri/ /index.html =404;
+		}
+		location /iframe.html {
+            try_files $uri $uri/ /iframe.html =404;
+        }
+	}
+}

package.json

@@ -1,19 +1,14 @@
 {
   "name": "coriolis_shipyard",
-  "version": "3.0.1",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"
   },
   "homepage": "https://coriolis.io",
   "bugs": "https://github.com/EDCD/coriolis/issues",
-  "contributors": [
-    { "name": "cmdrmcdonald" },
-    { "name": "willb321" },
-    { "name": "felixlinker" }
-  ],
   "private": true,
-  "engine": "node >= 10.13.0",
+  "engine": "node >= 4.8.1",
   "license": "MIT",
   "scripts": {
     "extract-translations": "grep -hroE \"(translate\\('[^']+'\\))|(tip.bind\\(null, '[^']+')\" src/* | grep -oE \"'[^']+'\" | grep -oE \"[^']+\" | sort -u -f",
@@ -23,8 +18,7 @@
     "test": "jest",
     "prod-serve": "nginx -p $(pwd) -c nginx.conf",
     "prod-stop": "kill -QUIT $(cat nginx.pid)",
-    "buildfresh": "rimraf node_modules && rm package-lock.json && npm install && npm run build > >(tee -a stdout.log) 2> >(tee -a stderr.log >&2)",
+    "build": "npm run clean && cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js",
-    "build": "npm run clean && cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
     "rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
     "deploy": "npm run lint && npm test && npm run build && npm run rsync"
   },
@@ -61,7 +55,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/plugin-proposal-do-expressions": "^7.0.0",
@@ -80,12 +74,15 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "appcache-webpack-plugin": "^1.4.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
     "babel-loader": "^8.0.0",
-    "copy-webpack-plugin": "^10.2.4",
+    "copy-webpack-plugin": "^4.5.2",
     "create-react-class": "^15.6.3",
     "cross-env": "^5.2.0",
-    "css-loader": "^6.7.3",
+    "css-loader": "^1.0.0",
     "d3-selection": "^1.3.2",
     "esdoc": "^1.1.0",
     "esdoc-custom-theme": "^1.4.2",
@@ -96,66 +93,54 @@
     "esdoc-standard-plugin": "^1.0.0",
     "eslint": "^5.6.0",
     "eslint-plugin-react": "^7.11.1",
-    "expose-loader": "^3.1.0",
+    "expose-loader": "^0.7.5",
-    "express": "^4.18.2",
+    "express": "^4.16.3",
-    "html-webpack-plugin": "^5.5.0",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "jsen": "^0.6.6",
+    "file-loader": "^2.0.0",
+    "html-webpack-plugin": "^3.0.7",
+    "jest-cli": "^23.6.0",
+    "jsen": "^0.6.4",
     "json-loader": "^0.5.4",
     "less": "^3.8.1",
-    "less-loader": "^11.1.0",
+    "less-loader": "^4.1.0",
-    "mini-css-extract-plugin": "^2.7.2",
+    "react-addons-perf": "^15.4.2",
     "react-container-dimensions": "^1.4.1",
-    "react-testutils-additions": "^15.0.0",
+    "react-testutils-additions": "^16.0.0",
     "react-transition-group": "^2.5.0",
-    "rimraf": "^4.1.2",
+    "rimraf": "^2.6.1",
-    "rollup": "^3.17.2",
+    "rollup": "^0.66.2",
-    "style-loader": "^3.3.1",
+    "rollup-plugin-node-resolve": "^3.4.0",
-    "uglify-js": "^3.17.4",
+    "style-loader": "^0.23.0",
-    "webpack": "^5.75.0",
+    "uglify-js": "^3.4.9",
-    "webpack-cli": "^5.0.1",
+    "url-loader": "^1.1.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack": "^4.20.2",
-    "webpack-merge": "^5.8.0",
+    "webpack-bugsnag-plugins": "^1.2.2",
-    "webpack-notifier": "^1.15.0",
+    "webpack-cli": "^3.1.1",
-    "workbox-cacheable-response": "^6.5.4",
+    "webpack-dev-server": "^3.1.9",
-    "workbox-expiration": "^6.5.4",
+    "webpack-notifier": "^1.6.0",
-    "workbox-precaching": "^6.5.4",
+    "workbox-webpack-plugin": "^3.6.1"
-    "workbox-routing": "^6.5.4",
-    "workbox-strategies": "^6.5.4",
-    "workbox-webpack-plugin": "^6.5.4"
   },
   "sideEffects": false,
   "dependencies": {
-    "assert": "^1.5.0",
+    "@babel/polyfill": "^7.0.0",
-    "auto-bind": "^5.0.1",
-    "base64url": "^3.0.1",
     "browserify-zlib-next": "^1.0.1",
-    "buffer": "^5.7.0",
     "classnames": "^2.2.6",
-    "constants-browserify": "^1.0.0",
-    "core-js": "^3.28.0",
     "coriolis-data": "../coriolis-data",
-    "crypto-browserify": "^3.12.0",
     "d3": "^5.7.0",
     "detect-browser": "^3.0.1",
     "fbemitter": "^2.1.1",
-    "https-browserify": "^1.0.0",
     "lodash": "^4.17.11",
     "lz-string": "^1.4.4",
-    "os-browserify": "^0.3.0",
+    "pako": "^1.0.6",
-    "pako": "^2.1.0",
-    "path-browserify": "^1.0.1",
     "prop-types": "^15.6.2",
-    "react": "^15.6.2",
+    "react": "^15.5.4",
-    "react-dom": "^15.6.2",
+    "react-dom": "^15.5.4",
+    "react-extras": "^0.7.1",
     "react-fuzzy": "^0.5.2",
     "react-ga": "^2.5.3",
-    "react-number-editor": "^4.0.3",
+    "react-number-editor": "Athanasius/react-number-editor.git#miggy",
     "recharts": "^1.2.0",
-    "register-service-worker": "^1.7.2",
+    "register-service-worker": "^1.5.2",
-    "stream-browserify": "^3.0.0",
+    "superagent": "^3.8.3"
-    "stream-http": "^3.2.0",
-    "superagent": "^3.8.3",
-    "url": "^0.11.0",
-    "vm-browserify": "^1.1.2"
   }
 }

rollup.config.js

@@ -1,4 +1,4 @@
-import nodeResolve from "@rollup/plugin-node-resolve";
+import nodeResolve from "rollup-plugin-node-resolve";
 
 export default {
 	  entry: "d3-funcs.js",

src/.htaccess

@@ -214,7 +214,7 @@ Options -MultiViews
     #       </Files>
 
     AddType application/x-web-app-manifest+json         webapp
-    # AddType text/cache-manifest                         appcache manifest
+    AddType text/cache-manifest                         appcache manifest
 
   # Media files
     AddType audio/mp4                                   f4a f4b m4a

src/app/Coriolis.jsx

@@ -22,7 +22,6 @@ import ComparisonPage from './pages/ComparisonPage';
 import ShipyardPage from './pages/ShipyardPage';
 import ErrorDetails from './pages/ErrorDetails';
 
-
 const zlib = require('pako');
 const request = require('superagent');
 
@@ -68,12 +67,12 @@ export default class Coriolis extends React.Component {
     this.state = {
       noTouch: !('ontouchstart' in window || navigator.msMaxTouchPoints || navigator.maxTouchPoints),
       page: null,
-      // Announcements must have an expiry date in format "YYYY-MM-DDTHH:MM:SSZ"
+      announcements: [],
-      announcements: [{expiry: "2024-11-30T00:00:00Z", text: "Mandalay added"}, {expiry: "2024-12-06T00:00:00Z", text: "Concord Cannon added"}, {expiry: "2024-12-08T00:00:00Z", text: "Boost Interval Feature added"}],
       language: getLanguage(Persist.getLangCode()),
       route: {},
       sizeRatio: Persist.getSizeRatio()
     };
+    this._getAnnouncements();
     Router('', (r) => this._setPage(ShipyardPage, r));
     Router('/import?', (r) => this._importBuild(r));
     Router('/import/:data', (r) => this._importBuild(r));
@@ -94,39 +93,34 @@ export default class Coriolis extends React.Component {
   _importBuild(r) {
     try {
       // Need to decode and gunzip the data, then build the ship
-      const data = zlib.inflate(new Buffer.from(r.params.data, 'base64'), { to: 'string' });
+      const data = zlib.inflate(new Buffer(r.params.data, 'base64'), { to: 'string' });
       const json = JSON.parse(data);
       console.info('Ship import data: ');
       console.info(json);
-      let ship, importString;
+      let ship;
-      if (json) {
+      if (json && json.modules) {
-        if (json.length && json[0].data) { // SLEF
+        ship = CompanionApiUtils.shipFromJson(json);
-          if (json.length > 1) { // Multiple builds, open modal
+      } else if (json && json.Modules) {
-            importString = data;
+        ship = JournalUtils.shipFromLoadoutJSON(json);
-          } else { // Single build, import directly
-            ship = JournalUtils.shipFromLoadoutJSON(json[0].data);
-          }
-        } else { // not SLEF
-          if (json.modules) {
-            ship = CompanionApiUtils.shipFromJson(json);
-          } else if (json.Modules) {
-            ship = JournalUtils.shipFromLoadoutJSON(json);
-          }
-        }
-      }
-      if (ship) {
-        r.params.ship = ship.id;
-        r.params.code = ship.toString();
-        this._setPage(OutfittingPage, r);
-      } else if (importString) {
-        this._setPage(ShipyardPage, r);
-        this._showModal(<ModalImport importString={data}/>);
       }
+      r.params.ship = ship.id;
+      r.params.code = ship.toString();
+      this._setPage(OutfittingPage, r)
     } catch (err) {
       this._onError('Failed to import ship', r.path, 0, 0, err);
     }
   }
 
+  async _getAnnouncements() {
+    try {
+      const announces = await request.get('https://orbis.zone/api/announcement')
+        .query({ showInCoriolis: true });
+      this.setState({ announcements: announces.body });
+    } catch (err) {
+      console.error(err)
+    }
+  }
+
   /**
    * Updates / Sets the page and route context
    * @param {[type]} page  The page to be shown
@@ -150,6 +144,13 @@ export default class Coriolis extends React.Component {
    */
   _onError(msg, scriptUrl, line, col, errObj) {
     console && console.error && console.error(arguments); // eslint-disable-line no-console
+    if (errObj) {
+      if (errObj instanceof Error) {
+        bugsnagClient.notify(errObj); // eslint-disable-line
+      } else if (errObj instanceof String) {
+        bugsnagClient.notify(msg, errObj); // eslint-disable-line
+      }
+    }
     this.setState({
       error: <ErrorDetails error={{ message: msg, details: { scriptUrl, line, col, error: JSON.stringify(errObj) } }}/>,
       page: null,
@@ -393,18 +394,18 @@ export default class Coriolis extends React.Component {
    */
   render() {
     let currentMenu = this.state.currentMenu;
+
     return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
                 className={this.state.noTouch ? 'no-touch' : null}>
       <Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate}
               currentMenu={currentMenu}/>
       <div className="announcement-container">{this.state.announcements.map(a => <Announcement
-        text={a.text}/>)}</div>
+        text={a.message}/>)}</div>
       {this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
         <NotFoundPage/>}
       {this.state.modal}
       {this.state.tooltip}
       <footer>
-
         <div className="right cap">
           <a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
              title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>

src/app/Router.js

@@ -72,7 +72,6 @@ Router.go = function(path, state) {
   gaTrack(path);
   let ctx = new Context(path, state);
   Router.dispatch(ctx);
-
   if (!ctx.unhandled) {
     if (isStandAlone()) {
       Persist.setState(ctx);

src/app/components/Announcement.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import autoBind from 'auto-bind';
+import { autoBind } from 'react-extras';
 
 /**
  * Announcement component

src/app/components/AvailableModulesMenu.jsx

@@ -4,7 +4,7 @@ import * as ModuleUtils from '../shipyard/ModuleUtils';
 import TranslatedComponent from './TranslatedComponent';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
-import { CoriolisLogo, MountFixed, MountGimballed, MountTurret } from './SvgIcons';
+import { MountFixed, MountGimballed, MountTurret } from './SvgIcons';
 import FuzzySearch from 'react-fuzzy';
 
 const PRESS_THRESHOLD = 500; // mouse/touch down threshold
@@ -20,7 +20,6 @@ const GRPCAT = {
   'cc': 'limpet controllers',
   'fx': 'limpet controllers',
   'hb': 'limpet controllers',
-  'mlc': 'limpet controllers',
   'pc': 'limpet controllers',
   'rpl': 'limpet controllers',
   'pce': 'passenger cabins',
@@ -39,18 +38,13 @@ const GRPCAT = {
   'ml': 'lasers',
   'c': 'projectiles',
   'mc': 'projectiles',
-  'advmc': 'projectiles',
   'axmc': 'experimental',
-  'axmce': 'experimental',
-  'ntp': 'experimental',
   'fc': 'projectiles',
   'rfl': 'experimental',
   'pa': 'projectiles',
   'rg': 'projectiles',
   'mr': 'ordnance',
-  'amr': 'ordnance',
   'axmr': 'experimental',
-  'axmre': 'experimental',
   'rcpl': 'experimental',
   'dtl': 'experimental',
   'tbsc': 'experimental',
@@ -89,8 +83,6 @@ const GRPCAT = {
   // Assists
   'dc': 'flight assists',
   'sua': 'flight assists',
-  // Stabilizers
-  'ews': 'weapon stabilizers',
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -100,7 +92,7 @@ const CATEGORIES = {
   'fi': ['fi'],
   'fuel': ['ft', 'fs'],
   'hangars': ['fh', 'pv'],
-  'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl', 'mlc'],
+  'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl'],
   'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'],
   'rf': ['rf'],
   'shields': ['sg', 'bsg', 'psg', 'scb'],
@@ -109,17 +101,16 @@ const CATEGORIES = {
 
   // Hardpoints
   'lasers': ['pl', 'ul', 'bl'],
-  'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
+  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
-  'ordnance': ['mr', 'amr', 'tp', 'nl'],
+  'ordnance': ['mr', 'tp', 'nl'],
   // Utilities
   'sb': ['sb'],
   'hs': ['hs'],
-  'csl': ['csl'],
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmce', 'axmr', 'axmre', 'ntp','rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
+  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'rsl', 'mahr',],
-  'weapon stabilizers': ['ews'],
+
   // Guardian
   'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'],
 
@@ -218,30 +209,16 @@ export default class AvailableModulesMenu extends TranslatedComponent {
               if (categories.length === 1) {
                 // Show category header instead of group header
                 if (m && grp == m.grp) {
-                  // If this is a missing module/weapon, skip it
+                  list.push(<div ref={(elem) => this.groupElem = elem} key={category}
-                  if (m.grp == "mh" || m.grp == "mm"){
-                    continue;
-                  } else {
-                    list.push(<div ref={(elem) => this.groupElem = elem} key={category}
                                  className={'select-category upp'}>{translate(category)}</div>);
-                  }
                 } else {
-                  if (category == "mh" || category == "mm"){
+                  list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
-                    continue;
-                  } else {
-                    list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
-                  }
                 }
               } else {
                 // Show category header as well as group header
                 if (!categoryHeader) {
-                  if (category == "mh" || category == "mm"){
+                  list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
-                    continue;
+                  categoryHeader = true;
-                  }
-                  else {
-                    list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
-                    categoryHeader = true;
-                  }
                 }
                 if (m && grp == m.grp) {
                   list.push(<div ref={(elem) => this.groupElem = elem} key={grp}
@@ -260,11 +237,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
                 } else if (i.mount === 'T') {
                   mount = 'Turreted';
                 }
-                let special = '';
+                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)}` };
-                if (typeof(i.special) !== 'undefined') {
-                  special = `(${translate(i.special)})`;
-                }
-                const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' '  + mount : ''} ${translate(grp)} ${translate(special)}` };
                 fuzzy.push(fuzz);
               }
             }
@@ -276,24 +249,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     return { list, currentGroup, fuzzy, trackingFocus };
   }
 
-  /**
-   * Return Is expiremental capacity reached
-   * @return {boolean}      Is experimental capacity reached
-   */
-  _experimentalCapacityReached() {
-    const ship = this.props.ship;
-    const ews = ship.internal.filter(o => o.m && o.m.grp === 'ews');
-    let expCap;
-
-    if(ews.length < 1){
-      expCap = 4;
-    } else{
-      expCap = ews[0].m.class == 3 ? 5 : 6;
-    }
-
-    return expCap <= this.props.ship.hardpoints.filter(o => o.m && o.m.experimental).length;
-  }
-
   /**
    * Generate React Components for Module Group
    * @param  {Ship} ship            Ship the selection is for
@@ -321,11 +276,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     let itemsOnThisRow = 0;
     for (let i = 0; i < sortedModules.length; i++) {
       let m = sortedModules[i];
-      // If m.grp is mh or mm, or m.symbol contains 'Missing' skip it
-      if (m.grp == 'mh' || m.grp == 'mm' || (typeof(m.symbol) !== 'undefined' && m.symbol.includes("Missing"))) {
-        // If this is a missing module, skip it
-        continue;
-      }
       let mount = null;
       let disabled = false;
       prevName = m.name;
@@ -335,9 +285,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
       // If the mounted module is experimental as well, we can replace it so
       // the maximum does not apply
       } else if (m.experimental && (!mountedModule || !mountedModule.experimental)) {
-        disabled = this._experimentalCapacityReached();
+        disabled = 4 <= ship.hardpoints.filter(o => o.m && o.m.experimental).length;
-      } else if (m.grp === 'mlc' && (!mountedModule || mountedModule.grp !== 'mlc')) {
-        disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
       }
       let active = mountedModule && mountedModule.id === m.id;
       let classes = cn(m.name ? 'lc' : 'c', {
@@ -434,7 +382,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     if (this.props.modules instanceof Array) {
       return;
     }
-    const mountedModule = this.props.m;
     return (
       <FuzzySearch
         list={this.state.fuzzy}
@@ -446,20 +393,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         onSelect={e => this.props.onSelect.bind(null, e.m)()}
         resultsTemplate={(props, state, styles, clickHandler) => {
           return state.results.map((val, i) => {
-            let disabled;
-
-            if(val.m.experimental && (!mountedModule || !mountedModule.experimental)) {
-              disabled = this._experimentalCapacityReached();
-            } else{
-              disabled = false;
-            }
-            const handler = disabled ? null : () => clickHandler(i);
-
             return (
               <div
                 key={i}
-                className={cn('lc', {disabled})}
+                className={'lc'}
-                onClick={handler}
+                onClick={() => clickHandler(i)}
               >
                 {val.name}
               </div>
@@ -578,15 +516,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         return 1;
       }
     }
-    // Sort multi limpet controllers by name
-    if (a.grp === 'mlc') {
-      if (a.name[0] <= b.name[0]) {
-        return -1;
-      }
-      if (a.name[0] > b.name[0]) {
-        return 1;
-      }
-    }
     // Rating ordered from highest (A) to lowest (E)
     if (a.rating < b.rating) {
       return -1;

src/app/components/CostSection.jsx

@@ -32,7 +32,7 @@ export default class CostSection extends TranslatedComponent {
     this._buildRetrofitShip = this._buildRetrofitShip.bind(this);
     this._onBaseRetrofitChange = this._onBaseRetrofitChange.bind(this);
     this._defaultRetrofitName = this._defaultRetrofitName.bind(this);
-    this._eddbShoppingList = this._inaraShoppingList.bind(this);
+    this._eddbShoppingList = this._eddbShoppingList.bind(this);
 
     let data = Ships[props.ship.id];   // Retrieve the basic ship properties, slots and defaults
     let retrofitName = this._defaultRetrofitName(props.ship.id, props.buildName);
@@ -306,8 +306,8 @@ export default class CostSection extends TranslatedComponent {
           <tr className='main'>
             <th colSpan='2' className='sortable le' onClick={this._sortCostBy.bind(this,'m')}>
               {translate('module')}
-              {shipDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('ship')} ${formats.pct(-1 * shipDiscount)}]`}</u> : null}
+              {shipDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('ship')} -${formats.pct(shipDiscount)}]`}</u> : null}
-              {moduleDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('modules')} ${formats.pct(-1 * moduleDiscount)}]`}</u> : null}
+              {moduleDiscount ? <u className='cap optional-hide' style={{ marginLeft: '0.5em' }}>{`[${translate('modules')} -${formats.pct(moduleDiscount)}]`}</u> : null}
             </th>
             <th className='sortable le' onClick={this._sortCostBy.bind(this, 'cr')} >{translate('credits')}</th>
           </tr>
@@ -328,9 +328,9 @@ export default class CostSection extends TranslatedComponent {
   }
 
   /**
-   * Open up a window for inara with a shopping list of our retrofit components
+   * Open up a window for EDDB with a shopping list of our retrofit components
    */
-  _inaraShoppingList() {
+  _eddbShoppingList() {
     const { retrofitCosts } = this.state;
     const { ship } = this.props;
 
@@ -338,7 +338,7 @@ export default class CostSection extends TranslatedComponent {
     const modIds = retrofitCosts.filter(item => item.retroItem.incCost && item.buyId && !item.buyPp).map(item => item.buyId).filter((v, i, a) => a.indexOf(v) === i);
 
     // Open up the relevant URL
-    window.open('https://inara.cz/inapi/corisearch.php?m=' + modIds.join(','));
+    window.open('https://eddb.io/station?m=' + modIds.join(','));
   }
 
   /**
@@ -387,7 +387,7 @@ export default class CostSection extends TranslatedComponent {
           <tbody>
             {rows}
             <tr className='ri'>
-              <td className='lbl' ><button onClick={this._inaraShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_REFIT_SHOPPING_LIST')} onMouseOut={tooltip.bind(null, null)}><ShoppingIcon className='lg' style={{ fill: 'black' }}/></button></td>
+              <td className='lbl' ><button onClick={this._eddbShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_REFIT_SHOPPING_LIST')} onMouseOut={tooltip.bind(null, null)}><ShoppingIcon className='lg' style={{ fill: 'black' }}/></button></td>
               <td colSpan='3' className='lbl' >{translate('cost')}</td>
               <td colSpan='2' className={cn('val', retrofitTotal > 0 ? 'warning' : 'secondary-disabled')} style={{ borderBottom:'none' }}>
                 {int(retrofitTotal)}{units.CR}

src/app/components/HardpointSlot.jsx

@@ -136,7 +136,6 @@ export default class HardpointSlot extends Slot {
           {showModuleResistances && m.getThermalResistance() ? <div
             className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null}
           {m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null}
-          {m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null}
           {m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={modButton => this.modButton = modButton}>
             <button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation}
                     onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}>

src/app/components/Header.jsx

@@ -10,6 +10,7 @@ import { Ships } from 'coriolis-data/dist';
 import Persist from '../stores/Persist';
 import { toDetailedExport } from '../shipyard/Serializer';
 import Ship from '../shipyard/Ship';
+import ModalBatchOrbis from './ModalBatchOrbis';
 import ModalDeleteAll from './ModalDeleteAll';
 import ModalExport from './ModalExport';
 import ModalHelp from './ModalHelp';
@@ -240,6 +241,43 @@ export default class Header extends TranslatedComponent {
     />);
   };
 
+  /**
+   * Uploads all ship-builds to orbis
+   * @param {e} e Event
+   */
+  _uploadAllBuildsToOrbis(e) {
+    e.preventDefault();
+    const data = Persist.getBuilds();
+    let postObject = [];
+    for (const ship in data) {
+      for (const code in data[ship]) {
+        const shipModel = ship;
+        if (!shipModel) {
+          throw 'No such ship found: "' + ship + '"';
+        }
+        const shipTemplate = Ships[shipModel];
+        const shipPostObject = {};
+        let shipInstance = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
+        shipInstance.buildWith(null);
+        shipInstance.buildFrom(data[ship][code]);
+        shipPostObject.coriolisId = shipInstance.id;
+        shipPostObject.coriolisShip = shipInstance;
+
+        shipPostObject.coriolisShip.url = window.location.origin + outfitURL(shipModel, data[ship][code], code);
+        shipPostObject.title = code || shipInstance.id;
+        shipPostObject.description = code || shipInstance.id;
+        shipPostObject.ShipName = shipInstance.id;
+        shipPostObject.Ship = shipInstance.id;
+        postObject.push(shipPostObject);
+      }
+    }
+    console.log(postObject);
+
+    this.context.showModal(<ModalBatchOrbis
+      ships={postObject}
+    />);
+  }
+
   /**
    * Show export modal with detailed export
    * @param  {SyntheticEvent} e Event
@@ -388,18 +426,14 @@ export default class Header extends TranslatedComponent {
     if (this.props.announcements) {
       announcements = [];
       for (let announce of this.props.announcements) {
-        // Announcement has expired, skip it
+        announcements.push(<Announcement text={announce.message} />);
-        if (Date.now() > Date.parse(announce.expiry)) {
-          continue;
-        }
-        // Add announcements which have not expired to the menu
-        announcements.push(<Announcement text={announce.text} />);
         announcements.push(<hr/>);
       }
     }
     return (
       <div className='menu-list' onClick={ (e) => e.stopPropagation() } style={{ whiteSpace: 'nowrap' }}>
         {announcements}
+        <hr />
       </div>
     );
   }
@@ -462,6 +496,7 @@ export default class Header extends TranslatedComponent {
           {translate('builds')} & {translate('comparisons')}
           <li><Link href="#" className='block' onClick={this._showBackup.bind(this)}>{translate('backup')}</Link></li>
           <li><Link href="#" className='block' onClick={this._showDetailedExport.bind(this)}>{translate('detailed export')}</Link></li>
+          <li><Link href="#" className='block' onClick={this._uploadAllBuildsToOrbis.bind(this)}>{translate('upload all builds to orbis')}</Link></li>
           <li><Link href="#" className='block' onClick={this._showImport.bind(this)}>{translate('import')}</Link></li>
           <li><Link href="#" className='block' onClick={this._showDeleteAll.bind(this)}>{translate('delete all')}</Link></li>
         </ul>

src/app/components/InternalSlot.jsx

@@ -88,7 +88,6 @@ export default class InternalSlot extends Slot {
           { m.getHullReinforcement() ? <div className='l'>{translate('armour')}: {formats.int(m.getHullReinforcement() + ship.baseArmour * m.getModValue('hullboost') / 10000)}</div> : null }
           { m.getProtection() ? <div className='l'>{translate('protection')}: {formats.rPct(m.getProtection())}</div> : null }
           { m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null }
-          { m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null }
 	  { m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
         </div>
       </div>;

src/app/components/LineChart.jsx

@@ -1,281 +1,281 @@
-import React from 'react';
+import React from 'react';
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';
-import ContainerDimensions from 'react-container-dimensions';
+import ContainerDimensions from 'react-container-dimensions';
-import * as d3 from 'd3';
+import * as d3 from 'd3';
-import TranslatedComponent from './TranslatedComponent';
+import TranslatedComponent from './TranslatedComponent';
-
+
-const MARGIN = { top: 15, right: 20, bottom: 35, left: 60 };
+const MARGIN = { top: 15, right: 20, bottom: 35, left: 60 };
-
+
-/**
+/**
- * Line Chart
+ * Line Chart
- */
+ */
-export default class LineChart extends TranslatedComponent {
+export default class LineChart extends TranslatedComponent {
-
+
-  static defaultProps = {
+  static defaultProps = {
-    code: '',
+    code: '',
-    xMin: 0,
+    xMin: 0,
-    yMin: 0,
+    yMin: 0,
-    points: 20,
+    points: 20,
-    colors: ['#ff8c0d'],
+    colors: ['#ff8c0d'],
-    aspect: 0.5
+    aspect: 0.5
-  };
+  };
-
+
-  static propTypes = {
+  static propTypes = {
-    func: PropTypes.func.isRequired,
+    func: PropTypes.func.isRequired,
-    xLabel: PropTypes.string.isRequired,
+    xLabel: PropTypes.string.isRequired,
-    xMin: PropTypes.number,
+    xMin: PropTypes.number,
-    xMax: PropTypes.number.isRequired,
+    xMax: PropTypes.number.isRequired,
-    xUnit: PropTypes.string.isRequired,
+    xUnit: PropTypes.string.isRequired,
-    xMark: PropTypes.number,
+    xMark: PropTypes.number,
-    yLabel: PropTypes.string.isRequired,
+    yLabel: PropTypes.string.isRequired,
-    yMin: PropTypes.number,
+    yMin: PropTypes.number,
-    yMax: PropTypes.number.isRequired,
+    yMax: PropTypes.number.isRequired,
-    yUnit: PropTypes.string,
+    yUnit: PropTypes.string,
-    series: PropTypes.array,
+    series: PropTypes.array,
-    colors: PropTypes.array,
+    colors: PropTypes.array,
-    points: PropTypes.number,
+    points: PropTypes.number,
-    aspect: PropTypes.number,
+    aspect: PropTypes.number,
-    code: PropTypes.string,
+    code: PropTypes.string,
-  };
+  };
-
+
-  /**
+  /**
-   * Constructor
+   * Constructor
-   * @param  {Object} props   React Component properties
+   * @param  {Object} props   React Component properties
-   * @param  {Object} context React Component context
+   * @param  {Object} context React Component context
-   */
+   */
-  constructor(props, context) {
+  constructor(props, context) {
-    super(props);
+    super(props);
-
+
-    this._updateDimensions = this._updateDimensions.bind(this);
+    this._updateDimensions = this._updateDimensions.bind(this);
-    this._updateSeries = this._updateSeries.bind(this);
+    this._updateSeries = this._updateSeries.bind(this);
-    this._tooltip = this._tooltip.bind(this);
+    this._tooltip = this._tooltip.bind(this);
-    this._showTip = this._showTip.bind(this);
+    this._showTip = this._showTip.bind(this);
-    this._hideTip = this._hideTip.bind(this);
+    this._hideTip = this._hideTip.bind(this);
-    this._moveTip = this._moveTip.bind(this);
+    this._moveTip = this._moveTip.bind(this);
-
+
-    const series = props.series;
+    const series = props.series;
-
+
-    let xScale = d3.scaleLinear();
+    let xScale = d3.scaleLinear();
-    let yScale = d3.scaleLinear();
+    let yScale = d3.scaleLinear();
-    let xAxisScale = d3.scaleLinear();
+    let xAxisScale = d3.scaleLinear();
-
+
-    this.xAxis = d3.axisBottom(xAxisScale).tickSizeOuter(0);
+    this.xAxis = d3.axisBottom(xAxisScale).tickSizeOuter(0);
-    this.yAxis = d3.axisLeft(yScale).ticks(6).tickSizeOuter(0);
+    this.yAxis = d3.axisLeft(yScale).ticks(6).tickSizeOuter(0);
-
+
-    this.state = {
+    this.state = {
-      xScale,
+      xScale,
-      xAxisScale,
+      xAxisScale,
-      yScale,
+      yScale,
-      tipHeight: 2 + (1.2 * (series ? series.length : 0.8)),
+      tipHeight: 2 + (1.2 * (series ? series.length : 0.8)),
-    };
+    };
-  }
+  }
-
+
-  /**
+  /**
-   * Update tooltip content
+   * Update tooltip content
-   * @param  {number} xPos x coordinate
+   * @param  {number} xPos x coordinate
-   * @param {number} width current container width
+   * @param {number} width current container width
-   */
+   */
-  _tooltip(xPos, width) {
+  _tooltip(xPos, width) {
-    let { xLabel, yLabel, xUnit, yUnit, func, series } = this.props;
+    let { xLabel, yLabel, xUnit, yUnit, func, series } = this.props;
-    let { xScale, yScale } = this.state;
+    let { xScale, yScale } = this.state;
-    let { formats, translate } = this.context.language;
+    let { formats, translate } = this.context.language;
-    let x0 = xScale.invert(xPos),
+    let x0 = xScale.invert(xPos),
-        y0 = func(x0),
+        y0 = func(x0),
-        tips = this.tipContainer,
+        tips = this.tipContainer,
-        yTotal = 0,
+        yTotal = 0,
-        flip = (xPos / width > 0.50),
+        flip = (xPos / width > 0.50),
-        tipWidth = 0,
+        tipWidth = 0,
-        tipHeightPx = tips.selectAll('rect').node().getBoundingClientRect().height;
+        tipHeightPx = tips.selectAll('rect').node().getBoundingClientRect().height;
-
+
-
+
-    xPos = xScale(x0); // Clamp xPos
+    xPos = xScale(x0); // Clamp xPos
-
+
-    tips.selectAll('text.text-tip.y').text(function(d, i) {
+    tips.selectAll('text.text-tip.y').text(function(d, i) {
-      let yVal = series ? y0[series[i]] : y0;
+      let yVal = series ? y0[series[i]] : y0;
-      yTotal += yVal;
+      yTotal += yVal;
-      return (series ? translate(series[i]) : '') + ' ' + formats.f2(yVal);
+      return (series ? translate(series[i]) : '') + ' ' + formats.f2(yVal);
-    }).append('tspan').attr('class', 'metric').text(yUnit ? ' ' + yUnit : '');
+    }).append('tspan').attr('class', 'metric').text(yUnit ? ' ' + yUnit : '');
-
+
-    tips.selectAll('text').each(function() {
+    tips.selectAll('text').each(function() {
-      if (this.getBBox().width > tipWidth) {
+      if (this.getBBox().width > tipWidth) {
-        tipWidth = Math.ceil(this.getBBox().width);
+        tipWidth = Math.ceil(this.getBBox().width);
-      }
+      }
-    });
+    });
-
+
-    let tipY = Math.floor(yScale(yTotal / (series ? series.length : 1)) - (tipHeightPx / 2));
+    let tipY = Math.floor(yScale(yTotal / (series ? series.length : 1)) - (tipHeightPx / 2));
-
+
-    tipWidth += 8;
+    tipWidth += 8;
-    tips.attr('transform', 'translate(' + xPos + ',' + tipY + ')');
+    tips.attr('transform', 'translate(' + xPos + ',' + tipY + ')');
-    tips.selectAll('text.text-tip').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start');
+    tips.selectAll('text.text-tip').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start');
-    tips.selectAll('text.text-tip.x').text(formats.f2(x0)).append('tspan').attr('class', 'metric').text(' ' + xUnit);
+    tips.selectAll('text.text-tip.x').text(formats.f2(x0)).append('tspan').attr('class', 'metric').text(' ' + xUnit);
-    tips.selectAll('rect').attr('width', tipWidth + 4).attr('x', flip ? -tipWidth - 12 : 8).attr('y', 0).style('text-anchor', flip ? 'end' : 'start');
+    tips.selectAll('rect').attr('width', tipWidth + 4).attr('x', flip ? -tipWidth - 12 : 8).attr('y', 0).style('text-anchor', flip ? 'end' : 'start');
-    this.markersContainer.selectAll('circle').attr('cx', xPos).attr('cy', (d, i) => yScale(series ? y0[series[i]] : y0));
+    this.markersContainer.selectAll('circle').attr('cx', xPos).attr('cy', (d, i) => yScale(series ? y0[series[i]] : y0));
-  }
+  }
-
+
-  /**
+  /**
-   * Update dimensions based on properties and scale
+   * Update dimensions based on properties and scale
-   * @param  {Object} props  React Component properties
+   * @param  {Object} props  React Component properties
-   * @param  {number} scale  size ratio / scale
+   * @param  {number} scale  size ratio / scale
-   * @param {number} width   current width of the container
+   * @param {number} width   current width of the container
-   * @returns {Object}       calculated dimensions
+   * @returns {Object}       calculated dimensions
-   */
+   */
-  _updateDimensions(props, scale, width) {
+  _updateDimensions(props, scale, width) {
-    const { xMax, xMin, yMin, yMax } = props;
+    const { xMax, xMin, yMin, yMax } = props;
-    const innerWidth = width - MARGIN.left - MARGIN.right;
+    const innerWidth = width - MARGIN.left - MARGIN.right;
-    const outerHeight = Math.round(width * props.aspect);
+    const outerHeight = Math.round(width * props.aspect);
-    const innerHeight = outerHeight - MARGIN.top - MARGIN.bottom;
+    const innerHeight = outerHeight - MARGIN.top - MARGIN.bottom;
-
+
-    this.state.xScale.range([0, innerWidth]).domain([xMin, xMax || 1]).clamp(true);
+    this.state.xScale.range([0, innerWidth]).domain([xMin, xMax || 1]).clamp(true);
-    this.state.xAxisScale.range([0, innerWidth]).domain([xMin, xMax]).clamp(true);
+    this.state.xAxisScale.range([0, innerWidth]).domain([xMin, xMax]).clamp(true);
-    this.state.yScale.range([innerHeight, 0]).domain([yMin, yMax + (yMax - yMin) * 0.1]); // 10% higher than maximum value for tooltip visibility
+    this.state.yScale.range([innerHeight, 0]).domain([yMin, yMax + (yMax - yMin) * 0.1]); // 10% higher than maximum value for tooltip visibility
-    return { innerWidth, outerHeight, innerHeight };
+    return { innerWidth, outerHeight, innerHeight };
-  }
+  }
-
+
-  /**
+  /**
-   * Show tooltip
+   * Show tooltip
-   * @param  {SyntheticEvent} e Event
+   * @param  {SyntheticEvent} e Event
-   */
+   */
-  _showTip(e) {
+  _showTip(e) {
-    e.preventDefault();
+    e.preventDefault();
-    this.tipContainer.style('display', null);
+    this.tipContainer.style('display', null);
-    this.markersContainer.style('display', null);
+    this.markersContainer.style('display', null);
-    this._moveTip(e);
+    this._moveTip(e);
-  }
+  }
-
+
-  /**
+  /**
-   * Move and update tooltip
+   * Move and update tooltip
-   * @param  {SyntheticEvent} e Event
+   * @param  {SyntheticEvent} e Event
-   * @param {number} width current container width
+   * @param {number} width current container width
-   */
+   */
-  _moveTip(e, width) {
+  _moveTip(e, width) {
-    let clientX = e.touches ? e.touches[0].clientX : e.clientX;
+    let clientX = e.touches ? e.touches[0].clientX : e.clientX;
-    this._tooltip(Math.round(clientX - e.currentTarget.getBoundingClientRect().left), width);
+    this._tooltip(Math.round(clientX - e.currentTarget.getBoundingClientRect().left), width);
-  }
+  }
-
+
-  /**
+  /**
-   * Hide tooltip
+   * Hide tooltip
-   * @param  {SyntheticEvent} e Event
+   * @param  {SyntheticEvent} e Event
-   */
+   */
-  _hideTip(e) {
+  _hideTip(e) {
-    e.preventDefault();
+    e.preventDefault();
-    this.tipContainer.style('display', 'none');
+    this.tipContainer.style('display', 'none');
-    this.markersContainer.style('display', 'none');
+    this.markersContainer.style('display', 'none');
-  }
+  }
-
+
-  /**
+  /**
-   * Update series generated from props
+   * Update series generated from props
-   * @param   {Object} props   React Component properties
+   * @param   {Object} props   React Component properties
-   * @param   {Object} state   React Component state
+   * @param   {Object} state   React Component state
-   */
+   */
-  _updateSeries(props, state) {
+  _updateSeries(props, state) {
-    let { func, xMin, xMax, series, points } = props;
+    let { func, xMin, xMax, series, points } = props;
-    let delta = (xMax - xMin) / points;
+    let delta = (xMax - xMin) / points;
-    let seriesData = new Array(points);
+    let seriesData = new Array(points);
-
+
-    if (delta) {
+    if (delta) {
-      seriesData = new Array(points);
+      seriesData = new Array(points);
-      for (let i = 0, x = xMin; i < points; i++) {
+      for (let i = 0, x = xMin; i < points; i++) {
-        seriesData[i] = [x, func(x)];
+        seriesData[i] = [x, func(x)];
-        x += delta;
+        x += delta;
-      }
+      }
-      seriesData[points - 1] = [xMax, func(xMax)];
+      seriesData[points - 1] = [xMax, func(xMax)];
-    } else {
+    } else {
-      let yVal = func(xMin);
+      let yVal = func(xMin);
-      seriesData = [[0, yVal], [1, yVal]];
+      seriesData = [[0, yVal], [1, yVal]];
-    }
+    }
-
+
-    const markerElems = [];
+    const markerElems = [];
-    const detailElems = [<text key='lbl' className='text-tip x' y='1.25em'/>];
+    const detailElems = [<text key='lbl' className='text-tip x' y='1.25em'/>];
-    const seriesLines = [];
+    const seriesLines = [];
-    for (let i = 0, l = series ? series.length : 1; i < l; i++) {
+    for (let i = 0, l = series ? series.length : 1; i < l; i++) {
-      const yAccessor = series ? function(d) { return state.yScale(d[1][this]); }.bind(series[i]) : (d) => state.yScale(d[1]);
+      const yAccessor = series ? function(d) { return state.yScale(d[1][this]); }.bind(series[i]) : (d) => state.yScale(d[1]);
-      seriesLines.push(d3.line().x((d, i) => this.state.xScale(d[0])).y(yAccessor));
+      seriesLines.push(d3.line().x((d, i) => this.state.xScale(d[0])).y(yAccessor));
-      detailElems.push(<text key={i} className='text-tip y' strokeWidth={0} fill={props.colors[i]} y={1.25 * (i + 2) + 'em'}/>);
+      detailElems.push(<text key={i} className='text-tip y' strokeWidth={0} fill={props.colors[i]} y={1.25 * (i + 2) + 'em'}/>);
-      markerElems.push(<circle key={i} className='marker' r='4' />);
+      markerElems.push(<circle key={i} className='marker' r='4' />);
-    }
+    }
-
+
-    const tipHeight = 2 + (1.2 * (seriesLines ? seriesLines.length : 0.8));
+    const tipHeight = 2 + (1.2 * (seriesLines ? seriesLines.length : 0.8));
-
+
-    this.setState({ markerElems, detailElems, seriesLines, seriesData, tipHeight });
+    this.setState({ markerElems, detailElems, seriesLines, seriesData, tipHeight });
-  }
+  }
-
+
-  /**
+  /**
-   * Update dimensions and series data based on props and context.
+   * Update dimensions and series data based on props and context.
-   */
+   */
-  componentWillMount() {
+  componentWillMount() {
-    this._updateSeries(this.props, this.state);
+    this._updateSeries(this.props, this.state);
-  }
+  }
-
+
-  /**
+  /**
-   * Update state based on property and context changes
+   * Update state based on property and context changes
-   * @param  {Object} nextProps   Incoming/Next properties
+   * @param  {Object} nextProps   Incoming/Next properties
-   * @param  {Object} nextContext Incoming/Next conext
+   * @param  {Object} nextContext Incoming/Next conext
-   */
+   */
-  componentWillReceiveProps(nextProps, nextContext) {
+  componentWillReceiveProps(nextProps, nextContext) {
-    const props = this.props;
+    const props = this.props;
-
+
-    if (props.code != nextProps.code) {
+    if (props.code != nextProps.code) {
-      this._updateSeries(nextProps, this.state);
+      this._updateSeries(nextProps, this.state);
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * Render the chart
+   * Render the chart
-   * @return {React.Component} Chart SVG
+   * @return {React.Component} Chart SVG
-   */
+   */
-  render() {
+  render() {
-    return (
+    return (
-      <ContainerDimensions>
+      <ContainerDimensions>
-        { ({ width, height }) => {
+        { ({ width, height }) => {
-          const { innerWidth, outerHeight, innerHeight } = this._updateDimensions(this.props, this.context.sizeRatio, width, height);
+          const { innerWidth, outerHeight, innerHeight } = this._updateDimensions(this.props, this.context.sizeRatio, width, height);
-          const { xMin, xMax, xLabel, yLabel, xUnit, yUnit, xMark, colors } = this.props;
+          const { xMin, xMax, xLabel, yLabel, xUnit, yUnit, xMark, colors } = this.props;
-          const { tipHeight, detailElems, markerElems, seriesData, seriesLines } = this.state;
+          const { tipHeight, detailElems, markerElems, seriesData, seriesLines } = this.state;
-          const lines = seriesLines.map((line, i) => <path key={i} className='line' fill='none' stroke={colors[i]} strokeWidth='1' d={line(seriesData)} />).reverse();
+          const lines = seriesLines.map((line, i) => <path key={i} className='line' fill='none' stroke={colors[i]} strokeWidth='1' d={line(seriesData)} />).reverse();
-
+
-          const markX = xMark ? innerWidth * (xMark - xMin) / (xMax - xMin) : 0;
+          const markX = xMark ? innerWidth * (xMark - xMin) / (xMax - xMin) : 0;
-          const xmark = xMark ? <path key={'mark'} className='line' fill='none' strokeDasharray='5,5' stroke={'#ff8c0d'} strokeWidth='1' d={'M ' + markX + ' ' + innerHeight + ' L ' + markX + ' 0'} /> : '';
+          const xmark = xMark ? <path key={'mark'} className='line' fill='none' strokeDasharray='5,5' stroke={'#ff8c0d'} strokeWidth='1' d={'M ' + markX + ' ' + innerHeight + ' L ' + markX + ' 0'} /> : '';
-          return (
+          return (
-            <div width={width} height={height}>
+            <div width={width} height={height}>
-              <svg style={{ width: '100%', height: outerHeight }}>
+              <svg style={{ width: '100%', height: outerHeight }}>
-                <g transform={`translate(${MARGIN.left},${MARGIN.top})`}>
+                <g transform={`translate(${MARGIN.left},${MARGIN.top})`}>
-                  <g>{xmark}</g>
+                  <g>{xmark}</g>
-                  <g>{lines}</g>
+                  <g>{lines}</g>
-                  <g className='x axis' ref={(elem) => d3.select(elem).call(this.xAxis)} transform={`translate(0,${innerHeight})`}>
+                  <g className='x axis' ref={(elem) => d3.select(elem).call(this.xAxis)} transform={`translate(0,${innerHeight})`}>
-                    <text className='cap' y='30' dy='.1em' x={innerWidth / 2} style={{ textAnchor: 'middle' }}>
+                    <text className='cap' y='30' dy='.1em' x={innerWidth / 2} style={{ textAnchor: 'middle' }}>
-                      <tspan>{xLabel}</tspan>
+                      <tspan>{xLabel}</tspan>
-                      <tspan className='metric'> ({xUnit})</tspan>
+                      <tspan className='metric'> ({xUnit})</tspan>
-                    </text>
+                    </text>
-                  </g>
+                  </g>
-                  <g className='y axis' ref={(elem) => d3.select(elem).call(this.yAxis)}>
+                  <g className='y axis' ref={(elem) => d3.select(elem).call(this.yAxis)}>
-                    <text className='cap' transform='rotate(-90)' y='-50' dy='.1em' x={innerHeight / -2} style={{ textAnchor: 'middle' }}>
+                    <text className='cap' transform='rotate(-90)' y='-50' dy='.1em' x={innerHeight / -2} style={{ textAnchor: 'middle' }}>
-                      <tspan>{yLabel}</tspan>
+                      <tspan>{yLabel}</tspan>
-                      { yUnit && <tspan className='metric'> ({yUnit})</tspan> }
+                      { yUnit && <tspan className='metric'> ({yUnit})</tspan> }
-                    </text>
+                    </text>
-                  </g>
+                  </g>
-                  <g ref={(g) => this.tipContainer = d3.select(g)} style={{ display: 'none' }}>
+                  <g ref={(g) => this.tipContainer = d3.select(g)} style={{ display: 'none' }}>
-                    <rect className='tooltip' height={tipHeight + 'em'}></rect>
+                    <rect className='tooltip' height={tipHeight + 'em'}></rect>
-                    {detailElems}
+                    {detailElems}
-                  </g>
+                  </g>
-                  <g ref={(g) => this.markersContainer = d3.select(g)} style={{ display: 'none' }}>
+                  <g ref={(g) => this.markersContainer = d3.select(g)} style={{ display: 'none' }}>
-                    {markerElems}
+                    {markerElems}
-                  </g>
+                  </g>
-                  <rect
+                  <rect
-                    fillOpacity='0'
+                    fillOpacity='0'
-                    height={innerHeight}
+                    height={innerHeight}
-                    width={innerWidth + 1}
+                    width={innerWidth + 1}
-                    onMouseEnter={this._showTip}
+                    onMouseEnter={this._showTip}
-                    onTouchStart={this._showTip}
+                    onTouchStart={this._showTip}
-                    onMouseLeave={this._hideTip}
+                    onMouseLeave={this._hideTip}
-                    onTouchEnd={this._hideTip}
+                    onTouchEnd={this._hideTip}
-                    onMouseMove={e => this._moveTip(e, width)}
+                    onMouseMove={e => this._moveTip(e, width)}
-                    onTouchMove={e => this._moveTip(e, width)}
+                    onTouchMove={e => this._moveTip(e, width)}
-                  />
+                  />
-                </g>
+                </g>
-              </svg>
+              </svg>
-            </div>
+            </div>
-          );
+          );
-        }}
+        }}
-      </ContainerDimensions>
+      </ContainerDimensions>
-    );
+    );
-  }
+  }
-}
+}

src/app/components/ModalBatchOrbis.jsx

@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import request from 'superagent';
+import TranslatedComponent from './TranslatedComponent';
+import { orbisUpload } from '../utils/ShortenUrl';
+import Persist from '../stores/Persist';
+
+/**
+ * Permalink modal
+ */
+export default class ModalBatchOrbis extends TranslatedComponent {
+
+  static propTypes = {
+    ships: PropTypes.any.isRequired
+  };
+
+  /**
+   * Constructor
+   * @param  {Object} props   React Component properties
+   */
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      orbisCreds: Persist.getOrbisCreds(),
+      resp: ''
+    };
+  }
+
+  /**
+   * Send ship to Orbis.zone
+   * @param {SyntheticEvent} e React Event
+   * @return {Promise} Promise sending post request to orbis
+   */
+  sendToOrbis(e) {
+    let agent;
+    try {
+      agent = request.agent(); // apparently this crashes somehow
+    } catch (e) {
+      console.error(e);
+    }
+    if (!agent) {
+      agent = request;
+    }
+    const API_ORBIS = 'https://orbis.zone/api/builds/add/batch';
+    return new Promise((resolve, reject) => {
+      try {
+        agent
+          .post(API_ORBIS)
+          .withCredentials()
+          .redirects(0)
+          .set('Content-Type', 'application/json')
+          .send(this.props.ships)
+          .end((err, response) => {
+            console.log(response);
+            if (err) {
+              console.error(err);
+              this.setState({ resp: response.text });
+              reject('Bad Request');
+            } else {
+              this.setState({ resp: 'All builds uploaded. Check https://orbis.zone' });
+              resolve('All builds uploaded. Check https://orbis.zone');
+            }
+          });
+      } catch (e) {
+        console.log(e);
+        reject(e.message ? e.message : e);
+      }
+    });
+  }
+
+  /**
+   * Render the modal
+   * @return {React.Component} Modal Content
+   */
+  render() {
+    let translate = this.context.language.translate;
+    this.sendToOrbis = this.sendToOrbis.bind(this);
+
+    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
+      <h2>{translate('permalink')}</h2>
+      <br/>
+      <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
+      <br/><br/>
+      <h3 >{translate('success')}</h3>
+      <input value={this.state.resp} readOnly size={25} onFocus={ (e) => e.target.select() }/>
+      <br/><br/>
+      <p>Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.</p>
+      <button className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToOrbis}>{translate('PHASE_UPLOAD_ORBIS')}</button>
+      <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
+    </div>;
+  }
+}

src/app/components/ModalImport.jsx

@@ -11,8 +11,7 @@ import * as ModuleUtils from '../shipyard/ModuleUtils';
 import { fromDetailedBuild } from '../shipyard/Serializer';
 import { Download } from './SvgIcons';
 import { outfitURL } from '../utils/UrlGenerators';
-import { shipFromJson, shipModelFromJson } from '../utils/CompanionApiUtils';
+import * as CompanionApiUtils from '../utils/CompanionApiUtils';
-import { shipFromLoadoutJSON } from '../utils/JournalUtils';
 
 const zlib = require('pako');
 
@@ -89,7 +88,6 @@ export default class ModalImport extends TranslatedComponent {
 
 
   static propTypes = {
-    importString: PropTypes.string, // Optional: Default data for import modal
     builds: PropTypes.object,  // Optional: Import object
   };
 
@@ -108,7 +106,7 @@ export default class ModalImport extends TranslatedComponent {
       shipDiscount: null,
       moduleDiscount: null,
       errorMsg: null,
-      importString: props.importString || null,
+      importString: null,
       importValid: false,
       insurance: null
     };
@@ -216,8 +214,8 @@ export default class ModalImport extends TranslatedComponent {
    * @throws {string} if parse/import fails
    */
   _importCompanionApiBuild(build) {
-    const shipModel = shipModelFromJson(build);
+    const shipModel = CompanionApiUtils.shipModelFromJson(build);
-    const ship = shipFromJson(build);
+    const ship = CompanionApiUtils.shipFromJson(build);
 
     let builds = {};
     builds[shipModel] = {};
@@ -323,30 +321,6 @@ export default class ModalImport extends TranslatedComponent {
     this.setState({ builds, singleBuild: true });
   }
 
-  /**
-   * Import SLEF formatted builds. Sets state to a map of the builds on success
-   * and flags if there was only a single build.
-   *
-   * @param  {string} importData - Array of the list of builds.
-   * @throws {string} If parse / import fails
-   */
-  _importSlefBuilds(importData) {
-    const builds = importData.reduce((memo, { data }) => {
-      const shipModel = shipModelFromJson(data);
-      const ship = shipFromLoadoutJSON(data);
-      const shipTemplate = Ships[shipModel];
-      const shipName = data.ShipName || shipTemplate.properties.name;
-
-      const key = `Imported ${shipName}`;
-      memo[shipModel] = {};
-      memo[shipModel][key] = ship.toString();
-
-      return memo;
-    }, {});
-
-    this.setState({ builds, singleBuild: Object.keys(builds).length === 1 });
-  }
-
   /**
    * Validate the import string / text box contents
    * @param  {SyntheticEvent} event Event
@@ -381,10 +355,8 @@ export default class ModalImport extends TranslatedComponent {
           throw 'Must be an object or array!';
         }
 
-        if (importData?.[0]?.header?.appName) { // has SLEF envelope?
+        if (importData.modules != null && importData.modules.Armour != null) { // Only the companion API has this information
-          this._importSlefBuilds(importData);
+          this._importCompanionApiBuild(importData); // Single sihp definition
-        } else if (importData.modules != null && importData.modules.Armour != null) { // Only the companion API has this information
-          this._importCompanionApiBuild(importData); // Single ship definition
         } else if (importData.ship != null && importData.ship.modules != null && importData.ship.modules.Armour != null) { // Only the companion API has this information
           this._importCompanionApiBuild(importData.ship); // Complete API dump
         } else if (importData instanceof Array) {   // Must be detailed export json
@@ -570,7 +542,7 @@ export default class ModalImport extends TranslatedComponent {
               {comparisonRows}
             </tbody>
           </table>
-        );
+          );
       }
 
       if(this.state.canEdit) {

src/app/components/ModalOrbis.jsx

@@ -0,0 +1,141 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import TranslatedComponent from './TranslatedComponent';
+import { orbisUpload } from '../utils/ShortenUrl';
+import Persist from '../stores/Persist';
+
+/**
+ * Permalink modal
+ */
+export default class ModalOrbis extends TranslatedComponent {
+
+  static propTypes = {
+    ship: PropTypes.any.isRequired
+  };
+
+  /**
+   * Constructor
+   * @param  {Object} props   React Component properties
+   */
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      orbisCreds: Persist.getOrbisCreds(),
+      orbisUrl: '...',
+      ship: this.props.ship,
+      authenticatedStatus: 'Checking...'
+    };
+    this.orbisCategory = this.orbisCategory.bind(this);
+  }
+
+  /**
+   * Send ship to Orbis.zone
+   * @param {SyntheticEvent} e React Event
+   */
+  sendToOrbis(e) {
+    const target = e.target;
+    target.disabled = true;
+    this.setState({ orbisUrl: 'Sending...' }, () => {
+      orbisUpload(this.props.ship, this.state.orbisCreds)
+        .then(orbisUrl => {
+          target.disabled = false;
+          this.setState({ orbisUrl });
+        })
+        .catch(err => {
+          target.disabled = false;
+          this.setState({ orbisUrl: 'Error - ' + err });
+        });
+    });
+  }
+
+  /**
+   * Get Orbis.zone auth status
+   * @returns {Object} auth status
+   */
+  getOrbisAuthStatus() {
+    return fetch('https://orbis.zone/api/checkauth', {
+      credentials: 'include',
+      mode: 'cors'
+    })
+    .then(data => data.json())
+    .then(res => {
+      this.setState({ authenticatedStatus: res.status || res.error });
+    })
+    .catch(err => {
+      console.error(err);
+      this.setState({ authenticatedStatus: err.message });
+    });
+  }
+
+  /**
+   * Handler for changing cmdr name
+   * @param {SyntheticEvent} e React Event
+   */
+  orbisPasswordHandler(e) {
+    let password = e.target.value;
+    this.setState({ orbisCreds: { email: this.state.orbisCreds.email, password } }, () => {
+      Persist.setOrbisCreds(this.state.orbisCreds);
+    });
+  }
+
+  /**
+   * Handler for changing cmdr name
+   * @param {SyntheticEvent} e React Event
+   */
+  orbisUsername(e) {
+    let orbisUsername = e.target.value;
+    this.setState({ orbisCreds: { email: orbisUsername, password: this.state.orbisCreds.password } }, () => {
+      Persist.setOrbisCreds(this.state.orbisCreds);
+    });
+  }
+
+  /**
+   * Handler for changing category
+   * @param {SyntheticEvent} e React Event
+   */
+  orbisCategory(e) {
+    let ship = this.state.ship;
+    let cat = e.target.value;
+    ship.category = cat;
+    this.setState({ship});
+  }
+
+  /**
+   * Render the modal
+   * @return {React.Component} Modal Content
+   */
+  render() {
+    let translate = this.context.language.translate;
+    this.orbisPasswordHandler = this.orbisPasswordHandler.bind(this);
+    this.orbisUsername = this.orbisUsername.bind(this);
+    this.sendToOrbis = this.sendToOrbis.bind(this);
+    this.getOrbisAuthStatus();
+    return <div className='modal' onClick={ (e) => e.stopPropagation() }>
+      <h2>{translate('upload to orbis')}</h2>
+      <br/>
+      <label>Orbis auth status: </label>
+      <input value={this.state.authenticatedStatus} readOnly size={25} onFocus={ (e) => e.target.select() }/>
+      <br/><br/>
+      <a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
+      <br/><br/>
+      <h3>Category</h3>
+      <select onChange={this.orbisCategory}>
+        <option value="">No Category</option>
+        <option>Combat</option>
+        <option>Mining</option>
+        <option>Trading</option>
+        <option>Exploration</option>
+        <option>Passenger Liner</option>
+        <option>PvP</option>
+      </select>
+      <br/><br/>
+      <h3 >{translate('Orbis link')}</h3>
+      <input value={this.state.orbisUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
+      <br/><br/>
+      <p>Orbis.zone is currently in a trial period, and may be wiped at any time as development progresses. Some elements are also still placeholders.</p>
+      <button className={'l cb dismiss cap'} disabled={!!this.state.failed} onClick={this.sendToOrbis}>{translate('PHASE_UPLOAD_ORBIS')}</button>
+      <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
+    </div>;
+  }
+}

src/app/components/ModalPermalink.jsx

@@ -34,18 +34,6 @@ export default class ModalPermalink extends TranslatedComponent {
     );
   }
 
-  /**
-   * Copy the shortened URL to the clipboard
-   * @param  {Event} e Click event
-   * @return {void}
-   */
-  copyShortLink() {
-    let copyText = document.getElementById("shortenedUrl");
-    // Copy the text inside the shortendUrl input to the clipboard
-    copyText.select();
-    document.execCommand("copy");
-  }
-
   /**
    * Render the modal
    * @return {React.Component} Modal Content
@@ -54,17 +42,15 @@ export default class ModalPermalink extends TranslatedComponent {
     let translate = this.context.language.translate;
 
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
-      <h3>{translate('permalink')}</h3>
+      <h2>{translate('permalink')}</h2>
       <br/>
       <h3>{translate('URL')}</h3>
       <input value={this.props.url} size={40} readOnly onFocus={ (e) => e.target.select() }/>
       <br/><br/>
       <h3 >{translate('shortened')}</h3>
-      <input id={'shortenedUrl'} value={this.state.shortenedUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/><button className={'cb dismiss cap'} onClick={this.copyShortLink}>{translate('copy to clipboard')}</button>
+      <input value={this.state.shortenedUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
       <br/><br/>
-      <hr />
+      <p>s.orbis.zone is the new URL shortener domain, old eddp.co urls are considered end of life and could go down at any moment. Sorry for any inconvenience.</p>
-      <p>s.orbis.zone is the URL shortener domain. These links should persist indefinitely going forward. If for some reason there is a problem with the link shortening process, please report it in the EDCD Discord Server.</p>
-      <hr />
       <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
     </div>;
   }

src/app/components/ModalShoppingList.jsx

@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import TranslatedComponent from './TranslatedComponent';
 import request from 'superagent';
 import Persist from '../stores/Persist';
-const zlib = require('zlib');
-const base64url = require('base64url');
 
 /**
  * Permalink modal
@@ -12,8 +10,7 @@ const base64url = require('base64url');
 export default class ModalShoppingList extends TranslatedComponent {
 
   static propTypes = {
-    ship: PropTypes.object.isRequired,
+    ship: PropTypes.object.isRequired
-    buildName: PropTypes.string
   };
 
   /**
@@ -59,6 +56,7 @@ export default class ModalShoppingList extends TranslatedComponent {
           continue;
         }
         if (module.m.blueprint.special) {
+          console.log(module.m.blueprint.special);
           blueprints.push({ uuid: module.m.blueprint.special.uuid, number: 1 });
         }
         for (const g in module.m.blueprint.grades) {
@@ -91,10 +89,8 @@ export default class ModalShoppingList extends TranslatedComponent {
     request
       .get('http://localhost:44405/commanders')
       .end((err, res) => {
-        this.display = 'block';
         if (err) {
           console.log(err);
-          this.display = 'none';
           return this.setState({ failed: true });
         }
         const cmdrs = JSON.parse(res.text);
@@ -150,113 +146,6 @@ export default class ModalShoppingList extends TranslatedComponent {
     }
   }
 
-  /**
-   * Fix issues with the item name for bulkheads when sending to EDOMH
-   * @param {*} ship Ship object
-   * @param {*} item Item name
-   * @returns updated item name
-   */
-  fixArmourItemNameForEDOMH(ship, item) {
-    // The module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
-    switch (ship.bulkheads.m.name){
-      case "Lightweight Alloy":
-        item = ship.id + "_Armour_Grade1";
-        break;
-      case "Reinforced Alloy":
-        item = ship.id + "_Armour_Grade2";
-        break;
-      case "Military Grade Composite":
-        item = ship.id + "_Armour_Grade3";
-        break;
-      case "Mirrored Surface Composite":
-        item = ship.id + "_Armour_Mirrored";
-        break;
-      case "Reactive Surface Composite":
-        item = ship.id + "_Armour_Reactive";
-        break;
-    }
-    return item;
-  }
-
-  /**
- * Send all blueprints to EDOMH. This is a modified copy of registerBPs because this.state.blueprints was empty when I tried to modify sendToEDEng and I couldn't figure out why
- * @param {Event} event React event
- */
-  sendToEDOMH(event) {
-    event.preventDefault();
-    const ship = this.props.ship;
-    const buildName = this.props.buildName;
-    let blueprints = [];
-
-    //create the json
-    for (const module of ship.costList) {
-      if (module.type === 'SHIP') {
-        continue;
-      }
-      if (module.m && module.m.blueprint) {
-        if (!module.m.blueprint.grade || !module.m.blueprint.grades) {
-          continue;
-        }
-        if (module.m.blueprint.special) {
-          let item = "";
-          // If the module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
-          if (module.m.blueprint.fdname.includes("Armour_")) {
-            item = this.fixArmourItemNameForEDOMH(ship, item)
-          }
-          else {
-            item = module.m.symbol;
-          }
-
-          blueprints.push({
-            "item": item,
-            "blueprint": module.m.blueprint.special.edname
-          });
-        }
-        for (let g in module.m.blueprint.grades) {
-          if (!module.m.blueprint.grades.hasOwnProperty(g)) {
-            continue;
-          }
-          // We only want the grade that the module is currently at, not every grade up to that point
-          if (Number(g) !== module.m.blueprint.grade) {
-            continue;
-          }
-          let item = "";
-          // If the module blueprint fdname contains "Armour_" it's a bulkhead and we need to pre-populate the item field with the correct name from the ship object
-          if (module.m.blueprint.fdname.includes("Armour_")) {
-            item = this.fixArmourItemNameForEDOMH(ship, item)
-          }
-          else {
-            item = module.m.symbol;
-          }
-          blueprints.push({
-            "item": item,
-            "blueprint": module.m.blueprint.fdname,
-            "grade": module.m.blueprint.grade,
-            "highestGradePercentage":1.0
-          });
-        }
-      }
-    }
-
-    let shipName = buildName + " - " + ship.name;
-
-    //create JSON to encode
-    let baseJson = {
-      "version":1,
-      "name": shipName, // TO-DO: Import build name and put that here correctly
-      "items": blueprints
-    }
-
-    let JSONString = JSON.stringify(baseJson)
-    let deflated = zlib.deflateSync(JSONString)
-
-    //actually encode
-    let link = base64url.encode(deflated)
-    link = "edomh://coriolis/?" + link;
-
-    window.open(link, "_self")
-  }
-
   /**
    * Convert mats object to string
    */
@@ -271,15 +160,14 @@ export default class ModalShoppingList extends TranslatedComponent {
         if (!module.m.blueprint.grade || !module.m.blueprint.grades) {
           continue;
         }
-        for (let g in module.m.blueprint.grades) {
+        for (const g in module.m.blueprint.grades) {
           if (!module.m.blueprint.grades.hasOwnProperty(g)) {
             continue;
           }
-          // Ignore grades higher than the grade selected
+          if (g > module.m.blueprint.grade) {
-          if (Number(g) > module.m.blueprint.grade) {
             continue;
           }
-          for (let i in module.m.blueprint.grades[g].components) {
+          for (const i in module.m.blueprint.grades[g].components) {
             if (!module.m.blueprint.grades[g].components.hasOwnProperty(i)) {
               continue;
             }
@@ -290,18 +178,6 @@ export default class ModalShoppingList extends TranslatedComponent {
             }
           }
         }
-        if (module.m.blueprint.special) {
-          for (const j in module.m.blueprint.special.components) {
-            if (!module.m.blueprint.special.components.hasOwnProperty(j)) {
-              continue;
-            }
-            if (mats[j]) {
-              mats[j] += module.m.blueprint.special.components[j];
-            } else {
-              mats[j] = module.m.blueprint.special.components[j];
-            }
-          }
-        }
       }
     }
     let matsString = '';
@@ -353,48 +229,34 @@ export default class ModalShoppingList extends TranslatedComponent {
     const compatible = this.checkBrowserIsCompatible();
     this.cmdrChangeHandler = this.cmdrChangeHandler.bind(this);
     this.sendToEDEng = this.sendToEDEng.bind(this);
-    this.sendToEDOMH = this.sendToEDOMH.bind(this);
     return <div className='modal' onClick={ (e) => e.stopPropagation() }>
-      <h3>{translate('PHRASE_SHOPPING_MATS')}</h3>
+      <h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
+      <label>{translate('Grade 1 rolls ')}</label>
+      <input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
+      <br/>
+      <label>{translate('Grade 2 rolls ')}</label>
+      <input id={2} type={'number'} min={0} defaultValue={this.state.matsPerGrade[2]} onChange={this.changeHandler} />
+      <br/>
+      <label>{translate('Grade 3 rolls ')}</label>
+      <input id={3} type={'number'} min={0} value={this.state.matsPerGrade[3]} onChange={this.changeHandler} />
+      <br/>
+      <label>{translate('Grade 4 rolls ')}</label>
+      <input id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
+      <br/>
+      <label>{translate('Grade 5 rolls ')}</label>
+      <input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
       <div>
-      <p>{translate('PHRASE_DIFFERENT_ROLLS')}</p>
-        <label>{translate('G1')}</label>
-        <input className={'groll'} id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
-        &nbsp;|&nbsp;<label>{translate('G2')}</label>
-        <input className={'groll'} id={2} type={'number'} min={0} defaultValue={this.state.matsPerGrade[2]} onChange={this.changeHandler} />
-        &nbsp;|&nbsp;<label>{translate('G3')}</label>
-        <input className={'groll'} id={3} type={'number'} min={0} value={this.state.matsPerGrade[3]} onChange={this.changeHandler} />
-        &nbsp;|&nbsp;<label>{translate('G4')}</label>
-        <input className={'groll'} id={4} type={'number'} min={0} value={this.state.matsPerGrade[4]} onChange={this.changeHandler} />
-        &nbsp;|&nbsp;<label>{translate('G5')}</label>
-        <input className={'groll'} id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} />
-      </div>
-
-      <div>
-        <p>{translate('PHRASE_ALL_MODULES_ALL_ROLLS')}</p>
         <textarea className='cb json' readOnly value={this.state.matsList} />
-        <p>{translate('PHRASE_FOR_FINER_CONTROL')}</p>
       </div>
-
+      <label hidden={!compatible} className={'l cap'}>{translate('CMDR Name')}</label>
-      <div id='edengineer' display={this.display} hidden={!!this.state.failed && !compatible}>
+      <br/>
-      <hr />
+      <select hidden={!compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
-        <h3>ED Engineer</h3>
+        {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
-        <h4 hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</h4>
+      </select>
-        <h4 hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAILED_TO_FIND_EDENGINEER')}</h4>
+      <br/>
-        <label for='cmdr-select' hidden={!!this.state.failed || !compatible} className={'l cap'}>{translate('CMDR Name:')}</label>
+      <p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAIL_EDENGINEER')}</p>
-        <select id='cmdr-select' hidden={!!this.state.failed || !compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
+      <p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
-          {this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
+      <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
-        </select>
-        <br/>
-          <button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
-      </div>
-      <div id='edomh'>
-      <hr />
-        <h3>ED Odyssey Materials Helper</h3>
-        <p>{translate('PHRASE_ENSURE_EDOMH')}</p>
-        <button className={'l cb dismiss cap'} onClick={this.sendToEDOMH}>{translate('Send to EDOMH')}</button>
-      </div>
-      <hr />
       <button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
     </div>;
   }

src/app/components/Modification.jsx

@@ -44,7 +44,7 @@ export default class Modification extends TranslatedComponent {
     if (reCast.endsWith(value) || reCast.startsWith(value)) {
       let { m, name, ship } = this.props;
       value = Math.max(Math.min(value, 50000), -50000);
-      ship.setModification(m, name, value, true);
+      ship.setModification(m, name, value, true, true);
     }
   }
 

src/app/components/ModificationsMenu.jsx

@@ -178,7 +178,7 @@ export default class ModificationsMenu extends TranslatedComponent {
           continue;
         }
         const classes = cn('button-inline-menu', {
-          active: m.blueprint && m.blueprint.special && m.blueprint.special.edname == specialName
+          active: m.blueprint && m.blueprint.special && m.blueprint.special.key == specialName
         });
         if (classes.indexOf('active') >= 0) this.selectedSpecialId = specialName;
         const close = this._specialSelected.bind(this, specialName);
@@ -436,8 +436,8 @@ export default class ModificationsMenu extends TranslatedComponent {
     let specialLabel;
     let specialTt;
     if (m.blueprint && m.blueprint.special) {
-      specialLabel = translate(m.blueprint.special.name);
+      specialLabel = m.blueprint.special.name;
-      specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname);
+      specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.key);
     } else {
       specialLabel = translate('PHRASE_SELECT_SPECIAL');
     }

src/app/components/Offence.jsx

@@ -243,13 +243,8 @@ export default class Offence extends TranslatedComponent {
           <td className='ri'><span onMouseOver={termtip.bind(null, baseSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.base.total)}</span></td>
           <td className='ri'><span onMouseOver={termtip.bind(null, effectiveShieldsSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.shields.total)}</span></td>
           <td className='ri'><span onMouseOver={termtip.bind(null, effectivenessShieldsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(weapon.effectiveness.shields.total)}</span></td>
-
-          <td className='ri'><span>{formats.f1(weapon.effectiveness.shields.dpe)}</span></td>
-
           <td className='ri'><span onMouseOver={termtip.bind(null, effectiveArmourSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.f1(weapon.sdps.armour.total)}</span></td>
           <td className='ri'><span onMouseOver={termtip.bind(null, effectivenessArmourTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>{formats.pct1(weapon.effectiveness.armour.total)}</span></td>
-
-          <td className='ri'><span>{formats.f1(weapon.effectiveness.armour.dpe)}</span></td>
         </tr>);
     }
 
@@ -276,20 +271,15 @@ export default class Offence extends TranslatedComponent {
               <tr className='main'>
                 <th rowSpan='2' className='sortable' onClick={sortOrder.bind(this, 'n')}>{translate('weapon')}</th>
                 <th colSpan='1'>{translate('overall')}</th>
-                <th colSpan='3'>{translate('opponent\'s shields')}</th>
+                <th colSpan='2'>{translate('opponent\'s shields')}</th>
-                <th colSpan='3'>{translate('opponent\'s armour')}</th>
+                <th colSpan='2'>{translate('opponent\'s armour')}</th>
               </tr>
               <tr>
                 <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_SHIELDS')} onMouseOut={tooltip.bind(null, null)} onClick={sortOrder.bind(this, 'esdpss')}>{'sdps'}</th>
                 <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_SHIELDS')} onMouseOut={tooltip.bind(null, null)} onClick={sortOrder.bind(this, 'esdpss')}>{'sdps'}</th>
                 <th className='sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVENESS_SHIELDS')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'es')}>{'eft'}</th>
-
-                <th className='sortable'>{'dpe'}</th>
-
                 <th className='lft sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVE_SDPS_ARMOUR')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'esdpsh')}>{'sdps'}</th>
                 <th className='sortable' onMouseOver={termtip.bind(null, 'TT_EFFECTIVENESS_ARMOUR')} onMouseOut={tooltip.bind(null, null)}onClick={sortOrder.bind(this, 'eh')}>{'eft'}</th>
-
-                <th className='sortable'>{'dpe'}</th> 
               </tr>
             </thead>
             <tbody>
@@ -300,10 +290,8 @@ export default class Offence extends TranslatedComponent {
                   <td className='ri'><span onMouseOver={termtip.bind(null, totalSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalSDps)}</span></td>
                   <td className='ri'><span onMouseOver={termtip.bind(null, totalShieldsSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalShieldsSDps)}</span></td>
                   <td></td>
-                  <td></td>
                   <td className='ri'><span onMouseOver={termtip.bind(null, totalArmourSDpsTooltipDetails)} onMouseOut={tooltip.bind(null, null)}>={formats.f1(totalArmourSDps)}</span></td>
                   <td></td>
-                  <td></td>
                 </tr>
               }
             </tbody>

src/app/components/PieChart.jsx

@@ -1,92 +1,92 @@
-import React, { Component } from 'react';
+import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';
-import ContainerDimensions from 'react-container-dimensions';
+import ContainerDimensions from 'react-container-dimensions';
-import * as d3 from 'd3';
+import * as d3 from 'd3';
-
+
-const CORIOLIS_COLOURS = ['#FF8C0D', '#1FB0FF', '#71A052', '#D5D54D'];
+const CORIOLIS_COLOURS = ['#FF8C0D', '#1FB0FF', '#71A052', '#D5D54D'];
-const LABEL_COLOUR = '#000000';
+const LABEL_COLOUR = '#000000';
-
+
-/**
+/**
- * A pie chart
+ * A pie chart
- */
+ */
-export default class PieChart extends Component {
+export default class PieChart extends Component {
-
+
-  static propTypes = {
+  static propTypes = {
-    data : PropTypes.array.isRequired
+    data : PropTypes.array.isRequired
-  };
+  };
-
+
-  /**
+  /**
-   * Constructor
+   * Constructor
-   * @param  {Object} props   React Component properties
+   * @param  {Object} props   React Component properties
-   * @param  {Object} context React Component context
+   * @param  {Object} context React Component context
-   */
+   */
-  constructor(props, context) {
+  constructor(props, context) {
-    super(props);
+    super(props);
-
+
-    this.pie = d3.pie().value((d) => d.value);
+    this.pie = d3.pie().value((d) => d.value);
-    this.colors = CORIOLIS_COLOURS;
+    this.colors = CORIOLIS_COLOURS;
-    this.arc = d3.arc();
+    this.arc = d3.arc();
-    this.arc.innerRadius(0);
+    this.arc.innerRadius(0);
-  }
+  }
-
+
-
+
-  /**
+  /**
-   * Generate a slice of the pie chart
+   * Generate a slice of the pie chart
-   * @param {Object} d     the data for this slice
+   * @param {Object} d     the data for this slice
-   * @param {number} i     the index of this slice
+   * @param {number} i     the index of this slice
-   * @param {number} width the current width of the parent container
+   * @param {number} width the current width of the parent container
-   * @returns {Object}     the SVG for the slice
+   * @returns {Object}     the SVG for the slice
-   */
+   */
-  sliceGenerator(d, i, width) {
+  sliceGenerator(d, i, width) {
-    if (!d || d.value == 0) {
+    if (!d || d.value == 0) {
-      // Ignore 0 values
+      // Ignore 0 values
-      return null;
+      return null;
-    }
+    }
-
+
-    const { data } = this.props;
+    const { data } = this.props;
-
+
-    // Push the labels further out from the centre of the slice
+    // Push the labels further out from the centre of the slice
-    let [labelX, labelY] = this.arc.centroid(d);
+    let [labelX, labelY] = this.arc.centroid(d);
-    const labelTranslate = `translate(${labelX * 1.5}, ${labelY * 1.5})`;
+    const labelTranslate = `translate(${labelX * 1.5}, ${labelY * 1.5})`;
-
+
-    // Put the keys in a line with equal spacing
+    // Put the keys in a line with equal spacing
-    const nonZeroItems = data.filter(d => d.value != 0).length;
+    const nonZeroItems = data.filter(d => d.value != 0).length;
-    const thisItemIndex = data.slice(0, i + 1).filter(d => d.value != 0).length - 1;
+    const thisItemIndex = data.slice(0, i + 1).filter(d => d.value != 0).length - 1;
-    const keyX = -width / 2 + (width / nonZeroItems) * (thisItemIndex + 0.5);
+    const keyX = -width / 2 + (width / nonZeroItems) * (thisItemIndex + 0.5);
-    const keyTranslate = `translate(${keyX}, ${width * 0.45})`;
+    const keyTranslate = `translate(${keyX}, ${width * 0.45})`;
-
+
-    return (
+    return (
-      <g key={`group-${i}`}>
+      <g key={`group-${i}`}>
-        <path key={`arc-${i}`} d={this.arc(d)} style={{ fill: this.colors[i] }} />
+        <path key={`arc-${i}`} d={this.arc(d)} style={{ fill: this.colors[i] }} />
-        <text key={`label-${i}`} transform={labelTranslate} style={{ strokeWidth: '0px', fill: LABEL_COLOUR }} textAnchor='middle'>{d.value}</text>
+        <text key={`label-${i}`} transform={labelTranslate} style={{ strokeWidth: '0px', fill: LABEL_COLOUR }} textAnchor='middle'>{d.value}</text>
-        <text key={`key-${i}`} transform={keyTranslate} style={{ strokeWidth:'0px', fill: this.colors[i] }} textAnchor='middle'>{d.data.label}</text>
+        <text key={`key-${i}`} transform={keyTranslate} style={{ strokeWidth:'0px', fill: this.colors[i] }} textAnchor='middle'>{d.data.label}</text>
-      </g>
+      </g>
-    );
+    );
-  }
+  }
-
+
-  /**
+  /**
-   * Render the component
+   * Render the component
-   * @returns {object} Markup
+   * @returns {object} Markup
-   */
+   */
-  render() {
+  render() {
-    return (
+    return (
-      <ContainerDimensions>
+      <ContainerDimensions>
-        { ({ width }) => {
+        { ({ width }) => {
-          const pie = this.pie(this.props.data),
+          const pie = this.pie(this.props.data),
-              translate = `translate(${width / 2}, ${width * 0.4})`;
+              translate = `translate(${width / 2}, ${width * 0.4})`;
-
+
-          this.arc.outerRadius(width * 0.4);
+          this.arc.outerRadius(width * 0.4);
-          return (
+          return (
-            <div width={width} height={width}>
+            <div width={width} height={width}>
-              <svg style={{ stroke: 'None' }} width={width} height={width * 0.9}>
+              <svg style={{ stroke: 'None' }} width={width} height={width * 0.9}>
-                <g transform={translate}>
+                <g transform={translate}>
-                  {pie.map((d, i) => this.sliceGenerator(d, i, width))}
+                  {pie.map((d, i) => this.sliceGenerator(d, i, width))}
-                </g>
+                </g>
-              </svg>
+              </svg>
-            </div>
+            </div>
-          );
+          );
-        }}
+        }}
-      </ContainerDimensions>
+      </ContainerDimensions>
-    );
+    );
-  }
+  }
-}
+}

src/app/components/Pips.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import TranslatedComponent from './TranslatedComponent';
 import { Pip } from './SvgIcons';
-import autoBind from 'auto-bind';
+import { autoBind } from 'react-extras';
 
 /**
  * Pips displays SYS/ENG/WEP pips and allows users to change them with key presses by clicking on the relevant area.

src/app/components/ShipSummaryTable.jsx

@@ -52,8 +52,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
     const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL';
     const canJump = ship.getSlotStatus(ship.standard[2]) == 3;
     const sgMetrics = Calc.shieldMetrics(ship, pips.sys);
-    const distBoost = canBoost ?  Calc.calcBoost(ship) : 'No Boost';
+    const shipBoost = canBoost ?  Calc.calcBoost(ship) : 'No Boost';
-    //const shipBoost = ship.boostInterval(ship)
     const restingHeat = Math.sqrt(((ship.standard[0].m.pgen * ship.standard[0].m.eff) / ship.heatCapacity) / 0.2);
     const armourMetrics = Calc.armourMetrics(ship);
     let shieldColour = 'blue';
@@ -73,7 +72,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
               <tr className='main'>
                 <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !canThrust }) }>{translate('speed')}</th>
                 <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !canBoost }) }>{translate('boost')}</th>
-                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_INTERVALS', { cap: 0 })}colSpan={2} className={ cn({ 'bg-warning-disabled': !canBoost }) }>{translate('boost int')}</th>
                 <th colSpan={5} className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('jump range')}</th>
                 <th rowSpan={2}>{translate('shield')}</th>
                 <th rowSpan={2}>{translate('integrity')}</th>
@@ -88,11 +86,10 @@ export default class ShipSummaryTable extends TranslatedComponent {
                 <th onMouseEnter={termtip.bind(null, 'hull hardness', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('hrd')}</th>
                 <th rowSpan={2}>{translate('crew')}</th>
                 <th onMouseEnter={termtip.bind(null, 'mass lock factor', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
+                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_INTERVAL', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('boost interval')}</th>
                 <th rowSpan={2}>{translate('resting heat (Beta)')}</th>
               </tr>
               <tr>
-                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_BOOST_INTERVAL', { cap: 0 })} onMouseLeave={hide}>{translate('distro')}</th>
-                <th onMouseEnter={termtip.bind(null, 'TT_SUMMARY_SHIP_BOOST_INTERVAL', { cap: 0 })} onMouseLeave={hide}>{translate('ship')}</th>
                 <th className={ cn({ 'lft': true, 'bg-warning-disabled': !canJump }) }>{translate('max')}</th>
                 <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('unladen')}</th>
                 <th className={ cn({ 'bg-warning-disabled': !canJump }) }>{translate('laden')}</th>
@@ -107,8 +104,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
               <tr>
                 <td onMouseEnter={termtip.bind(null, speedTooltip, { cap: 0 })} onMouseLeave={hide}>{ canThrust ? <span>{int(ship.calcSpeed(4, ship.fuelCapacity, 0, false))}{u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
                 <td onMouseEnter={termtip.bind(null, boostTooltip, { cap: 0 })} onMouseLeave={hide}>{ canBoost ? <span>{int(ship.calcSpeed(4, ship.fuelCapacity, 0, true))}{u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
-                <td>{distBoost !== 'No Boost' ? formats.time(distBoost) : 'No Boost'}</td>
-                <td>{ship.boostInt && ship.boostInt !== 'undefined' ? formats.time(ship.boostInt) : 0 }</td>
                 <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_MAX_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{ f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
                 <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
                 <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_LADEN_SINGLE_JUMP', { cap: 0 })} onMouseLeave={hide}>{ canJump ? <span>{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}</span> : <span className='warning'>0 <Warning/></span> }</td>
@@ -129,6 +124,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
                 <td>{int(ship.hardness)}</td>
                 <td>{ship.crew}</td>
                 <td>{ship.masslock}</td>
+                <td>{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}</td>
                 <td>{formats.pct(restingHeat)}</td>
               </tr>
             </tbody>

src/app/components/Slider.jsx

@@ -1,386 +1,386 @@
-import React from 'react';
+import React from 'react';
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';
-
+
-const MARGIN_LR = 8; // Left/ Right margin
+const MARGIN_LR = 8; // Left/ Right margin
-
+
-/**
+/**
- * Horizontal Slider
+ * Horizontal Slider
- */
+ */
-export default class Slider extends React.Component {
+export default class Slider extends React.Component {
-
+
-  static defaultProps = {
+  static defaultProps = {
-    axis: false,
+    axis: false,
-    min: 0,
+    min: 0,
-    max: 1,
+    max: 1,
-    scale: 1  // SVG render scale
+    scale: 1  // SVG render scale
-  };
+  };
-
+
-  static propTypes = {
+  static propTypes = {
-    axis: PropTypes.bool,
+    axis: PropTypes.bool,
-    axisUnit: PropTypes.string,// units (T, M, etc.)
+    axisUnit: PropTypes.string,// units (T, M, etc.)
-    max: PropTypes.number,
+    max: PropTypes.number,
-    min: PropTypes.number,
+    min: PropTypes.number,
-    onChange: PropTypes.func.isRequired,// function which determins percent value
+    onChange: PropTypes.func.isRequired,// function which determins percent value
-    onResize: PropTypes.func,
+    onResize: PropTypes.func,
-    percent: PropTypes.number.isRequired,// value of slider
+    percent: PropTypes.number.isRequired,// value of slider
-    scale: PropTypes.number
+    scale: PropTypes.number
-  };
+  };
-
+
-  /**
+  /**
-   * Constructor
+   * Constructor
-   * @param  {Object} props   React Component properties
+   * @param  {Object} props   React Component properties
-   */
+   */
-  constructor(props) {
+  constructor(props) {
-    super(props);
+    super(props);
-    this._down = this._down.bind(this);
+    this._down = this._down.bind(this);
-    this._move = this._move.bind(this);
+    this._move = this._move.bind(this);
-    this._up = this._up.bind(this);
+    this._up = this._up.bind(this);
-    this._keyup = this._keyup.bind(this);
+    this._keyup = this._keyup.bind(this);
-    this._keydown = this._keydown.bind(this);
+    this._keydown = this._keydown.bind(this);
-    this._touchstart = this._touchstart.bind(this);
+    this._touchstart = this._touchstart.bind(this);
-    this._touchend = this._touchend.bind(this);
+    this._touchend = this._touchend.bind(this);
-
+
-    this._updatePercent = this._updatePercent.bind(this);
+    this._updatePercent = this._updatePercent.bind(this);
-    this._updateDimensions = this._updateDimensions.bind(this);
+    this._updateDimensions = this._updateDimensions.bind(this);
-
+
-    this.state = { width: 0 };
+    this.state = { width: 0 };
-  }
+  }
-
+
-  /**
+  /**
-   * On Mouse/Touch down handler
+   * On Mouse/Touch down handler
-   * @param  {SyntheticEvent} event Event
+   * @param  {SyntheticEvent} event Event
-   */
+   */
-  _down(event) {
+  _down(event) {
-    let rect = event.currentTarget.getBoundingClientRect();
+    let rect = event.currentTarget.getBoundingClientRect();
-    this.left = rect.left;
+    this.left = rect.left;
-    this.width = rect.width;
+    this.width = rect.width;
-    this._move(event);
+    this._move(event);
-    this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
+    this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
-  }
+  }
-
+
-  /**
+  /**
-   * Update the slider percentage on move
+   * Update the slider percentage on move
-   * @param  {SyntheticEvent} event Event
+   * @param  {SyntheticEvent} event Event
-   */
+   */
-  _move(event) {
+  _move(event) {
-    if(this.width !== null && this.left != null) {
+    if(this.width !== null && this.left != null) {
-      let clientX = event.touches ? event.touches[0].clientX : event.clientX;
+      let clientX = event.touches ? event.touches[0].clientX : event.clientX;
-      event.preventDefault();
+      event.preventDefault();
-      this._updatePercent(clientX - this.left, this.width);
+      this._updatePercent(clientX - this.left, this.width);
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * On Mouse/Touch up handler
+   * On Mouse/Touch up handler
-   * @param  {Event} event  DOM Event
+   * @param  {Event} event  DOM Event
-   */
+   */
-  _up(event) {
+  _up(event) {
-    this.sliderInputBox.sliderVal.focus();
+    this.sliderInputBox.sliderVal.focus();
-    clearTimeout(this.touchStartTimer);
+    clearTimeout(this.touchStartTimer);
-    event.preventDefault();
+    event.preventDefault();
-    this.left = null;
+    this.left = null;
-    this.width = null;
+    this.width = null;
-  }
+  }
-
+
-
+
-  /**
+  /**
-   * Key up handler for keyboard.
+   * Key up handler for keyboard.
-   * display the number field then set focus to it
+   * display the number field then set focus to it
-   * when "Enter" key is pressed
+   * when "Enter" key is pressed
-   * @param {Event} event Keyboard event
+   * @param {Event} event Keyboard event
-   */
+   */
-  _keyup(event) {
+  _keyup(event) {
-    switch (event.key) {
+    switch (event.key) {
-      case 'Enter':
+      case 'Enter':
-        event.preventDefault();
+        event.preventDefault();
-        this.sliderInputBox._setDisplay('block');
+        this.sliderInputBox._setDisplay('block');
-        return;
+        return;
-      default:
+      default:
-        return;
+        return;
-    }
+    }
-  }
+  }
-  /**
+  /**
-   * Key down handler
+   * Key down handler
-   * increment slider position by +/- 1 when right/left arrow key is pressed or held
+   * increment slider position by +/- 1 when right/left arrow key is pressed or held
-   * @param {Event} event Keyboard even
+   * @param {Event} event Keyboard even
-   */
+   */
-  _keydown(event) {
+  _keydown(event) {
-    let newVal = this.props.percent * this.props.max;
+    let newVal = this.props.percent * this.props.max;
-    switch (event.key) {
+    switch (event.key) {
-      case 'ArrowRight':
+      case 'ArrowRight':
-        newVal += 1;
+        newVal += 1;
-        if (newVal <= this.props.max) this.props.onChange(newVal / this.props.max);
+        if (newVal <= this.props.max) this.props.onChange(newVal / this.props.max);
-        return;
+        return;
-      case 'ArrowLeft':
+      case 'ArrowLeft':
-        newVal -= 1;
+        newVal -= 1;
-        if (newVal >= 0) this.props.onChange(newVal / this.props.max);
+        if (newVal >= 0) this.props.onChange(newVal / this.props.max);
-        return;
+        return;
-      default:
+      default:
-        return;
+        return;
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * Touch start handler
+   * Touch start handler
-   * @param  {Event} event  DOM Event
+   * @param  {Event} event  DOM Event
-   *
+   * 
-   */
+   */
-  _touchstart(event) {
+  _touchstart(event) {
-    this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
+    this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
-  }
+  }
-
+  
-  /**
+  /**
-   * Touch end handler
+   * Touch end handler
-   * @param  {Event} event  DOM Event
+   * @param  {Event} event  DOM Event
-   *
+   * 
-   */
+   */
-  _touchend(event) {
+  _touchend(event) {
-    this.sliderInputBox.sliderVal.focus();
+    this.sliderInputBox.sliderVal.focus();
-    clearTimeout(this.touchStartTimer);
+    clearTimeout(this.touchStartTimer);
-  }
+  }
-
+
-  /**
+  /**
-   * Determine if the user is still dragging
+   * Determine if the user is still dragging
-   * @param  {SyntheticEvent} event Event
+   * @param  {SyntheticEvent} event Event
-   */
+   */
-  _enter(event) {
+  _enter(event) {
-    if(event.buttons !== 1) {
+    if(event.buttons !== 1) {
-      this.left = null;
+      this.left = null;
-      this.width = null;
+      this.width = null;
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * Update the slider percentage
+   * Update the slider percentage
-   * @param  {number} pos   Slider drag position
+   * @param  {number} pos   Slider drag position
-   * @param  {number} width Slider width
+   * @param  {number} width Slider width
-   * @param  {Event} event  DOM Event
+   * @param  {Event} event  DOM Event
-   */
+   */
-  _updatePercent(pos, width) {
+  _updatePercent(pos, width) {
-    this.props.onChange(Math.min(Math.max(pos / width, 0), 1));
+    this.props.onChange(Math.min(Math.max(pos / width, 0), 1));
-  }
+  }
-
+
-  /**
+  /**
-   * Update dimenions from rendered DOM
+   * Update dimenions from rendered DOM
-   */
+   */
-  _updateDimensions() {
+  _updateDimensions() {
-    this.setState({
+    this.setState({
-      outerWidth: this.node.getBoundingClientRect().width
+      outerWidth: this.node.getBoundingClientRect().width
-    });
+    });
-  }
+  }
-
+
-  /**
+  /**
-   * Add listeners when about to mount
+   * Add listeners when about to mount
-   */
+   */
-  componentWillMount() {
+  componentWillMount() {
-    if (this.props.onResize) {
+    if (this.props.onResize) {
-      this.resizeListener = this.props.onResize(this._updateDimensions);
+      this.resizeListener = this.props.onResize(this._updateDimensions);
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * Trigger DOM updates on mount
+   * Trigger DOM updates on mount
-   */
+   */
-  componentDidMount() {
+  componentDidMount() {
-    this._updateDimensions();
+    this._updateDimensions();
-  }
+  }
-
+
-  /**
+  /**
-   * Remove listeners on unmount
+   * Remove listeners on unmount
-   */
+   */
-  componentWillUnmount() {
+  componentWillUnmount() {
-    if (this.resizeListener) {
+    if (this.resizeListener) {
-      this.resizeListener.remove();
+      this.resizeListener.remove();
-    }
+    }
-  }
+  }
-
+
-  /**
+  /**
-   * Render the slider
+   * Render the slider
-   * @return {React.Component} The slider
+   * @return {React.Component} The slider
-   */
+   */
-  render() {
+  render() {
-    let outerWidth = this.state.outerWidth;
+    let outerWidth = this.state.outerWidth;
-    let { axis, axisUnit, min, max, scale } = this.props;
+    let { axis, axisUnit, min, max, scale } = this.props;
-    let style = {
+    let style = {
-      width: '100%',
+      width: '100%',
-      height: axis ? '2.5em' : '1.5em',
+      height: axis ? '2.5em' : '1.5em',
-      boxSizing: 'border-box'
+      boxSizing: 'border-box'
-    };
+    };
-    if (!outerWidth) {
+    if (!outerWidth) {
-      return <svg style={style} ref={node => this.node = node} />;
+      return <svg style={style} ref={node => this.node = node} />;
-    }
+    }
-    let margin = MARGIN_LR * scale;
+    let margin = MARGIN_LR * scale;
-    let width = outerWidth - (margin * 2);
+    let width = outerWidth - (margin * 2);
-    let pctPos = width * this.props.percent;
+    let pctPos = width * this.props.percent;
-    return <div><svg
+    return <div><svg 
-      onMouseUp={this._up} onMouseEnter={this._enter.bind(this)} onMouseMove={this._move} onKeyUp={this._keyup} onKeyDown={this._keydown} style={style} ref={node => this.node = node} tabIndex="0">
+      onMouseUp={this._up} onMouseEnter={this._enter.bind(this)} onMouseMove={this._move} onKeyUp={this._keyup} onKeyDown={this._keydown} style={style} ref={node => this.node = node} tabIndex="0">
-      <rect className='primary' style={{ opacity: 0.3 }} x={margin} y='0.25em' rx='0.3em' ry='0.3em' width={width} height='0.7em' />
+      <rect className='primary' style={{ opacity: 0.3 }} x={margin} y='0.25em' rx='0.3em' ry='0.3em' width={width} height='0.7em' />
-      <rect className='primary-disabled' x={margin} y='0.45em' rx='0.15em' ry='0.15em' width={pctPos} height='0.3em' />
+      <rect className='primary-disabled' x={margin} y='0.45em' rx='0.15em' ry='0.15em' width={pctPos} height='0.3em' />
-      <circle className='primary' r={margin} cy='0.6em' cx={pctPos + margin} />
+      <circle className='primary' r={margin} cy='0.6em' cx={pctPos + margin} />
-      <rect x={margin} width={width} height='100%' fillOpacity='0' style={{ cursor: 'col-resize' }} onMouseDown={this._down} onTouchMove={this._move} onTouchStart={this._down} onTouchEnd={this._touchend} />
+      <rect x={margin} width={width} height='100%' fillOpacity='0' style={{ cursor: 'col-resize' }} onMouseDown={this._down} onTouchMove={this._move} onTouchStart={this._down} onTouchEnd={this._touchend} />
-      {axis && <g style={{ fontSize: '.7em' }}>
+      {axis && <g style={{ fontSize: '.7em' }}>
-        <text className='primary-disabled' y='3em' x={margin} style={{ textAnchor: 'middle' }}>{min + axisUnit}</text>
+        <text className='primary-disabled' y='3em' x={margin} style={{ textAnchor: 'middle' }}>{min + axisUnit}</text>
-        <text className='primary-disabled' y='3em' x='50%' style={{ textAnchor: 'middle' }}>{(min + max / 2) + axisUnit}</text>
+        <text className='primary-disabled' y='3em' x='50%' style={{ textAnchor: 'middle' }}>{(min + max / 2) + axisUnit}</text>
-        <text className='primary-disabled' y='3em' x='100%' style={{ textAnchor: 'end' }}>{max + axisUnit}</text>
+        <text className='primary-disabled' y='3em' x='100%' style={{ textAnchor: 'end' }}>{max + axisUnit}</text>
-      </g>}
+      </g>}
-    </svg>
+    </svg>
-    <TextInputBox ref={(tb) => this.sliderInputBox = tb}
+    <TextInputBox ref={(tb) => this.sliderInputBox = tb}
-      onChange={this.props.onChange}
+      onChange={this.props.onChange}
-      percent={this.props.percent}
+      percent={this.props.percent}
-      axisUnit={this.props.axisUnit}
+      axisUnit={this.props.axisUnit}
-      scale={this.props.scale}
+      scale={this.props.scale}
-      max={this.props.max}
+      max={this.props.max}
-    />
+    />
-   </div>;
+   </div>;
-  }
+  }
-}
+}
-/**
+/**
- * New component to add keyboard support for sliders - works on all devices (desktop, iOS, Android)
+ * New component to add keyboard support for sliders - works on all devices (desktop, iOS, Android)
- **/
+ **/
-class TextInputBox extends React.Component {
+class TextInputBox extends React.Component {
-  static propTypes = {
+  static propTypes = {
-    axisUnit: PropTypes.string,// units (T, M, etc.)
+    axisUnit: PropTypes.string,// units (T, M, etc.)
-    max: PropTypes.number,
+    max: PropTypes.number,
-    onChange: PropTypes.func.isRequired,// function which determins percent value
+    onChange: PropTypes.func.isRequired,// function which determins percent value
-    percent: PropTypes.number.isRequired,// value of slider
+    percent: PropTypes.number.isRequired,// value of slider
-    scale: PropTypes.number
+    scale: PropTypes.number
-  };
+  };
-  /**
+  /**
-   * Determine if the user is still dragging
+   * Determine if the user is still dragging
-   * @param  {Object} props React Component properties
+   * @param  {Object} props React Component properties
-   */
+   */
-  constructor(props) {
+  constructor(props) {
-    super(props);
+    super(props);
-    this._handleFocus = this._handleFocus.bind(this);
+    this._handleFocus = this._handleFocus.bind(this);
-    this._handleBlur = this._handleBlur.bind(this);
+    this._handleBlur = this._handleBlur.bind(this);
-    this._handleChange = this._handleChange.bind(this);
+    this._handleChange = this._handleChange.bind(this);
-    this._keyup = this._keyup.bind(this);
+    this._keyup = this._keyup.bind(this);
-    this.state = this._getInitialState();
+    this.state = this._getInitialState();
-  }
+  }
-  /**
+  /**
-   * Update input value if slider changes will change props/state
+   * Update input value if slider changes will change props/state
-   * @param  {Object} nextProps React Component properites
+   * @param  {Object} nextProps React Component properites
-   * @param  {Object} nextState React Component state values
+   * @param  {Object} nextState React Component state values
-   */
+   */
-  componentWillReceiveProps(nextProps, nextState) {
+  componentWillReceiveProps(nextProps, nextState) {
-    let nextValue = nextProps.percent * nextProps.max;
+    let nextValue = nextProps.percent * nextProps.max;
-    // See https://stackoverflow.com/questions/32414308/updating-state-on-props-change-in-react-form
+    // See https://stackoverflow.com/questions/32414308/updating-state-on-props-change-in-react-form
-    if (nextValue !== this.state.inputValue && nextValue <= nextProps.max) {
+    if (nextValue !== this.state.inputValue && nextValue <= nextProps.max) {
-      this.setState({ inputValue: nextValue });
+      this.setState({ inputValue: nextValue });
-    }
+    }
-  }
+  }
-    /**
+    /**
-   * Update slider textbox visibility/values if changes are made to slider
+   * Update slider textbox visibility/values if changes are made to slider
-   * @param  {Object} prevProps React Component properites
+   * @param  {Object} prevProps React Component properites
-   * @param  {Object} prevState React Component state values
+   * @param  {Object} prevState React Component state values
-   */
+   */
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate(prevProps, prevState) {
-    if (prevState.divStyle.display == 'none' && this.state.divStyle.display == 'block') {
+    if (prevState.divStyle.display == 'none' && this.state.divStyle.display == 'block') {
-      this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10);
+      this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10);  
-    }
+    }
-    if (prevProps.max !== this.props.max && this.state.inputValue > this.props.max) {
+    if (prevProps.max !== this.props.max && this.state.inputValue > this.props.max) {
-      // they chose a different module
+      // they chose a different module
-      this.setState({ inputValue: this.props.max });
+      this.setState({ inputValue: this.props.max });
-    }
+    }
-    if (this.state.inputValue != prevState.inputValue && prevProps.max == this.props.max) {
+    if (this.state.inputValue != prevState.inputValue && prevProps.max == this.props.max) {
-      this.props.onChange(this.state.inputValue / this.props.max);
+      this.props.onChange(this.state.inputValue / this.props.max);
-    }
+    }
-  }
+  }
-  /**
+  /**
-   * Set initial state for the textbox.
+   * Set initial state for the textbox. 
-   * We may want to rethink this to
+   * We may want to rethink this to 
-   * try and make it a stateless component
+   * try and make it a stateless component
-   * @returns {object} React state object with initial values set
+   * @returns {object} React state object with initial values set
-   */
+   */
-  _getInitialState() {
+  _getInitialState() {
-    return {
+    return {
-      divStyle: { display:'none' },
+      divStyle: { display:'none' }, 
-      inputStyle: { width:'4em' },
+      inputStyle: { width:'4em' },
-      labelStyle: { marginLeft: '.1em' },
+      labelStyle: { marginLeft: '.1em' },
-      maxLength:5,
+      maxLength:5,
-      size:5,
+      size:5,
-      min:0,
+      min:0,
-      tabIndex:-1,
+      tabIndex:-1,
-      type:'number',
+      type:'number',
-      readOnly: true,
+      readOnly: true,
-      inputValue: this.props.percent * this.props.max
+      inputValue: this.props.percent * this.props.max
-    };
+    };
-  }
+  }
-  /**
+  /**
-   *
+   * 
-   * @param {string} val block or none
+   * @param {string} val block or none
-   */
+   */
-  _setDisplay(val) {
+  _setDisplay(val) {
-    this.setState({
+    this.setState({
-      divStyle: { display:val }
+      divStyle: { display:val }
-    });
+    });
-  }
+  }
-  /**
+  /**
-   * Update the input value
+   * Update the input value
-   * when textbox gets focus
+   * when textbox gets focus
-   */
+   */
-  _handleFocus() {
+  _handleFocus() {
-    this.setState({
+    this.setState({
-      inputValue:this._getValue()
+      inputValue:this._getValue()
-    });
+    });
-  }
+  }
-  /**
+  /**
-   * Update inputValue when textbox loses focus
+   * Update inputValue when textbox loses focus
-   */
+   */
-  _handleBlur() {
+  _handleBlur() {
-    this._setDisplay('none');
+    this._setDisplay('none');
-    if (this.state.inputValue !== '') {
+    if (this.state.inputValue !== '') {
-      this.props.onChange(this.state.inputValue / this.props.max);
+      this.props.onChange(this.state.inputValue / this.props.max);
-    } else {
+    } else {
-      this.setState({
+      this.setState({
-        inputValue: this.props.percent * this.props.max
+        inputValue: this.props.percent * this.props.max
-      });
+      });
-    }
+    }
-  }
+  }
-  /**
+  /**
-   * Get the value in the text box
+   * Get the value in the text box
-   * @returns {number} inputValue Value of the input box
+   * @returns {number} inputValue Value of the input box 
-   */
+   */
-  _getValue() {
+  _getValue() {
-    return this.state.inputValue;
+    return this.state.inputValue;
-  }
+  }
-  /**
+  /**
-   * Update and set limits on input box
+   * Update and set limits on input box
-   * values depending on what user
+   * values depending on what user
-   * has selected
+   * has selected
-   *
+   * 
-   * @param {SyntheticEvent} event ReactJs onChange event
+   * @param {SyntheticEvent} event ReactJs onChange event
-   */
+   */
-  _handleChange(event) {
+  _handleChange(event) {
-    if (event.target.value < 0) {
+    if (event.target.value < 0) {
-      this.setState({ inputValue: 0 });
+      this.setState({ inputValue: 0 });
-    } else if (event.target.value <= this.props.max)  {
+    } else if (event.target.value <= this.props.max)  {
-      this.setState({ inputValue: event.target.value });
+      this.setState({ inputValue: event.target.value });
-    } else {
+    } else {
-      this.setState({ inputValue: this.props.max });
+      this.setState({ inputValue: this.props.max });
-    }
+    }
-  }
+  }
-  /**
+  /**
-   * Key up handler for input field.
+   * Key up handler for input field.
-   * If user hits Enter key, blur/close the input field
+   * If user hits Enter key, blur/close the input field
-   * @param {Event} event Keyboard event
+   * @param {Event} event Keyboard event
-   */
+   */
-  _keyup(event) {
+  _keyup(event) {
-    switch (event.key) {
+    switch (event.key) {
-      case 'Enter':
+      case 'Enter':
-        this.sliderVal.blur();
+        this.sliderVal.blur();
-        return;
+        return;
-      default:
+      default:
-        return;
+        return;
-    }
+    }
-  }
+  }
-  /**
+  /**
-   * Get the value in the text box
+   * Get the value in the text box
-   * @return {React.Component} Text Input component for Slider
+   * @return {React.Component} Text Input component for Slider
-   */
+   */
-  render() {
+  render() {
-    let {  axisUnit, onChange, percent, scale } = this.props;
+    let {  axisUnit, onChange, percent, scale } = this.props;
-    return <div style={this.state.divStyle}><input style={this.state.inputStyle} value={this._getValue()} min={this.state.min} max={this.props.max} onChange={this._handleChange} onKeyUp={this._keyup} tabIndex={this.state.tabIndex} maxLength={this.state.maxLength} size={this.state.size} onBlur={() => {this._handleBlur();}} onFocus={() => {this._handleFocus();}} type={this.state.type} ref={(ip) => this.sliderVal = ip}/><text className="primary upp" style={this.state.labelStyle}>{this.props.axisUnit}</text></div>;
+    return <div style={this.state.divStyle}><input style={this.state.inputStyle} value={this._getValue()} min={this.state.min} max={this.props.max} onChange={this._handleChange} onKeyUp={this._keyup} tabIndex={this.state.tabIndex} maxLength={this.state.maxLength} size={this.state.size} onBlur={() => {this._handleBlur();}} onFocus={() => {this._handleFocus();}} type={this.state.type} ref={(ip) => this.sliderVal = ip}/><text className="primary upp" style={this.state.labelStyle}>{this.props.axisUnit}</text></div>;
-  }
+  }
-}
+}
-
+

src/app/components/Slot.jsx

@@ -99,7 +99,6 @@ export default class Slot extends TranslatedComponent {
     let translate = language.translate;
     let { ship, m, enabled, dropClass, dragOver, onOpen, onChange, selected, eligible, onSelect, warning, availableModules } = this.props;
     let slotDetails, modificationsMarker, menu;
-    let missing = false;
 
     if (!selected) {
       // If not selected then sure that modifications flag is unset
@@ -109,11 +108,6 @@ export default class Slot extends TranslatedComponent {
     if (m) {
       slotDetails = this._getSlotDetails(m, enabled, translate, language.formats, language.units);  // Must be implemented by sub classes
       modificationsMarker = JSON.stringify(m);
-      if(typeof m.grp !== 'undefined' || m.grp !== null) {
-        if(m.grp == "mh" || m.grp == "mm") {
-          missing = true;
-        }
-      }
     } else {
       slotDetails = <div className={'empty'}>{translate(eligible ? 'emptyrestricted' : 'empty')}</div>;
       modificationsMarker = '';
@@ -144,16 +138,13 @@ export default class Slot extends TranslatedComponent {
     }
 
     // TODO: implement touch dragging
-    
+
     return (
       <div className={cn('slot', dropClass, { selected })} onClick={onOpen} onKeyDown={this._keyDown} onContextMenu={this._contextMenu} onDragOver={dragOver} tabIndex="0" ref={slotDiv => this.slotDiv = slotDiv}>
-        {
+        <div className='details-container'>
-          // If missing module/hardpoint, set the div container to warning status.
-        }
-        <div className={ missing === true ? 'details-container warning' : 'details-container'}>
           <div className='sz'>{this._getMaxClassLabel(translate)}</div>
             {slotDetails}
-  	    </div>
+  	  </div>
         {menu}
       </div>
     );

src/app/components/StandardSlot.jsx

@@ -93,11 +93,6 @@ export default class StandardSlot extends TranslatedComponent {
       this._modificationsSelected = false;
     }
 
-    // If this is a missing module, therefore has the 'info' field, set the warning value on the module to be true when loaded.
-    if (m.info) {
-      warning = () => true;
-    }
-
     const modificationsMarker = JSON.stringify(m);
 
     if (selected) {
@@ -129,7 +124,7 @@ export default class StandardSlot extends TranslatedComponent {
         <div className={cn('details-container', { warning: warning && warning(slot.m), disabled: m.grp !== 'bh' && !slot.enabled })}>
           <div className={'sz'}>{m.grp == 'bh' ? m.name.charAt(0) : slot.maxClass}</div>
           <div>
-            <div className={'l'}>{classRating} {m.getInfo() ? translate(m.ukName) : translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }</div>
+            <div className={'l'}>{classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }</div>
             <div className={'r'}>{formats.round(mass)}{units.T}</div>
 	    <div/>
             <div className={'cb'}>
@@ -149,8 +144,7 @@ export default class StandardSlot extends TranslatedComponent {
                 { showModuleResistances && m.getKineticResistance() ? <div className='l'>{translate('kinres')}: {formats.pct(m.getKineticResistance())}</div> : null }
                 { showModuleResistances && m.getThermalResistance() ? <div className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null }
                 { m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null }
-                { m.getInfo() ? <div className='l'>{translate(m.getInfo())}</div> : null }
+	        { validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button  tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
-	        { m.getInfo() ? <div className='r'></div> : validMods.length > 0 ? <div className='r' tabIndex="0" ref={ modButton => this.modButton = modButton }><button  tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation} onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}><ListModifications /></button></div> : null }
             </div>
           </div>
         </div>

src/app/components/StandardSlotSection.jsx

@@ -209,7 +209,7 @@ export default class StandardSlotSection extends SlotSection {
       selected={currentMenu == st[4]}
       onChange={this.props.onChange}
       ship={ship}
-      warning={m => m instanceof Module ? m.getEnginesCapacity() < ship.boostEnergy : m.engcap < ship.boostEnergy}
+      warning={m => m instanceof Module ? m.getEnginesCapacity() <= ship.boostEnergy : m.engcap <= ship.boostEnergy}
     />;
 
     slots[6] = <StandardSlot

src/app/components/SvgIcons.jsx

@@ -247,8 +247,7 @@ export class OrbisIcon extends SvgIcon {
         <path d="m155.34 679.12 173.25-190.21-15.626-13.721-170.9 190.4zm31.01 31.714 202.41-169.1-16.418-14.417-198.76 170.43z"/>
         <path d="m702.66 178.87-173.25 190.21 15.625 13.721 170.9-190.4zm-31.01-31.714-202.41 169.1 16.418 14.417 198.76-170.43z" />
         <rect transform="matrix(-.7071 -.7071 .7071 -.7071 429.34 1036.2)" x="387.09" y="420.77" width="84.379" height="16.859" />
-      </g>
+    </g>);
-    );
   }
 }
 

src/app/components/VerticalBarChart.jsx

@@ -1,80 +1,80 @@
-import TranslatedComponent from './TranslatedComponent';
+import TranslatedComponent from './TranslatedComponent';
-import React, { PropTypes } from 'react';
+import React, { PropTypes } from 'react';
-import ContainerDimensions from 'react-container-dimensions';
+import ContainerDimensions from 'react-container-dimensions';
-import { BarChart, Bar, XAxis, YAxis, LabelList } from 'recharts';
+import { BarChart, Bar, XAxis, YAxis, LabelList } from 'recharts';
-
+
-const CORIOLIS_COLOURS = ['#FF8C0D', '#1FB0FF', '#71A052', '#D5D54D'];
+const CORIOLIS_COLOURS = ['#FF8C0D', '#1FB0FF', '#71A052', '#D5D54D'];
-const LABEL_COLOUR = '#000000';
+const LABEL_COLOUR = '#000000';
-const AXIS_COLOUR = '#C06400';
+const AXIS_COLOUR = '#C06400';
-
+
-const ASPECT = 1;
+const ASPECT = 1;
-
+
-const merge = function(one, two) {
+const merge = function(one, two) {
-  return Object.assign({}, one, two);
+  return Object.assign({}, one, two);
-};
+};
-
+
-/**
+/**
- * A vertical bar chart
+ * A vertical bar chart
- */
+ */
-export default class VerticalBarChart extends TranslatedComponent {
+export default class VerticalBarChart extends TranslatedComponent {
-  static propTypes = {
+  static propTypes = {
-    data : PropTypes.array.isRequired,
+    data : PropTypes.array.isRequired,
-    yMax : PropTypes.number
+    yMax : PropTypes.number
-  };
+  };
-
+
-  /**
+  /**
-   * Constructor
+   * Constructor
-   * @param  {Object} props   React Component properties
+   * @param  {Object} props   React Component properties
-   * @param  {Object} context React Component context
+   * @param  {Object} context React Component context
-   */
+   */
-  constructor(props, context) {
+  constructor(props, context) {
-    super(props);
+    super(props);
-
+
-    this._termtip = this._termtip.bind(this);
+    this._termtip = this._termtip.bind(this);
-  }
+  }
-
+
-  /**
+  /**
-   * Render the bar chart
+   * Render the bar chart
-   * @returns {Object} the markup
+   * @returns {Object} the markup
-   */
+   */
-  render() {
+  render() {
-    const { tooltip, termtip } = this.context;
+    const { tooltip, termtip } = this.context;
-
+
-    // Calculate maximum for Y
+    // Calculate maximum for Y
-    let dataMax = Math.max(...this.props.data.map(d => d.value));
+    let dataMax = Math.max(...this.props.data.map(d => d.value));
-    if (dataMax == -Infinity) dataMax = 0;
+    if (dataMax == -Infinity) dataMax = 0;
-    let yMax = this.props.yMax ? Math.round(this.props.yMax) : 0;
+    let yMax = this.props.yMax ? Math.round(this.props.yMax) : 0;
-    const localMax = Math.max(dataMax, yMax);
+    const localMax = Math.max(dataMax, yMax);
-
+
-    return (
+    return (
-      <ContainerDimensions>
+      <ContainerDimensions>
-        { ({ width }) => (
+        { ({ width }) => (
-          <div width='100%'>
+          <div width='100%'>
-            <BarChart width={width} height={width * ASPECT} data={this.props.data} margin={{ top: 5, right: 5, left: 5, bottom: 5 }}>
+            <BarChart width={width} height={width * ASPECT} data={this.props.data} margin={{ top: 5, right: 5, left: 5, bottom: 5 }}>
-              <XAxis interval={0} fontSize='0.8em' stroke={AXIS_COLOUR} dataKey='label' />
+              <XAxis interval={0} fontSize='0.8em' stroke={AXIS_COLOUR} dataKey='label' />
-              <YAxis interval={'preserveStart'} tickCount={11} fontSize='0.8em' stroke={AXIS_COLOUR} type='number' domain={[0, localMax]}/>
+              <YAxis interval={'preserveStart'} tickCount={11} fontSize='0.8em' stroke={AXIS_COLOUR} type='number' domain={[0, localMax]}/>
-              <Bar dataKey='value' fill={CORIOLIS_COLOURS[0]} isAnimationActive={false} onMouseOver={this._termtip} onMouseOut={tooltip.bind(null, null)}>
+              <Bar dataKey='value' fill={CORIOLIS_COLOURS[0]} isAnimationActive={false} onMouseOver={this._termtip} onMouseOut={tooltip.bind(null, null)}>
-                <LabelList dataKey='value' position='insideTop'/>
+                <LabelList dataKey='value' position='insideTop'/>
-              </Bar>
+              </Bar>
-            </BarChart>
+            </BarChart>
-          </div>
+          </div>
-        )}
+        )}
-      </ContainerDimensions>
+      </ContainerDimensions>
-    );
+    );
-  }
+  }
-
+
-  /**
+  /**
-   * Generate a term tip
+   * Generate a term tip
-   * @param {Object} d the data
+   * @param {Object} d the data
-   * @param {number} i the index
+   * @param {number} i the index
-   * @param {Object} e the event
+   * @param {Object} e the event
-   * @returns {Object} termtip markup
+   * @returns {Object} termtip markup
-   */
+   */
-  _termtip(d, i, e) {
+  _termtip(d, i, e) {
-    if (this.props.data[i].tooltip) {
+    if (this.props.data[i].tooltip) {
-      return this.context.termtip(this.props.data[i].tooltip, e);
+      return this.context.termtip(this.props.data[i].tooltip, e);
-    } else {
+    } else {
-      return null;
+      return null;
-    }
+    }
-  }
+  }
-}
+}

src/app/i18n/Language.jsx

@@ -8,7 +8,6 @@ import * as RU from './ru';
 import * as PL from './pl';
 import * as PT from './pt';
 import * as CN from './cn';
-import * as KO from './ko';
 import * as d3 from 'd3';
 
 let fallbackTerms = EN.terms;
@@ -30,7 +29,6 @@ export function getLanguage(langCode) {
     case 'pl': lang = PL; break;
     case 'pt': lang = PT; break;
     case 'cn': lang = CN; break;
-    case 'ko': lang = KO; break;
     default:
       lang = EN;
   }
@@ -99,6 +97,5 @@ export const Languages = {
   ru: 'ру́сский',
   pl: 'polski',
   pt: 'português',
-  cn: '中文',
+  cn: '中文'
-  ko: '한국어'
 };

src/app/i18n/cn.json

@@ -398,7 +398,6 @@
   "No modded components.": "没有改装的部件",
   "Sending...": "发送中...",
   "Send to EDEngineer": "发送至EDEngineer",
-  "Send to EDOMH": "发送至EDOMH",
   "PHASE_UPLOAD_ORBIS": "上传到orbis.zone（测试阶段）",
   "orbis username": "orbis.zone的Email或用户名",
   "orbis password": "orbis.zone的密码",

src/app/i18n/de.js

@@ -1,16 +1,16 @@
-export const formats = {
+export const formats = {
-  decimal: ',',
+  decimal: ',',
-  thousands: '.',
+  thousands: '.',
-  grouping: [3],
+  grouping: [3],
-  currency: ['', ' €'],
+  currency: ['', ' €'],
-  dateTime: '%A, der %e. %B %Y, %X',
+  dateTime: '%A, der %e. %B %Y, %X',
-  date: '%d.%m.%Y',
+  date: '%d.%m.%Y',
-  time: '%H:%M:%S',
+  time: '%H:%M:%S',
-  periods: ['AM', 'PM'], // unused
+  periods: ['AM', 'PM'], // unused
-  days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+  days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
-  shortDays: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+  shortDays: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
-  months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+  months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
-  shortMonths: ['Jan', 'Feb', 'Mrz', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']
+  shortMonths: ['Jan', 'Feb', 'Mrz', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']
-};
+};
-
+
-export { default as terms } from './de.json';
+export { default as terms } from './de.json';

src/app/i18n/en.json

@@ -26,9 +26,6 @@
     "PHRASE_NO_SPECIAL": "No experimental effect",
     "PHRASE_SHOPPING_LIST": "Stations that sell this build",
     "PHRASE_SHOPPING_MATS": "Materials needed for this build",
-    "PHRASE_DIFFERENT_ROLLS": "Material requirements will differ, based on the number of rolls per grade, per module.",
-    "PHRASE_FOR_FINER_CONTROL": "For finer control over rolls per grade/module, a more accurate list of required mats and help in finding those mats, please consider using the export options below to ED Odyssey Materials Helper, or ED Engineer, or use the Crafting Lists feature on inara.cz.",
-    "PHRASE_ALL_MODULES_ALL_ROLLS": "The list below, assumes standard to G5 Engineered (approx 80% - 90%) with the rolls above, for ALL engineered modules in the build. You can adjust the number of rolls above for each grade, however it will still apply to all engineered modules in the build.",
     "PHRASE_REFIT_SHOPPING_LIST": "Stations that sell required modules",
     "PHRASE_TOTAL_EFFECTIVE_SHIELD": "Total amount of damage that can be taken from each damage type, if using all shield cells",
     "PHRASE_TIME_TO_LOSE_SHIELDS": "Shields will hold for",
@@ -66,9 +63,7 @@
     "TT_SUMMARY_SPEED": "With full fuel tank and 4 pips to ENG",
     "TT_SUMMARY_SPEED_NONFUNCTIONAL": "Thrusters powered off or over maximum mass with full fuel and cargo loads",
     "TT_SUMMARY_BOOST": "With full fuel tank and 4 pips to ENG",
-    "TT_SUMMARY_SHIP_BOOST_INTERVAL": "Time each boost lasts on this ship",
+    "TT_SUMMARY_BOOST_INTERVAL": "Time between each boost with 4 pips to ENG",
-    "TT_SUMMARY_BOOST_INTERVAL": "Time between boosts with 4 pips to ENG",
-    "TT_SUMMARY_BOOST_INTERVALS": "If DISTRO is less than or equal to SHIP, the ship can boost continuously",
     "TT_SUMMARY_BOOST_NONFUNCTIONAL": "Power distributor not able to supply enough power to boost",
     "TT_SUMMARY_SHIELDS": "Raw shield strength, including boosters",
     "TT_SUMMARY_SHIELDS_SCB": "Raw shield strength, including boosters and SCBs",
@@ -86,10 +81,8 @@
     "TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Farthest possible range with no cargo, a full fuel tank, and jumping as far as possible each time",
     "TT_SUMMARY_LADEN_TOTAL_JUMP": "Farthest possible range with full cargo, a full fuel tank, and jumping as far as possible each time",
     "HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
-    "PHRASE_ENSURE_EDOMH": "Ensure ED Odyssey Material Helper is installed and registered to handle edomh:// urls, else this button will do nothing!",
+	"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
-    "PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
+	"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
-    "PHRASE_FAILED_TO_FIND_EDENGINEER": "Failed to find ED Engineer API. Please ensure it is running and try again.",
-    "MISSING_MODULES": "Missing Modules",
     "am": "Auto Field-Maintenance Unit",
     "bh": "Bulkheads",
     "bl": "Beam Laser",
@@ -100,7 +93,6 @@
     "ch": "Chaff Launcher",
     "cr": "Cargo Rack",
     "cs": "Manifest Scanner",
-    "csl": "Caustic Sink Launcher",
     "dc": "Docking Computer",
     "ec": "Electronic Countermeasure",
     "fc": "Fragment Cannon",
@@ -116,18 +108,10 @@
     "kw": "Kill Warrant Scanner",
     "ls": "Life Support",
     "mc": "Multi-cannon",
-    "mh": "Missing Weapon/Utility",
-    "mm": "Missing Module",
-    "advmc": "Multi-cannon (Advanced)",
     "axmc": "AX Multi-cannon",
-    "axmce": "AX Multi-cannon (Enhanced)",
     "ml": "Mining Laser",
-    "mlc": "Multi Limpet Controller",
     "mr": "Missile Rack",
-    "amr": "Missile Rack (Advanced)",
     "axmr": "AX Missile Rack",
-    "axmre": "AX Missile Rack (Enhanced)",
-    "ews": "Experimental Weapon Stabilizer",
     "mrp": "Module Reinforcement Package",
     "nl": "Mine Launcher",
     "pa": "Plasma Accelerator",
@@ -172,10 +156,8 @@
     "sua": "Supercruise Assist",
     "t": "thrusters",
     "tp": "Torpedo Pylon",
-    "ntp": "Nanite Torpedo Pylon",
     "ul": "Burst Laser",
     "Send To EDEngineer": "Send To EDEngineer",
-    "Send To EDOMH": "Send To EDOMH",
     "ws": "Frame Shift Wake Scanner",
     "rpl": "Repair Limpet Controller",
     "rcpl": "Recon Limpet Controller",
@@ -223,10 +205,9 @@
     "internal protection": "Internal protection",
     "external protection": "External protection",
     "engagement range": "Engagement range",
-    "boost interval": "Boost interval",
+    "boost interval": "Boost intervall",
     "total": "Total",
     "ammo": "Ammunition maximum",
-    "info": "Info",
     "boot": "Boot time",
     "hacktime": "Hack time",
     "brokenregen": "Broken regeneration rate",

src/app/i18n/ko.js

@@ -1,16 +0,0 @@
-export const formats = {
-    decimal: '.',
-    thousands: ',',
-    grouping: [3],
-    currency: ['₩', ''],
-    dateTime: '%a %b %e %X %Y',
-    date: '%Y/%m/%d',
-    time: '%H:%M:%S',
-    periods: ['오전', '오후'],
-    days: ['일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'],
-    shortDays: ['일', '월', '화', '수', '목', '금', '토'],
-    months: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
-    shortMonths: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월']
-};
-
-export { default as terms } from './ko.json';

src/app/i18n/pt.js

@@ -2,15 +2,15 @@ export const formats = {
   decimal: ',',
   thousands: '.',
   grouping: [3],
-  currency: ['$', ''],
+  currency: ['', ' €'],
   dateTime: '%A, %e de %B de %Y, %X',
   date: '%d/%m/%Y',
   time: '%H:%M:%S',
   periods: ['AM', 'PM'],
-  days: ['domingo', 'segunda', 'terça', 'quarta', 'quinta', 'sexta', 'sábado'],
+  days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
-  shortDays: ['dom', 'seg', 'ter', 'qua', 'qui', 'sex', 'sab'],
+  shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
-  months: ['janeiro', 'fevereiro', 'março', 'abril', 'maio', 'junho', 'julho', 'agosto', 'setembro', 'outubro', 'novembro', 'dezembro'],
+  months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-  shortMonths: ['jan', 'fev', 'mar', 'abr', 'mai', 'jun', 'jul', 'ago', 'set', 'out', 'nov', 'dez']
+  shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
 };
 
 export { default as terms } from './pt.json';

src/app/index.js

@@ -1,6 +1,12 @@
+import '@babel/polyfill';
 import React from 'react';
 import { render } from 'react-dom';
 import '../less/app.less';
 import Coriolis from './Coriolis';
+// import TapEventPlugin from 'react/lib/TapEventPlugin';
+// import EventPluginHub from 'react/lib/EventPluginHub';
+
+// onTouchTap not ready for primetime yet, too many issues with preventing default
+// EventPluginHub.injection.injectEventPluginsByName({ TapEventPlugin });
 
 render(<Coriolis />, document.getElementById('coriolis'));

src/app/pages/AboutPage.jsx

@@ -94,6 +94,39 @@ export default class AboutPage extends Page {
           </a>
           .
         </p>
+
+        <h3>Supporting Coriolis</h3>
+        <p>
+          Coriolis is an open source project, and I work on it in my free time.
+          I have set up a patreon at{' '}
+          <a href="https://www.patreon.com/coriolis_elite">
+            patreon.com/coriolis_elite
+          </a>
+          , which will be used to keep Coriolis up to date and the servers
+          running.
+        </p>
+        <form
+          action="https://www.paypal.com/cgi-bin/webscr"
+          method="post"
+          target="_top"
+        >
+          <input type="hidden" name="cmd" value="_s-xclick" />
+          <input type="hidden" name="hosted_button_id" value="SJBKT2SWEEU68" />
+          <input
+            type="image"
+            src="https://www.paypalobjects.com/en_AU/i/btn/btn_donate_SM.gif"
+            border="0"
+            name="submit"
+            alt="PayPal – The safer, easier way to pay online!"
+          />
+          <img
+            alt=""
+            border="0"
+            src="https://www.paypalobjects.com/en_AU/i/scr/pixel.gif"
+            width="1"
+            height="1"
+          />
+        </form>
       </div>
     );
   }

src/app/pages/ErrorDetails.jsx

@@ -45,9 +45,6 @@ export default class ErrorDetails extends React.Component {
     return <div className='error'>
       <h1>Jameson, we have a problem..</h1>
       <h1><small>{error.message}</small></h1>
-        Import Error handling has been improved, but still isn't perfect. <br/>MOST Import failures are a result of missing modules in Coriolis, <br />OR incorrect import strings generated by third party apps. If you're seeing this page, we may have failed to handle the errors in your import correctly. Please see the data output below, specifically the 'scriptUrl:' section if it's there and then if you feel confident enough, please check the github issues page linked below and see if there is a similar issue already logged. If not, please create a new issue with the data below. If you're not confident, please ask for help on the Coriolis Channel of the EDCD Discord server.
-        <br/>
-        <br/>
       <br/>
         {importerror ? <div>If you are attempting to import a ship from EDDI or EDMC and are seeing a 'Z_BUF_ERROR' it means that the URL has not been provided correctly.  This is a common problem when using Microsoft Internet Explorer or Microsoft Edge, and you should use another browser instead.</div> : null }
       <br/>

src/app/pages/OutfittingPage.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+// import Perf from 'react-addons-perf';
 import { Ships } from 'coriolis-data/dist';
 import cn from 'classnames';
 import Page from './Page';
@@ -18,6 +19,7 @@ import {
   LinkIcon,
   ShoppingIcon,
   MatIcon,
+  OrbisIcon
 } from '../components/SvgIcons';
 import LZString from 'lz-string';
 import ShipSummaryTable from '../components/ShipSummaryTable';
@@ -35,6 +37,7 @@ import OutfittingSubpages from '../components/OutfittingSubpages';
 import ModalExport from '../components/ModalExport';
 import ModalPermalink from '../components/ModalPermalink';
 import ModalShoppingList from '../components/ModalShoppingList';
+import ModalOrbis from '../components/ModalOrbis';
 
 /**
  * Document Title Generator
@@ -57,6 +60,7 @@ export default class OutfittingPage extends Page {
    */
   constructor(props, context) {
     super(props, context);
+    // window.Perf = Perf;
     this.state = this._initState(props, context);
     this._keyDown = this._keyDown.bind(this);
     this._exportBuild = this._exportBuild.bind(this);
@@ -677,9 +681,26 @@ export default class OutfittingPage extends Page {
   }
 
   /**
-   * Open up a window for inara with a shopping list of our components
+   * Generate Orbis link
    */
-  _inaraShoppingList() {
+  _genOrbis() {
+    const data = {};
+    const ship = this.state.ship;
+    ship.coriolisId = ship.id;
+    data.coriolisShip = ship;
+    data.url = window.location.href;
+    data.title = this.state.buildName || ship.id;
+    data.description = this.state.buildName || ship.id;
+    data.ShipName = ship.id;
+    data.Ship = ship.id;
+    console.log(data);
+    this.context.showModal(<ModalOrbis ship={data} />);
+  }
+
+  /**
+   * Open up a window for EDDB with a shopping list of our components
+   */
+  _eddbShoppingList() {
     const ship = this.state.ship;
 
     const shipId = Ships[ship.id].eddbID;
@@ -692,7 +713,7 @@ export default class OutfittingPage extends Page {
 
     // Open up the relevant URL
     window.open(
-      'https://inara.cz/inapi/corisearch.php?s=' + shipId + '&m=' + modIds.join(',')
+      'https://eddb.io/station?s=' + shipId + '&m=' + modIds.join(',')
     );
   }
 
@@ -700,9 +721,7 @@ export default class OutfittingPage extends Page {
    * Generates the shopping list
    */
   _genShoppingList() {
-    this.context.showModal(<ModalShoppingList
+    this.context.showModal(<ModalShoppingList ship={this.state.ship} />);
-      ship={this.state.ship}
-      buildName={this.state.buildName} />);
   }
 
   /**
@@ -914,7 +933,7 @@ export default class OutfittingPage extends Page {
               <Download className="lg" />
             </button>
             <button
-              onClick={this._inaraShoppingList}
+              onClick={this._eddbShoppingList}
               onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_LIST')}
               onMouseOut={hide}
             >
@@ -927,6 +946,13 @@ export default class OutfittingPage extends Page {
             >
               <LinkIcon className="lg" />
             </button>
+            <button
+              onClick={this._genOrbis}
+              onMouseOver={termtip.bind(null, 'PHASE_UPLOAD_ORBIS')}
+              onMouseOut={hide}
+            >
+              <OrbisIcon className="lg" />
+            </button>
             <button
               onClick={this._genShoppingList}
               onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_MATS')}

src/app/pages/Page.jsx

@@ -62,14 +62,6 @@ export default class Page extends React.Component {
    */
   componentDidMount() {
     document.title = this.state.title || 'Coriolis';
-    try {
-      (window.adsbygoogle = window.adsbygoogle || []).push({
-        google_ad_client: "ca-pub-3709458261881414",
-        enable_page_level_ads: true
-      });
-    } catch (error) {
-
-    }
   }
 
   /**

src/app/pages/ShipyardPage.jsx

@@ -205,6 +205,7 @@ export default class ShipyardPage extends Page {
         onMouseEnter={noTouch && this._highlightShip.bind(this, s.id)}
         onClick={() => this._toggleCompare(s.id)}
       >
+        <td className="ri">{s.manufacturer}</td>
         <td className="ri">{fInt(s.retailCost)}</td>
         <td className="ri cap">{translate(SizeMap[s.class])}</td>
         <td className="ri">{fInt(s.crew)}</td>
@@ -367,6 +368,13 @@ export default class ShipyardPage extends Page {
             <table style={{ marginLeft: 'calc(12em - 1px)', zIndex: 0 }} className="shipyard-table">
               <thead>
                 <tr className="main">
+                  <th
+                    rowSpan={3}
+                    className="sortable"
+                    onClick={sortShips('manufacturer')}
+                  >
+                    {translate('manufacturer')}
+                  </th>
                   <th>&nbsp;</th>
                   <th
                     rowSpan={3}
@@ -544,7 +552,7 @@ export default class ShipyardPage extends Page {
                   </th>
                   <th
                     className="sortable"
-                    onMouseEnter={termtip.bind(null, 'power distributor')}
+                    onMouseEnter={termtip.bind(null, 'power distriubtor')}
                     onMouseLeave={hide}
                     onClick={sortShips('standard', 4)}
                   >
@@ -615,7 +623,7 @@ export default class ShipyardPage extends Page {
           </div>
         </div>
         <div className="table-tools" >
-          <label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>{translate('Group highlighted ships')}</label>
+          <label><input type="checkbox" checked={this.state.groupCompared} onClick={() => this._toggleGroupCompared()}/>Group highlighted ships</label>
         </div>
         </div>
       </div>

src/app/shipyard/Calculations.js

@@ -14,7 +14,6 @@ export function jumpRange(mass, fsd, fuel, ship) {
   const fsdOptimalMass = fsd instanceof Module ? fsd.getOptMass() : fsd.optmass;
   let jumpAddition = 0;
   if (ship) {
-    mass += ship.reserveFuelCapacity || 0;
     for (const module of ship.internal) {
       if (module && module.m && module.m.grp === 'gfsb' && ship.getSlotStatus(module) == 3) {
         jumpAddition += module.m.getJumpBoost();
@@ -341,30 +340,63 @@ export function shieldMetrics(ship, sys) {
   const maxSysResistance = this.sysResistance(4);
 
   let shield = {};
+  const dimReturnLine = (res) => 1 - (1 - res) * 0.7;
 
   const shieldGeneratorSlot = ship.findInternalByGroup('sg');
   if (shieldGeneratorSlot && shieldGeneratorSlot.enabled && shieldGeneratorSlot.m) {
     const shieldGenerator = shieldGeneratorSlot.m;
+    let res = {
+      kin: shieldGenerator.kinres,
+      therm: shieldGenerator.thermres,
+      expl: shieldGenerator.explres
+    };
     // Boosters
     let boost = 1;
     let boosterExplDmg = 1;
     let boosterKinDmg = 1;
     let boosterThermDmg = 1;
+    // const explDim = dimReturnLine(shieldGenerator.explres);
+    // const thermDim = dimReturnLine(shieldGenerator.thermres);
+    // const kinDim = dimReturnLine(shieldGenerator.kinres);
     for (let slot of ship.hardpoints) {
       if (slot.enabled && slot.m && slot.m.grp == 'sb') {
         boost += slot.m.getShieldBoost();
+        res.expl += slot.m.getExplosiveResistance();
+        res.kin += slot.m.getKineticResistance();
+        res.therm += slot.m.getThermalResistance();
         boosterExplDmg = boosterExplDmg * (1 - slot.m.getExplosiveResistance());
         boosterKinDmg = boosterKinDmg * (1 - slot.m.getKineticResistance());
         boosterThermDmg = boosterThermDmg * (1 - slot.m.getThermalResistance());
       }
+      if (slot.m && slot.m.grp == 'gsrp') {
+
+      }
     }
     // Calculate diminishing returns for boosters
     // Diminishing returns not currently in-game
     // boost = Math.min(boost, (1 - Math.pow(Math.E, -0.7 * boost)) * 2.5);
 
+
     // Remove base shield generator strength
     boost -= 1;
 
+    // if (res.expl > explDim) {
+    //   const overage = (res.expl - explDim) * 0.5;
+    //   res.expl = explDim + overage;
+    //   boosterExplDmg = explDim + overage;
+    // }
+    //
+    // if (res.therm > thermDim) {
+    //   const overage = (res.therm - thermDim) * 0.5;
+    //   res.therm = thermDim + overage;
+    //   boosterThermDmg = thermDim + overage;
+    // }
+    //
+    // if (res.kin > kinDim) {
+    //   const overage = (res.kin - kinDim) * 0.5;
+    //   res.kin = kinDim + overage;
+    //   boosterKinDmg = kinDim + overage;
+    // }
     let shieldAddition = 0;
     if (ship) {
       for (const module of ship.internal) {
@@ -383,8 +415,7 @@ export function shieldMetrics(ship, sys) {
 
     // Our initial regeneration comes from the SYS capacitor store, which is replenished as it goes
     // 0.6 is a magic number from FD: each 0.6 MW of energy from the power distributor recharges 1 MJ/s of regeneration
-    let capacitorDrain = (shieldGenerator.getBrokenRegenerationRate() * shieldGenerator.getDistDraw()) - sysRechargeRate;
+    let capacitorDrain = (shieldGenerator.getBrokenRegenerationRate() * 0.6) - sysRechargeRate;
-    
     let capacitorLifetime = powerDistributor.getSystemsCapacity() / capacitorDrain;
 
     let recover = 16;
@@ -400,7 +431,7 @@ export function shieldMetrics(ship, sys) {
         recover = Math.Infinity;
       } else {
         // Recover remaining shields at the rate of the power distributor's recharge
-        recover += remainingShieldToRecover / (sysRechargeRate / shieldGenerator.getDistDraw());
+        recover += remainingShieldToRecover / (sysRechargeRate / 0.6);
       }
     }
 
@@ -409,7 +440,7 @@ export function shieldMetrics(ship, sys) {
 
     // Our initial regeneration comes from the SYS capacitor store, which is replenished as it goes
     // 0.6 is a magic number from FD: each 0.6 MW of energy from the power distributor recharges 1 MJ/s of regeneration
-    capacitorDrain = (shieldGenerator.getRegenerationRate() * shieldGenerator.getDistDraw()) - sysRechargeRate;
+    capacitorDrain = (shieldGenerator.getRegenerationRate() * 0.6) - sysRechargeRate;
     capacitorLifetime = powerDistributor.getSystemsCapacity() / capacitorDrain;
 
     let recharge = 0;
@@ -425,7 +456,7 @@ export function shieldMetrics(ship, sys) {
         recharge = Math.Inf;
       } else {
         // Recharge remaining shields at the rate of the power distributor's recharge
-        recharge += remainingShieldToRecharge / (sysRechargeRate / shieldGenerator.getDistDraw());
+        recharge += remainingShieldToRecharge / (sysRechargeRate / 0.6);
       }
     }
 
@@ -467,7 +498,7 @@ export function shieldMetrics(ship, sys) {
      */
 
     let sgExplosiveDmg = 1 - shieldGenerator.getExplosiveResistance();
-    let sgSbExplosiveDmg = diminishingReturnsShields(sgExplosiveDmg, sgExplosiveDmg * boosterExplDmg);
+    let sgSbExplosiveDmg = diminishDamageMult(sgExplosiveDmg * 0.7, (1 - shieldGenerator.getExplosiveResistance()) * boosterExplDmg);
     /** @type {ShieldDamageMults} */
     shield.explosive = {
       generator: sgExplosiveDmg,
@@ -479,7 +510,7 @@ export function shieldMetrics(ship, sys) {
     };
 
     let sgKineticDmg = 1 - shieldGenerator.getKineticResistance();
-    let sgSbKineticDmg = diminishingReturnsShields(sgKineticDmg, sgKineticDmg * boosterKinDmg);
+    let sgSbKineticDmg = diminishDamageMult(sgKineticDmg * 0.7, (1 - shieldGenerator.getKineticResistance()) * boosterKinDmg);
     /** @type {ShieldDamageMults} */
     shield.kinetic = {
       generator: sgKineticDmg,
@@ -491,7 +522,7 @@ export function shieldMetrics(ship, sys) {
     };
 
     let sgThermalDmg = 1 - shieldGenerator.getThermalResistance();
-    let sgSbThermalDmg = diminishingReturnsShields(sgThermalDmg , sgThermalDmg * boosterThermDmg);
+    let sgSbThermalDmg = diminishDamageMult(sgThermalDmg * 0.7, (1 - shieldGenerator.getThermalResistance()) * boosterThermDmg);
     /** @type {ShieldDamageMults} */
     shield.thermal = {
       generator: sgThermalDmg,
@@ -531,20 +562,29 @@ export function armourMetrics(ship) {
   let moduleArmour = 0;
   let moduleProtection = 1;
   const bulkheads = ship.bulkheads.m;
-  let hullExplDmgs = [];
+  let hullExplDmg = 1;
-  let hullKinDmgs = [];
+  let hullKinDmg = 1;
-  let hullThermDmgs = [];
+  let hullThermDmg = 1;
-  let hullCausDmgs = [];
+  let hullCausDmg = 1;
+  // const dimReturnLine = (res) => 1 - (1 - res) * 0.7;
+  // let res = {
+  //   kin: 0,
+  //   therm: 0,
+  //   expl: 0
+  // };
   // Armour from HRPs and module armour from MRPs
   for (let slot of ship.internal) {
     if (slot.m && slot.enabled && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
       armourReinforcement += slot.m.getHullReinforcement();
       // Hull boost for HRPs is applied against the ship's base armour
       armourReinforcement += ship.baseArmour * slot.m.getModValue('hullboost') / 10000;
-      hullExplDmgs.push(1 - slot.m.getExplosiveResistance());
+      // res.expl += slot.m.getExplosiveResistance();
-      hullKinDmgs.push(1 - slot.m.getKineticResistance());
+      // res.kin += slot.m.getKineticResistance();
-      hullThermDmgs.push(1 - slot.m.getThermalResistance());
+      // res.therm += slot.m.getThermalResistance();
-      hullCausDmgs.push(1 - slot.m.getCausticResistance());
+      hullExplDmg = hullExplDmg * (1 - slot.m.getExplosiveResistance());
+      hullKinDmg = hullKinDmg * (1 - slot.m.getKineticResistance());
+      hullThermDmg = hullThermDmg * (1 - slot.m.getThermalResistance());
+      hullCausDmg = hullCausDmg * (1 - slot.m.getCausticResistance());
     }
     if (slot.m && slot.enabled && (slot.m.grp == 'mrp' || slot.m.grp == 'gmrp')) {
       moduleArmour += slot.m.getIntegrity();
@@ -553,6 +593,27 @@ export function armourMetrics(ship) {
   }
   moduleProtection = 1 - moduleProtection;
 
+  // const explDim = dimReturnLine(bulkheads.explres);
+  // const thermDim = dimReturnLine(bulkheads.thermres);
+  // const kinDim = dimReturnLine(bulkheads.kinres);
+  // if (res.expl > explDim) {
+  //   const overage = (res.expl - explDim) * 0.5;
+  //   res.expl = explDim + overage;
+  //   hullExplDmg = explDim + overage;
+  // }
+  //
+  // if (res.therm > thermDim) {
+  //   const overage = (res.therm - thermDim) * 0.5;
+  //   res.therm = thermDim + overage;
+  //   hullThermDmg = thermDim + overage;
+  // }
+  //
+  // if (res.kin > kinDim) {
+  //   const overage = (res.kin - kinDim) * 0.5;
+  //   res.kin = kinDim + overage;
+  //   hullKinDmg = kinDim + overage;
+  // }
+
   const armour = {
     bulkheads: armourBulkheads,
     reinforcement: armourReinforcement,
@@ -569,8 +630,8 @@ export function armourMetrics(ship) {
     total: 1
   };
 
-  let armourExplDmg = 1 - ship.bulkheads.m.getExplosiveResistance();
+  let armourExplDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getExplosiveResistance());
-  let armourReinforcedExplDmg = diminishingReturnsArmour(armourExplDmg, ...hullExplDmgs);
+  let armourReinforcedExplDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getExplosiveResistance()) * hullExplDmg);
   armour.explosive = {
     bulkheads: armourExplDmg,
     reinforcement: armourReinforcedExplDmg / armourExplDmg,
@@ -578,8 +639,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedExplDmg
   };
 
-  let armourKinDmg = 1 - ship.bulkheads.m.getKineticResistance();
+  let armourKinDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getKineticResistance());
-  let armourReinforcedKinDmg = diminishingReturnsArmour(armourKinDmg, ...hullKinDmgs);
+  let armourReinforcedKinDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getKineticResistance()) * hullKinDmg);
   armour.kinetic = {
     bulkheads: armourKinDmg,
     reinforcement: armourReinforcedKinDmg / armourKinDmg,
@@ -587,8 +648,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedKinDmg
   };
 
-  let armourThermDmg = 1 - ship.bulkheads.m.getThermalResistance();
+  let armourThermDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getThermalResistance());
-  let armourReinforcedThermDmg = diminishingReturnsArmour(armourThermDmg, ...hullThermDmgs);
+  let armourReinforcedThermDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getThermalResistance()) * hullThermDmg);
   armour.thermal = {
     bulkheads: armourThermDmg,
     reinforcement: armourReinforcedThermDmg / armourThermDmg,
@@ -596,8 +657,8 @@ export function armourMetrics(ship) {
     res: 1 - armourReinforcedThermDmg
   };
 
-  let armourCausDmg = 1 - ship.bulkheads.m.getCausticResistance();
+  let armourCausDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getCausticResistance());
-  let armourReinforcedCausDmg = diminishingReturnsArmour(armourCausDmg, ...hullCausDmgs);
+  let armourReinforcedCausDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getCausticResistance()) * hullCausDmg);
   armour.caustic = {
     bulkheads: armourCausDmg,
     reinforcement: armourReinforcedCausDmg / armourCausDmg,
@@ -843,14 +904,12 @@ export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour
       shields: {
         range: 1,
         sys: opponentHasShields ? opponentShields.absolute.sys : 1,
-        resistance: 1,
+        resistance: 1
-        dpe: 1
       },
       armour: {
         range: 1,
         hardness: 1,
-        resistance: 1,
+        resistance: 1
-        dpe: 1
       }
     }
   };
@@ -910,19 +969,11 @@ export function _weaponSustainedDps(m, opponent, opponentShields, opponentArmour
   weapon.damage.shields.total = weapon.damage.shields.absolute + weapon.damage.shields.explosive + weapon.damage.shields.kinetic + weapon.damage.shields.thermal;
   weapon.damage.armour.total = weapon.damage.armour.absolute + weapon.damage.armour.explosive + weapon.damage.armour.kinetic + weapon.damage.armour.thermal;
 
-
-
   weapon.effectiveness.shields.resistance *= shieldsResistance;
   weapon.effectiveness.armour.resistance *= armourResistance;
 
-
   weapon.effectiveness.shields.total = weapon.effectiveness.shields.range * weapon.effectiveness.shields.sys * weapon.effectiveness.shields.resistance;
   weapon.effectiveness.armour.total = weapon.effectiveness.armour.range * weapon.effectiveness.armour.resistance * weapon.effectiveness.armour.hardness;
-
-  weapon.effectiveness.shields.dpe = weapon.damage.shields.total / m.getEps() / m.getSustainedFactor();
-  weapon.effectiveness.armour.dpe =  weapon.damage.armour.total / m.getEps() / m.getSustainedFactor();
-
-
   return weapon;
 }
 
@@ -986,50 +1037,15 @@ export function timeToDeplete(amount, dps, eps, capacity, recharge) {
 }
 
 /**
- * Checks whether diminishing returns should be applied to shield damage
+ * Applies diminishing returns to resistances.
- * multipliers and does so if necessary.
+ * @param {number} diminishFrom The base resistance up to which no diminishing returns are applied.
- * @param {number} shieldMult Damage multiplier of shield generator
+ * @param {number} damageMult Resistance as damage multiplier
- * @param {number} combinedMult Damage multiplier of shields and shield boosters
+ * @returns {number} Actual damage multiplier
- * @returns {number} Overall damage multiplier
  */
-export function diminishingReturnsShields(shieldMult, combinedMult) {
+export function diminishDamageMult(diminishFrom, damageMult) {
-  let max = shieldMult * 0.7;
+  if (damageMult > diminishFrom) {
-  if (combinedMult < max) {
+    return damageMult;
-    return mapIntoDiminishingRange(max / 2, max, combinedMult);
   } else {
-    return combinedMult;
+    return (diminishFrom / 2) + 0.5 * damageMult;
   }
 }
-
-/**
- * Checks whether diminishing returns should be applied to armour damage
- * multipliers and does so if necessary.
- * @param  {...any} mults Damage multipliers of alloys and hull reinforcement
- * packages
- * @returns {number} Overall damage multiplier
- */
-export function diminishingReturnsArmour(...mults) {
-  let max = Math.min(0.7, ...mults);
-  let combined = mults.reduce((aggr, v) => aggr * v);
-  let diminished = mapIntoDiminishingRange(0.35, max, combined);
-  if (diminished < 0.7) {
-    return diminished;
-  } else {
-    return combined;
-  }
-}
-
-/**
- * Applies diminishing returns to a damage multiplier. Effictively, the range
- * [`0`, `max`]` is mapped into the range [`min`, `max`] for the value `now`.
- * It can also happen, that `now` is outside of the range [`min`, `max`], then
- * `now` is actually improved, i.e. enlarged.
- * @param {number} min Best theoretical damage multiplier
- * @param {number} max Damage multiplier from which diminishing returns start to
- * be applied
- * @param {number} now The current damage multiplier
- * @returns {number} Remapped damage multiplier
- */
-export function mapIntoDiminishingRange(min, max, now) {
-  return min + (max - min) * (now / max);
-}

src/app/shipyard/Constants.js

@@ -25,6 +25,7 @@ export const ModuleGroupToName = {
   pd: 'Power Distributor',
   s: 'Sensors',
   ft: 'Fuel Tank',
+  pas: 'Planetary Approach Suite',
 
   // Internal
   fs: 'Fuel Scoop',
@@ -57,9 +58,6 @@ export const ModuleGroupToName = {
   gmrp: 'Guardian Module Reinforcement Package',
   mahr: 'Meta Alloy Hull Reinforcement Package',
   sua: 'Supercruise Assist',
-  mlc: "Multi Limpet Controller",
-  rpl: "Repair Limpet Controller",
-  pas: 'Planetary Approach Suite',
 
   // Hard Points
   bl: 'Beam Laser',
@@ -77,15 +75,11 @@ export const ModuleGroupToName = {
   nl: 'Mine Launcher',
   ml: 'Mining Laser',
   mr: 'Missile Rack',
-  amr: 'Missile Rack (Advanced)',
   axmr: 'AX Missile Rack',
-  axmre: 'AX Missile Rack (Enhanced)',
   pa: 'Plasma Accelerator',
   po: 'Point Defence',
   mc: 'Multi-cannon',
-  advmc: 'Multi-cannon (Advanced)',
   axmc: 'AX Multi-cannon',
-  axmce: 'AX Multi-cannon (Enhanced)',
   pl: 'Pulse Laser',
   rg: 'Rail Gun',
   sb: 'Shield Booster',

src/app/shipyard/Module.js

@@ -46,7 +46,7 @@ export default class Module {
 
     if ((!raw) && this.blueprint && this.blueprint.special) {
       // This module has a special effect, see if we need to alter our returned value
-      const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
+      const modifierActions = Modifications.modifierActions[this.blueprint.special.key];
       if (modifierActions && modifierActions[name]) {
         // this special effect modifies our returned value
         const modification = Modifications.modifications[name];
@@ -70,7 +70,7 @@ export default class Module {
 
   /**
    * Set a value for a given modification ID
-   * @param {String} name                 The name of the modification
+   * @param {Number} name                 The name of the modification
    * @param {object} value  The value of the modification. If it is a numeric value then it should be an integer scaled so that -2.34% == -234
    * @param {Boolean}   valueiswithspecial   true if the value includes the special effect (when coming from a UI component)
    */
@@ -81,15 +81,9 @@ export default class Module {
     if (!this.origVals) {
       this.origVals = {};
     }
-    if (!valueiswithspecial) {
+    if (valueiswithspecial && this.blueprint && this.blueprint.special) {
-      // Resistance modifiers scale with the base value.
-      if (name === 'kinres' || name === 'thermres' || name === 'causres' || name === 'explres') {
-        let baseValue = this.get(name, false);
-        value = (1 - baseValue) * value;
-      }
-    } else if (valueiswithspecial && this.blueprint && this.blueprint.special) {
       // This module has a special effect, see if we need to alter the stored value
-      const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
+      const modifierActions = Modifications.modifierActions[this.blueprint.special.key];
       if (modifierActions && modifierActions[name]) {
         // This special effect modifies the value being set, so we need to revert it prior to storing the value
         const modification = Modifications.modifications[name];
@@ -119,7 +113,7 @@ export default class Module {
   /**
    * Helper to obtain a module's value.
    * @param {String} name     The name of the modifier to obtain
-   * @param {Boolean} modified Whether to return the raw or modified value
+   * @param {Number} modified Whether to return the raw or modified value
    * @return {Number} The value queried
    */
   get(name, modified = true) {
@@ -439,15 +433,6 @@ export default class Module {
     return this.get('integrity', modified);
   }
 
-  /**
-   * Get the info of this module
-   * @param {Boolean} [modified=false] Whether to take modifications into account
-   * @return {String} the info of this module
-   */
-  getInfo(modified = false) {
-    return (modified && this.getModValue('info')) || this.info;
-  }
-
   /**
    * Get the mass of this module
    * @param {Boolean} [modified=true] Whether to take modifications into account
@@ -709,7 +694,7 @@ export default class Module {
     let result = 0;
     if (this['maxmass']) {
       result = this['maxmass'];
-      if (result && modified && !ModuleUtils.isShieldGenerator(this['grp'])) {
+      if (result && modified) {
         let mult = this.getModValue('optmass') / 10000;
         if (mult) { result = result * (1 + mult); }
       }
@@ -831,7 +816,7 @@ export default class Module {
     if (clipSize) {
       // If auto-loader is applied, effective clip size will be nearly doubled
       // as you get one reload for every two shots fired.
-      if (this.blueprint && this.blueprint.special && this.blueprint.special.edname === 'special_auto_loader' && modified) {
+      if (this.blueprint && this.blueprint.special && this.blueprint.special.key === 'special_auto_loader' && modified) {
         clipSize += clipSize - 1;
       }
 

src/app/shipyard/ModuleSet.js

@@ -13,19 +13,6 @@ function filter(arr, maxClass, minClass, mass) {
   return arr.filter(m => m.class <= maxClass && m.class >= minClass && (m.maxmass === undefined || mass <= m.maxmass));
 }
 
-/**
- * Filter SCO Modules to only return legal size.
- * @param  {Array}  arr        Array of available FSD modules.
- * @param  {number} maxSize    Maximum allowable size for SCO modules.
- * @return {Array}             Subset of modules filtered based on legal size amd type.
- */
-function sco_filter(arr, maxSize) {
-  return arr.filter(module => {
-    return !(module.hasOwnProperty('name') && module['name'] === "Frame Shift Drive (SCO)" && module['class'] < maxSize);
-  });
-}
-
-
 /**
  * The available module set for a specific ship
  */
@@ -54,7 +41,6 @@ export default class ModuleSet {
 
     this.standard[0] = filter(stnd.pp, maxStandardArr[0], 0, mass);  // Power Plant
     this.standard[2] = filter(stnd.fsd, maxStandardArr[2], 0, mass);  // FSD
-    this.standard[2] = sco_filter(this.standard[2], maxStandardArr[2]) // FSD - Filter SCO Modules
     this.standard[4] = filter(stnd.pd, maxStandardArr[4], 0, mass);  // Power Distributor
     this.standard[6] = filter(stnd.ft, maxStandardArr[6], 0, mass);  // Fuel Tank
     // Thrusters, filter modules by class only (to show full list of ratings for that class)

src/app/shipyard/Ship.js

@@ -10,7 +10,7 @@ import { Ships, Modifications } from 'coriolis-data/dist';
 import { chain } from 'lodash';
 const zlib = require('zlib');
 
-const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc', 'ews'];
+const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc'];
 
 // Constants for modifications struct
 const SLOT_ID_DONE = -1;
@@ -140,7 +140,7 @@ export default class Ship {
    */
   canBoost(cargo, fuel) {
     return this.canThrust(cargo, fuel) &&                           // Thrusters operational
-        this.standard[4].m.getEnginesCapacity() >= this.boostEnergy; // PD capacitor is sufficient for boost
+        this.standard[4].m.getEnginesCapacity() > this.boostEnergy; // PD capacitor is sufficient for boost
   }
 
   /**
@@ -492,18 +492,25 @@ export default class Ship {
    * @param {Object} m          The module to change
    * @param {Object} name       The name of the modification to change
    * @param {Number} value The new value of the modification.  The value of the modification is scaled to provide two decimal places of precision in an integer.  For example 1.23% is stored as 123
-   * @param {boolean}   isAbsolute True if value is an absolute value and not a modification value
+   * @param {bool}   sentfromui True if this update was sent from the UI
+   * @param {bool}   isAbsolute True if value is an absolute value and not a
+   *                            modification value
    */
-  setModification(m, name, value, isAbsolute = false) {
+  setModification(m, name, value, sentfromui, isAbsolute) {
     if (isNaN(value)) {
       // Value passed is invalid; reset it to 0
       value = 0;
     }
 
     if (isAbsolute) {
-      m.setPretty(name, value, isAbsolute);
+      m.setPretty(name, value, sentfromui);
     } else {
-      m.setModValue(name, value, false);
+      // Resistance modifiers scale with the base value
+      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
+        let baseValue = m.get(name, false);
+        value = (1 - baseValue) * value;
+      }
+      m.setModValue(name, value, sentfromui);
     }
 
     // Handle special cases
@@ -536,7 +543,7 @@ export default class Ship {
       this.recalculateArmour();
     } else if (name === 'shieldreinforcement') {
       this.recalculateShieldCells();
-    } else if (name === 'burst' || name === 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
+    } else if (name === 'burst' || name == 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
       this.recalculateDps();
       this.recalculateHps();
       this.recalculateEps();

src/app/stores/Persist.js

@@ -15,6 +15,7 @@ const LS_KEY_SIZE_RATIO = 'sizeRatio';
 const LS_KEY_TOOLTIPS = 'tooltips';
 const LS_KEY_MODULE_RESISTANCES = 'moduleResistances';
 const LS_KEY_ROLLS = 'matsPerGrade';
+const LS_KEY_ORBIS = 'orbis';
 
 let LS;
 
@@ -94,6 +95,7 @@ export class Persist extends EventEmitter {
     let buildJson = _get(LS_KEY_BUILDS);
     let comparisonJson = _get(LS_KEY_COMPARISONS);
 
+    this.orbisCreds = _get(LS_KEY_ORBIS) || { email: '', password: '' };
     this.onStorageChange = this.onStorageChange.bind(this);
     this.langCode = _getString(LS_KEY_LANG) || 'en';
     this.insurance = insurance && Insurance[insurance.toLowerCase()] !== undefined ? insurance : 'standard';
@@ -108,9 +110,9 @@ export class Persist extends EventEmitter {
     this.matsPerGrade = matsPerGrade || {
       1: 2,
       2: 2,
-      3: 3,
+      3: 4,
       4: 4,
-      5: 5
+      5: 10
     };
     this.cmdrName = cmdrName || { selected: '', cmdrs: [] };
     this.tooltipsEnabled = tips === null ? true : tips;
@@ -167,6 +169,10 @@ export class Persist extends EventEmitter {
           this.matsPerGrade = JSON.parse(newValue);
           this.emit('matsPerGrade', this.matsPerGrade);
           break;
+        case LS_KEY_ORBIS:
+          this.orbisCreds = JSON.parse(newValue);
+          this.emit('orbis', this.orbisCreds);
+          break;
       }
     } catch (e) {
       // On JSON.Parse Error - don't sync or do anything
@@ -192,6 +198,24 @@ export class Persist extends EventEmitter {
     this.emit('language', langCode);
   }
 
+  /**
+   * Get the current orbis.zone credentials
+   * @return {String} language code
+   */
+  getOrbisCreds() {
+    return this.orbisCreds;
+  };
+
+  /**
+   * Update and save the orbis.zone credentials
+   * @param {Object} creds object with username and password properties.
+   */
+  setOrbisCreds(creds) {
+    this.langCode = creds;
+    _put(LS_KEY_ORBIS, creds);
+    this.emit('orbis', creds);
+  }
+
   /**
    * Show tooltips setting
    * @param  {boolean} show Optional - update setting

src/app/utils/BlueprintFunctions.js

@@ -1,435 +1,435 @@
-import React from 'react';
+import React from 'react';
-import { Modifications } from 'coriolis-data/dist';
+import { Modifications } from 'coriolis-data/dist';
-import { STATS_FORMATTING } from '../shipyard/StatsFormatting';
+import { STATS_FORMATTING } from '../shipyard/StatsFormatting';
-
+
-/**
+/**
- * Generate a tooltip with details of a blueprint's specials
+ * Generate a tooltip with details of a blueprint's specials
- * @param   {Object}  translate   The translate object
+ * @param   {Object}  translate   The translate object
- * @param   {Object}  blueprint   The blueprint at the required grade
+ * @param   {Object}  blueprint   The blueprint at the required grade
- * @param   {string}  grp         The group of the module
+ * @param   {string}  grp         The group of the module
- * @param   {Object}  m           The module to compare with
+ * @param   {Object}  m           The module to compare with
- * @param   {string} specialName  The name of the special
+ * @param   {string} specialName  The name of the special
- * @returns {Object}              The react components
+ * @returns {Object}              The react components
- */
+ */
-export function specialToolTip(translate, blueprint, grp, m, specialName) {
+export function specialToolTip(translate, blueprint, grp, m, specialName) {
-  const effects = [];
+  const effects = [];
-  if (!blueprint || !blueprint.features) {
+  if (!blueprint || !blueprint.features) {
-    return undefined;
+    return undefined;
-  }
+  }
-  if (m) {
+  if (m) {
-    // We also add in any benefits from specials that aren't covered above
+    // We also add in any benefits from specials that aren't covered above
-    if (m.blueprint) {
+    if (m.blueprint) {
-      for (const feature in Modifications.modifierActions[specialName]) {
+      for (const feature in Modifications.modifierActions[specialName]) {
-        // if (!blueprint.features[feature] && !m.mods.feature) {
+        // if (!blueprint.features[feature] && !m.mods.feature) {
-        const featureDef = Modifications.modifications[feature];
+        const featureDef = Modifications.modifications[feature];
-        if (featureDef && !featureDef.hidden) {
+        if (featureDef && !featureDef.hidden) {
-          let symbol = '';
+          let symbol = '';
-          if (feature === 'jitter') {
+          if (feature === 'jitter') {
-            symbol = '°';
+            symbol = '°';
-          } else if (featureDef.type === 'percentage') {
+          } else if (featureDef.type === 'percentage') {
-            symbol = '%';
+            symbol = '%';
-          }
+          }
-          let current = m.getModValue(feature) - m.getModValue(feature, true);
+          let current = m.getModValue(feature) - m.getModValue(feature, true);
-          if (featureDef.type === 'percentage') {
+          if (featureDef.type === 'percentage') {
-            current = Math.round(current / 10) / 10;
+            current = Math.round(current / 10) / 10;
-          } else if (featureDef.type === 'numeric') {
+          } else if (featureDef.type === 'numeric') {
-            current /= 100;
+            current /= 100;
-          }
+          }
-          const currentIsBeneficial = isValueBeneficial(feature, current);
+          const currentIsBeneficial = isValueBeneficial(feature, current);
-
+
-          effects.push(
+          effects.push(
-            <tr key={feature + '_specialTT'}>
+            <tr key={feature + '_specialTT'}>
-              <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
+              <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
-              <td>&nbsp;</td>
+              <td>&nbsp;</td>
-              <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'}
+              <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'}
-                style={{ textAlign: 'right' }}>{current}{symbol}</td>
+                style={{ textAlign: 'right' }}>{current}{symbol}</td>
-              <td>&nbsp;</td>
+              <td>&nbsp;</td>
-            </tr>
+            </tr>
-          );
+          );
-        }
+        }
-      }
+      }
-    }
+    }
-  }
+  }
-
+
-  return (
+  return (
-    <div>
+    <div>
-      <table width='100%'>
+      <table width='100%'>
-        <tbody>
+        <tbody>
-          {effects}
+          {effects}
-        </tbody>
+        </tbody>
-      </table>
+      </table>
-    </div>
+    </div>
-  );
+  );
-}
+}
-
+
-/**
+/**
- * Generate a tooltip with details of a blueprint's effects
+ * Generate a tooltip with details of a blueprint's effects
- * @param   {Object}  translate   The translate object
+ * @param   {Object}  translate   The translate object
- * @param   {Object}  blueprint   The blueprint at the required grade
+ * @param   {Object}  blueprint   The blueprint at the required grade
- * @param   {Array}   engineers   The engineers supplying this blueprint
+ * @param   {Array}   engineers   The engineers supplying this blueprint
- * @param   {string}  grp         The group of the module
+ * @param   {string}  grp         The group of the module
- * @param   {Object}  m           The module to compare with
+ * @param   {Object}  m           The module to compare with
- * @returns {Object}              The react components
+ * @returns {Object}              The react components
- */
+ */
-export function blueprintTooltip(translate, blueprint, engineers, grp, m) {
+export function blueprintTooltip(translate, blueprint, engineers, grp, m) {
-  const effects = [];
+  const effects = [];
-  if (!blueprint || !blueprint.features) {
+  if (!blueprint || !blueprint.features) {
-    return undefined;
+    return undefined;
-  }
+  }
-  for (const feature in blueprint.features) {
+  for (const feature in blueprint.features) {
-    const featureIsBeneficial = isBeneficial(feature, blueprint.features[feature]);
+    const featureIsBeneficial = isBeneficial(feature, blueprint.features[feature]);
-    const featureDef = Modifications.modifications[feature];
+    const featureDef = Modifications.modifications[feature];
-    if (!featureDef.hidden) {
+    if (!featureDef.hidden) {
-      let symbol = '';
+      let symbol = '';
-      if (feature === 'jitter') {
+      if (feature === 'jitter') {
-        symbol = '°';
+        symbol = '°';
-      } else if (featureDef.type === 'percentage') {
+      } else if (featureDef.type === 'percentage') {
-        symbol = '%';
+        symbol = '%';
-      }
+      }
-      let lowerBound = blueprint.features[feature][0];
+      let lowerBound = blueprint.features[feature][0];
-      let upperBound = blueprint.features[feature][1];
+      let upperBound = blueprint.features[feature][1];
-      if (featureDef.type === 'percentage') {
+      if (featureDef.type === 'percentage') {
-        lowerBound = Math.round(lowerBound * 1000) / 10;
+        lowerBound = Math.round(lowerBound * 1000) / 10;
-        upperBound = Math.round(upperBound * 1000) / 10;
+        upperBound = Math.round(upperBound * 1000) / 10;
-      }
+      }
-      const lowerIsBeneficial  = isValueBeneficial(feature, lowerBound);
+      const lowerIsBeneficial  = isValueBeneficial(feature, lowerBound);
-      const upperIsBeneficial  = isValueBeneficial(feature, upperBound);
+      const upperIsBeneficial  = isValueBeneficial(feature, upperBound);
-      if (m) {
+      if (m) {
-        // We have a module - add in the current value
+        // We have a module - add in the current value
-        let current = m.getModValue(feature);
+        let current = m.getModValue(feature);
-        if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
+        if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
-          current = Math.round(current / 10) / 10;
+          current = Math.round(current / 10) / 10;
-        } else if (featureDef.type === 'numeric') {
+        } else if (featureDef.type === 'numeric') {
-          current /= 100;
+          current /= 100;
-        }
+        }
-        const currentIsBeneficial  = isValueBeneficial(feature, current);
+        const currentIsBeneficial  = isValueBeneficial(feature, current);
-        effects.push(
+        effects.push(
-          <tr key={feature}>
+          <tr key={feature}>
-            <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
+            <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
-            <td className={lowerBound === 0 ? '' : lowerIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{lowerBound}{symbol}</td>
+            <td className={lowerBound === 0 ? '' : lowerIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{lowerBound}{symbol}</td>
-            <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
+            <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
-            <td className={upperBound === 0 ? '' : upperIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{upperBound}{symbol}</td>
+            <td className={upperBound === 0 ? '' : upperIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{upperBound}{symbol}</td>
-          </tr>
+          </tr>
-        );
+        );
-      } else {
+      } else {
-        // We do not have a module, no value
+        // We do not have a module, no value
-        effects.push(
+        effects.push(
-          <tr key={feature}>
+          <tr key={feature}>
-            <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
+            <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
-            <td className={lowerBound === 0 ? '' : lowerIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{lowerBound}{symbol}</td>
+            <td className={lowerBound === 0 ? '' : lowerIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{lowerBound}{symbol}</td>
-            <td className={upperBound === 0 ? '' : upperIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{upperBound}{symbol}</td>
+            <td className={upperBound === 0 ? '' : upperIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{upperBound}{symbol}</td>
-          </tr>
+          </tr>
-        );
+        );
-      }
+      }
-    }
+    }
-  }
+  }
-  if (m) {
+  if (m) {
-    // Because we have a module add in any benefits that aren't part of the primary blueprint
+    // Because we have a module add in any benefits that aren't part of the primary blueprint
-    for (const feature in m.mods) {
+    for (const feature in m.mods) {
-      if (!blueprint.features[feature]) {
+      if (!blueprint.features[feature]) {
-        const featureDef = Modifications.modifications[feature];
+        const featureDef = Modifications.modifications[feature];
-        if (featureDef && !featureDef.hidden) {
+        if (featureDef && !featureDef.hidden) {
-          let symbol = '';
+          let symbol = '';
-          if (feature === 'jitter') {
+          if (feature === 'jitter') {
-            symbol = '°';
+            symbol = '°';
-          } else if (featureDef.type === 'percentage') {
+          } else if (featureDef.type === 'percentage') {
-            symbol = '%';
+            symbol = '%';
-          }
+          }
-          let current = m.getModValue(feature);
+          let current = m.getModValue(feature);
-          if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
+          if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
-            current = Math.round(current / 10) / 10;
+            current = Math.round(current / 10) / 10;
-          } else if (featureDef.type === 'numeric') {
+          } else if (featureDef.type === 'numeric') {
-            current /= 100;
+            current /= 100;
-          }
+          }
-          const currentIsBeneficial  = isValueBeneficial(feature, current);
+          const currentIsBeneficial  = isValueBeneficial(feature, current);
-          effects.push(
+          effects.push(
-            <tr key={feature}>
+            <tr key={feature}>
-              <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
+              <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
-              <td>&nbsp;</td>
+              <td>&nbsp;</td>
-              <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
+              <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
-              <td>&nbsp;</td>
+              <td>&nbsp;</td>
-            </tr>
+            </tr>
-          );
+          );
-        }
+        }
-      }
+      }
-    }
+    }
-
+
-    // We also add in any benefits from specials that aren't covered above
+    // We also add in any benefits from specials that aren't covered above
-    if (m.blueprint && m.blueprint.special) {
+    if (m.blueprint && m.blueprint.special) {
-      for (const feature in Modifications.modifierActions[m.blueprint.special.edname]) {
+      for (const feature in Modifications.modifierActions[m.blueprint.special.key]) {
-        if (!blueprint.features[feature] && !m.mods.feature) {
+        if (!blueprint.features[feature] && !m.mods.feature) {
-          const featureDef = Modifications.modifications[feature];
+          const featureDef = Modifications.modifications[feature];
-          if (featureDef && !featureDef.hidden) {
+          if (featureDef && !featureDef.hidden) {
-            let symbol = '';
+            let symbol = '';
-            if (feature === 'jitter') {
+            if (feature === 'jitter') {
-              symbol = '°';
+              symbol = '°';
-            } else if (featureDef.type === 'percentage') {
+            } else if (featureDef.type === 'percentage') {
-              symbol = '%';
+              symbol = '%';
-            }
+            }
-            let current = m.getModValue(feature);
+            let current = m.getModValue(feature);
-            if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
+            if (featureDef.type === 'percentage' || featureDef.name === 'burst' || featureDef.name === 'burstrof') {
-              current = Math.round(current / 10) / 10;
+              current = Math.round(current / 10) / 10;
-            } else if (featureDef.type === 'numeric') {
+            } else if (featureDef.type === 'numeric') {
-              current /= 100;
+              current /= 100;
-            }
+            }
-            const currentIsBeneficial  = isValueBeneficial(feature, current);
+            const currentIsBeneficial  = isValueBeneficial(feature, current);
-            effects.push(
+            effects.push(
-              <tr key={feature}>
+              <tr key={feature}>
-                <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
+                <td style={{ textAlign: 'left' }}>{translate(feature, grp)}</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;</td>
-                <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
+                <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'} style={{ textAlign: 'right' }}>{current}{symbol}</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;</td>
-              </tr>
+              </tr>
-            );
+            );
-          }
+          }
-        }
+        }
-      }
+      }
-    }
+    }
-  }
+  }
-
+
-  let components;
+  let components;
-  if (!m) {
+  if (!m) {
-    components = [];
+    components = [];
-    for (const component in blueprint.components) {
+    for (const component in blueprint.components) {
-      components.push(
+      components.push(
-        <tr key={component}>
+        <tr key={component}>
-          <td style={{ textAlign: 'left' }}>{translate(component)}</td>
+          <td style={{ textAlign: 'left' }}>{translate(component)}</td>
-          <td style={{ textAlign: 'right' }}>{blueprint.components[component]}</td>
+          <td style={{ textAlign: 'right' }}>{blueprint.components[component]}</td>
-        </tr>
+        </tr>
-      );
+      );
-    }
+    }
-  }
+  }
-
+
-  let engineersList;
+  let engineersList;
-  if (engineers) {
+  if (engineers) {
-    engineersList = [];
+    engineersList = [];
-    for (const engineer of engineers) {
+    for (const engineer of engineers) {
-      engineersList.push(
+      engineersList.push(
-        <tr key={engineer}>
+        <tr key={engineer}>
-          <td style={{ textAlign: 'left' }}>{engineer}</td>
+          <td style={{ textAlign: 'left' }}>{engineer}</td>
-        </tr>
+        </tr>
-      );
+      );
-    }
+    }
-  }
+  }
-
+
-  return (
+  return (
-    <div>
+    <div>
-      <table width='100%'>
+      <table width='100%'>
-        <thead>
+        <thead>
-          <tr>
+          <tr>
-            <td>{translate('feature')}</td>
+            <td>{translate('feature')}</td>
-            <td>{translate('worst')}</td>
+            <td>{translate('worst')}</td>
-            {m ? <td>{translate('current')}</td> : null }
+            {m ? <td>{translate('current')}</td> : null }
-            <td>{translate('best')}</td>
+            <td>{translate('best')}</td>
-          </tr>
+          </tr>
-        </thead>
+        </thead>
-        <tbody>
+        <tbody>
-          {effects}
+          {effects}
-        </tbody>
+        </tbody>
-      </table>
+      </table>
-      { components ?  <table width='100%'>
+      { components ?  <table width='100%'>
-        <thead>
+        <thead>
-          <tr>
+          <tr>
-            <td>{translate('component')}</td>
+            <td>{translate('component')}</td>
-            <td>{translate('amount')}</td>
+            <td>{translate('amount')}</td>
-          </tr>
+          </tr>
-        </thead>
+        </thead>
-        <tbody>
+        <tbody>
-          {components}
+          {components}
-        </tbody>
+        </tbody>
-      </table> : null }
+      </table> : null }
-      { engineersList ? <table width='100%'>
+      { engineersList ? <table width='100%'>
-        <thead>
+        <thead>
-          <tr>
+          <tr>
-            <td>{translate('engineers')}</td>
+            <td>{translate('engineers')}</td>
-          </tr>
+          </tr>
-        </thead>
+        </thead>
-        <tbody>
+        <tbody>
-          {engineersList}
+          {engineersList}
-        </tbody>
+        </tbody>
-      </table>  : null }
+      </table>  : null }
-    </div>
+    </div>
-  );
+  );
-}
+}
-
+
-/**
+/**
- * Is this blueprint feature beneficial?
+ * Is this blueprint feature beneficial?
- * @param   {string}  feature    The name of the feature
+ * @param   {string}  feature    The name of the feature
- * @param   {array}   values     The value of the feature
+ * @param   {array}   values     The value of the feature
- * @returns {boolean}            True if this feature is beneficial
+ * @returns {boolean}            True if this feature is beneficial
- */
+ */
-export function isBeneficial(feature, values) {
+export function isBeneficial(feature, values) {
-  const fact = (values[0] < 0 || (values[0] === 0 && values[1] < 0));
+  const fact = (values[0] < 0 || (values[0] === 0 && values[1] < 0));
-  if (Modifications.modifications[feature].higherbetter) {
+  if (Modifications.modifications[feature].higherbetter) {
-    return !fact;
+    return !fact;
-  } else {
+  } else {
-    return fact;
+    return fact;
-  }
+  }
-}
+}
-
+
-/**
+/**
- * Is this feature value beneficial?
+ * Is this feature value beneficial?
- * @param   {string}  feature    The name of the feature
+ * @param   {string}  feature    The name of the feature
- * @param   {number}  value      The value of the feature
+ * @param   {number}  value      The value of the feature
- * @returns {boolean}            True if this value is beneficial
+ * @returns {boolean}            True if this value is beneficial
- */
+ */
-export function isValueBeneficial(feature, value) {
+export function isValueBeneficial(feature, value) {
-  if (Modifications.modifications[feature].higherbetter) {
+  if (Modifications.modifications[feature].higherbetter) {
-    return value > 0;
+    return value > 0;
-  } else {
+  } else {
-    return value < 0;
+    return value < 0;
-  }
+  }
-}
+}
-
+
-/**
+/**
- * Is the change as shown beneficial?
+ * Is the change as shown beneficial?
- * @param {string} feature The name of the feature
+ * @param {string} feature The name of the feature
- * @param {number} value The value of the feature as percentage change
+ * @param {number} value The value of the feature as percentage change
- * @returns True if the value is beneficial
+ * @returns True if the value is beneficial
- */
+ */
-export function isChangeValueBeneficial(feature, value) {
+export function isChangeValueBeneficial(feature, value) {
-  let changeHigherBetter = STATS_FORMATTING[feature].higherbetter;
+  let changeHigherBetter = STATS_FORMATTING[feature].higherbetter;
-  if (changeHigherBetter === undefined) {
+  if (changeHigherBetter === undefined) {
-    return isValueBeneficial(feature, value);
+    return isValueBeneficial(feature, value);
-  }
+  }
-
+
-  if (changeHigherBetter) {
+  if (changeHigherBetter) {
-    return value > 0;
+    return value > 0;
-  } else {
+  } else {
-    return value < 0;
+    return value < 0;
-  }
+  }
-}
+}
-
+
-/**
+/**
- * Get a blueprint with a given name and an optional module
+ * Get a blueprint with a given name and an optional module
- * @param   {string} name    The name of the blueprint
+ * @param   {string} name    The name of the blueprint
- * @param   {Object} module  The module for which to obtain this blueprint
+ * @param   {Object} module  The module for which to obtain this blueprint
- * @returns {Object}         The matching blueprint
+ * @returns {Object}         The matching blueprint
- */
+ */
-export function getBlueprint(name, module) {
+export function getBlueprint(name, module) {
-  // Start with a copy of the blueprint
+  // Start with a copy of the blueprint
-  const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0);
+  const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0);
-  const found = Modifications.blueprints[findMod(name)];
+  const found = Modifications.blueprints[findMod(name)];
-  if (!found || !found.fdname) {
+  if (!found || !found.fdname) {
-    return {};
+    return {};
-  }
+  }
-  const blueprint = JSON.parse(JSON.stringify(found));
+  const blueprint = JSON.parse(JSON.stringify(found));
-  return blueprint;
+  return blueprint;
-}
+}
-
+
-/**
+/**
- * Provide 'percent' primary modifications
+ * Provide 'percent' primary modifications
- * @param {Object}      ship      The ship for which to perform the modifications
+ * @param {Object}      ship      The ship for which to perform the modifications
- * @param {Object}      m         The module for which to perform the modifications
+ * @param {Object}      m         The module for which to perform the modifications
- * @param {Number} percent The percent to set values to of full.
+ * @param {Number} percent The percent to set values to of full.
- */
+ */
-export function setPercent(ship, m, percent) {
+export function setPercent(ship, m, percent) {
-  ship.clearModifications(m);
+  ship.clearModifications(m);
-  // Pick given value as multiplier
+  // Pick given value as multiplier
-  const mult = percent / 100;
+  const mult = percent / 100;
-  setQualityCB(m.blueprint, mult, (featureName, value) => ship.setModification(m, featureName, value));
+  const features = m.blueprint.grades[m.blueprint.grade].features;
-}
+  for (const featureName in features) {
-
+    let value;
-/**
+    if (Modifications.modifications[featureName].higherbetter) {
- * Sets the blueprint quality and fires a callback for each property affected.
+      // Higher is better, but is this making it better or worse?
- * @param {Object}   blueprint  The ship for which to perform the modifications
+      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
- * @param {Number}   quality    The quality to apply - float number 0 to 1.
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
- * @param {Function} cb         The Callback to run for each property. Function (featureName, value)
+      } else {
- */
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
-export function setQualityCB(blueprint, quality, cb) {
+      }
-  // Pick given value as multiplier
+    } else {
-  const features = blueprint.grades[blueprint.grade].features;
+      // Higher is worse, but is this making it better or worse?
-  for (const featureName in features) {
+      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-    let value;
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
-    if (Modifications.modifications[featureName].higherbetter) {
+      } else {
-      // Higher is better, but is this making it better or worse?
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
+      }
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
+    }
-      } else {
+
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
+    _setValue(ship, m, featureName, value);
-      }
+  }
-    } else {
+}
-      // Higher is worse, but is this making it better or worse?
+
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
+/**
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
+ * Provide 'random' primary modifications
-      } else {
+ * @param {Object}      ship      The ship for which to perform the modifications
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
+ * @param {Object}      m         The module for which to perform the modifications
-      }
+ */
-    }
+export function setRandom(ship, m) {
-
+  // Pick a single value for our randomness
-    if (Modifications.modifications[featureName].type == 'percentage') {
+  setPercent(ship, m, Math.random() * 100);
-      value = value * 10000;
+}
-    } else if (Modifications.modifications[featureName].type == 'numeric') {
+
-      value = value * 100;
+/**
-    }
+ * Set a modification feature value
-
+ * @param {Object}      ship          The ship for which to perform the modifications
-    cb(featureName, value);
+ * @param {Object}      m             The module for which to perform the modifications
-  }
+ * @param {string}      featureName   The feature being set
-}
+ * @param {number}      value         The value being set for the feature
-
+ */
-/**
+function _setValue(ship, m, featureName, value) {
- * Provide 'random' primary modifications
+  if (Modifications.modifications[featureName].type == 'percentage') {
- * @param {Object}      ship      The ship for which to perform the modifications
+    ship.setModification(m, featureName, value * 10000);
- * @param {Object}      m         The module for which to perform the modifications
+  } else if (Modifications.modifications[featureName].type == 'numeric') {
- */
+    ship.setModification(m, featureName, value * 100);
-export function setRandom(ship, m) {
+  } else {
-  // Pick a single value for our randomness
+    ship.setModification(m, featureName, value);
-  setPercent(ship, m, Math.random() * 100);
+  }
-}
+}
-
+
-/**
+/**
- * Provide 'percent' primary query
+ * Provide 'percent' primary query
- * @param {Object}      m         The module for which to perform the query
+ * @param {Object}      m         The module for which to perform the query
- * @returns {Number} percent The percentage indicator of current applied values.
+ * @returns {Number} percent The percentage indicator of current applied values.
- */
+ */
-export function getPercent(m) {
+export function getPercent(m) {
-  let result = null;
+  let result = null;
-  const features = m.blueprint.grades[m.blueprint.grade].features;
+  const features = m.blueprint.grades[m.blueprint.grade].features;
-  for (const featureName in features) {
+  for (const featureName in features) {
-    if (features[featureName][0] === features[featureName][1]) {
+    if (features[featureName][0] === features[featureName][1]) {
-      continue;
+      continue;
-    }
+    }
-
+
-    let value = _getValue(m, featureName);
+    let value = _getValue(m, featureName);
-    let mult;
+    let mult;
-    if (Modifications.modifications[featureName].higherbetter) {
+    if (Modifications.modifications[featureName].higherbetter) {
-      // Higher is better, but is this making it better or worse?
+      // Higher is better, but is this making it better or worse?
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
+      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+        mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
-      } else {
+      } else {
-        mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+        mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
-      }
+      }
-    } else {
+    } else {
-      // Higher is worse, but is this making it better or worse?
+      // Higher is worse, but is this making it better or worse?
-      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
+      if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+        mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
-      } else {
+      } else {
-        mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+        mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
-      }
+      }
-    }
+    }
-
+
-    if (result && result != mult) {
+    if (result && result != mult) {
-      return null;
+      return null;
-    } else if (result != mult) {
+    } else if (result != mult) {
-      result = mult;
+      result = mult;
-    }
+    }
-  }
+  }
-
+
-  return result;
+  return result;
-}
+}
-
+
-/**
+/**
- * Query a feature value
+ * Query a feature value
- * @param {Object}      m             The module for which to perform the query
+ * @param {Object}      m             The module for which to perform the query
- * @param {string}      featureName   The feature being queried
+ * @param {string}      featureName   The feature being queried
- * @returns {number}  The value of the modification as a %
+ * @returns {number}  The value of the modification as a %
- */
+ */
-function _getValue(m, featureName) {
+function _getValue(m, featureName) {
-  if (Modifications.modifications[featureName].type == 'percentage') {
+  if (Modifications.modifications[featureName].type == 'percentage') {
-    return m.getModValue(featureName, true) / 10000;
+    return m.getModValue(featureName, true) / 10000;
-  } else if (Modifications.modifications[featureName].type == 'numeric') {
+  } else if (Modifications.modifications[featureName].type == 'numeric') {
-    return m.getModValue(featureName, true) / 100;
+    return m.getModValue(featureName, true) / 100;
-  } else {
+  } else {
-    return m.getModValue(featureName, true);
+    return m.getModValue(featureName, true);
-  }
+  }
-}
+}

src/app/utils/CompanionApiUtils.js

@@ -31,15 +31,12 @@ export const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
   'Independant_Trader': 'keelback',
   'Krait_MkII': 'krait_mkii',
   'Mamba': 'mamba',
-  'Mandalay': 'mandalay',
   'Krait_Light': 'krait_phantom',
   'Orca': 'orca',
   'Python': 'python',
-  'Python_nx': 'python_nx',
   'SideWinder': 'sidewinder',
   'Type6': 'type_6_transporter',
   'Type7': 'type_7_transport',
-  'Type8': 'type_8_transport',
   'Type9': 'type_9_heavy',
   'Type9_Military': 'type_10_defender',
   'TypeX': 'alliance_chieftain',

src/app/utils/JournalUtils.js

@@ -1,395 +1,303 @@
-import Ship from '../shipyard/Ship';
+import Ship from '../shipyard/Ship';
-import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils';
+import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils';
-import { Ships } from 'coriolis-data/dist';
+import { Ships } from 'coriolis-data/dist';
-import Module from '../shipyard/Module';
+import Module from '../shipyard/Module';
-import { Modules } from 'coriolis-data/dist';
+import { Modules } from 'coriolis-data/dist';
-import { Modifications } from 'coriolis-data/dist';
+import { Modifications } from 'coriolis-data/dist';
-import { getBlueprint, setQualityCB } from './BlueprintFunctions';
+import { getBlueprint } from './BlueprintFunctions';
-
+
-/**
+/**
- * Check if an imported module is valid
+ * Obtain a module given its FD Name
- * @param {Object} module the module to check
+ * @param {string} fdname the FD Name of the module
- * @param {Object} moduleType the type of module to check
+ * @return {Module} the module
- * @return {boolean} true if the module is valid
+ */
- */
+function _moduleFromFdName(fdname) {
-function _isValidImportedModule(module, moduleType) {
+  if (!fdname) return null;
-  // First of all, has the _moduleFromFdName function returned 'null'?
+  fdname = fdname.toLowerCase();
-  if (!module){
+  // Check standard modules
-    return false
+  for (const grp in Modules.standard) {
-  }
+    if (Modules.standard.hasOwnProperty(grp)) {
-  else {
+      for (const i in Modules.standard[grp]) {
-    return true
+        if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
-  }
+          // Found it
-}
+          return new Module({ template: Modules.standard[grp][i] });
-
+        }
-/**
+      }
- * Obtain a module given its FD Name
+    }
- * @param {string} fdname the FD Name of the module
+  }
- * @return {Module} the module
+
- */
+  // Check hardpoint modules
-function _moduleFromFdName(fdname) {
+  for (const grp in Modules.hardpoints) {
-  if (!fdname) return null;
+    if (Modules.hardpoints.hasOwnProperty(grp)) {
-  fdname = fdname.toLowerCase();
+      for (const i in Modules.hardpoints[grp]) {
-  // Check standard modules
+        if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
-  for (const grp in Modules.standard) {
+          // Found it
-    if (Modules.standard.hasOwnProperty(grp)) {
+          return new Module({ template: Modules.hardpoints[grp][i] });
-      for (const i in Modules.standard[grp]) {
+        }
-        if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
+      }
-          // Found it
+    }
-          return new Module({ template: Modules.standard[grp][i] });
+  }
-        }
+
-      }
+  // Check internal modules
-    }
+  for (const grp in Modules.internal) {
-  }
+    if (Modules.internal.hasOwnProperty(grp)) {
-
+      for (const i in Modules.internal[grp]) {
-  // Check hardpoint modules
+        if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
-  for (const grp in Modules.hardpoints) {
+          // Found it
-    if (Modules.hardpoints.hasOwnProperty(grp)) {
+          return new Module({ template: Modules.internal[grp][i] });
-      for (const i in Modules.hardpoints[grp]) {
+        }
-        if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
+      }
-          // Found it
+    }
-          return new Module({ template: Modules.hardpoints[grp][i] });
+  }
-        }
+
-      }
+  // Not found
-    }
+  return null;
-  }
+}
-
+
-  // Check internal modules
+/**
-  for (const grp in Modules.internal) {
+ * Build a ship from the journal Loadout event JSON
-    if (Modules.internal.hasOwnProperty(grp)) {
+ * @param {object} json the Loadout event JSON
-      for (const i in Modules.internal[grp]) {
+ * @return {Ship} the built ship
-        if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
+ */
-          // Found it
+export function shipFromLoadoutJSON(json) {
-          return new Module({ template: Modules.internal[grp][i] });
+// Start off building a basic ship
-        }
+  const shipModel = shipModelFromJson(json);
-      }
+  if (!shipModel) {
-    }
+    throw 'No such ship found: "' + json.Ship + '"';
-  }
+  }
-
+  const shipTemplate = Ships[shipModel];
-  // Not found
+
-  return null;
+  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
-}
+  ship.buildWith(null);
-
+  // Initial Ship building, don't do engineering yet.
-/**
+  let modsToAdd = [];
- * Build a ship from the journal Loadout event JSON
+
- * @param {object} json the Loadout event JSON
+  for (const module of json.Modules) {
- * @return {Ship} the built ship
+    switch (module.Slot.toLowerCase()) {
- */
+      // Cargo Hatch.
-export function shipFromLoadoutJSON(json) {
+      case 'cargohatch':
-// Start off building a basic ship
+        ship.cargoHatch.enabled = module.On;
-  const shipModel = shipModelFromJson(json);
+        ship.cargoHatch.priority = module.Priority;
-  if (!shipModel) {
+        break;
-    throw 'No such ship found: "' + json.Ship + '"';
+      // Add the bulkheads
-  }
+      case 'armour':
-  const shipTemplate = Ships[shipModel];
+        if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
-
+          ship.useBulkhead(0, true);
-  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
-  ship.buildWith(null);
+          ship.useBulkhead(1, true);
-  // Initial Ship building, don't do engineering yet.
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
-  let modsToAdd = [];
+          ship.useBulkhead(2, true);
-
+        } else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
-  for (const module of json.Modules) {
+          ship.useBulkhead(3, true);
-    switch (module.Slot.toLowerCase()) {
+        } else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
-      // Cargo Hatch.
+          ship.useBulkhead(4, true);
-      case 'cargohatch':
+        } else {
-        ship.cargoHatch.enabled = module.On;
+          throw 'Unknown bulkheads "' + module.Item + '"';
-        ship.cargoHatch.priority = module.Priority;
+        }
-        break;
+        ship.bulkheads.enabled = true;
-      // Add the bulkheads
+        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-      case 'armour':
+        break;
-        if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
+      case 'powerplant':
-          ship.useBulkhead(0, true);
+        const powerplant = _moduleFromFdName(module.Item);
-        } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
+        ship.use(ship.standard[0], powerplant, true);
-          ship.useBulkhead(1, true);
+        ship.standard[0].enabled = module.On;
-        } else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
+        ship.standard[0].priority = module.Priority;
-          ship.useBulkhead(2, true);
+        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-        } else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
+        break;
-          ship.useBulkhead(3, true);
+      case 'mainengines':
-        } else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
+        const thrusters = _moduleFromFdName(module.Item);
-          ship.useBulkhead(4, true);
+        ship.use(ship.standard[1], thrusters, true);
-        } else {
+        ship.standard[1].enabled = module.On;
-          throw 'Unknown bulkheads "' + module.Item + '"';
+        ship.standard[1].priority = module.Priority;
-        }
+        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-        ship.bulkheads.enabled = true;
+        break;
-        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+      case 'frameshiftdrive':
-        break;
+        const frameshiftdrive = _moduleFromFdName(module.Item);
-      case 'powerplant':
+        ship.use(ship.standard[2], frameshiftdrive, true);
-        let powerplant = _moduleFromFdName(module.Item);
+        ship.standard[2].enabled = module.On;
-        // Check the powerplant returned is valid
+        ship.standard[2].priority = module.Priority;
-        if (!_isValidImportedModule(powerplant, 'powerplant'))
+        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-        { 
+        break;
-          powerplant = _moduleFromFdName('Int_Missing_Powerplant');
+      case 'lifesupport':
-          module.Engineering = null;
+        const lifesupport = _moduleFromFdName(module.Item);
-        }
+        ship.use(ship.standard[3], lifesupport, true);
-        ship.use(ship.standard[0], powerplant, true);
+        ship.standard[3].enabled = module.On === true;
-        ship.standard[0].enabled = module.On;
+        ship.standard[3].priority = module.Priority;
-        ship.standard[0].priority = module.Priority;
+        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        break;
-        break;
+      case 'powerdistributor':
-      case 'mainengines':
+        const powerdistributor = _moduleFromFdName(module.Item);
-        let thrusters = _moduleFromFdName(module.Item);
+        ship.use(ship.standard[4], powerdistributor, true);
-        // Check the thrusters returned is valid
+        ship.standard[4].enabled = module.On;
-        if (!_isValidImportedModule(thrusters, 'thrusters'))
+        ship.standard[4].priority = module.Priority;
-        { 
+        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-          thrusters = _moduleFromFdName('Int_Missing_Engine');
+        break;
-          module.Engineering = null;
+      case 'radar':
-        }
+        const sensors = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[1], thrusters, true);
+        ship.use(ship.standard[5], sensors, true);
-        ship.standard[1].enabled = module.On;
+        ship.standard[5].enabled = module.On;
-        ship.standard[1].priority = module.Priority;
+        ship.standard[5].priority = module.Priority;
-        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
-        break;
+        break;
-      case 'frameshiftdrive':
+      case 'fueltank':
-        let frameshiftdrive = _moduleFromFdName(module.Item);
+        const fueltank = _moduleFromFdName(module.Item);
-        // Check the frameshiftdrive returned is valid
+        ship.use(ship.standard[6], fueltank, true);
-        if (!_isValidImportedModule(frameshiftdrive, 'frameshiftdrive'))
+        ship.standard[6].enabled = true;
-        { 
+        ship.standard[6].priority = 0;
-          frameshiftdrive = _moduleFromFdName('Int_Missing_Hyperdrive');
+        break;
-          module.Engineering = null;
+      default:
-        }
+    }
-        ship.use(ship.standard[2], frameshiftdrive, true);
+    if (module.Slot.toLowerCase().search(/hardpoint/) !== -1) {
-        ship.standard[2].enabled = module.On;
+      // Add hardpoints
-        ship.standard[2].priority = module.Priority;
+      let hardpoint;
-        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+      let hardpointClassNum = -1;
-        break;
+      let hardpointSlotNum = -1;
-      case 'lifesupport':
+      let hardpointArrayNum = 0;
-        let lifesupport = _moduleFromFdName(module.Item);
+      for (let i in shipTemplate.slots.hardpoints) {
-        // Check the lifesupport returned is valid
+        if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
-        if (!_isValidImportedModule(lifesupport, 'lifesupport'))
+          // Another slot of the same class
-        { 
+          hardpointSlotNum++;
-          lifesupport = _moduleFromFdName('Int_Missing_LifeSupport');
+        } else {
-          module.Engineering = null;
+          // The first slot of a new class
-        }
+          hardpointClassNum = shipTemplate.slots.hardpoints[i];
-        ship.use(ship.standard[3], lifesupport, true);
+          hardpointSlotNum = 1;
-        ship.standard[3].enabled = module.On === true;
+        }
-        ship.standard[3].priority = module.Priority;
+
-        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        // Now that we know what we're looking for, find it
-        break;
+        const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
-      case 'powerdistributor':
+        const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase());
-        let powerdistributor = _moduleFromFdName(module.Item);
+        if (!hardpointSlot) {
-        // Check the powerdistributor returned is valid
+          // This can happen with old imports that don't contain new hardpoints
-        if (!_isValidImportedModule(powerdistributor, 'powerdistributor'))
+        } else if (!hardpointSlot) {
-        { 
+          // No module
-          powerdistributor = _moduleFromFdName('Int_Missing_PowerDistributor'); 
+        } else {
-          module.Engineering = null;
+          hardpoint = _moduleFromFdName(hardpointSlot.Item);
-        }
+          ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
-        ship.use(ship.standard[4], powerdistributor, true);
+          ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
-        ship.standard[4].enabled = module.On;
+          ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
-        ship.standard[4].priority = module.Priority;
+          modsToAdd.push({ coriolisMod: hardpoint, json: hardpointSlot });
-        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        }
-        break;
+        hardpointArrayNum++;
-      case 'radar':
+      }
-        let sensors = _moduleFromFdName(module.Item);
+    }
-        // Check the sensors returned is valid
+  }
-        if (!_isValidImportedModule(sensors, 'sensors'))
+
-        { 
+  let internalSlotNum = 0;
-          sensors = _moduleFromFdName('Int_Missing_Sensors');
+  let militarySlotNum = 1;
-          module.Engineering = null;
+  for (let i in shipTemplate.slots.internal) {
-        }
+    if (!shipTemplate.slots.internal.hasOwnProperty(i)) {
-        ship.use(ship.standard[5], sensors, true);
+      continue;
-        ship.standard[5].enabled = module.On;
+    }
-        ship.standard[5].priority = module.Priority;
+    const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'Military' : false;
-        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+
-        break;
+    // The internal slot might be a standard or a military slot.  Military slots have a different naming system
-      case 'fueltank':
+    let internalSlot = null;
-        let fueltank = _moduleFromFdName(module.Item);
+    if (isMilitary) {
-        // Check the fueltank returned is valid
+      const internalName = 'Military0' + militarySlotNum;
-        if (!_isValidImportedModule(fueltank, 'fueltank'))
+      internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
-        { 
+      militarySlotNum++;
-          fueltank = _moduleFromFdName('Int_Missing_FuelTank');
+    } else {
-        }
+      // Slot numbers are not contiguous so handle skips.
-        ship.use(ship.standard[6], fueltank, true);
+      for (; internalSlot === null && internalSlotNum < 99; internalSlotNum++) {
-        ship.standard[6].enabled = true;
+        // Slot sizes have no relationship to the actual size, either, so check all possibilities
-        ship.standard[6].priority = 0;
+        for (let slotsize = 0; slotsize < 9; slotsize++) {
-        break;
+          const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize;
-      default:
+          if (json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())) {
-    }
+            internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
-    if (module.Slot.toLowerCase().search(/hardpoint/) !== -1) {
+            break;
-      // Add hardpoints
+          }
-      let hardpoint;
+        }
-      let hardpointClassNum = -1;
+      }
-      let hardpointSlotNum = -1;
+    }
-      let hardpointArrayNum = 0;
+
-      for (let i in shipTemplate.slots.hardpoints) {
+    if (!internalSlot) {
-        if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
+      // This can happen with old imports that don't contain new slots
-          // Another slot of the same class
+    } else {
-          hardpointSlotNum++;
+      const internalJson = internalSlot;
-        } else {
+      const internal = _moduleFromFdName(internalJson.Item);
-          // The first slot of a new class
+      ship.use(ship.internal[i], internal, true);
-          hardpointClassNum = shipTemplate.slots.hardpoints[i];
+      ship.internal[i].enabled = internalJson.On === true;
-          hardpointSlotNum = 1;
+      ship.internal[i].priority = internalJson.Priority;
-        }
+      modsToAdd.push({ coriolisMod: internal, json: internalSlot });
-
+    }
-        // Now that we know what we're looking for, find it
+  }
-        const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
+
-        const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase());
+  for (const i of modsToAdd) {
-        if (!hardpointSlot) {
+    if (i.json.Engineering) {
-          // This can happen with old imports that don't contain new hardpoints
+      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
-        } else {
+    }
-          hardpoint = _moduleFromFdName(hardpointSlot.Item);
+  }
-          // Check the hardpoint module returned is valid
+  // We don't have any information on it so guess it's priority 5 and disabled
-          if (!_isValidImportedModule(hardpoint, 'hardpoint')){ 
+  if (!ship.cargoHatch) {
-            // Check if it's a Utility or Hardpoint
+    ship.cargoHatch.enabled = false;
-            if (hardpointSlot.Slot.toLowerCase().search(/tiny/))
+    ship.cargoHatch.priority = 4;
-            {
+  }
-              // Use the missing_hardpoint module 'Missing Hardpoint' which will inform the user that the module is missing
+
-              hardpoint = _moduleFromFdName('Hpt_Missing_Hardpoint');
+  // Now update the ship's codes before returning it
-            }
+  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString();
-            else {
+}
-              // Use the missing_hardpoint module 'Missing Utility' which will inform the user that the module is missing
+
-              hardpoint = _moduleFromFdName('Hpt_Missing_Utility');
+/**
-            }
+ * Add the modifications for a module
-            ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
+ * @param {Module} module the module
-            ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
+ * @param {Object} modifiers the modifiers
-            ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+ * @param {Object} blueprint the blueprint of the modification
-          } else {
+ * @param {Object} grade the grade of the modification
-            ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
+ * @param {Object} specialModifications special modification
-            ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
+ */
-            ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+function _addModifications(module, modifiers, blueprint, grade, specialModifications) {
-            modsToAdd.push({ coriolisMod: hardpoint, json: hardpointSlot });
+  if (!modifiers) return;
-          }
+  let special;
-        }
+  if (specialModifications) {
-        hardpointArrayNum++;
+    if (specialModifications == 'special_plasma_slug') {
-      }
+      if (module.symbol.match(/PlasmaAccelerator/i)) {
-    }
+        specialModifications = 'special_plasma_slug_pa';
-  }
+      } else {
-
+        specialModifications = 'special_plasma_slug_cooled';
-  let internalSlotNum = 0;
+      }
-  let militarySlotNum = 1;
+    }
-  for (let i in shipTemplate.slots.internal) {
+    special = Modifications.specials[specialModifications];
-    if (!shipTemplate.slots.internal.hasOwnProperty(i)) {
+  }
-      continue;
+  // Add the blueprint definition, grade and special
-    }
+  if (blueprint) {
-    const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'Military' : false;
+    module.blueprint = getBlueprint(blueprint, module);
-    const isPlanetary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'PlanetaryApproachSuite' : false;
+    if (grade) {
-
+      module.blueprint.grade = Number(grade);
-    // The internal slot might be a standard or a military slot, or a planetary slot.  Military and Planetary slots have a different naming system
+    }
-    let internalSlot = null;
+    if (special) {
-    if (isMilitary) {
+      module.blueprint.special = special;
-      const internalName = 'Military0' + militarySlotNum;
+    }
-      internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
+  }
-      militarySlotNum++;
+  for (const i in modifiers) {
-    } else if (isPlanetary) {
+    // Some special modifications
-      const internalName = 'PlanetaryApproachSuite';
+    // Look up the modifiers to find what we need to do
-      internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
+    const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, '') === val.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, ''));
-    } else {
+    const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)];
-      // Slot numbers are not contiguous so handle skips.
+    // TODO: Figure out how to scale this value.
-      for (; internalSlot === null && internalSlotNum < 99; internalSlotNum++) {
+    if (!!modifiers[i].LessIsGood) {
-        // Slot sizes have no relationship to the actual size, either, so check all possibilities
+
-        for (let slotsize = 0; slotsize < 9; slotsize++) {
+    }
-          const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize;
+    let value = (modifiers[i].Value / modifiers[i].OriginalValue * 100 - 100)  * 100;
-          if (json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())) {
+    if (value === Infinity) {
-            internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
+      value = modifiers[i].Value * 100;
-            break;
+    }
-          }
+    if (modifiers[i].Label.search('DamageFalloffRange') >= 0) {
-        }
+      value = (modifiers[i].Value / module.range - 1) * 100;
-      }
+    }
-    }
+    if (modifiers[i].Label.search('Resistance') >= 0) {
-
+      value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
-    if (!internalSlot) {
+    }
-      // This can happen with old imports that don't contain new slots
+    if (modifiers[i].Label.search('ShieldMultiplier') >= 0 || modifiers[i].Label.search('DefenceModifierHealthMultiplier') >= 0) {
-    } else {
+      value = ((100 + modifiers[i].Value) / (100 + modifiers[i].OriginalValue) * 100 - 100)  * 100;
-      const internalJson = internalSlot;
+    }
-      let internal = _moduleFromFdName(internalJson.Item);
+
-      // Check the internal module returned is valid
+    // Carry out the required changes
-      if (!_isValidImportedModule(internal, 'internal'))
+    for (const action in modifierActions) {
-      { 
+      if (isNaN(modifierActions[action])) {
-        internal = _moduleFromFdName('Int_Missing_Module');
+        module.setModValue(action, modifierActions[action]);
-        ship.use(ship.internal[i], internal, true);
+      } else {
-        ship.internal[i].enabled = internalJson.On === true;
+        module.setModValue(action, value, true);
-        ship.internal[i].priority = internalJson.Priority;
+      }
-        //throw 'Unknown internal module: "' + module.Item + '"'; 
+    }
-      }
+  }
-      else {
+}
-        ship.use(ship.internal[i], internal, true);
-        ship.internal[i].enabled = internalJson.On === true;
-        ship.internal[i].priority = internalJson.Priority;
-        modsToAdd.push({ coriolisMod: internal, json: internalSlot });
-      }
-    }
-  }
-
-  for (const i of modsToAdd) {
-    if (i.json.Engineering) {
-      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.Quality, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
-    }
-  }
-  // We don't have any information on it so guess it's priority 5 and disabled
-  if (!ship.cargoHatch) {
-    ship.cargoHatch.enabled = false;
-    ship.cargoHatch.priority = 4;
-  }
-
-  // Now update the ship's codes before returning it
-  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString();
-}
-
-/**
- * Add the modifications for a module
- * @param {Module} module the module
- * @param {Object} modifiers the modifiers
- * @param {float} quality quality of the modifiers 0 to 1
- * @param {Object} blueprint the blueprint of the modification
- * @param {Object} grade the grade of the modification
- * @param {Object} specialModifications special modification
- */
-function _addModifications(module, modifiers, quality, blueprint, grade, specialModifications) {
-  if (!modifiers && !quality) return;
-  let special;
-  if (specialModifications) {
-    if (specialModifications == 'special_plasma_slug') {
-      if (module.symbol.match(/PlasmaAccelerator/i)) {
-        specialModifications = 'special_plasma_slug_pa';
-      } else {
-        specialModifications = 'special_plasma_slug_cooled';
-      }
-    }
-    special = Modifications.specials[specialModifications];
-  }
-  // Add the blueprint definition, grade and special
-  if (blueprint) {
-    module.blueprint = getBlueprint(blueprint, module);
-    if (grade) {
-      module.blueprint.grade = Number(grade);
-    }
-    if (special) {
-      module.blueprint.special = special;
-    }
-  }
-  if (modifiers) {
-    for (const i in modifiers) {
-      // Some special modifications
-      // Look up the modifiers to find what we need to do
-      const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, '') === val.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, ''));
-      const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)];
-      // TODO: Figure out how to scale this value.
-      if (!!modifiers[i].LessIsGood) {
-
-      }
-      let value = (modifiers[i].Value / modifiers[i].OriginalValue * 100 - 100) * 100;
-      if (value === Infinity) {
-        value = modifiers[i].Value * 100;
-      }
-      if (modifiers[i].Label.search('DamageFalloffRange') >= 0) {
-        value = (modifiers[i].Value / module.range - 1) * 100;
-      }
-      if (modifiers[i].Label.search('Resistance') >= 0) {
-        value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
-      }
-      if (modifiers[i].Label.search('ShieldMultiplier') >= 0 || modifiers[i].Label.search('DefenceModifierHealthMultiplier') >= 0) {
-        value = ((100 + modifiers[i].Value) / (100 + modifiers[i].OriginalValue) * 100 - 100) * 100;
-      }
-
-      // Carry out the required changes
-      for (const action in modifierActions) {
-        if (isNaN(modifierActions[action])) {
-          module.setModValue(action, modifierActions[action]);
-        } else {
-          module.setModValue(action, value, true);
-        }
-      }
-    }
-  } else if (quality) {
-    setQualityCB(module.blueprint, quality, (featureName, value) => module.setModValue(featureName, value, false));
-  }
-}

src/app/utils/ShortenUrl.js

@@ -105,7 +105,7 @@ function orbisShorten(url, success, error) {
   }
 }
 
-const API_ORBIS = 'https://api.orbis.zone/ships';
+const API_ORBIS = 'https://orbis.zone/api/builds/add';
 /**
  * Upload to Orbis
  * @param  {object} ship        The URL to shorten

src/index.ejs

@@ -8,8 +8,6 @@
     <meta name="description" content="A ship builder, outfitting and comparison
       tool for Elite Dangerous">
     <meta name="mobile-web-app-capable" content="yes">
-   
-
     <meta name="viewport" content="width=device-width, initial-scale=1.0,
       maximum-scale=1.0, user-scalable=0">
     <link rel="manifest" href="/manifest.json">
@@ -27,7 +25,7 @@
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
     <meta name="msapplication-config" content="/browserconfig.xml">
     <meta name="theme-color" content="#000000">
-    <!-- <script data-ad-client="ca-pub-3709458261881414" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> -->
+
     <script>
       window.CORIOLIS_GAPI_KEY = '<%- htmlWebpackPlugin.options.gapiKey %>';
       window.CORIOLIS_VERSION = '<%- htmlWebpackPlugin.options.version %>';
@@ -40,12 +38,21 @@
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
+
       gtag('config', 'UA-55840909-18');
     </script>
-  </head>
-  <body style="background-color:#000;">
-    <section id="coriolis">
 
-    </section>
+
-  </body>
+
-</html>
+    <!-- Bugsnag -->
+        <script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
+        <script>
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
+      window.Bugsnag = window.bugsnagClient
+    </script>
+      </head>
+      <body style="background-color:#000;">
+        <section id="coriolis"></section>
+
+      </body>
+    </html>

src/less/app.less

@@ -183,5 +183,4 @@ footer {
 .announcement {
   border: 1px @secondary solid;
   padding: 10px;
-  margin: 5px;
+}
-}

src/less/modal.less

@@ -41,67 +41,24 @@
   h2 {
     margin: 0;
   }
+}
 
-  h4 {
+textarea {
-    text-transform: uppercase;
+  background: @primary-bg;
-    font-family: @fStandard;
+  border: none;
-    font-weight: normal;
+  outline: none;
-    font-size: 1em;
+  color: @primary-disabled;
-    margin: 1em;
+
-    color: @warning;
+  &.json {
+    display:block;
+    width:100%;
+    min-height: 10em;
+    resize: vertical;
+    user-select: text;
+    margin:2em 0;
   }
+}
 
-  p {
+.dismiss {
-    margin: 1em;
+  background-color: @primary-bg;
-    text-wrap: pretty;
+}
-  }
-
-  button {
-    clear: bottom;
-    margin: 5px;
-  }
-
-  hr {
-    clear: both;
-    margin: 15px, 10px, 15px, 10px;
-    padding: top, 5;
-  }
-
-  select {
-    clear: bottom;
-    margin: 10px;
-    width: 50%;
-  }
-
-  label {
-    clear: bottom;
-    margin: 20px;
-    color: @primary;
-  }
-
-  .groll {
-    width: 6%;
-    margin: 5px;
-    text-align: center;
-  }
-
-  textarea {
-    background: @primary-bg;
-    border: none;
-    outline: none;
-    color: @primary-disabled;
-
-    &.json {
-      display:block;
-      width:100%;
-      min-height: 10em;
-      resize: vertical;
-      user-select: text;
-      margin:1em 0;
-    }
-  }
-
-  .dismiss {
-    background-color: @primary-bg;
-  }
-}

src/migrate.html

@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Coriolis EDCD Edition</title>
-    <meta charset="UTF-8" />
-    <link rel="stylesheet" href="<%= htmlWebpackPlugin.files.css[0] %>" />
-    <!-- Standard headers -->
-    <meta
-      name="description"
-      content="A ship builder, outfitting and comparison
-      tool for Elite Dangerous"
-    />
-    <meta name="mobile-web-app-capable" content="yes" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0,
-      maximum-scale=1.0, user-scalable=0"
-    />
-    <link rel="manifest" href="/manifest.json" />
-    <link rel="shortcut icon" href=/favicon2.ico>
-    <link
-      rel="icon"
-      sizes="152x152 192x192"
-      type="image/png"
-      href="/192x192.png"
-    />
-
-    <!-- Apple/iOS headers -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-title" content="Coriolis" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-
-    <!-- Microsoft Windows Phone/Tablet headers -->
-    <meta name="msapplication-TileColor" content="#000000" />
-    <meta name="msapplication-TileImage" content="/mstile-144x144.png" />
-    <meta name="msapplication-config" content="/browserconfig.xml" />
-    <meta name="theme-color" content="#000000" />
-  </head>
-  <body>
-    <body style="background-color:#000;">
-      <section id="coriolis">
-        <div class="modal">
-          <h2>
-            Please migrate to <a href="https://coriolis.io">coriolis.io</a>
-          </h2>
-          You are currently on coriolis.<strong>.edcd</strong>.io This domain is
-          considered deprecated. To migrate your builds, copy the below text and
-          go to
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://coriolis.io"
-            >this link</a
-          >, press ctrl + i and then paste in the data. (If you are on mobile,
-          you can go to the settings and hit import)
-          <div>
-            <textarea id="data" class="cb json"></textarea>
-          </div>
-        </div>
-      </section>
-    </body>
-    <script>
-      const LS = localStorage;
-      /**
-       * Safe localstorage get string
-       * @param  {String} key key
-       * @return {String} The stored string
-       */
-      function _getString(key) {
-        return LS ? LS.getItem(key) : null;
-      }
-
-      /**
-       * Safe localstorage get
-       * @param  {String} key key
-       * @return {object | number} The stored data
-       */
-      function _get(key) {
-        let str = _getString(key);
-        try {
-          return str ? JSON.parse(str) : null;
-        } catch (e) {
-          return null;
-        }
-      }
-
-      const textarea = document.querySelector("#data");
-      const data = {
-        builds: _get("builds") || {},
-        comparisons: _get("comparisons") || {},
-        insurance: _get("insurance") || "standard",
-        shipDiscount: _get("shipDiscount") || 0,
-        moduleDiscount: _get("moduleDiscount") || 0
-      };
-      textarea.textContent = JSON.stringify(data, null, 2);
-    </script>
-  </body>
-</html>

src/sw.js

@@ -1,54 +1,46 @@
-import {precacheAndRoute, createHandlerBoundToURL} from 'workbox-precaching';
-import {NavigationRoute, registerRoute} from 'workbox-routing';
-import {StaleWhileRevalidate, CacheFirst} from 'workbox-strategies';
-import {CacheableResponsePlugin} from 'workbox-cacheable-response'
-import {ExpirationPlugin} from 'workbox-expiration';
-
 console.log('Hello from sw.js');
 
-// See https://developer.chrome.com/docs/workbox/migration/migrate-from-v4/ for guide to changes made
+if (workbox) {
-console.log('Yay! Workbox is loaded 🎉');
+  console.log('Yay! Workbox is loaded 🎉');
-precacheAndRoute(self.__WB_MANIFEST || []);
+  workbox.precaching.precacheAndRoute(self.__precacheManifest);
 
-const handler = createHandlerBoundToURL('/index.html');
+  workbox.routing.registerNavigationRoute('/index.html');
-const navigationRoute = new NavigationRoute(handler
-  // , {allowlist: [...], denylist: [...],}
-);
-registerRoute(navigationRoute);
 
+  workbox.routing.registerRoute(
+    /\.(?:png|jpg|jpeg|svg|gif)$/,
+    new workbox.strategies.CacheFirst({
+      plugins: [
+        new workbox.cacheableResponse.Plugin({
+          statuses: [0, 200]
+        })
+      ]
+    })
+  );
 
-registerRoute(
+  workbox.routing.registerRoute(
-  /\.(?:png|jpg|jpeg|svg|gif)$/,
+    /\.(?:js|css)$/,
-  new CacheFirst({
+    new workbox.strategies.StaleWhileRevalidate({
-    plugins: [
+      cacheName: 'static-resources',
-      new CacheableResponsePlugin({
+    })
-        statuses: [0, 200]
+  );
-      })
-    ]
-  })
-);
 
-registerRoute(
+  workbox.routing.registerRoute(
-  /\.(?:js|css)$/,
+    new RegExp('https://fonts.(?:googleapis|gstatic).com/(.*)'),
-  new StaleWhileRevalidate({
+    new workbox.strategies.CacheFirst({
-    cacheName: 'static-resources',
+      cacheName: 'google-fonts',
-  })
+      plugins: [
-);
+        new workbox.expiration.Plugin({
-
+          maxEntries: 30
-registerRoute(
+        }),
-  new RegExp('https://fonts.(?:googleapis|gstatic).com/(.*)'),
+        new workbox.cacheableResponse.Plugin({
-  new CacheFirst({
+          statuses: [0, 200]
-    cacheName: 'google-fonts',
+        })
-    plugins: [
+      ]
-      new ExpirationPlugin({
+    })
-        maxEntries: 30
+  );
-      }),
+} else {
-      new CacheableResponsePlugin({
+  console.log('Boo! Workbox didn\'t load 😬');
-        statuses: [0, 200]
+}
-      })
-    ]
-  })
-);
 
 self.addEventListener('message', event => {
   if (!event.data) {

webpack.common.js

@@ -1,81 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-
-const pkgJson = require('./package');
-const buildDate = new Date();
-
-module.exports = {
-  entry: {
-    main: './src/app/index.js'
-  },
-  resolve: {
-    // When requiring, you don't need to add these extensions
-    extensions: ['.js', '.jsx', '.json', '.less'],
-    fallback: {
-      // Consider replacing brwoserify-zlib-next c. 2016 package with pako, which it's just a wrapper for
-      /* Some of these polyfills may not even be necessary, and were added in an attempt to deal with build issues
-            while upgrading to Webpack v5 */
-      "zlib": require.resolve("browserify-zlib-next"),
-      "assert": require.resolve("assert/"),
-      "buffer": require.resolve("buffer/"),
-      "stream": require.resolve("stream-browserify"),
-      /*
-      "url": require.resolve("url/"),
-      "path": require.resolve("path-browserify"),
-      "crypto": require.resolve("crypto-browserify"),
-      "os": require.resolve("os-browserify/browser"),
-      "https": require.resolve("https-browserify"),
-      "http": require.resolve("stream-http"),
-      "vm": require.resolve("vm-browserify"),
-      "constants": require.resolve("constants-browserify"),
-      // "fs": false
-      */
-    }
-  },
-  optimization: {
-    usedExports: true
-  },
-  output: {
-    path: path.join(__dirname, 'build'),
-    chunkFilename: '[name].bundle.js',
-    // assetModuleFilename: '[contenthash][ext]',
-    publicPath: '/',
-    clean: true // we already do rimraf on the build dir, but this should obviate that
-  },
-  plugins: [
-    // new webpack.optimize.CommonsChunkPlugin({
-    //   name: 'lib',
-    //   filename: 'lib.js'
-    // }),
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: path.join(__dirname, 'src/index.ejs'),
-      version: pkgJson.version,
-      // gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
-      date: buildDate,
-    }),
-    new MiniCssExtractPlugin({
-        filename: 'app.css',
-    }),
-    // Solve missing Buffer polyfill that breaks module engineering
-    new webpack.ProvidePlugin({
-      Buffer: ['buffer', 'Buffer'],
-    }),
-  ],
-  module: {
-    rules: [
-      { test: /\.css$/, use: [MiniCssExtractPlugin.loader, 'css-loader' ]},
-      {
-        test: /\.less$/,
-        use: [MiniCssExtractPlugin.loader, 'css-loader', 'less-loader' ]
-      },
-      { test: /\.(js|jsx)$/, use: ['babel-loader'], include: path.join(__dirname, 'src') },
-      {
-        test: /\.(jpe?g|svg|png|gif|ico|eot|ttf|woff|woff2?)(\?v=\d+\.\d+\.\d+)?$/i,
-        type: 'asset/resource',
-      },
-    ]
-  }
-};

webpack.config.dev.js

@@ -1,27 +1,69 @@
+const path = require('path');
 const webpack = require('webpack');
-const { merge } = require('webpack-merge');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
-const common = require('./webpack.common.js');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
-
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 const WebpackNotifierPlugin = require('webpack-notifier');
+const pkgJson = require('./package');
+const buildDate = new Date();
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
-module.exports = merge(common, {
+module.exports = {
   devtool: 'source-map',
   devServer: {
     headers: { 'Access-Control-Allow-Origin': '*' }
   },
   mode: 'development',
+  entry: {
+    main: './src/app/index.js',
+  },
+  resolve: {
+    // When requiring, you don't need to add these extensions
+    extensions: ['.js', '.jsx', '.json', '.less']
+  },
   optimization: {
     minimize: false,
+    usedExports: true
+  },
+  output: {
+    path: path.join(__dirname, 'build'),
+    chunkFilename: '[name].bundle.js',
+    publicPath: '/'
   },
   plugins: [
-    new CopyWebpackPlugin({
+    new CopyWebpackPlugin(['src/.htaccess', 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
-      patterns: [
+    // new webpack.optimize.CommonsChunkPlugin({
-      'src/.htaccess', 
+    //   name: 'lib',
-      'src/iframe.html', 
+    //   filename: 'lib.js'
-      'src/xdLocalStoragePostMessageApi.min.js'
+    // }),
-    ]}),
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: path.join(__dirname, 'src/index.ejs'),
+      version: pkgJson.version,
+      date: buildDate,
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || ''
+    }),
+    new ExtractTextPlugin({
+      filename: 'app.css',
+      disable: false,
+      allChunks: true
+    }),
     new WebpackNotifierPlugin({ alwaysNotify: true }),
+    new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
-  ]
+  ],
-});
+  module: {
+    rules: [
+      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
+      {
+        test: /\.less$/,
+        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
+      },
+      { test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src') },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+    ]
+  }
+};

webpack.config.prod.js

@@ -1,38 +1,54 @@
-const { merge } = require('webpack-merge');
-const common = require('./webpack.common.js');
-
 const path = require('path');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpack = require('webpack');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const { InjectManifest } = require('workbox-webpack-plugin');
-const { max } = require('lodash');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const { BugsnagSourceMapUploaderPlugin, BugsnagBuildReporterPlugin } = require('webpack-bugsnag-plugins');
+const pkgJson = require('./package');
+const buildDate = new Date();
 
-module.exports = merge(common, {
+module.exports = {
-  // devtool: 'source-map',
+  devtool: 'source-map',
+  entry: {
+    main: './src/app/index.js'
+  },
+  resolve: {
+    extensions: ['.js', '.jsx', '.json', '.less']
+  },
+  output: {
+    path: path.join(__dirname, 'build'),
+    chunkFilename: '[name].bundle.js',
+    publicPath: '/',
+    globalObject: 'this'
+  },
   mode: 'production',
   optimization: {
     minimize: true,
-  },
+    usedExports: true
-  output: {
-    globalObject: 'this'
   },
   plugins: [
-    new CopyWebpackPlugin({
+    new CopyWebpackPlugin(['src/.htaccess', { from: 'src/schemas', to: 'schemas' }, {
-      patterns: [
+      from: 'src/images/logo/*',
-        'src/.htaccess',
+      flatten: true,
-        'src/iframe.html',
+      to: ''
-        'src/xdLocalStoragePostMessageApi.min.js',
+    }, 'src/iframe.html', 'src/xdLocalStoragePostMessageApi.min.js']),
-        { from: 'src/schemas', to: 'schemas' },
+    // new webpack.optimize.CommonsChunkPlugin({
-        {
+    //  name: 'lib',
-          from: 'src/images/logo/*',
+    //  filename: 'lib.[chunkhash:6].js'
-          to: '[name][ext]'
+    // }),
-        }
+    new HtmlWebpackPlugin({
-    ]}),
+      inject: true,
-    /* new HtmlWebpackPlugin({
+      template: path.join(__dirname, 'src/index.ejs'),
-      // uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
+      uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
-    }), */
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
-    new MiniCssExtractPlugin({
+      date: buildDate,
-      filename: '[contenthash:6].css',
+      version: pkgJson.version
+    }),
+    new ExtractTextPlugin({
+      filename: '[hash:6].css',
+      disable: false,
+      allChunks: true
     }),
     // new BugsnagBuildReporterPlugin({
     //   apiKey: 'ba9fae819372850fb660755341fa6ef5',
@@ -43,11 +59,25 @@ module.exports = merge(common, {
     //   overwrite: true,
     //   appVersion: `${pkgJson.version}-${buildDate.toISOString()}`
     // }),
-
     new InjectManifest({
       swSrc: './src/sw.js',
+      importWorkboxFrom: 'cdn',
       swDest: 'service-worker.js'
     }),
-
+  ],
-  ]
+  module: {
-});
+    rules: [
+      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' }) },
+      {
+        test: /\.less$/,
+        loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader' })
+      },
+      { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+    ]
+  }
+};