Merge pull request #5 from hedgepigdaniel/cleanup

Cleanup
faceyspacey · Oct 13, 2017 · ecfe9d0 · ecfe9d0
2 parents e7c14bd + dbd75fa
commit ecfe9d0
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 33 deletions.
diff --git 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(
-    `<!doctype html>
-      <html>
+    `<html>
         <head>
           <meta charset="utf-8">
-          <title>redux-first-router-demo</title>
+          <title>gnome-blockchains-demo</title>
           ${styles}
           <link rel="stylesheet prefetch" href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
         </head>

diff --git 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 = () =>
-  <div>
-    <label htmlFor='MettingDate'> Meeting Date </label>
-    <DateTimePicker />
-    <div>
+  <div className={styles.meetingAgenda}>
+    <div className={styles.meetingDateDiv}>
+      <div>
+        <label htmlFor='MettingDate' className='meetingDateLabel'>
+          {' '}Meeting Date
+          <DateTimePicker />
+        </label>
+      </div>
+    </div>
+    <div className={styles.meetingTableWrapper}>
       <MeetingTable />
-      <button>Add another </button>
+      <button>Submit</button>
     </div>
   </div>
 

diff --git 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 = () =>
-  <div>
+  <div className={styles.datetimePicker}>
     <DateTime />
   </div>
 

diff --git 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 = () =>
-  <div>
-    <div>
-      <label htmlFor='MettingPoint'>Meeting point</label>
-      <input />
+  <div className={styles.meetingTable}>
+    <div className={styles.meetingRows}>
+      <label htmlFor='MettingPoint' className={styles.meetingLabels}>
+        Meeting point
+      </label>
+      <input className='form-control' />
     </div>
-    <div>
-      <label htmlFor='ShortDesc'> Short Desc </label>
-      <textarea />
+    <div className={styles.meetingRows}>
+      <label htmlFor='ShortDesc' className={styles.meetingLabels}>
+        {' '}Short Desc{' '}
+      </label>
+      <textarea className='form-control' />
     </div>
-    <div>
-      <label htmlFor='NumVotes'> Num of votes reqd </label>
+    <div className={styles.meetingRows}>
+      <label htmlFor='NumVotes' className={styles.meetingLabels}>
+        {' '}Num of votes reqd{' '}
+      </label>
       <input />
     </div>
   </div>

diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
@@ -10,21 +10,6 @@ const Sidebar = ({ onClick, path }) =>
 
     <NavLink activeClassName={styles.active} exact to='/'>HOME</NavLink>
 
-    <NavLink activeClassName={styles.active} to='/list/db-graphql'>
-      DB & GRAPHQL
-    </NavLink>
-
-    <NavLink activeClassName={styles.active} to={['list', 'react-redux']}>
-      REACT & REDUX
-    </NavLink>
-
-    <NavLink
-      activeClassName={styles.active}
-      to={{ type: 'LIST', payload: { category: 'fp' } }}
-    >
-      FP
-    </NavLink>
-
     <div style={{ height: 14 }} />
 
     <NavLink

diff --git a/src/css/DatetimePick.css b/src/css/DatetimePick.css
@@ -0,0 +1,27 @@
+.datetimePicker {
+  display: inline-block;
+  width: 250px;
+  margin-bottom: 0;
+  margin-left: 4%;
+  &.input-append, &.input-prepend {
+    font-size: inherit; /* override bootstrap2 insanity */
+  }
+
+  .rdt {
+    display: inline-block;
+
+    .form-control {
+      border-radius: 0;
+    }
+
+    .rdtPicker {
+      .rdtSwitch, .rdtTimeToggle {
+        background-color: #f8f8f8;
+
+        &:hover {
+          background-color: #eee;
+        }
+      }
+    }
+  }
+}
diff --git a/src/css/MeetingAgenda.css b/src/css/MeetingAgenda.css
@@ -0,0 +1,14 @@
+.meetingAgenda {
+
+}
+
+.meetingDateDiv  {
+   margin-top: 5%;
+   margin-left: 15%;
+}
+
+.meetingTableWrapper {
+   margin: 1%
+}
+
+
diff --git a/src/css/MeetingTable.css b/src/css/MeetingTable.css
@@ -0,0 +1,25 @@
+.meetingTable {
+
+}
+
+.meetingRows {
+    margin-left: 18%;
+    padding: 1%;
+}
+
+.meetingLabels {
+    margin-right: 1%;
+    padding: 1%;
+}
+.meetingPoint {
+
+}
+
+.meetingShortDesc {
+
+}
+
+.meetingVotes {
+
+}
+