diff --git a/app/Http/Controllers/Admin/AdminBaseController.php b/app/Http/Controllers/Admin/AdminBaseController.php index 01427cb3..4ef48b99 100644 --- a/app/Http/Controllers/Admin/AdminBaseController.php +++ b/app/Http/Controllers/Admin/AdminBaseController.php @@ -9,15 +9,5 @@ use Response; class AdminBaseController extends Controller { - protected $layout = 'layouts.admin'; - public function sendResponse($result, $message) - { - return Response::json(ResponseUtil::makeResponse($message, $result)); - } - - public function sendError($error, $code = 404) - { - return Response::json(ResponseUtil::makeError($error), $code); - } } diff --git a/app/Http/Controllers/Frontend/BaseController.php b/app/Http/Controllers/Frontend/BaseController.php new file mode 100644 index 00000000..8727055d --- /dev/null +++ b/app/Http/Controllers/Frontend/BaseController.php @@ -0,0 +1,8 @@ +middleware('auth'); - } - + /** + * Show the application dashboard. + * @return \Illuminate\Http\Response + */ public function index() { return view('home'); diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php index 9c279e28..d2c7073d 100644 --- a/resources/views/admin/app.blade.php +++ b/resources/views/admin/app.blade.php @@ -25,7 +25,7 @@ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 69acd824..3dfe5870 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,107 +1,68 @@ - - - - - - InfyOm Laravel Generator +@extends('layouts.app') - - +@section('content') +
+
+
+
+
Login
+
+
+ {{ csrf_field() }} - - +
+ - - +
+ - - + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
- - +
+ - - +
+ - - - + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
- - -
-
- - - - - - - - - - - +@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 80c3e94b..2537f078 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,84 +1,47 @@ - - - - - - InfyOm Laravel Generator +@extends('layouts.app') - - + +@section('content') +
+
+
+
+
Reset Password
+
+ @if (session('status')) +
+ {{ session('status') }} +
+ @endif - - +
+ {{ csrf_field() }} - - +
+ - - +
+ - - + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
- - - - - - - - - -
-
- - - - - - - - - +@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 49c0c608..83aafd73 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,109 +1,70 @@ - - - - - - InfyOm Laravel Generator +@extends('layouts.app') - - +@section('content') +
+
+
+
+
Reset Password
- - +
+
+ {{ csrf_field() }} - - + - - +
+ - - +
+ - - + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
- - - +
+ - - -
- - - - - - - - - - +@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 51532b1e..015da43a 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,132 +1,82 @@ - - - - - - InfyOm Laravel Generator | Registration Page +@extends('layouts.app') - - +@section('content') +
+
+
+
+
Register
+
+
+ {{ csrf_field() }} - - +
+ - - +
+ - - + @if ($errors->has('name')) + + {{ $errors->first('name') }} + + @endif +
+
- - +
+ - - +
+ - - + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
- - - - - -
- +
+ -
- +
+ - + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
- {!! csrf_field() !!} +
+ -
- - +
+ - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
+ @if ($errors->has('password_confirmation')) + + {{ $errors->first('password_confirmation') }} + + @endif +
+
-
- - - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
- -
- - - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
- -
- - - - @if ($errors->has('password_confirmation')) - - {{ $errors->first('password_confirmation') }} - - @endif -
- -
-
-
- -
+
+
+ +
+
+
- -
- -
-
- - - I already have a membership +
-
- - - - - - - - - - - - +@endsection diff --git a/resources/views/frontend/dashboard.blade.php b/resources/views/frontend/dashboard.blade.php new file mode 100644 index 00000000..c9350210 --- /dev/null +++ b/resources/views/frontend/dashboard.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.default.app') + +@section('content') +
+
+
+
+
Dashboard
+ +
+ You are logged in! +
+
+
+
+
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index d0e173bd..9eaf5d25 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,10 +1,91 @@ -@extends('layouts.default.app') + + + + + + -@section('content') -
-
+ Laravel + + + + + + +
+ @if (Route::has('login')) +
+ Login + Register +
+ @endif + +
+
+ phpVMS4 +
+ +
-@endsection + + diff --git a/routes/admin.php b/routes/admin.php index 78a25068..2bbd90ed 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -9,7 +9,7 @@ Route::get('/admin', function () { Route::group([ 'namespace' => 'Admin', - //'middleware' => 'auth', + 'middleware' => 'auth', 'prefix' => 'admin', ], function () { Route::resource('airlines', 'AirlinesController'); diff --git a/routes/web.php b/routes/web.php index 3fac7622..1efb7f22 100755 --- a/routes/web.php +++ b/routes/web.php @@ -11,35 +11,16 @@ | */ -Route::get('/', function () { - return redirect('home'); -}); - +Auth::routes(); +Route::get('/', 'HomeController@index'); Route::get('/home', 'HomeController@index'); -Route::get('/login', 'Auth\LoginController@index'); -/** - * User routes that require auth - */ - -/*Route::group([ - 'namespace' => 'User', - 'middleware' => 'auth', -], function () { - -});*/ - -Route::get('/admin', function () { - return redirect('/admin/airlines'); -}); Route::group([ - 'namespace' => 'Admin', + 'namespace' => 'Frontend', 'middleware' => 'auth', - 'prefix' => 'admin', ], function () { - Route::resource('airlines', 'AirlinesController'); - Route::resource('aircraft', 'AircraftController'); + Route::resource('dashboard', 'DashboardController'); });