Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 07:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Willyb321
2019-01-03 08:54:49 +11:00
parent 1cb88115f6 deeb525433
commit fb811faf5e
1 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/app/Coriolis.jsx
View File

@@ -15,7 +15,10 @@ import ModalImport from './components/ModalImport';
import ModalPermalink from './components/ModalPermalink'; import ModalPermalink from './components/ModalPermalink';
import * as CompanionApiUtils from './utils/CompanionApiUtils'; import * as CompanionApiUtils from './utils/CompanionApiUtils';
import * as JournalUtils from './utils/JournalUtils'; import * as JournalUtils from './utils/JournalUtils';
import AboutPage from './pages/AboutPage';
import NotFoundPage from './pages/NotFoundPage'; import NotFoundPage from './pages/NotFoundPage';
import OutfittingPage from './pages/OutfittingPage';
import ComparisonPage from './pages/ComparisonPage';
import ShipyardPage from './pages/ShipyardPage'; import ShipyardPage from './pages/ShipyardPage';
import ErrorDetails from './pages/ErrorDetails'; import ErrorDetails from './pages/ErrorDetails';
@@ -73,48 +76,13 @@ export default class Coriolis extends React.Component {
Router('', (r) => this._setPage(ShipyardPage, r)); Router('', (r) => this._setPage(ShipyardPage, r));
Router('/import?', (r) => this._importBuild(r)); Router('/import?', (r) => this._importBuild(r));
Router('/import/:data', (r) => this._importBuild(r)); Router('/import/:data', (r) => this._importBuild(r));
Router('/outfit/?', (r) => { Router('/outfit/?', (r) => this._setPage(OutfittingPage, r));
return import(/* webpackChunkName: "outfit" */ './pages/OutfittingPage') Router('/outfit/:ship/?', (r) => this._setPage(OutfittingPage, r));
.then(OutfittingPage => { Router('/outfit/:ship/:code?', (r) => this._setPage(OutfittingPage, r));
return this._setPage(OutfittingPage.default, r); Router('/compare/:name?', (r) => this._setPage(ComparisonPage, r));
}) Router('/comparison?', (r) => this._setPage(ComparisonPage, r));
}); Router('/comparison/:code', (r) => this._setPage(ComparisonPage, r));
Router('/outfit/:ship/?', (r) => { Router('/about', (r) => this._setPage(AboutPage, r));
return import(/* webpackChunkName: "outfit" */ './pages/OutfittingPage')
.then(OutfittingPage => {
return this._setPage(OutfittingPage.default, r);
})
});
Router('/outfit/:ship/:code?', (r) => {
return import(/* webpackChunkName: "outfit" */ './pages/OutfittingPage')
.then(OutfittingPage => {
return this._setPage(OutfittingPage.default, r);
})
});
Router('/compare/:name?', (r) => {
return import(/* webpackChunkName: "compare" */ './pages/ComparisonPage')
.then(ComparisonPage => {
return this._setPage(ComparisonPage.default, r);
})
});
Router('/comparison?', (r) => {
return import(/* webpackChunkName: "compare" */ './pages/ComparisonPage')
.then(ComparisonPage => {
return this._setPage(ComparisonPage.default, r);
})
});
Router('/comparison/:code', (r) => {
return import(/* webpackChunkName: "compare" */ './pages/ComparisonPage')
.then(ComparisonPage => {
return this._setPage(ComparisonPage.default, r);
})
});
Router('/about', (r) => {
return import(/* webpackChunkName: "about" */ './pages/AboutPage')
.then(AboutPage => {
return this._setPage(AboutPage.default, r);
})
});
Router('*', (r) => this._setPage(null, r)); Router('*', (r) => this._setPage(null, r));
} }
@@ -137,10 +105,7 @@ export default class Coriolis extends React.Component {
} }
r.params.ship = ship.id; r.params.ship = ship.id;
r.params.code = ship.toString(); r.params.code = ship.toString();
return import(/* webpackChunkName: "outfit" */ './pages/OutfittingPage') this._setPage(OutfittingPage, r)
.then(AboutPage => {
return this._setPage(AboutPage.default, r);
})
} catch (err) { } catch (err) {
this._onError('Failed to import ship', r.path, 0, 0, err); this._onError('Failed to import ship', r.path, 0, 0, err);
} }