From 8b438a81f6b5eb71a82ea96b90dd7496b77e59cf Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 12 Feb 2019 20:02:14 +0000
Subject: [PATCH] Prettify the journals page.

---
 src/Journals/JournalsList.tsx | 51 ++++++++++++++++++++++++-----------
 src/Journals/index.tsx        | 14 ----------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/Journals/JournalsList.tsx b/src/Journals/JournalsList.tsx
index 6a58887..9135904 100644
--- a/src/Journals/JournalsList.tsx
+++ b/src/Journals/JournalsList.tsx
@@ -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>
     );
   }
 
diff --git a/src/Journals/index.tsx b/src/Journals/index.tsx
index 940d6fc..e417db3 100644
--- a/src/Journals/index.tsx
+++ b/src/Journals/index.tsx
@@ -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}