From 48bad2fda68c8d4db153b557ccc51a57ce492128 Mon Sep 17 00:00:00 2001 From: William Blythe Date: Fri, 21 Dec 2018 07:39:29 +1100 Subject: [PATCH] more rewrite work --- package-lock.json | 760 ++++++----------------------------- src/components/Header.jsx | 4 +- src/components/ShipTable.jsx | 32 +- 3 files changed, 150 insertions(+), 646 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee328deb..e575500a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3589,7 +3589,7 @@ }, "dependencies": { "@babel/cli": { - "version": "7.1.5", + "version": "7.2.0", "bundled": true, "requires": { "chokidar": "^2.0.3", @@ -3612,16 +3612,16 @@ } }, "@babel/core": { - "version": "7.1.6", + "version": "7.2.0", "bundled": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.6", - "@babel/helpers": "^7.1.5", - "@babel/parser": "^7.1.6", + "@babel/generator": "^7.2.0", + "@babel/helpers": "^7.2.0", + "@babel/parser": "^7.2.0", "@babel/template": "^7.1.2", "@babel/traverse": "^7.1.6", - "@babel/types": "^7.1.6", + "@babel/types": "^7.2.0", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", @@ -3645,10 +3645,10 @@ } }, "@babel/generator": { - "version": "7.1.6", + "version": "7.2.0", "bundled": true, "requires": { - "@babel/types": "^7.1.6", + "@babel/types": "^7.2.0", "jsesc": "^2.5.1", "lodash": "^4.17.10", "source-map": "^0.5.0", @@ -3800,22 +3800,22 @@ } }, "@babel/helper-wrap-function": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-function-name": "^7.1.0", "@babel/template": "^7.1.0", "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/types": "^7.2.0" } }, "@babel/helpers": { - "version": "7.1.5", + "version": "7.2.0", "bundled": true, "requires": { "@babel/template": "^7.1.2", "@babel/traverse": "^7.1.5", - "@babel/types": "^7.1.5" + "@babel/types": "^7.2.0" } }, "@babel/highlight": { @@ -3828,44 +3828,44 @@ } }, "@babel/parser": { - "version": "7.1.6", + "version": "7.2.0", "bundled": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-remap-async-to-generator": "^7.1.0", - "@babel/plugin-syntax-async-generators": "^7.0.0" + "@babel/plugin-syntax-async-generators": "^7.2.0" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.0.0" + "@babel/plugin-syntax-json-strings": "^7.2.0" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0" + "@babel/plugin-syntax-object-rest-spread": "^7.2.0" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.0.0" + "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -3874,42 +3874,42 @@ } }, "@babel/plugin-syntax-async-generators": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-json-strings": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-module-imports": "^7.0.0", @@ -3918,14 +3918,14 @@ } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.1.5", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -3933,7 +3933,7 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", @@ -3947,21 +3947,21 @@ } }, "@babel/plugin-transform-computed-properties": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.1.3", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -3970,14 +3970,14 @@ } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", @@ -3985,14 +3985,14 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-function-name": "^7.1.0", @@ -4000,14 +4000,14 @@ } }, "@babel/plugin-transform-literals": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", @@ -4015,7 +4015,7 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", @@ -4024,7 +4024,7 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.1.3", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-hoist-variables": "^7.0.0", @@ -4032,7 +4032,7 @@ } }, "@babel/plugin-transform-modules-umd": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", @@ -4047,7 +4047,7 @@ } }, "@babel/plugin-transform-object-super": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -4055,7 +4055,7 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.1.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-call-delegate": "^7.1.0", @@ -4071,21 +4071,21 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-spread": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -4093,7 +4093,7 @@ } }, "@babel/plugin-transform-template-literals": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", @@ -4101,14 +4101,14 @@ } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.0.0", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -4117,47 +4117,47 @@ } }, "@babel/preset-env": { - "version": "7.1.6", + "version": "7.2.0", "bundled": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.1.0", - "@babel/plugin-proposal-json-strings": "^7.0.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.0.0", - "@babel/plugin-syntax-async-generators": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.0.0", - "@babel/plugin-transform-arrow-functions": "^7.0.0", - "@babel/plugin-transform-async-to-generator": "^7.1.0", - "@babel/plugin-transform-block-scoped-functions": "^7.0.0", - "@babel/plugin-transform-block-scoping": "^7.1.5", - "@babel/plugin-transform-classes": "^7.1.0", - "@babel/plugin-transform-computed-properties": "^7.0.0", - "@babel/plugin-transform-destructuring": "^7.0.0", - "@babel/plugin-transform-dotall-regex": "^7.0.0", - "@babel/plugin-transform-duplicate-keys": "^7.0.0", - "@babel/plugin-transform-exponentiation-operator": "^7.1.0", - "@babel/plugin-transform-for-of": "^7.0.0", - "@babel/plugin-transform-function-name": "^7.1.0", - "@babel/plugin-transform-literals": "^7.0.0", - "@babel/plugin-transform-modules-amd": "^7.1.0", - "@babel/plugin-transform-modules-commonjs": "^7.1.0", - "@babel/plugin-transform-modules-systemjs": "^7.0.0", - "@babel/plugin-transform-modules-umd": "^7.1.0", + "@babel/plugin-proposal-async-generator-functions": "^7.2.0", + "@babel/plugin-proposal-json-strings": "^7.2.0", + "@babel/plugin-proposal-object-rest-spread": "^7.2.0", + "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", + "@babel/plugin-syntax-async-generators": "^7.2.0", + "@babel/plugin-syntax-object-rest-spread": "^7.2.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", + "@babel/plugin-transform-arrow-functions": "^7.2.0", + "@babel/plugin-transform-async-to-generator": "^7.2.0", + "@babel/plugin-transform-block-scoped-functions": "^7.2.0", + "@babel/plugin-transform-block-scoping": "^7.2.0", + "@babel/plugin-transform-classes": "^7.2.0", + "@babel/plugin-transform-computed-properties": "^7.2.0", + "@babel/plugin-transform-destructuring": "^7.2.0", + "@babel/plugin-transform-dotall-regex": "^7.2.0", + "@babel/plugin-transform-duplicate-keys": "^7.2.0", + "@babel/plugin-transform-exponentiation-operator": "^7.2.0", + "@babel/plugin-transform-for-of": "^7.2.0", + "@babel/plugin-transform-function-name": "^7.2.0", + "@babel/plugin-transform-literals": "^7.2.0", + "@babel/plugin-transform-modules-amd": "^7.2.0", + "@babel/plugin-transform-modules-commonjs": "^7.2.0", + "@babel/plugin-transform-modules-systemjs": "^7.2.0", + "@babel/plugin-transform-modules-umd": "^7.2.0", "@babel/plugin-transform-new-target": "^7.0.0", - "@babel/plugin-transform-object-super": "^7.1.0", - "@babel/plugin-transform-parameters": "^7.1.0", + "@babel/plugin-transform-object-super": "^7.2.0", + "@babel/plugin-transform-parameters": "^7.2.0", "@babel/plugin-transform-regenerator": "^7.0.0", - "@babel/plugin-transform-shorthand-properties": "^7.0.0", - "@babel/plugin-transform-spread": "^7.0.0", - "@babel/plugin-transform-sticky-regex": "^7.0.0", - "@babel/plugin-transform-template-literals": "^7.0.0", - "@babel/plugin-transform-typeof-symbol": "^7.0.0", - "@babel/plugin-transform-unicode-regex": "^7.0.0", - "browserslist": "^4.1.0", + "@babel/plugin-transform-shorthand-properties": "^7.2.0", + "@babel/plugin-transform-spread": "^7.2.0", + "@babel/plugin-transform-sticky-regex": "^7.2.0", + "@babel/plugin-transform-template-literals": "^7.2.0", + "@babel/plugin-transform-typeof-symbol": "^7.2.0", + "@babel/plugin-transform-unicode-regex": "^7.2.0", + "browserslist": "^4.3.4", "invariant": "^2.2.2", "js-levenshtein": "^1.1.3", "semver": "^5.3.0" @@ -4201,7 +4201,7 @@ } }, "@babel/types": { - "version": "7.1.6", + "version": "7.2.0", "bundled": true, "requires": { "esutils": "^2.0.2", @@ -4257,7 +4257,7 @@ "bundled": true }, "@types/lodash": { - "version": "4.14.119", + "version": "4.14.118", "bundled": true }, "@types/marked": { @@ -4269,7 +4269,7 @@ "bundled": true }, "@types/node": { - "version": "10.12.12", + "version": "10.12.15", "bundled": true }, "@types/pako": { @@ -4289,7 +4289,7 @@ "bundled": true }, "ajv": { - "version": "6.5.5", + "version": "6.6.1", "bundled": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -4498,12 +4498,12 @@ } }, "browserslist": { - "version": "4.3.4", + "version": "4.3.5", "bundled": true, "requires": { - "caniuse-lite": "^1.0.30000899", - "electron-to-chromium": "^1.3.82", - "node-releases": "^1.0.1" + "caniuse-lite": "^1.0.30000912", + "electron-to-chromium": "^1.3.86", + "node-releases": "^1.0.5" } }, "builtin-modules": { @@ -4539,7 +4539,7 @@ } }, "caniuse-lite": { - "version": "1.0.30000910", + "version": "1.0.30000916", "bundled": true }, "capture-stack-trace": { @@ -4573,7 +4573,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.0", "braces": "^2.3.0", - "fsevents": "^1.2.2", "glob-parent": "^3.1.0", "inherits": "^2.0.1", "is-binary-path": "^1.0.0", @@ -4722,11 +4721,6 @@ "version": "1.0.2", "bundled": true }, - "coriolis-data": { - "version": "3.0.0", - "from": "github:edcd/coriolis-data", - "bundled": true - }, "create-error-class": { "version": "3.0.2", "bundled": true, @@ -4849,16 +4843,12 @@ "version": "3.1.0", "bundled": true }, - "duplexer": { - "version": "0.1.1", - "bundled": true - }, "duplexer3": { "version": "0.1.4", "bundled": true }, "electron-to-chromium": { - "version": "1.3.84", + "version": "1.3.88", "bundled": true }, "elegant-spinner": { @@ -4880,20 +4870,6 @@ "version": "2.0.2", "bundled": true }, - "event-stream": { - "version": "3.3.6", - "bundled": true, - "requires": { - "duplexer": "^0.1.1", - "flatmap-stream": "^0.1.0", - "from": "^0.1.7", - "map-stream": "0.0.7", - "pause-stream": "^0.0.11", - "split": "^1.0.1", - "stream-combiner": "^0.2.2", - "through": "^2.3.8" - } - }, "execa": { "version": "0.10.0", "bundled": true, @@ -5056,10 +5032,6 @@ "locate-path": "^2.0.0" } }, - "flatmap-stream": { - "version": "0.1.2", - "bundled": true - }, "for-in": { "version": "1.0.2", "bundled": true @@ -5071,10 +5043,6 @@ "map-cache": "^0.2.2" } }, - "from": { - "version": "0.1.7", - "bundled": true - }, "fs-extra": { "version": "7.0.1", "bundled": true, @@ -5092,467 +5060,6 @@ "version": "1.0.0", "bundled": true }, - "fsevents": { - "version": "1.2.4", - "bundled": true, - "optional": true, - "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": "^2.1.0" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "optional": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true - } - } - }, "get-stream": { "version": "3.0.0", "bundled": true @@ -6276,11 +5783,11 @@ "bundled": true }, "lru-cache": { - "version": "4.1.4", + "version": "4.1.5", "bundled": true, "requires": { "pseudomap": "^1.0.2", - "yallist": "^3.0.2" + "yallist": "^2.1.2" } }, "make-dir": { @@ -6298,10 +5805,6 @@ "version": "2.0.0", "bundled": true }, - "map-stream": { - "version": "0.0.7", - "bundled": true - }, "map-visit": { "version": "1.0.0", "bundled": true, @@ -6402,11 +5905,6 @@ "version": "0.0.7", "bundled": true }, - "nan": { - "version": "2.11.1", - "bundled": true, - "optional": true - }, "nanomatch": { "version": "1.2.13", "bundled": true, @@ -6429,21 +5927,21 @@ "bundled": true }, "node-releases": { - "version": "1.0.4", + "version": "1.1.0", "bundled": true, "requires": { "semver": "^5.3.0" } }, "nodemon": { - "version": "1.18.6", + "version": "1.18.7", "bundled": true, "requires": { "chokidar": "^2.0.4", "debug": "^3.1.0", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.0", + "pstree.remy": "^1.1.2", "semver": "^5.5.0", "supports-color": "^5.2.0", "touch": "^3.1.0", @@ -6655,7 +6153,7 @@ } }, "pako": { - "version": "1.0.6", + "version": "1.0.7", "bundled": true }, "parse-json": { @@ -6701,13 +6199,6 @@ "pify": "^3.0.0" } }, - "pause-stream": { - "version": "0.0.11", - "bundled": true, - "requires": { - "through": "~2.3" - } - }, "pify": { "version": "3.0.0", "bundled": true @@ -6743,23 +6234,13 @@ "version": "2.0.3", "bundled": true }, - "ps-tree": { - "version": "1.1.0", - "bundled": true, - "requires": { - "event-stream": "~3.3.0" - } - }, "pseudomap": { "version": "1.0.2", "bundled": true }, "pstree.remy": { - "version": "1.1.0", - "bundled": true, - "requires": { - "ps-tree": "^1.1.0" - } + "version": "1.1.2", + "bundled": true }, "punycode": { "version": "2.1.1", @@ -6866,13 +6347,13 @@ } }, "regexpu-core": { - "version": "4.2.0", + "version": "4.4.0", "bundled": true, "requires": { "regenerate": "^1.4.0", "regenerate-unicode-properties": "^7.0.0", - "regjsgen": "^0.4.0", - "regjsparser": "^0.3.0", + "regjsgen": "^0.5.0", + "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", "unicode-match-property-value-ecmascript": "^1.0.2" } @@ -6893,11 +6374,11 @@ } }, "regjsgen": { - "version": "0.4.0", + "version": "0.5.0", "bundled": true }, "regjsparser": { - "version": "0.3.0", + "version": "0.6.0", "bundled": true, "requires": { "jsesc": "~0.5.0" @@ -7173,7 +6654,7 @@ "bundled": true }, "spdx-correct": { - "version": "3.0.2", + "version": "3.1.0", "bundled": true, "requires": { "spdx-expression-parse": "^3.0.0", @@ -7227,14 +6708,6 @@ } } }, - "stream-combiner": { - "version": "0.2.2", - "bundled": true, - "requires": { - "duplexer": "~0.1.1", - "through": "~2.3.4" - } - }, "string-width": { "version": "2.1.1", "bundled": true, @@ -7716,7 +7189,7 @@ "bundled": true }, "yallist": { - "version": "3.0.3", + "version": "2.1.2", "bundled": true }, "yargs-parser": { @@ -8797,7 +8270,8 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -8908,7 +8382,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -8918,6 +8393,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9029,7 +8505,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9144,6 +8621,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/components/Header.jsx b/src/components/Header.jsx index d9e95fb1..3a09c29a 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -4,8 +4,8 @@ import { CoriolisLogo, Hammer, Rocket, Cogs, Help, StatsBars } from './SvgIcons' const cn = (...args) => args.join(' ') const translate = (args) => args; -const hasBuilds = false -const openedMenu = false +const hasBuilds = () => false +const openedMenu = () => false class Header extends Component { render() { diff --git a/src/components/ShipTable.jsx b/src/components/ShipTable.jsx index 77490c1f..e107641c 100644 --- a/src/components/ShipTable.jsx +++ b/src/components/ShipTable.jsx @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import * as Forge from 'ed-forge'; +import {getShipMetaProperty} from 'ed-forge/lib/data/ships'; import {FORGE_SHIPS} from '../utils/Constants'; - import {Link} from 'react-router-dom'; import cn from 'classnames'; @@ -49,10 +49,34 @@ class ShipTable extends Component { } this.state = { shipRows: [], + shipPredicate: 'name', + shipDesc: true, detailRows: [] }; } + /** + * Update state with the specified sort predicates + * @param {String} shipPredicate Sort predicate - property name + * @param {number} shipPredicateIndex Sort predicate - property index + */ + _sortShips(shipPredicate, shipPredicateIndex) { + let shipDesc = this.state.shipDesc; + + if (typeof shipPredicateIndex == 'object') { + shipPredicateIndex = undefined; + } + + if ( + this.state.shipPredicate == shipPredicate && + this.state.shipPredicateIndex == shipPredicateIndex + ) { + shipDesc = !shipDesc; + } + + this.setState({ shipPredicate, shipDesc, shipPredicateIndex }); + } + componentWillMount() { this._genShipRows(); } @@ -61,6 +85,7 @@ class ShipTable extends Component { const shipRows = []; for (const shipName of FORGE_SHIPS) { const ship = Forge.Factory.newShip(shipName); + let name = shipName console.log(ship); shipRows.push( - {shipName} + {name} ); this.setState({shipRows}) @@ -81,7 +106,8 @@ class ShipTable extends Component { _highlightShip() {} render() { - + let sortShips = (predicate, index) => + this._sortShips.bind(this, predicate, index); return (