From c074f32bbe9d8d0b859edd62ca7834393a81df14 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 30 Jun 2020 10:19:01 +0200 Subject: [PATCH] Fixes and implementation of forgot password --- .../app/Http/Controllers/UserController.php | 14 +++ skolehjem/public/css/admin.css | 20 ++++ skolehjem/public/css/webapp.css | 20 ++++ .../resources/sass/app/forms/_forms.scss | 5 + .../views/admin/users/forgot.blade.php | 18 ++++ .../views/admin/users/login.blade.php | 5 +- .../views/app/users/forgot.blade.php | 18 ++++ .../resources/views/app/users/login.blade.php | 5 +- .../resources/views/user/create.blade.php | 27 ----- .../views/user/layout/base.blade.php | 14 +++ skolehjem/resources/views/welcome.blade.php | 100 ------------------ skolehjem/routes/web.php | 3 +- 12 files changed, 115 insertions(+), 134 deletions(-) create mode 100644 skolehjem/resources/views/admin/users/forgot.blade.php create mode 100644 skolehjem/resources/views/app/users/forgot.blade.php delete mode 100644 skolehjem/resources/views/user/create.blade.php create mode 100644 skolehjem/resources/views/user/layout/base.blade.php delete mode 100644 skolehjem/resources/views/welcome.blade.php diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index ac5c34d..105dcb9 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -202,4 +202,18 @@ class UserController extends Controller return redirect()->route("root.index"); } + + /*******************************************/ + /* Forgot password */ + /*******************************************/ + + public function showForgot(){ + return Response::detect('users.forgot'); + } + + public function forgot(){ + + } + + } diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index 67294f5..c6b3a23 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -77,6 +77,26 @@ input.appinput { margin-bottom: 1rem; } +.appinput::-moz-placeholder { + opacity: 1; + color: white; +} + +.appinput:-ms-input-placeholder { + opacity: 1; + color: white; +} + +.appinput::-ms-input-placeholder { + opacity: 1; + color: white; +} + +.appinput::placeholder { + opacity: 1; + color: white; +} + .d-flex { display: flex; } diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index 4e077df..514644a 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -77,6 +77,26 @@ input.appinput { margin-bottom: 1rem; } +.appinput::-moz-placeholder { + opacity: 1; + color: white; +} + +.appinput:-ms-input-placeholder { + opacity: 1; + color: white; +} + +.appinput::-ms-input-placeholder { + opacity: 1; + color: white; +} + +.appinput::placeholder { + opacity: 1; + color: white; +} + .d-flex { display: flex; } diff --git a/skolehjem/resources/sass/app/forms/_forms.scss b/skolehjem/resources/sass/app/forms/_forms.scss index 15a89a7..15a1e8b 100644 --- a/skolehjem/resources/sass/app/forms/_forms.scss +++ b/skolehjem/resources/sass/app/forms/_forms.scss @@ -55,3 +55,8 @@ input.appinput { line-height: 2rem; margin-bottom: 1rem; } + +.appinput::placeholder { + opacity: 1; + color: white; +} diff --git a/skolehjem/resources/views/admin/users/forgot.blade.php b/skolehjem/resources/views/admin/users/forgot.blade.php new file mode 100644 index 0000000..4a4c0df --- /dev/null +++ b/skolehjem/resources/views/admin/users/forgot.blade.php @@ -0,0 +1,18 @@ +@extends("app.layout.base") + +@section("title") + Login +@endsection + +@section("content") +
+
+ Syddansk Erhvervsskole +
+
+ @csrf + + +
+
+@endsection diff --git a/skolehjem/resources/views/admin/users/login.blade.php b/skolehjem/resources/views/admin/users/login.blade.php index 5accdac..83333a2 100644 --- a/skolehjem/resources/views/admin/users/login.blade.php +++ b/skolehjem/resources/views/admin/users/login.blade.php @@ -1,4 +1,4 @@ -@extends("app.layout.base") +@extends("user.layout.base") @section("title") Login @@ -20,8 +20,7 @@ - - Forgot password? + Forgot password? @endsection diff --git a/skolehjem/resources/views/app/users/forgot.blade.php b/skolehjem/resources/views/app/users/forgot.blade.php new file mode 100644 index 0000000..286ff7b --- /dev/null +++ b/skolehjem/resources/views/app/users/forgot.blade.php @@ -0,0 +1,18 @@ +@extends("user.layout.base") + +@section("title") + Login +@endsection + +@section("content") +
+
+ Syddansk Erhvervsskole +
+
+ @csrf + + +
+
+@endsection diff --git a/skolehjem/resources/views/app/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php index 5d9ade1..aff8766 100644 --- a/skolehjem/resources/views/app/users/login.blade.php +++ b/skolehjem/resources/views/app/users/login.blade.php @@ -1,4 +1,4 @@ -@extends("app.layout.base") +@extends("user.layout.base") @section("title") Login @@ -19,8 +19,7 @@ - - Forgot password? + Forgot password? @endsection diff --git a/skolehjem/resources/views/user/create.blade.php b/skolehjem/resources/views/user/create.blade.php deleted file mode 100644 index ea07ef6..0000000 --- a/skolehjem/resources/views/user/create.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@extends('layout.base') - -@section("title") - Opret Bruger -@endsection - -@section('content') -
-
- @csrf - - - - - - - - - - - - - - -
-
-@endsection diff --git a/skolehjem/resources/views/user/layout/base.blade.php b/skolehjem/resources/views/user/layout/base.blade.php new file mode 100644 index 0000000..5fdc8e1 --- /dev/null +++ b/skolehjem/resources/views/user/layout/base.blade.php @@ -0,0 +1,14 @@ + + + + @yield("title") + + + + + @yield("content") + + + @yield("scripts") + + diff --git a/skolehjem/resources/views/welcome.blade.php b/skolehjem/resources/views/welcome.blade.php deleted file mode 100644 index 3fb48cc..0000000 --- a/skolehjem/resources/views/welcome.blade.php +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - -
-
- - diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 97c63aa..ce578ac 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -23,7 +23,8 @@ Route::get("/", "RootController@index")->name("root.index"); Route::get("/login", "UserController@showLogin")->name("users.show-login"); Route::post("/login", "UserController@login")->name("users.login"); Route::get("/logout", "UserController@logout")->name("users.logout"); - +Route::get("/forgot", "UserController@showForgot")->name("users.show-forgot"); +Route::post("/forgot", "UserController@forgot")->name("users.forgot"); Route::get("phones", "PhoneController@index")->name("phones.index");