diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index e048e86..6d6bf29 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -32,87 +32,39 @@ class UserController extends \BaseController
'email' => Input::get('email'),
'password' => Hash::make(\Input::get('password'))));
-
-
if($user->save())
{
$user_id = $user->id;
- return Redirect::to('users/group')->with('success', 'You have successfully registered')
- ->with('id', $user_id);
+ return Redirect::route('group', array('user_id' => $user_id));
+
}else
{
- return \Redirect::to('users/create')->with('errors', 'Something terrible happened');
+ return \Redirect::to('create')->with('errors', 'Something terrible happened');
}
}
}
/**
- * Display the mentor or mentee choice view
- * @return Response
+ * Display the two buttons for choosing between mentor and mentee
+ * @return View response
*/
- public function chooseGroup()
+ public function chooseGroup($user_id)
{
- return View::make('users.group');
+ return View::make('users.group')->with('user_id', $user_id);
}
- /**
- * Handles POST to complete user profile
- * @param int $id user id
- * @return Response
- */
- public function completeProfile($id)
+ public function completeRegistration()
{
- $user = User::find($id);
- return View::make('users.complete', array('user' => $user));
- }
+ $user_id = \Request::segment(3);
+ $group_id = \Request::segment(4);
- /**
- * Handles POST request to update user profile
- * @param $id of the user being updated
- * @return Response
- */
- public function saveProfile($id)
- {
- $user = User::find($id);
- }
+ $user = User::find($user_id);
+ return View::make('users.profile')->with('user', $user)->with('group_id', $group_id);
- /**
- * Display the view of a single user
- * @param $id user id to be displayed
- * @return Response
- */
- public function viewProfile($id)
- {
- $user = User::find($id);
-
- return View::make('users.profile', array('user' => $user));
- }
-
-
- /**
- * Display view to edit a given user
- * @param $id of the user being updated
- * @return Response
- */
- public function edit($id)
- {
- $user = User::find($id);
- return View::make('users.edit', array('user' => $user));
}
-
- /**
- * Handle POST request to delete a user
- * @param $id of the user to destroy
- * @return Response
- */
- public function destroy($id)
- {
- $user = User::destroy($id);
-
- }
}
\ No newline at end of file
diff --git a/app/routes.php b/app/routes.php
index ebb1f6c..215042e 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -24,15 +24,8 @@ Route::post('logout', array('uses' => 'SessionController@doLogout'));
*/
Route::get('users/create', array('as' => 'create', 'uses' => 'UserController@create'));
Route::post('users/store', array('uses' => 'UserController@store'));
-Route::put('users/{id}/update', array('before' => 'auth', 'as' => 'update', 'uses' => 'UserController@update'));
-Route::get('users/{id}/edit', array('before' => 'auth','uses' => 'UserController@edit'));
-Route::delete('users/{id}/delete', array('before' => 'auth','uses' => 'UserController@destroy'));
-Route::get('users/group', array('uses' => 'UserController@chooseGroup'));
-Route::get('users/{id}', array('uses' => 'UserController@viewProfile'));
-Route::post('users/{id}', array('uses' => 'UserController@updateProfile'));
-
-
-
+Route::get('users/group/{user_id}', array('as' => 'group', 'uses' => 'UserController@chooseGroup'));
+Route::get('users/group/{user_id}/{group_id}', array('as' => 'complete', 'uses' => 'UserController@completeRegistration'));
/**
* User Password Reminder Controller routes
@@ -41,11 +34,3 @@ Route::get('password/remind', array('uses' => 'RemindersController@getRemind'));
Route::post('password/remind', array('uses' => 'RemindersController@postRemind'));
Route::get('password/reset/{token}', array('uses' => 'RemindersController@getReset'));
Route::post('password/reset/{token}', array('uses' => 'RemindersController@postReset'));
-
-// App::missing(function($exception)
-// {
-// return View::make('home');
-// });
-
-
-
diff --git a/app/views/users/group.blade.php b/app/views/users/group.blade.php
index c60cb37..836caba 100644
--- a/app/views/users/group.blade.php
+++ b/app/views/users/group.blade.php
@@ -49,19 +49,22 @@
+
+
+
mentor - someone who teaches or gives help and advice to a less experienced and often younger person.(a friend of Odysseus entrusted with the education of Odysseus' son Telemachus)
mentee - a less experienced person (protege) who is offered special guidance and support by a respected and trusted person with more experience (a mentor)