From 5aef65f44c4ec3364152d5ef52cad9f599a4765d Mon Sep 17 00:00:00 2001 From: anish Date: Fri, 13 Oct 2017 14:28:52 +1100 Subject: [PATCH 1/2] Cleanup --- server/render.js | 6 +++--- src/components/Admin.js | 17 ++++++++++++----- src/components/DateTimePicker.js | 4 +++- src/components/MeetingTable.js | 25 ++++++++++++++++--------- src/components/Sidebar.js | 15 --------------- 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/server/render.js b/server/render.js index c1c2dfb..fd937f2 100644 --- a/server/render.js +++ b/server/render.js @@ -4,6 +4,7 @@ import { Provider } from 'react-redux' import { flushChunkNames } from 'react-universal-component/server' import flushChunks from 'webpack-flush-chunks' import configureStore from './configureStore' + import App from '../src/components/App' export default ({ clientStats }) => async (req, res, next) => { @@ -20,11 +21,10 @@ export default ({ clientStats }) => async (req, res, next) => { console.log('CHUNK NAMES', chunkNames) return res.send( - ` - + ` - redux-first-router-demo + gnome-blockchains-demo ${styles} diff --git a/src/components/Admin.js b/src/components/Admin.js index 6d9debf..e888e17 100644 --- a/src/components/Admin.js +++ b/src/components/Admin.js @@ -1,16 +1,23 @@ import React from 'react' import { admin } from '../css/Switcher' +import styles from '../css/MeetingAgenda' import DateTimePicker from './DateTimePicker' import MeetingTable from './MeetingTable' const MeetingAgenda = () => -
- - -
+
+
+
+ +
+
+
- +
diff --git a/src/components/DateTimePicker.js b/src/components/DateTimePicker.js index 6c43c9c..5a87458 100644 --- a/src/components/DateTimePicker.js +++ b/src/components/DateTimePicker.js @@ -1,8 +1,10 @@ import React from 'react' import DateTime from 'react-datetime' +import styles from '../css/DatetimePick' + const DateTimePicker = () => -
+
diff --git a/src/components/MeetingTable.js b/src/components/MeetingTable.js index 5ab3568..3c22e96 100644 --- a/src/components/MeetingTable.js +++ b/src/components/MeetingTable.js @@ -1,17 +1,24 @@ import React from 'react' +import styles from '../css/MeetingTable' const MeetingTable = () => -
-
- - +
+
+ +
-
- -