Merge branch 'master' into morgans-tests

src/actions/index.js

@@ -1,23 +1,8 @@
-export const REGISTER = 'REGISTER';
 export const LOGIN = 'LOGIN';
 
-export const register = (username, password, displayName) => {
+export const login = (token) => {
     return {
-        type: REGISTER,
-        user: {
-            username,
-            displayName
-        }
+    type: LOGIN,
+    token: token,
     }
-}
-
-export const login = (username, token, userId) => {
-    return {
-        type: LOGIN,
-        user: {
-            username, 
-            token,
-            userId
-        }
-    }
-}
+};

src/components/DonorList.jsx

@@ -1,9 +1,10 @@
-import React from 'react'
-import { Item } from 'semantic-ui-react'
+import React from 'react';
+import { Item } from 'semantic-ui-react';
 
 class Donors extends React.Component {
     render () {
         return (
+
         <Item.Group>
           <Item>
             <Item.Content>
@@ -23,6 +24,7 @@ class Donors extends React.Component {
             </Item.Content>
           </Item>
         </Item.Group>
+
         )
     }
 }

src/components/Loginpage.jsx

@@ -3,6 +3,7 @@ import { withRouter } from 'react-router-dom';
 import { Button, Form } from 'semantic-ui-react';
 import Header from './Header.jsx';
 import LoggedInModal from './LoggedInModal';
+import { login } from '../actions';
 
 class Loginpage extends Component {
     state = {
@@ -21,19 +22,46 @@ class Loginpage extends Component {
     }
 
     handleRegistration = () => {
-        fetch("a url")
-            .then(response => response.json())
-            .then(data => {
-            })
-    }
-
-    handleLogin = () => {
-        // fetch("a url")
-        //     .then(response => response.json())
-        //     .then(data => {
-        //     })
-        this.setState({ loggedIn: true });
-    }
+        fetch("https://kwitter-api.herokuapp.com/auth/register", {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          mode: "cors",
+          body: JSON.stringify({
+            username: this.state.usernameRegistration,
+            password: this.state.passwordRegistration,
+          }),
+        })
+          .then(response => response.json())
+          .then(data => {
+            alert("You've been registered!")
+          })
+      }
+
+      handleLogin = () => {
+        fetch("https://kwitter-api.herokuapp.com/auth/login",
+          {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            mode: "cors",
+            body: JSON.stringify({
+              username: this.state.username,
+              password: this.state.password,
+            }),
+          })
+          .then(response => response.json())
+          .then(data => {
+            this.props.dispatch(login(data.token));
+            if (data.token) {
+              this.setState({ loggedIn: true });
+            } else {
+              alert("Please register first.");
+            }
+          })
+      }
 
     render() {
         const { username, password, emailRegistration, usernameRegistration, passwordRegistration } = this.state;
@@ -81,14 +109,6 @@ class Loginpage extends Component {
                         <Button type="submit" className="ui primary basic button">Register</Button>
                     </Form>
                 </div>
-                <div id='groupList' className="ui container">
-                    <h3 className='loginPageText'> Not-for-Profits you can help today! </h3>
-                    <ol>
-                        <li>Not for Profit</li>
-                        <li>Not for Profit</li>
-                        <li>Not for Profit</li>
-                    </ol>
-                </div>
             </React.Fragment>
         )
     }

src/components/Navigation.jsx

@@ -18,8 +18,9 @@ class Navigation extends Component {
                 <Sidebar className="color" as={Menu} animation='overlay' icon='labeled' inverted vertical visible width='thin'>
                     <Menu.Item as='a' href="/navigation/home"><Icon name='home' />Home</Menu.Item>
                     <Menu.Item as='a' href="/navigation/group"><Icon name='group' />Groups</Menu.Item>
-                    <Menu.Item as='a' href="/navigation/calendar"><Icon name='calendar alternate outline' />Calendar</Menu.Item>
+                    <Menu.Item as='a' href="/navigation/groupregister"><Icon name='plus' />Add Group</Menu.Item>
                     <Menu.Item as='a' href="/navigation/donorlist"><Icon name='caret square down outline' />Donor List</Menu.Item>
+                    <Menu.Item as='a' href="/navigation/calendar"><Icon name='calendar alternate outline' />Calendar</Menu.Item>
                 </Sidebar>
 
                 <Sidebar.Pusher>

src/index.js

@@ -5,10 +5,10 @@ import App from './App';
 import registerServiceWorker from './registerServiceWorker';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
-import foodFetchReducer from './reducers/reducer';
+import { reducer } from './reducers/';
 import { createStore } from "redux";
 
-const store = createStore(foodFetchReducer, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__())
+const store = createStore(reducer, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__())
 
 
 ReactDOM.render((

src/reducers/index.js

@@ -1,3 +1,17 @@
-// import reducer from './reducer.jsx'
+import { LOGIN } from '../actions';
 
-// export default reducer;
+const initialState = {
+    token: "",
+}
+export const reducer = (state = initialState, action) => {
+    switch (action.type) {
+        case LOGIN:
+            console.log(action.token)
+            return {
+                ...state,
+                token: action.token
+            }
+        default:
+            return state;
+    }
+};