Changed structure

src/ui/AccessionDetailsPage.tsx → src/accession/AccessionDetailsPage.tsx

 import React from 'react';
 
 import { AccessionService } from '@genesys/client/service';
-import { Property } from './Property';
+import { Property } from 'ui/common/Property';
 import AccessionDetails from '@genesys/client/model/accession/AccessionDetails';
 import { WithTranslation, withTranslation } from 'react-i18next';
 

src/ui/AccessionListPage.tsx → src/accession/AccessionListPage.tsx

@@ -6,7 +6,7 @@ import { AccessionService } from '@genesys/client/service';
 import AccessionFilter from '@genesys/client/model/accession/AccessionFilter';
 import Accession from '@genesys/client/model/accession/Accession';
 import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage';
-import Pagination from './Pagination';
+import Pagination from 'ui/common/Pagination';
 import { AccessionFilters } from './AccessionFilters';
 import { withTranslation, WithTranslation } from 'react-i18next';
 import { LocalStorageCart } from 'utilities';

src/ui/AccessionOverviewSection.tsx → src/accession/AccessionOverviewSection.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { withTranslation, WithTranslation } from 'react-i18next';
 // model
 import AccessionOverview from '@genesys/client/model/accession/AccessionOverview';
-import PropertiesCard from 'ui/PropertiesCard';
+import PropertiesCard from 'ui/common/PropertiesCard';
 import { VocabularyService } from '@genesys/client/service';
 
 interface IAccessionOverviewPageState {

src/genesys.tsx

@@ -5,10 +5,10 @@ import { log } from '@genesys/client/utilities/debug';
 // import * as cookies from 'es-cookie';
 
 import { reconfigureServiceAxios, LoginService } from '@genesys/client/service';
-import App from './ui/App';
-import ApiAccessError from './ui/ApiAccessError';
+import App from 'ui/core/App';
+import ApiAccessError from 'ui/core/ApiAccessError';
 import { Config, DefaultConfig } from '../config/config';
-import OverviewPage from './ui/OverviewPage';
+import OverviewPage from 'accession/OverviewPage';
 
 // declare const window: Window & { devToolsExtension: any, __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: any, initialLanguage: any, initialI18nStore: any, localeMapping: any };
 // const AUTH_COOKIE = 'GENESYS_AUTH';

src/ui/RequestPage.tsx → src/request/RequestPage.tsx

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { withTranslation, WithTranslation } from 'react-i18next';
 import { RouteComponentProps } from 'react-router-dom';
-import ErrorDisplay from 'ui/ErrorDisplay';
+import ErrorDisplay from 'ui/common/ErrorDisplay';
 import { ApiInfoService, RequestService } from '@genesys/client/service';
 import { LocalStorageCart } from 'utilities';
 import EasySMTAUserData from '@genesys/client/model/request/EasySMTAUserData';
 import RequestInfo from '@genesys/client/model/request/RequestInfo';
-import CaptchaInput from './CaptchaInput';
+import CaptchaInput from 'ui/common/CaptchaInput';
 
 interface IRequestPageState {
   apiError: string | Error;

src/ui/Navigation.tsx → src/ui/common/Navigation.tsx

 import React from 'react';
 import { Link } from 'react-router-dom';
-import {WithTranslation, withTranslation} from "react-i18next";
+import { WithTranslation, withTranslation } from 'react-i18next';
 
 interface INavigation extends React.ClassAttributes<any>, WithTranslation {}
 
@@ -13,9 +13,9 @@ class Navigation extends React.Component<INavigation, any> {
       <header>
         <nav>
           <ul style={ { display: 'flex', listStyle: 'none' } }>
-            <li style={ { marginRight: '20px' } }><Link to="/">{t("nav.home")}</Link></li>
+            <li style={ { marginRight: '20px' } }><Link to="/">{t('nav.home')}</Link></li>
             <li style={ { marginRight: '20px' } }><Link to="/overview">{t('nav.overview')}</Link></li>
-            <li style={ { marginRight: '20px' } }><Link to="/api-info">{t("nav.apiInfo")}</Link></li>
+            <li style={ { marginRight: '20px' } }><Link to="/api-info">{t('nav.apiInfo')}</Link></li>
             <li style={ { marginRight: '20px' } }><Link to="/cart/">{t('nav.cart')}</Link></li>
           </ul>
         </nav>

src/ui/Pagination.tsx → src/ui/common/Pagination.tsx

 import React from 'react';
 import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage';
-import { history } from './App';
+import { history } from 'ui/core/App';
 import { withTranslation, WithTranslation } from 'react-i18next';
 
 interface IPagination extends React.ClassAttributes<any>, WithTranslation {

src/ui/PropertiesCard.tsx → src/ui/common/PropertiesCard.tsx

 import React from 'react';
-import { Property } from 'ui/Property';
+import { Property } from 'ui/common/Property';
 import { TreeMap } from 'd3js';
 import { WithTranslation, withTranslation } from 'react-i18next';
 

src/ui/Property.tsx → src/ui/common/Property.tsx

 import React from 'react';
-import Number from 'ui/Number';
+import Number from 'ui/common/Number';
 
 interface IProperty extends React.ClassAttributes<any> {
   title: string;

src/ui/App.tsx → src/ui/core/App.tsx

 import React from 'react';
 import { HashRouter as Router, Route, Switch } from 'react-router-dom';
-import NotFound from './NotFound';
-import ApiInfoPage from './ApiInfoPage';
-import AccessionList from './AccessionListPage';
-import AccessionDetails from './AccessionDetailsPage';
+import NotFound from 'ui/core/NotFound';
+import ApiInfoPage from 'serverinfo/ApiInfoPage';
+import AccessionList from 'accession/AccessionListPage';
+import AccessionDetails from 'accession/AccessionDetailsPage';
 import { createHashHistory } from 'history';
-import CartPage from 'ui/CartPage';
-import OverviewPage from 'ui/OverviewPage';
-import RequestPage from 'ui/RequestPage';
+import CartPage from 'request/CartPage';
+import OverviewPage from 'accession/OverviewPage';
+import RequestPage from 'request/RequestPage';
 
 const hashHistory = createHashHistory({});