From f4ae08839ba77f4c0ed3a0b6c5d0e68ecd03e32c Mon Sep 17 00:00:00 2001 From: NoNameGuy Date: Fri, 8 Sep 2017 15:19:48 +0100 Subject: [PATCH] Verification mail Bug solved --- .../Auth/ResetPasswordController.php | 4 +- laravel/config/app.php | 2 +- .../views/auth/passwords/email.blade.php | 11 +-- laravel/resources/views/layouts/app.blade.php | 96 ++++--------------- 4 files changed, 29 insertions(+), 84 deletions(-) diff --git a/laravel/app/Http/Controllers/Auth/ResetPasswordController.php b/laravel/app/Http/Controllers/Auth/ResetPasswordController.php index cf726ee..331308b 100644 --- a/laravel/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/laravel/app/Http/Controllers/Auth/ResetPasswordController.php @@ -25,7 +25,7 @@ class ResetPasswordController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/'; /** * Create a new controller instance. @@ -36,4 +36,6 @@ class ResetPasswordController extends Controller { $this->middleware('guest'); } + + } diff --git a/laravel/config/app.php b/laravel/config/app.php index 56883c9..562485a 100644 --- a/laravel/config/app.php +++ b/laravel/config/app.php @@ -51,7 +51,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://localhost'), + 'url' => env('APP_URL', 'http://geocomb.app'), /* |-------------------------------------------------------------------------- diff --git a/laravel/resources/views/auth/passwords/email.blade.php b/laravel/resources/views/auth/passwords/email.blade.php index e566cfb..140bd0a 100644 --- a/laravel/resources/views/auth/passwords/email.blade.php +++ b/laravel/resources/views/auth/passwords/email.blade.php @@ -1,12 +1,9 @@ @extends('layouts.app') - @section('content') -
-
-
-
-
Reset Password
-
+@include('header') +
+

Reset Password

+
@if (session('status'))
{{ session('status') }} diff --git a/laravel/resources/views/layouts/app.blade.php b/laravel/resources/views/layouts/app.blade.php index 7e0b0df..5490e18 100644 --- a/laravel/resources/views/layouts/app.blade.php +++ b/laravel/resources/views/layouts/app.blade.php @@ -1,80 +1,26 @@ - - - - - - +@if (!Auth::guest()) +
  • + + +
    • +@endif + +
    +
    + - - - - {{ config('app.name', 'Laravel') }} - - - - - -
    - - - @yield('content') -
    +@yield('content') +
    - +