diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index b188b5f..d77e495 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -31,7 +31,9 @@ class UserController extends Controller
{
case Verify::SUCCESS:
#\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:
return redirect()->back()->with('error', 'Invalid credentials');
case Verify::DISABLED:
@@ -121,6 +123,16 @@ class UserController extends Controller
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.
*
diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png
index 4e68afa..0057edc 100644
Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ
diff --git a/app/Http/routes.php b/app/Http/routes.php
index e88ac61..c68d0b9 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -18,7 +18,7 @@ Route::get('/', ['as' => 'home', function () {
return redirect($video->id);
-}])->middleware('auth');
+}])/*->middleware('auth')*/;
Route::get('nojs', function() { return view('nojs'); });
@@ -145,7 +145,8 @@ Route::group(["middleware" => "theme"], function() {
# '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('{id}', 'VideoController@show')->where('id', '[0-9]+');
diff --git a/resources/views/layout1/login.blade.php b/resources/views/layout1/login.blade.php
index a0a6ed0..c86ddb7 100644
--- a/resources/views/layout1/login.blade.php
+++ b/resources/views/layout1/login.blade.php
@@ -30,4 +30,4 @@
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/layout1/partials/navigation.blade.php b/resources/views/layout1/partials/navigation.blade.php
index ba04871..ff7345e 100644
--- a/resources/views/layout1/partials/navigation.blade.php
+++ b/resources/views/layout1/partials/navigation.blade.php
@@ -7,9 +7,16 @@
+ @if(Auth::check())
-
-
+
+
+ @else
+
+
+
+ @endif
+