vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

This commit is contained in:
Vedde 2020-06-30 10:57:36 +02:00
parent 5b36a52320 bc862a2303
commit 8415338120
6 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skolehjem/app/Http/Controllers/RootController.php
View File

@ -7,6 +7,11 @@ use Illuminate\Http\Response;
class RootController extends Controller class RootController extends Controller
{ {
function __construct()
{
$this->middleware("auth");
}
public function index() { public function index() {
return Response::detect("root.index"); return Response::detect("root.index");
} }

13
skolehjem/app/Http/Controllers/UserController.php
View File

@ -200,7 +200,7 @@ class UserController extends Controller
public function logout(Request $request) { public function logout(Request $request) {
Auth::logout(); 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'); 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');
} }

16
skolehjem/database/seeds/UserSeeder.php
View File

@ -2,6 +2,7 @@
use App\User; use App\User;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Log;
class UserSeeder extends Seeder class UserSeeder extends Seeder
{ {
@ -13,12 +14,19 @@ class UserSeeder extends Seeder
public function run() public function run()
{ {
try { // try {
if(User::findByName("admin")) //
return; // } catch (Exception $e) {
} catch (Exception $e) { // }
Log::debug("YEET");
if(User::where("name_first", "admin"))
{
return;
} }
Log::debug("OPRET");
$user = new \App\User(); $user = new \App\User();
$user->name_first = "admin"; $user->name_first = "admin";

2
skolehjem/resources/views/admin/users/forgot.blade.php
View File

@ -1,4 +1,4 @@
@extends("app.layout.base") @extends("user.layout.base")
@section("title") @section("title")
Login Login

3
skolehjem/resources/views/app/users/login.blade.php
View File

@ -9,7 +9,8 @@
<div class="brand"> <div class="brand">
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole"> <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
</div> </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="email" name="email" placeholder="Email" required>
<input class="appinput" type="password" name="password" placeholder="Password" required> <input class="appinput" type="password" name="password" placeholder="Password" required>
<label class="toggle"> <label class="toggle">

2
skolehjem/resources/views/user/layout/base.blade.php
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}"> <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head> </head>
<body> <body style="background-color: #00788a;">
@yield("content") @yield("content")
<script src="{{ mix("/js/app.js") }}"></script> <script src="{{ mix("/js/app.js") }}"></script>