diff --git a/remember_laravel/app/Http/Controllers/Auth/LoginController.php b/remember_laravel/app/Http/Controllers/Auth/LoginController.php index b2ea669a0d282114a7875ffe769da416a0c7f18e..91d32f1bba5ef59058bcebd015a2c5fa10d7163d 100644 --- a/remember_laravel/app/Http/Controllers/Auth/LoginController.php +++ b/remember_laravel/app/Http/Controllers/Auth/LoginController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers\Auth; +use Auth; +use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; @@ -25,7 +27,7 @@ class LoginController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/dashboard'; /** * Create a new controller instance. @@ -36,4 +38,12 @@ class LoginController extends Controller { $this->middleware('guest')->except('logout'); } + + public function logout(Request $request) + { + Auth::logout(); + + return redirect('/'); + } } + diff --git a/remember_laravel/app/Http/Controllers/Auth/RegisterController.php b/remember_laravel/app/Http/Controllers/Auth/RegisterController.php index 0e8d66aa16c7e1fdea43e20a70a87a36ed2d967b..a174507ce9abcd61d63f9d534e2764ff919313dc 100644 --- a/remember_laravel/app/Http/Controllers/Auth/RegisterController.php +++ b/remember_laravel/app/Http/Controllers/Auth/RegisterController.php @@ -28,7 +28,7 @@ class RegisterController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/'; /** * Create a new controller instance. diff --git a/remember_laravel/app/Http/Controllers/Auth/ResetPasswordController.php b/remember_laravel/app/Http/Controllers/Auth/ResetPasswordController.php index cf726eecdfe76d0b0e4bd02e42df02c7c31f8bd1..2c863aa6b54ab5df5629330e804db10b4eb2fa3a 100644 --- a/remember_laravel/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/remember_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. diff --git a/remember_laravel/app/Http/Controllers/Auth/VerificationController.php b/remember_laravel/app/Http/Controllers/Auth/VerificationController.php index 23a43a84d73cf713768c8382731fe4b504b03314..22aaf00666f82c5ab90729dcdb67c154be8de822 100644 --- a/remember_laravel/app/Http/Controllers/Auth/VerificationController.php +++ b/remember_laravel/app/Http/Controllers/Auth/VerificationController.php @@ -25,7 +25,7 @@ class VerificationController extends Controller * * @var string */ - protected $redirectTo = '/home'; + protected $redirectTo = '/'; /** * Create a new controller instance. diff --git a/remember_laravel/public/css/dashboard/pages.css b/remember_laravel/public/css/dashboard/pages.css index fe452a257db4dab900458974c266c37db6d32a99..992f0a9e75ea5aa7e0e50f6d685293f5a8cb2ea7 100644 --- a/remember_laravel/public/css/dashboard/pages.css +++ b/remember_laravel/public/css/dashboard/pages.css @@ -1874,7 +1874,7 @@ File: Pages Accounts pages ============= */ .account-pages { - background: url("../images/agsquare.png"); + background: url("../../storage/images/agsquare.png"); position: absolute; height: 100%; width: 100%; diff --git a/remember_laravel/resources/views/auth/app.blade.php b/remember_laravel/resources/views/auth/app.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..c1cfc0a3783fa834fc990735a69f84a8a7b70067 --- /dev/null +++ b/remember_laravel/resources/views/auth/app.blade.php @@ -0,0 +1,61 @@ +<!DOCTYPE html> +<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content="Remember PET"> + <meta name="author" content="PET Computação UFPR"> + <title>{{ config('app.name', 'Laravel') }}</title> + + <!-- CSRF Token --> + <meta name="csrf-token" content="{{ csrf_token() }}"> + + <!-- Styles --> + + <link href="{{ asset('css/dashboard/bootstrap.min.css') }}" rel="stylesheet" type="text/css" /> + <link href="{{ asset('css/dashboard/core.css') }}" rel="stylesheet" type="text/css" /> + <link href="{{ asset('css/dashboard/components.css') }}" rel="stylesheet" type="text/css" /> + <link href="{{ asset('css/dashboard/icons.css') }}" rel="stylesheet" type="text/css" /> + <link href="{{ asset('css/dashboard/pages.css') }}" rel="stylesheet" type="text/css" /> + <link href="{{ asset('css/dashboard/responsive.css') }}" rel="stylesheet" type="text/css" /> + + <!-- HTML5 Shiv and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> + <![endif]--> + + <!-- Scripts --> + <script src="{{ asset('js/dashboard/modernizr.min.js') }}"></script> +</head> +<body> + <div id="app"> + <main class="py-4"> + <div class="account-pages"></div> + <div class="clearfix"></div> + @yield('content') + </main> + </div> + + <script> + var resizefunc = []; + </script> + + <!-- jQuery --> + <script src="{{ asset('js/dashboard/jquery.min.js') }}"></script> + <script src="{{ asset('js/dashboard/bootstrap.min.js') }}"></script> + <script src="{{ asset('js/dashboard/detect.js') }}"></script> + <script src="{{ asset('js/dashboard/fastclick.js') }}"></script> + <script src="{{ asset('js/dashboard/jquery.slimscroll.js') }}"></script> + <script src="{{ asset('js/dashboard/jquery.blockUI.js') }}"></script> + <script src="{{ asset('js/dashboard/waves.js') }}"></script> + <script src="{{ asset('js/dashboard/wow.min.js') }}"></script> + <script src="{{ asset('js/dashboard/jquery.nicescroll.js') }}"></script> + <script src="{{ asset('js/dashboard/jquery.scrollTo.min.js') }}"></script> + + + <script src="{{ asset('js/dashboard/jquery.core.js') }}"></script> + <script src="{{ asset('js/dashboard/jquery.app.js') }}"></script> +</body> +</html> diff --git a/remember_laravel/resources/views/auth/login.blade.php b/remember_laravel/resources/views/auth/login.blade.php index 9edb920ecec0ea238662fb1492e45e761b4e938b..3fae0db1e801f480463c672711597f3ae8cb5286 100644 --- a/remember_laravel/resources/views/auth/login.blade.php +++ b/remember_laravel/resources/views/auth/login.blade.php @@ -1,73 +1,57 @@ -@extends('layouts.app') +@extends('auth.app') @section('content') -<div class="container"> - <div class="row justify-content-center"> - <div class="col-md-8"> - <div class="card"> - <div class="card-header">{{ __('Login') }}</div> - - <div class="card-body"> - <form method="POST" action="{{ route('login') }}"> - @csrf - - <div class="form-group row"> - <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label> - - <div class="col-md-6"> - <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus> - - @if ($errors->has('email')) - <span class="invalid-feedback" role="alert"> - <strong>{{ $errors->first('email') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group row"> - <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label> - - <div class="col-md-6"> - <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required> - - @if ($errors->has('password')) - <span class="invalid-feedback" role="alert"> - <strong>{{ $errors->first('password') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group row"> - <div class="col-md-6 offset-md-4"> - <div class="form-check"> - <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}> - - <label class="form-check-label" for="remember"> - {{ __('Remember Me') }} - </label> - </div> - </div> - </div> - - <div class="form-group row mb-0"> - <div class="col-md-8 offset-md-4"> - <button type="submit" class="btn btn-primary"> - {{ __('Login') }} - </button> - - @if (Route::has('password.request')) - <a class="btn btn-link" href="{{ route('password.request') }}"> - {{ __('Forgot Your Password?') }} - </a> - @endif - </div> +<div class="wrapper-page"> + <div class=" card-box"> + <div class="panel-heading"> + <h3 class="text-center"> Sign In to <strong class="text-custom">{{ config('app.name') }}</strong> </h3> + </div> + + + <div class="panel-body"></div> + <form class="form-horizontal m-t-20" method="POST" action="{{ route('login') }}"> + @csrf + <div class="form-group"> + <div class="col-xs-12"> + <input id="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" value="{{ old('email') }}" type="email" placeholder="Email Address" required autofocus> + @if ($errors->has('email')) + <span class="invalid-feedback" role="alert"> + <strong>{{ $errors->first('email') }}</strong> + </span> + @endif + </div> + </div> + + <div class="form-group"> + <div class="col-xs-12"> + <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="Password" required> + @if ($errors->has('password')) + <span class="invalid-feedback" role="alert"> + <strong>{{ $errors->first('password') }}</strong> + </span> + @endif + </div> + </div> + + <div class="form-group "> + <div class="col-xs-12"> + <div class="checkbox checkbox-primary"> + <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}> + <label for="remember"> + Remember me + </label> </div> - </form> + + </div> + </div> + + <div class="form-group text-center m-t-40"> + <div class="col-xs-12"> + <button class="btn btn-pink btn-block text-uppercase waves-effect waves-light" type="submit">Log In</button> + </div> </div> - </div> - </div> - </div> + </form> + </div> + </div> </div> @endsection diff --git a/remember_laravel/resources/views/auth/passwords/email.blade.php b/remember_laravel/resources/views/auth/passwords/email.blade.php index ccbee595c03a6d44cd8e56d8e7eda6478d05513e..140fe3a7ed421f4871038a57f063db9c8539140d 100644 --- a/remember_laravel/resources/views/auth/passwords/email.blade.php +++ b/remember_laravel/resources/views/auth/passwords/email.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('auth..app') @section('content') <div class="container"> diff --git a/remember_laravel/resources/views/auth/passwords/reset.blade.php b/remember_laravel/resources/views/auth/passwords/reset.blade.php index bf27f4c85688339bd5ca270754f6a35b7c0f4524..4b7503a2f8aa9fe86183ad92c67305a4a6c3954a 100644 --- a/remember_laravel/resources/views/auth/passwords/reset.blade.php +++ b/remember_laravel/resources/views/auth/passwords/reset.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('auth.app') @section('content') <div class="container"> diff --git a/remember_laravel/resources/views/auth/register.blade.php b/remember_laravel/resources/views/auth/register.blade.php index ad95f2cfd98c305028f9b054021d7f169c495cc2..6f81db045f1d07e0be181619561ba806d4a1320a 100644 --- a/remember_laravel/resources/views/auth/register.blade.php +++ b/remember_laravel/resources/views/auth/register.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('auth.app') @section('content') <div class="container"> diff --git a/remember_laravel/resources/views/auth/verify.blade.php b/remember_laravel/resources/views/auth/verify.blade.php index c742cb4bdcd60fc413ee8c88a0b1461d9a6c6306..3e7c54b83305fa9748b896b0cebe8df9cb266ffd 100644 --- a/remember_laravel/resources/views/auth/verify.blade.php +++ b/remember_laravel/resources/views/auth/verify.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('auth.app') @section('content') <div class="container"> diff --git a/remember_laravel/resources/views/dashboard/home.blade.php b/remember_laravel/resources/views/dashboard/home.blade.php new file mode 100644 index 0000000000000000000000000000000000000000..92a8dfd297d562625b8830cf7ce722cd34eae796 --- /dev/null +++ b/remember_laravel/resources/views/dashboard/home.blade.php @@ -0,0 +1,11 @@ +@extends('dashboard.layout.base') + +@section('content') +<div> + oi +</div> +@endsection + +@section('bottomJs') + +@endsection \ No newline at end of file diff --git a/remember_laravel/resources/views/dashboard/layout/css.blade.php b/remember_laravel/resources/views/dashboard/layout/css.blade.php index fcf1de694f4994dfabf80a30326049b5d7c8acd6..9e6709f078659080c0e1d11be482a5fc807a61e4 100644 --- a/remember_laravel/resources/views/dashboard/layout/css.blade.php +++ b/remember_laravel/resources/views/dashboard/layout/css.blade.php @@ -1,11 +1,11 @@ -<link href="asset('css/dashboard/plugins/custombox/css/custombox.css') }}" rel="stylesheet"> -<link href="asset('css/dashboard/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/core.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/components.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/icons.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/pages.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/menu.css') }}" rel="stylesheet" type="text/css" /> -<link href="asset('css/dashboard/css/responsive.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/plugins/custombox/css/custombox.css') }}" rel="stylesheet"> +<link href="{{ asset('css/dashboard/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/core.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/components.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/icons.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/pages.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/menu.css') }}" rel="stylesheet" type="text/css" /> +<link href="{{ asset('css/dashboard/css/responsive.css') }}" rel="stylesheet" type="text/css" /> <!-- DASHBOARD.CSS NEEDS TO BE AT THE BOTTOM OF THIS FILE IF YOU NEED TO ADD ANY NEW CSS STYLESHEETS, PLEASE diff --git a/remember_laravel/routes/web.php b/remember_laravel/routes/web.php index a84360167240dc8d48563eba117400d8f12293fc..f733d9b5ea5af25c5773cdec4ef0e8a7099af652 100644 --- a/remember_laravel/routes/web.php +++ b/remember_laravel/routes/web.php @@ -18,8 +18,12 @@ Route::get('/', 'HomeController@index')->name('home'); -Route::get('/php-info', 'HomeController@user_info'); - -Auth::routes(); - +Route::group(['prefix' => 'dashboard', 'middleware' => ['web', 'auth']], function () { + Route::get('/', function () { + return view('dashboard.home'); + })->name('dashboard-home'); +}); +Route::get('login', 'Auth\LoginController@showLoginForm')->name('login'); +Route::post('login', 'Auth\LoginController@login'); +Route::get('logout', 'Auth\LoginController@logout')->name('logout');