Prettify the journals page.

master
Tom Hacohen 6 years ago
parent 56f976c766
commit 8b438a81f6

@ -1,8 +1,16 @@
import * as React from 'react';
import { History } from 'history';
import { Link } from 'react-router-dom';
import IconButton from '@material-ui/core/IconButton';
import IconAdd from '@material-ui/icons/Add';
import { List, ListItem } from '../widgets/List';
import AppBarOverride from '../widgets/AppBarOverride';
import Container from '../widgets/Container';
import * as EteSync from '../api/EteSync';
import { routeResolver } from '../App';
@ -55,22 +63,33 @@ class JournalsList extends React.PureComponent {
});
return (
<List>
<ListItem
primaryText="Address Books"
nestedItems={journalMap.ADDRESS_BOOK}
/>
<ListItem
primaryText="Calendars"
nestedItems={journalMap.CALENDAR}
/>
<ListItem
primaryText="Tasks"
nestedItems={journalMap.TASKS}
/>
</List>
<Container>
<AppBarOverride title="Journals">
<IconButton
component={Link}
title="New"
{...{to: routeResolver.getRoute('journals.new')}}
>
<IconAdd />
</IconButton>
</AppBarOverride>
<List>
<ListItem
primaryText="Address Books"
nestedItems={journalMap.ADDRESS_BOOK}
/>
<ListItem
primaryText="Calendars"
nestedItems={journalMap.CALENDAR}
/>
<ListItem
primaryText="Tasks"
nestedItems={journalMap.TASKS}
/>
</List>
</Container>
);
}

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

Loading…
Cancel
Save