|
|
@ -1,16 +1,11 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
import { Location, History } from 'history';
|
|
|
|
import { Location, History } from 'history';
|
|
|
|
import { Route, Switch } from 'react-router';
|
|
|
|
import { Route, Switch } from 'react-router';
|
|
|
|
import { Link } from 'react-router-dom';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import IconButton from '@material-ui/core/IconButton';
|
|
|
|
|
|
|
|
import IconAdd from '@material-ui/icons/Add';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import Journal from './Journal';
|
|
|
|
import Journal from './Journal';
|
|
|
|
import JournalEdit from './JournalEdit';
|
|
|
|
import JournalEdit from './JournalEdit';
|
|
|
|
import JournalsList from './JournalsList';
|
|
|
|
import JournalsList from './JournalsList';
|
|
|
|
|
|
|
|
|
|
|
|
import AppBarOverride from '../widgets/AppBarOverride';
|
|
|
|
|
|
|
|
import { routeResolver } from '../App';
|
|
|
|
import { routeResolver } from '../App';
|
|
|
|
|
|
|
|
|
|
|
|
import { store, JournalsData, UserInfoData, CredentialsData } from '../store';
|
|
|
|
import { store, JournalsData, UserInfoData, CredentialsData } from '../store';
|
|
|
@ -44,15 +39,6 @@ class Journals extends React.PureComponent {
|
|
|
|
exact={true}
|
|
|
|
exact={true}
|
|
|
|
render={({ history }) => (
|
|
|
|
render={({ history }) => (
|
|
|
|
<>
|
|
|
|
<>
|
|
|
|
<AppBarOverride title="Journals">
|
|
|
|
|
|
|
|
<IconButton
|
|
|
|
|
|
|
|
component={Link}
|
|
|
|
|
|
|
|
title="New"
|
|
|
|
|
|
|
|
{...{to: routeResolver.getRoute('journals.new')}}
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<IconAdd />
|
|
|
|
|
|
|
|
</IconButton>
|
|
|
|
|
|
|
|
</AppBarOverride>
|
|
|
|
|
|
|
|
<JournalsList
|
|
|
|
<JournalsList
|
|
|
|
userInfo={this.props.userInfo}
|
|
|
|
userInfo={this.props.userInfo}
|
|
|
|
etesync={this.props.etesync}
|
|
|
|
etesync={this.props.etesync}
|
|
|
|