123 link auth to form

client/actions/auth.js

@@ -1,5 +1,7 @@
 import {setToken} from '../utils/tokens'
-import {register as registerApi, signin as signinApi} from '../api/auth'
+import {registerApi} from '../api/auth'
+import {signin as signinApi} from '../api/auth'
+
 
 export const signinPending = _ => {
   return {
@@ -50,6 +52,7 @@ export const signin = (user) => dispatch => {
 }
 
 export const register = (user) => dispatch => {
+  console.log(user)
   dispatch(registerPending())
   return registerApi(user)
     .then(res => {

client/api/auth.js

@@ -2,7 +2,8 @@ import request from 'superagent'
 
 const url = 'http://localhost:3000/api/v1/auth'
 
-export function register (user) {
+export function registerApi (user) {
+  console.log('hello')
   return request
     .post(`${url}/register`)
     .send(user)
@@ -12,5 +13,6 @@ export function register (user) {
 export const signin = (user) => {
   return request
     .post(`${url}/signin`)
-    .send({ user })
-    .then(res => res.body)
+    .send(user)
+    .then(res => res.body)
+}

client/components/Dashboard.jsx

@@ -1,4 +1,3 @@
-
 import React, { Component } from 'react'
 import ProgressModule from './ProgressModule'
 import DropdownModule from './DropdownModule'
@@ -50,4 +49,4 @@ export default class Dashboard extends Component {
       </React.Fragment>
     )
   }
-}
+}

client/components/Register.jsx

@@ -1,46 +1,55 @@
 import React from 'react'
+import {connect} from 'react-redux'
 
-class Register extends React.Component {
-  constructor (props) {
-    super(props)
-    this.state = {
+import {register, registerError} from '../actions/auth'
+
+export class Register extends React.Component {
+    state = {
       name: '',
       surname: '',
-      hash: '',
-      role: '',
-      cohort: ''
+      password: ''
+      // role: '',
+      // cohort: ''
     }
 
-    this.handleChange = this.handleChange.bind(this)
-    this.handleSubmit = this.handleSubmit.bind(this)
-  }
+  registering = () => {
+    const { name, surname, password } = this.state
 
-  handleSubmit (evt) {
-    this.props.saveItem(this.state)
-    this.setState(this.state)
-    evt.preventDefault()
-  }
+    if(!name) {
+      return this.props.dispatch(registerFailure('Must provide name.'))
+    }
+    if(!surname) {
+      return this.props.dispatch(registerFailure('Must provide surname.'))
+    }
+    if(!password) {
+      return this.props.dispatch(registerFailure('Must provide email.'))
+    }
+
+    this.props.dispatch(register({name, surname, password}))
 
-  handleChange (evt) {
     this.setState({
-      [evt.target.name]: evt.target.value
+      name: '',
+      surname: '',
+      password: ''
     })
   }
 
-  resetForm (evt) {
+  handleChange = (event) => {
     this.setState({
-      item: this.state,
-      invalid: {}
+      [event.target.name]: event.target.value
     })
-    evt && evt.preventDefault()
   }
 
   render () {
+    console.log(this.state)
     return (
       <form>
         <label htmlFor='name'>First name</label>
         <br/>
-        <input type='text' placeholder='First name' name='name'
+        <input 
+          type='text' 
+          placeholder='First name' 
+          name='name'
           className='u-full-width'
           value={this.state.name}
           onChange={this.handleChange}
@@ -49,27 +58,55 @@ class Register extends React.Component {
         <br/>
         <label htmlFor='surname'>Surname</label>
         <br/>
-        <input type='text' placeholder='Last name' name='surname'
+        <input 
+          type='text' 
+          placeholder='Last name' 
+          name='surname'
           className='u-full-width'
-          value={this.state.name}
+          value={this.state.surname}
           onChange={this.handleChange}
         />
         <br/>
         <br/>
         <label htmlFor='hash'>Hash</label>
         <br/>
-        <input type='password' placeholder='Password' name='password'
+        <input 
+          type='password' 
+          placeholder='Password' 
+          name='password'
           className='u-full-width'
-          value={this.state.description}
+          value={this.state.password}
           onChange={this.handleChange}
         />
         <br/>
         <br/>
-        <label htmlFor='role'>Role</label>
+        <br/>
+        <button 
+          type='submit' 
+          className='button-primary' 
+          value='Add' 
+          onClick={this.registering}
+          >
+        Register</button>
+      </form>
+    )
+  }
+}
+
+const mapStateToProps = ({auth}) => {
+  return {
+    auth
+  }
+}
+
+export default connect(mapStateToProps)(Register)
+
+
+        {/* <label htmlFor='role'>Role</label>
         <br/>
         <select placeholder='Are you a student or a teacher?' name='role'
           className='u-full-width'
-          value={this.state.description}
+          value={this.state.role}
           onChange={this.handleChange}
         >
           <option value="student">Student</option>
@@ -78,19 +115,10 @@ class Register extends React.Component {
         <br/>
         <br/>
         {/* cohort will be a drop down box */}
-        <label htmlFor='cohort'>Cohort</label>
+        {/* <label htmlFor='cohort'>Cohort</label>
         <br/>
         <input type='text' name='cohort' placeholder='Your cohort'
           className='u-full-width'
-          value={this.state.description}
+          value={this.state.cohor}
           onChange={this.handleChange}
-        />
-        <br/>
-        <button type='submit' className='button-primary' value='Add' onSubmit={this.handleSubmit}
-          onClick={this.resetForm}>Register</button>
-      </form>
-    )
-  }
-}
-
-export default Register
+        />  */}

client/reducers/auth.js

@@ -1,5 +1,6 @@
 import {getToken} from '../utils/tokens'
 
+
 const initialState = {
   error: null,
   loggedIn: !!getToken(),

server/routes/auth.js

@@ -8,6 +8,7 @@ router.post('/register', register, token.issue)
 router.post('/login', validateLogin, checkUser, token.issue)
 
 function register (req, res, next) {
+  console.log(req.body)
   db.registerUser(req.body)
     .then(([id]) => {
       res.locals.userId = id