Commit 5e872d3e authored by Oleksii Savran's avatar Oleksii Savran Committed by Matija Obreza
Browse files

Changed structure

parent 8bf6c8d5
import React from 'react'; import React from 'react';
import { AccessionService } from '@genesys/client/service'; 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 AccessionDetails from '@genesys/client/model/accession/AccessionDetails';
import { WithTranslation, withTranslation } from 'react-i18next'; import { WithTranslation, withTranslation } from 'react-i18next';
......
...@@ -6,7 +6,7 @@ import { AccessionService } from '@genesys/client/service'; ...@@ -6,7 +6,7 @@ import { AccessionService } from '@genesys/client/service';
import AccessionFilter from '@genesys/client/model/accession/AccessionFilter'; import AccessionFilter from '@genesys/client/model/accession/AccessionFilter';
import Accession from '@genesys/client/model/accession/Accession'; import Accession from '@genesys/client/model/accession/Accession';
import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage'; import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage';
import Pagination from './Pagination'; import Pagination from 'ui/common/Pagination';
import { AccessionFilters } from './AccessionFilters'; import { AccessionFilters } from './AccessionFilters';
import { withTranslation, WithTranslation } from 'react-i18next'; import { withTranslation, WithTranslation } from 'react-i18next';
import { LocalStorageCart } from 'utilities'; import { LocalStorageCart } from 'utilities';
......
...@@ -2,7 +2,7 @@ import * as React from 'react'; ...@@ -2,7 +2,7 @@ import * as React from 'react';
import { withTranslation, WithTranslation } from 'react-i18next'; import { withTranslation, WithTranslation } from 'react-i18next';
// model // model
import AccessionOverview from '@genesys/client/model/accession/AccessionOverview'; 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'; import { VocabularyService } from '@genesys/client/service';
interface IAccessionOverviewPageState { interface IAccessionOverviewPageState {
......
...@@ -5,10 +5,10 @@ import { log } from '@genesys/client/utilities/debug'; ...@@ -5,10 +5,10 @@ import { log } from '@genesys/client/utilities/debug';
// import * as cookies from 'es-cookie'; // import * as cookies from 'es-cookie';
import { reconfigureServiceAxios, LoginService } from '@genesys/client/service'; import { reconfigureServiceAxios, LoginService } from '@genesys/client/service';
import App from './ui/App'; import App from 'ui/core/App';
import ApiAccessError from './ui/ApiAccessError'; import ApiAccessError from 'ui/core/ApiAccessError';
import { Config, DefaultConfig } from '../config/config'; 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 }; // declare const window: Window & { devToolsExtension: any, __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: any, initialLanguage: any, initialI18nStore: any, localeMapping: any };
// const AUTH_COOKIE = 'GENESYS_AUTH'; // const AUTH_COOKIE = 'GENESYS_AUTH';
......
...@@ -2,12 +2,12 @@ import React from 'react'; ...@@ -2,12 +2,12 @@ import React from 'react';
import { withTranslation, WithTranslation } from 'react-i18next'; import { withTranslation, WithTranslation } from 'react-i18next';
import { RouteComponentProps } from 'react-router-dom'; 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 { ApiInfoService, RequestService } from '@genesys/client/service';
import { LocalStorageCart } from 'utilities'; import { LocalStorageCart } from 'utilities';
import EasySMTAUserData from '@genesys/client/model/request/EasySMTAUserData'; import EasySMTAUserData from '@genesys/client/model/request/EasySMTAUserData';
import RequestInfo from '@genesys/client/model/request/RequestInfo'; import RequestInfo from '@genesys/client/model/request/RequestInfo';
import CaptchaInput from './CaptchaInput'; import CaptchaInput from 'ui/common/CaptchaInput';
interface IRequestPageState { interface IRequestPageState {
apiError: string | Error; apiError: string | Error;
......
import React from 'react'; import React from 'react';
import { Link } from 'react-router-dom'; 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 {} interface INavigation extends React.ClassAttributes<any>, WithTranslation {}
...@@ -13,9 +13,9 @@ class Navigation extends React.Component<INavigation, any> { ...@@ -13,9 +13,9 @@ class Navigation extends React.Component<INavigation, any> {
<header> <header>
<nav> <nav>
<ul style={ { display: 'flex', listStyle: 'none' } }> <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="/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> <li style={ { marginRight: '20px' } }><Link to="/cart/">{t('nav.cart')}</Link></li>
</ul> </ul>
</nav> </nav>
......
import React from 'react'; import React from 'react';
import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage'; import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage';
import { history } from './App'; import { history } from 'ui/core/App';
import { withTranslation, WithTranslation } from 'react-i18next'; import { withTranslation, WithTranslation } from 'react-i18next';
interface IPagination extends React.ClassAttributes<any>, WithTranslation { interface IPagination extends React.ClassAttributes<any>, WithTranslation {
......
import React from 'react'; import React from 'react';
import { Property } from 'ui/Property'; import { Property } from 'ui/common/Property';
import { TreeMap } from 'd3js'; import { TreeMap } from 'd3js';
import { WithTranslation, withTranslation } from 'react-i18next'; import { WithTranslation, withTranslation } from 'react-i18next';
......
import React from 'react'; import React from 'react';
import Number from 'ui/Number'; import Number from 'ui/common/Number';
interface IProperty extends React.ClassAttributes<any> { interface IProperty extends React.ClassAttributes<any> {
title: string; title: string;
......
import React from 'react'; import React from 'react';
import { HashRouter as Router, Route, Switch } from 'react-router-dom'; import { HashRouter as Router, Route, Switch } from 'react-router-dom';
import NotFound from './NotFound'; import NotFound from 'ui/core/NotFound';
import ApiInfoPage from './ApiInfoPage'; import ApiInfoPage from 'serverinfo/ApiInfoPage';
import AccessionList from './AccessionListPage'; import AccessionList from 'accession/AccessionListPage';
import AccessionDetails from './AccessionDetailsPage'; import AccessionDetails from 'accession/AccessionDetailsPage';
import { createHashHistory } from 'history'; import { createHashHistory } from 'history';
import CartPage from 'ui/CartPage'; import CartPage from 'request/CartPage';
import OverviewPage from 'ui/OverviewPage'; import OverviewPage from 'accession/OverviewPage';
import RequestPage from 'ui/RequestPage'; import RequestPage from 'request/RequestPage';
const hashHistory = createHashHistory({}); const hashHistory = createHashHistory({});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment