#97 Added new route and navbar button to studyGroup Form

jacobrs · Mar 5, 2017 · 26bd530 · 26bd530
1 parent f977759
commit 26bd530
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/client/modules/App/components/Header/Header.js b/client/modules/App/components/Header/Header.js
@@ -32,9 +32,12 @@ export class Header extends Component {
         </div>
         <div className="collapse navbar-collapse" id="navbarNav">
           <ul className={`nav navbar-nav ${styles.right}`}>
+          <li className="nav-item active">
+              <Link className={`nav-link ${styles['nav-links-inline']}`} to="/registerGroup">Create Study Group</Link>
+            </li>
             <li className="nav-item active">
               <i className={`${styles['small-nav-icon']} fa fa-home`} aria-hidden="true"></i>
-              <Link className={`nav-link ${styles['nav-links-inline']}`}>Home</Link>
+              <Link className={`nav-link ${styles['nav-links-inline']}`} to="/profile">Home</Link>
             </li>
             <li className="nav-item" id={styles.signout}>
               <Link onClick={this.handleLogout} className={`nav-link ${styles['nav-links-inline']}`}>Sign Out</Link>

diff --git a/client/modules/User/UserActions.js b/client/modules/User/UserActions.js
@@ -133,7 +133,7 @@ export function logoutUserRequest() {
 
 export function createStudyGroup(studyGroup) {
   console.log(studyGroup);
-  browserHistory.replace('/');
+  browserHistory.replace('/profile');
   return {
     type: CREATE_GROUP,
     studyGroup,

diff --git a/client/modules/User/components/UserRegistrationForm/UserRegistrationForm.js b/client/modules/User/components/UserRegistrationForm/UserRegistrationForm.js
@@ -32,8 +32,8 @@ export class UserRegistrationForm extends Component {
   addUser = (e) => {
     console.log(this.state);
     if (this.state.nickname && this.state.studentId && this.state.email && this.state.password) {
-      this.props.addUser(this.state.nickname, this.state.studentId, this.state.email, this.state.password);
       this.notifyUser();
+      this.props.addUser(this.state.nickname, this.state.studentId, this.state.email, this.state.password);
       this.setState({ nickname: '', studentId: '', email: '', password: '' });
       //To stop the page from refreshing
       e.preventDefault();

diff --git a/client/modules/User/components/UserStudyGroupForm/UserStudyGroupForm.js b/client/modules/User/components/UserStudyGroupForm/UserStudyGroupForm.js
@@ -3,7 +3,7 @@ import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import Validation from 'react-validation';
 
 import Valid from '../FormComponents/Validator';
-import styles from './UserRegistrationForm.css';
+import styles from './UserStudyGroupForm.css';
 
 export class UserStudyGroupForm extends Component {
   constructor(props) {

diff --git a/client/routes.js b/client/routes.js
@@ -4,6 +4,7 @@ import { Route, IndexRoute } from 'react-router';
 import App from './modules/App/App';
 import UserDashboardPage from './modules/User/pages/UserDashboardPage/UserDashboardPage';
 import UserRegistrationPage from './modules/User/pages/UserRegistrationPage/UserRegistrationPage';
+import UserStudyGroupPage from './modules/User/pages/UserStudyGroupPage/UserStudyGroupPage';
 
 // require.ensure polyfill for node
 if (typeof require.ensure !== 'function') {
@@ -32,6 +33,7 @@ export default (
         });
       }}
     />
+    <Route path="/registerGroup" component={UserStudyGroupPage} />
     <Route path="/register" component={UserRegistrationPage} />
     <Route path="/profile" component={UserDashboardPage} />
   </Route>