Skip to content

Commit

Permalink
Edited login views
Browse files Browse the repository at this point in the history
solved caching issue: permissions for storage
Added a favicon
  • Loading branch information
zalsader committed Sep 23, 2015
1 parent 1f22407 commit 0c9bf25
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 20 deletions.
11 changes: 6 additions & 5 deletions app/Http/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
*/

Route::get('/','HomeController@home');

Route::get('/leaderboard','HomeController@leaderboard');
Route::get('login','Auth\AuthController@getLogin');
Route::post('login','Auth\AuthController@postLogin');
Route::get('signup','Auth\AuthController@getRegister');
Route::post('signup','Auth\AuthController@postRegister');
Route::get('logout', 'Auth\AuthController@getLogout');
Route::get('login', ['as' => 'loginGet', 'uses' => 'Auth\AuthController@getLogin']);
Route::post('login', ['as' => 'loginPost', 'uses' => 'Auth\AuthController@postLogin']);
Route::get('signup', ['as' => 'signupGet', 'uses' => 'Auth\AuthController@getRegister']);
Route::post('signup', ['as' => 'signupPost', 'uses' => 'Auth\AuthController@postRegister']);
Route::get('logout', ['as' => 'logoutGet', 'uses' => 'Auth\AuthController@getLogout']);
Route::group(['middleware' => 'auth'], function($router){
$router->resource('profile','ProfileController');
Route::group(['as' => 'Submission::', 'prefix' => 'question/{questionId}'], function($r){
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
Empty file modified public/index.php
100644 → 100755
Empty file.
Empty file modified public/robots.txt
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion resources/views/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<br>
<br>
<h4>Welcome {{\Auth::user()->name}}!</h4>
<a href="{{url('logout')}}" class="btn btn-danger">log out</a>
<a href="{{route('logoutGet')}}" class="btn btn-danger">log out</a>
</div>
</div>
<hr class="clear">
Expand Down
24 changes: 15 additions & 9 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,28 @@
</tr>
@endif
</table>
<div class="input-group col-xs-4">
<div class="form-group">
<div class="input-group col-xs-12 col-md-4 col-md-offset-4">
<span class="input-group-addon" id="basic-addon1" style="width:140px">Email</span>
<input name="email" type="text" class="form-control" placeholder="e.g.: ex@example.com" aria-describedby="basic-addon1" value="{{old('email')}}">
</div>
<br>
<div class="input-group col-xs-4">
</div>
<div class="form-group">
<div class="input-group col-xs-12 col-md-4 col-md-offset-4">
<span class="input-group-addon" id="basic-addon1" style="width:140px">Password</span>
<input name = "password" type="password" class="form-control" aria-describedby="basic-addon1">
</div>
<br>
<button type="submit" class="col-xs-4 col-xs-offset-4 btn btn-info">Sign in</button>
</div>
<div class="form-group">
<button type="submit" class="col-xs-12 col-md-4 col-md-offset-4 btn btn-info">Sign in</button>
</div>
</form>
<br><br><br>
<p class="col-xs-4 col-lg-offset-4">Don't have account? then
<a href="{{url('signup')}}">sign up</a>
<br/>
<br>
<div class="row">
<p class="col-xs-12 col-md-4 col-md-offset-4">Don't have account? then
<a href="{{route('signupGet')}}">sign up</a>
</div>
<br>
<br>
<br>
@stop
2 changes: 1 addition & 1 deletion resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@section('content')

<form action="{{url('signup')}}" method="POST">
<form action="{{route('signupPost')}}" method="POST">
{!! csrf_field() !!}
<table class="table" style="width:50%; margin:0 auto">
@if(count($errors)>0)
Expand Down
16 changes: 12 additions & 4 deletions resources/views/embrace.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,24 @@
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" media="all" rel="stylesheet" />
</head>
<body>
<center>
<div class="container">
<div class="row">
<div class="col-xs-offset-4">
<a href="{{url('/')}}"><img src="{{url('images/TLAP.jpg')}}" width="350px"></a>
</div>
</div>

@yield('content')

<br>
<br>
</center>
</div>
<hr>
<a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/SBLogo.png')}}" width="150px" class="col-lg-offset-4"></a>
<a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/cs.jpg')}}" width="150px" class="col-lg-offset-1"></a>
<div class="container">
<div class="row">
<a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/SBLogo.png')}}" width="150px" class="col-xs-offset- col-sm-offset-4"></a>
<a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/cs.jpg')}}" width="150px" class="col-xs-offset-1"></a>
</div>
</div>
</body>
</html>
Empty file modified storage/app/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/cache/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/sessions/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/framework/views/.gitignore
100644 → 100755
Empty file.
Empty file modified storage/logs/.gitignore
100644 → 100755
Empty file.

0 comments on commit 0c9bf25

Please sign in to comment.