diff --git a/packages/frontend/package.json b/packages/frontend/package.json index acbb49c..6fec32b 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -26,7 +26,6 @@ "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "elite-feature-flags": "^1.0.0", - "elite-configuration": "^1.0.0", - "elite-routing": "^1.0.0" + "elite-configuration": "^1.0.0" } } diff --git a/packages/frontend/src/components/App.tsx b/packages/frontend/src/components/App.tsx index 4fa933c..a277b98 100644 --- a/packages/frontend/src/components/App.tsx +++ b/packages/frontend/src/components/App.tsx @@ -1,27 +1,25 @@ +import { getConfiguration } from 'elite-configuration'; +import { FeatureFlagsProvider } from 'elite-feature-flags'; +import { Configuration } from 'elite-types'; import * as React from 'react'; import { hot } from 'react-hot-loader'; -import { Route, Switch, Redirect } from 'react-router'; +import { Redirect, Route, Switch } from 'react-router'; import { Router } from 'react-router-dom'; import history from '../util/history'; -import { FeatureFlagsProvider } from 'elite-feature-flags'; -import { Configuration } from 'elite-types'; -import { getConfiguration } from 'elite-configuration'; -import { getAllRegisteredAppRoutes } from 'elite-routing'; -import { AppPaths, registerRoutes } from '../util/routes'; +import { AppPath, APP_ROUTES } from '../util/routes'; // Global bootstrap: install subsystems and load configuration -registerRoutes(); const configuration: Configuration = getConfiguration(); export const AppComponent = () => ( - {getAllRegisteredAppRoutes().map((routeProps, index) => ( + {APP_ROUTES.map((routeProps, index) => ( ))} {/* Error 404 Fallback */} - + diff --git a/packages/frontend/src/components/pages/HomePage.tsx b/packages/frontend/src/components/pages/HomePage.tsx index f3e3656..272989c 100644 --- a/packages/frontend/src/components/pages/HomePage.tsx +++ b/packages/frontend/src/components/pages/HomePage.tsx @@ -1,8 +1,8 @@ +import { Divider } from '@material-ui/core'; +import { FeatureFlag } from 'elite-feature-flags'; import * as React from 'react'; import { RouteComponentProps } from 'react-router'; import { LinkDirectory } from './support/LinkDirectory'; -import { Divider } from '@material-ui/core'; -import { FeatureFlag } from 'elite-feature-flags'; export interface HomePageProps extends RouteComponentProps {} diff --git a/packages/frontend/src/components/pages/support/LinkDirectory.tsx b/packages/frontend/src/components/pages/support/LinkDirectory.tsx index ec54a4f..84964f2 100644 --- a/packages/frontend/src/components/pages/support/LinkDirectory.tsx +++ b/packages/frontend/src/components/pages/support/LinkDirectory.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { Link } from 'react-router-dom'; -import { getLinkForRoute, getDisplayNameForRoute, getAllRegisteredAppRoutes } from 'elite-routing'; +import { APP_ROUTES, getDisplayNameForRoute, getLinkForRoute } from '../../../util/routes'; export const LinkDirectory = () => (