mentors Commit Details

Date:

2014-06-26 22:00:58 (11 years 2 months ago)

Author:

Right Or Wrong

Branch:

develop

Commit:

ab86cfc30c5751ce47a86228c9c475f15254796d

Parents:

d48ec0c882cd6c9950041c7eda5ebfb10f1ace3b

Message:

added some code

Changes:

File differences

-48
49 49
50 50
51 
51
52 52
53 53
54 54
+␊
␉public function doLogout()␊
␉{␊
␉␉Auth::logout();␊
␉␉\Auth::logout();␊
␉␉return \Redirect::to('/');␊
␉}␊
␊
 ␊
 ␉public function doLogout()␊
 ␉{␊
-␉␉Auth::logout();␊
+␉␉\Auth::logout();␊
 ␉␉return \Redirect::to('/');␊
 ␉}␊
 ␊

-54
55 55
56 56
57 
57
58 58
59 59
60 60
+␉ */␊
␉public function chooseGroup()␊
␉{␊
␉␉return View::make('users.group')->with('id', array());␊
␉␉return View::make('users.group');␊
␉}␊
␊
␉/**␊
 ␉ */␊
 ␉public function chooseGroup()␊
 ␉{␊
-␉␉return View::make('users.group')->with('id', array());␊
+␉␉return View::make('users.group');␊
 ␉}␊
 ␊
 ␉/**␊

-15
16 16
17 17
18 
19 
18
19
20
21
20 22
21 23
22 24
+␉␉Schema::create('user_xref_role', function(Blueprint $table)␊
␉␉{␊
␉␉␉$table->increments('id');␊
␉␉␉$table->integer('user_id');␊
␉␉␉$table->integer('role_id');␊
␉␉␉$table->integer('user_id')->unsigned();␊
␉␉␉$table->foreign('user_id')->references('id')->on('users')->onUpdate('cascade');␊
␉␉␉$table->integer('role_id')->unsigned();␊
␉␉␉$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade');␊
␉␉␉$table->timestamps();␊
␉␉});␊
␉}␊
 ␉␉Schema::create('user_xref_role', function(Blueprint $table)␊
 ␉␉{␊
 ␉␉␉$table->increments('id');␊
-␉␉␉$table->integer('user_id');␊
-␉␉␉$table->integer('role_id');␊
+␉␉␉$table->integer('user_id')->unsigned();␊
+␉␉␉$table->foreign('user_id')->references('id')->on('users')->onUpdate('cascade');␊
+␉␉␉$table->integer('role_id')->unsigned();␊
+␉␉␉$table->foreign('role_id')->references('id')->on('roles')->onUpdate('cascade');␊
 ␉␉␉$table->timestamps();␊
 ␉␉});␊
 ␉}␊

-31
32 32
33 33
34 
35 34
36 
37 
38 
39 35
40 36
41 37
+Route::get('users/{id}', array('uses' => 'UserController@viewProfile'));␊
Route::post('users/{id}', array('uses' => 'UserController@updateProfile'));␊
␊
Route::get('choose', function(){ ␊
␊
␉return View::make('mentors.group');␊
␊
});␊
␊
␊
/**␊
 Route::get('users/{id}', array('uses' => 'UserController@viewProfile'));␊
 Route::post('users/{id}', array('uses' => 'UserController@updateProfile'));␊
 ␊
-Route::get('choose', function(){ ␊
 ␊
-␉return View::make('mentors.group');␊
-␊
-});␊
 ␊
 ␊
 /**␊

-35
36 36
37 37
38 
38
39 39
40 40
41 41
+␊
␉␉<div class="container padded">␊
␉␉␉<div class="container">␊
␉␉␉␉<legend><h2>Complete Your Profile</h2></legend>␊
␉␉␉␉<legend><h2>Complete Your Registration</h2></legend>␊
␉␉␉</div>␊
␉␉␊
␉␉␉<div class="row">␊
 ␊
 ␉␉<div class="container padded">␊
 ␉␉␉<div class="container">␊
-␉␉␉␉<legend><h2>Complete Your Profile</h2></legend>␊
+␉␉␉␉<legend><h2>Complete Your Registration</h2></legend>␊
 ␉␉␉</div>␊
 ␉␉␊
 ␉␉␉<div class="row">␊