mentors Commit Details

Date:

2014-07-06 23:54:01 (11 years 4 months ago)

Author:

Right Or Wrong

Branch:

develop

Commit:

42af084481b7ad8e29c5c76c0ac3b69c1d7bbb03

Parents:

9c6e30d77d84872a58be700f398f66373d8540db

Message:

did some cleanup here and there

Changes:

File differences

-47
48 48
49 49
50 
50
51 51
52 52
53 53
... ...
60 60
61 61
62 62
63 
63
64 64
65 65
66 66
+␉␉␉␉} else {␉ ␉␊
␊
␉␉␉␉␉Session::flash('message', 'You entered the wrong email or password. Try again!');␊
␉␉␉␉␉return \Redirect::to('login');␊
␉␉␉␉␉return Redirect::to('login')->with('email', Input::get('email'));␊
␊
␉␉␉␉}␊
␉␉␉}else␊

␉␉␉␉} else {␉ ␉␊
␊
␉␉␉␉␉Session::flash('message', 'You entered the wrong email or password. Try again!');␊
␉␉␉␉␉return \Redirect::to('login');␊
␉␉␉␉␉return Redirect::to('login')->with('email', Input::get('email'));␊
␊
␉␉␉␉}␊
␉␉␉}␊
 ...
 ␉␉␉␉} else {␉ ␉␊
 ␊
 ␉␉␉␉␉Session::flash('message', 'You entered the wrong email or password. Try again!');␊
-␉␉␉␉␉return \Redirect::to('login');␊
+␉␉␉␉␉return Redirect::to('login')->with('email', Input::get('email'));␊
 ␊
 ␉␉␉␉}␊
 ␉␉␉}else␊
 ␉␉␉␉} else {␉ ␉␊
 ␊
 ␉␉␉␉␉Session::flash('message', 'You entered the wrong email or password. Try again!');␊
-␉␉␉␉␉return \Redirect::to('login');␊
+␉␉␉␉␉return Redirect::to('login')->with('email', Input::get('email'));␊
 ␊
 ␉␉␉␉}␊
 ␉␉␉}␊

-37
38 38
39 39
40 
41 
42 
43 
44 
45 40
41
46 42
47 43
48 44
+␉Route::get('users', array('as' => 'users', 'uses' => 'UserController@index'));␊
␉Route::get('mentors', array('as' => 'mentors', 'uses' => 'UserController@mentors'));␊
␉Route::get('mentees', array('as' => 'mentees', 'uses' => 'UserController@mentees'));␊
␊
});␊
␊
Route::group(array('before' => 'auth'), function()␊
{␊
␉Route::resource('projects', 'ProjectsController');␊
␊
});␊
␊
/**␊
 ␉Route::get('users', array('as' => 'users', 'uses' => 'UserController@index'));␊
 ␉Route::get('mentors', array('as' => 'mentors', 'uses' => 'UserController@mentors'));␊
 ␉Route::get('mentees', array('as' => 'mentees', 'uses' => 'UserController@mentees'));␊
-␊
-});␊
-␊
-Route::group(array('before' => 'auth'), function()␊
-{␊
 ␉Route::resource('projects', 'ProjectsController');␊
+␊
 });␊
 ␊
 /**␊

-51
52 52
53 53
54 
54
55 55
56 56
57 57
+␉␉␉␉<div class="control-group">␊
␉␉␉  ␉ {{ Form::label('email', 'Email', array('class' => 'control-label')) }}␊
␉␉␉    <div class="controls">␊
␉␉␉␉  {{ Form::text('email', \Input::old('email'), array('class' => 'form-control borderd input-large', 'span' => 'span6', 'placeholder' => 'awesome@awesome.com'))}} <p class="alert-error pull-right">{{ $errors->first('email') }}</p>␊
␉␉␉␉  {{ Form::text('email', Input::old('email'), array('class' => 'form-control borderd input-large', 'span' => 'span6', 'placeholder' => 'awesome@awesome.com'))}} <p class="alert-error pull-right">{{ $errors->first('email') }}</p>␊
␉␉␉    </div>␊
␉␉␉  </div>␊
␉␉␉  <div class="control-group">␊
 ␉␉␉␉<div class="control-group">␊
 ␉␉␉  ␉ {{ Form::label('email', 'Email', array('class' => 'control-label')) }}␊
 ␉␉␉    <div class="controls">␊
-␉␉␉␉  {{ Form::text('email', \Input::old('email'), array('class' => 'form-control borderd input-large', 'span' => 'span6', 'placeholder' => 'awesome@awesome.com'))}} <p class="alert-error pull-right">{{ $errors->first('email') }}</p>␊
+␉␉␉␉  {{ Form::text('email', Input::old('email'), array('class' => 'form-control borderd input-large', 'span' => 'span6', 'placeholder' => 'awesome@awesome.com'))}} <p class="alert-error pull-right">{{ $errors->first('email') }}</p>␊
 ␉␉␉    </div>␊
 ␉␉␉  </div>␊
 ␉␉␉  <div class="control-group">␊

Download the corresponding diff file

mentors

File differences

Branches