From 2936364934dd575b3cca1a4107f0003fac66aa89 Mon Sep 17 00:00:00 2001 From: William Blythe Date: Wed, 26 Dec 2018 08:50:00 +1100 Subject: [PATCH 1/2] prep for abl --- src/app/components/AvailableModulesMenu.jsx | 2 +- src/app/i18n/en.json | 1 + src/app/shipyard/Constants.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx index a9737618..d26f3865 100644 --- a/src/app/components/AvailableModulesMenu.jsx +++ b/src/app/components/AvailableModulesMenu.jsx @@ -109,7 +109,7 @@ const CATEGORIES = { // Guardian 'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc'], - 'mining': ['ml', 'scl', 'pwa', 'sdm'], + 'mining': ['ml', 'scl', 'pwa', 'sdm', 'abl'], }; /** diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json index 3badba14..a5a7d71b 100644 --- a/src/app/i18n/en.json +++ b/src/app/i18n/en.json @@ -133,6 +133,7 @@ "ghrp": "Guardian Hull Reinforcement Package", "gmrp": "Guardian Module Reinforcement Package", "pwa": "Pulse Wave Analyser", + "abl": "Abrasion Blaster", "scl": "Seismic Charge Launcher", "sdm": "Sub-Surface Displacement Missile", "tbsc": "Shock Cannon", diff --git a/src/app/shipyard/Constants.js b/src/app/shipyard/Constants.js index 8b6b06fc..60dd67d2 100755 --- a/src/app/shipyard/Constants.js +++ b/src/app/shipyard/Constants.js @@ -95,6 +95,7 @@ export const ModuleGroupToName = { tbem: 'Enzyme Missile Rack', tbrfl: 'Remote Release Flechette Launcher', pwa: 'Pulse Wave Analyser', + abl: 'Abrasion Blaster', scl: 'Seismic Charge Launcher', sdm: 'Sub-Surface Displacement Missile', }; From 98782da200ffc6f136fb47c525d6897d7c3e30da Mon Sep 17 00:00:00 2001 From: William Blythe Date: Wed, 26 Dec 2018 09:07:05 +1100 Subject: [PATCH 2/2] make shipyardpage not dynamic import --- src/app/Coriolis.jsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx index d812497f..2fd3e790 100644 --- a/src/app/Coriolis.jsx +++ b/src/app/Coriolis.jsx @@ -16,6 +16,7 @@ import ModalPermalink from './components/ModalPermalink'; import * as CompanionApiUtils from './utils/CompanionApiUtils'; import * as JournalUtils from './utils/JournalUtils'; import NotFoundPage from './pages/NotFoundPage'; +import ShipyardPage from './pages/ShipyardPage'; import ErrorDetails from './pages/ErrorDetails'; const zlib = require('pako'); @@ -69,12 +70,7 @@ export default class Coriolis extends React.Component { sizeRatio: Persist.getSizeRatio() }; this._getAnnouncements(); - Router('', (r) => { - return import(/* webpackChunkName: "shipyard" */ './pages/ShipyardPage') - .then(ShipyardPage => { - return this._setPage(ShipyardPage.default, r); - }) - }); + Router('', (r) => this._setPage(ShipyardPage, r)); Router('/import?', (r) => this._importBuild(r)); Router('/import/:data', (r) => this._importBuild(r)); Router('/outfit/?', (r) => {