fixed a bug in the authentication system, thx mr_sose
This commit is contained in:
@@ -31,7 +31,9 @@ class UserController extends Controller
|
|||||||
{
|
{
|
||||||
case Verify::SUCCESS:
|
case Verify::SUCCESS:
|
||||||
#\Session::put('background', auth()->user()->background);
|
#\Session::put('background', auth()->user()->background);
|
||||||
return redirect("/")->with('success', 'Login successful');
|
#return redirect("/main")->with('success', 'Login successful');
|
||||||
|
return redirect()->back()->with('success', 'Login successful');
|
||||||
|
#return back('/main')->with('success', 'Login successful');
|
||||||
case Verify::INVALID_CREDENTIALS:
|
case Verify::INVALID_CREDENTIALS:
|
||||||
return redirect()->back()->with('error', 'Invalid credentials');
|
return redirect()->back()->with('error', 'Invalid credentials');
|
||||||
case Verify::DISABLED:
|
case Verify::DISABLED:
|
||||||
@@ -121,6 +123,16 @@ class UserController extends Controller
|
|||||||
return view('apply');
|
return view('apply');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function loggain()
|
||||||
|
{
|
||||||
|
if(auth()->check()) {
|
||||||
|
\Session::reflash();
|
||||||
|
\Session::flash('info', 'Cannot login when logged in, lmao');
|
||||||
|
return redirect('/');
|
||||||
|
}
|
||||||
|
return view('login');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Store a newly created resource in storage.
|
* Store a newly created resource in storage.
|
||||||
*
|
*
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 545 KiB After Width: | Height: | Size: 771 B |
@@ -18,7 +18,7 @@ Route::get('/', ['as' => 'home', function () {
|
|||||||
|
|
||||||
return redirect($video->id);
|
return redirect($video->id);
|
||||||
|
|
||||||
}])->middleware('auth');
|
}])/*->middleware('auth')*/;
|
||||||
|
|
||||||
Route::get('nojs', function() { return view('nojs'); });
|
Route::get('nojs', function() { return view('nojs'); });
|
||||||
|
|
||||||
@@ -145,7 +145,8 @@ Route::group(["middleware" => "theme"], function() {
|
|||||||
# 'donations' => \App\Models\Donation::orderBy('timestamp', 'DESC')->get()
|
# 'donations' => \App\Models\Donation::orderBy('timestamp', 'DESC')->get()
|
||||||
# ]);
|
# ]);
|
||||||
#});
|
#});
|
||||||
Route::get('login', function() { return view('login'); });
|
#Route::get('login', function() { return view('login'); });
|
||||||
|
Route::get('login', 'UserController@loggain');
|
||||||
#Route::get('counter-strike', function() { return view('counter-strike'); });
|
#Route::get('counter-strike', function() { return view('counter-strike'); });
|
||||||
|
|
||||||
Route::get('{id}', 'VideoController@show')->where('id', '[0-9]+');
|
Route::get('{id}', 'VideoController@show')->where('id', '[0-9]+');
|
||||||
|
@@ -30,4 +30,4 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@endsection
|
@endsection
|
@@ -7,9 +7,16 @@
|
|||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
|
@if(Auth::check())
|
||||||
<a class="navbar-brand" href="/main">
|
<a class="navbar-brand" href="/main">
|
||||||
<img src="{{ asset('logo.svg') }}" alt="w0bm.com">
|
<img src="{{ asset('logo.svg') }}" alt="w0bm.com">
|
||||||
</a>
|
</a>
|
||||||
|
@else
|
||||||
|
<a class="navbar-brand" href="/">
|
||||||
|
<img src="{{ asset('logo.svg') }}" alt="w0bm.com">
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class=" collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class=" collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
|
@@ -137,9 +137,29 @@
|
|||||||
|
|
||||||
@else
|
@else
|
||||||
{{$video->tesThumb()}}
|
{{$video->tesThumb()}}
|
||||||
|
{{--<a href="#" data-toggle="modal" data-target="#loginmodal"><i class="fa fa-sign-in"></i> Login</a>
|
||||||
|
@include('partials.loginmodal') --}}
|
||||||
<div class="centershock" style="text-align: center;">
|
<div class="centershock" style="text-align: center;">
|
||||||
<p class="forbidden">403 - Forbidden</p>
|
<p class="forbidden">403 - Forbidden</p>
|
||||||
<p class="loginlol"><a href="/login">login</a> to watch this webbum</p>
|
<div class="wrap-collabsible">
|
||||||
|
<input id="collapsible" class="toggle" type="checkbox">
|
||||||
|
<label for="collapsible" class="lbl-toggle">Login</label>
|
||||||
|
<div class="collapsible-content">
|
||||||
|
<div class="content-inner">
|
||||||
|
<div class="centered">
|
||||||
|
<form action="{{action('UserController@login')}}" method="post" class="form-signin">
|
||||||
|
{!! csrf_field() !!}
|
||||||
|
<input type="text" name="identifier" placeholder="Username" class="form-control">
|
||||||
|
<input type="password" name="password" placeholder="Password" class="form-control">
|
||||||
|
<input type="checkbox" name="remember" checked> Remember me<br>
|
||||||
|
<button type="submit" class="btn btn-primary">Login</button>
|
||||||
|
<a href="{{url('register')}}" class="btn btn-success disabled">Register</a>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<p>w0bm now supports a javascript free experience, check it out if you dont like js that much</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="media">
|
<div class="media">
|
||||||
<div class="media-left media-middle">
|
<div class="media-left media-middle">
|
||||||
|
Reference in New Issue
Block a user