Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
This commit is contained in:
commit
8415338120
|
@ -7,6 +7,11 @@ use Illuminate\Http\Response;
|
|||
|
||||
class RootController extends Controller
|
||||
{
|
||||
function __construct()
|
||||
{
|
||||
$this->middleware("auth");
|
||||
}
|
||||
|
||||
public function index() {
|
||||
return Response::detect("root.index");
|
||||
}
|
||||
|
|
|
@ -200,7 +200,7 @@ class UserController extends Controller
|
|||
public function logout(Request $request) {
|
||||
Auth::logout();
|
||||
|
||||
return redirect()->route("root.index");
|
||||
return redirect()->route("users.login");
|
||||
}
|
||||
|
||||
/*******************************************/
|
||||
|
@ -211,8 +211,17 @@ class UserController extends Controller
|
|||
return Response::detect('users.forgot');
|
||||
}
|
||||
|
||||
public function forgot(){
|
||||
public function forgot(Request $request){
|
||||
$user = User::query()->where('email', '=', $request->email)->first();
|
||||
|
||||
if($user == null){
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
//Send email
|
||||
//TODO: Implement mail.
|
||||
|
||||
return redirect()->route('users.login');
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
use App\User;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class UserSeeder extends Seeder
|
||||
{
|
||||
|
@ -13,12 +14,19 @@ class UserSeeder extends Seeder
|
|||
public function run()
|
||||
{
|
||||
|
||||
try {
|
||||
if(User::findByName("admin"))
|
||||
// try {
|
||||
//
|
||||
// } catch (Exception $e) {
|
||||
// }
|
||||
|
||||
Log::debug("YEET");
|
||||
|
||||
if(User::where("name_first", "admin"))
|
||||
{
|
||||
return;
|
||||
} catch (Exception $e) {
|
||||
}
|
||||
|
||||
Log::debug("OPRET");
|
||||
$user = new \App\User();
|
||||
|
||||
$user->name_first = "admin";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@extends("app.layout.base")
|
||||
@extends("user.layout.base")
|
||||
|
||||
@section("title")
|
||||
Login
|
||||
|
|
|
@ -9,7 +9,8 @@
|
|||
<div class="brand">
|
||||
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
|
||||
</div>
|
||||
<form action="" method="post">
|
||||
<form action="{{ route("users.login") }}" method="post">
|
||||
@csrf
|
||||
<input class="appinput" type="email" name="email" placeholder="Email" required>
|
||||
<input class="appinput" type="password" name="password" placeholder="Password" required>
|
||||
<label class="toggle">
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
|
||||
</head>
|
||||
<body>
|
||||
<body style="background-color: #00788a;">
|
||||
@yield("content")
|
||||
|
||||
<script src="{{ mix("/js/app.js") }}"></script>
|
||||
|
|
Loading…
Reference in New Issue