From 8b98db74a2bddaea576a9faa9f8ba1ad8fb08941 Mon Sep 17 00:00:00 2001 From: chrosey Date: Thu, 15 Jun 2017 12:47:36 +0200 Subject: [PATCH] Added Auth --- app/Benutzer.php | 2 +- app/Eintragung.php | 9 ++ .../Controllers/Auth/RegisterController.php | 3 + app/Http/Controllers/EintragController.php | 85 ++++++++++++++++++ app/Http/Controllers/HomeController.php | 28 ++++++ .../Controllers/VeranstaltungController.php | 9 +- app/Policies/EintragPolicy.php | 59 ++++++++++++ app/Policies/VeranstaltungPolicy.php | 64 +++++++++++++ app/User.php | 13 ++- app/Veranstaltung.php | 8 ++ resources/views/auth/login.blade.php | 68 ++++++++++++++ .../views/auth/passwords/email.blade.php | 46 ++++++++++ .../views/auth/passwords/reset.blade.php | 76 ++++++++++++++++ resources/views/auth/register.blade.php | 89 +++++++++++++++++++ resources/views/home.blade.php | 17 ++++ resources/views/layouts/app.blade.php | 27 +++--- .../views/veranstaltung/create.blade.php | 12 +-- resources/views/veranstaltung/index.blade.php | 4 +- resources/views/veranstaltung/show.blade.php | 10 +++ routes/web.php | 8 +- 20 files changed, 614 insertions(+), 23 deletions(-) create mode 100644 app/Http/Controllers/EintragController.php create mode 100644 app/Http/Controllers/HomeController.php create mode 100644 app/Policies/EintragPolicy.php create mode 100644 app/Policies/VeranstaltungPolicy.php create mode 100644 resources/views/auth/login.blade.php create mode 100644 resources/views/auth/passwords/email.blade.php create mode 100644 resources/views/auth/passwords/reset.blade.php create mode 100644 resources/views/auth/register.blade.php create mode 100644 resources/views/home.blade.php diff --git a/app/Benutzer.php b/app/Benutzer.php index 52930832..dd653a1d 100644 --- a/app/Benutzer.php +++ b/app/Benutzer.php @@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model; class Benutzer extends User { - protected $table = "benutzer"; + protected $table = "users"; } diff --git a/app/Eintragung.php b/app/Eintragung.php index f1e97219..d4568207 100644 --- a/app/Eintragung.php +++ b/app/Eintragung.php @@ -7,4 +7,13 @@ use Illuminate\Database\Eloquent\Model; class Eintragung extends Model { protected $table = "eintragungen"; + protected $dates = ['kann_ab', 'kann_bis']; + + public function veranstaltung(){ + return $this->belongsTo('App\Veranstaltung'); + } + + public function user(){ + return $this->belongsTo('App\User'); + } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index ed8d1b77..48dec1db 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -51,6 +51,7 @@ class RegisterController extends Controller 'name' => 'required|string|max:255', 'email' => 'required|string|email|max:255|unique:users', 'password' => 'required|string|min:6|confirmed', + 'anzeigename' => 'required|string|unique:users' ]); } @@ -66,6 +67,8 @@ class RegisterController extends Controller 'name' => $data['name'], 'email' => $data['email'], 'password' => bcrypt($data['password']), + 'anzeigename' => $data['anzeigename'], + 'telefon' => $data['telefon'] ]); } } diff --git a/app/Http/Controllers/EintragController.php b/app/Http/Controllers/EintragController.php new file mode 100644 index 00000000..c2024903 --- /dev/null +++ b/app/Http/Controllers/EintragController.php @@ -0,0 +1,85 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view('home'); + } +} diff --git a/app/Http/Controllers/VeranstaltungController.php b/app/Http/Controllers/VeranstaltungController.php index 68feff6c..bdc92e9d 100644 --- a/app/Http/Controllers/VeranstaltungController.php +++ b/app/Http/Controllers/VeranstaltungController.php @@ -27,9 +27,10 @@ class VeranstaltungController extends Controller { $v = new Veranstaltung(); $v->beginn = \Carbon\Carbon::today(); + $v->gaeste = 0; - return view ('veranstaltung.create', ['model' => - $v]); + return view ('veranstaltung.create', + $v); } /** @@ -65,7 +66,9 @@ class VeranstaltungController extends Controller */ public function show(Veranstaltung $veranstaltung) { - + if ($veranstaltung->has('eintragungen')) { + $veranstaltung->eintragungen; + } return view('veranstaltung.show', $veranstaltung); } diff --git a/app/Policies/EintragPolicy.php b/app/Policies/EintragPolicy.php new file mode 100644 index 00000000..bc215cff --- /dev/null +++ b/app/Policies/EintragPolicy.php @@ -0,0 +1,59 @@ +hasMany('App\Eintragung'); + } + public function einteilungen(){ + return $this->hasMany('App\Einteilung'); + } + public function arbeitszeiten(){ + return $this->hasMany('App\Arbeitszeit'); + } } diff --git a/app/Veranstaltung.php b/app/Veranstaltung.php index 6d4da0b7..45d5c69d 100644 --- a/app/Veranstaltung.php +++ b/app/Veranstaltung.php @@ -11,4 +11,12 @@ class Veranstaltung extends Model protected $fillable = ['name','beginn','ende','geaste','hinweise']; protected $dates = ['beginn', 'ende']; + + public function eintragungen(){ + return $this->hasMany('App\Eintragung'); + } + + public function einteilungen(){ + return $this->hasMany('App\Einteilung'); + } } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php new file mode 100644 index 00000000..757d821d --- /dev/null +++ b/resources/views/auth/login.blade.php @@ -0,0 +1,68 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
Login
+
+
+ {{ csrf_field() }} + +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+ +
+
+
+ +
+
+
+ +
+
+ + + + Forgot Your Password? + +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php new file mode 100644 index 00000000..e566cfb0 --- /dev/null +++ b/resources/views/auth/passwords/email.blade.php @@ -0,0 +1,46 @@ +@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 new file mode 100644 index 00000000..6ed9298a --- /dev/null +++ b/resources/views/auth/passwords/reset.blade.php @@ -0,0 +1,76 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
Reset Password
+ +
+ @if (session('status')) +
+ {{ session('status') }} +
+ @endif + +
+ {{ csrf_field() }} + + + +
+ + +
+ + + @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 +
+
+ +
+
+ +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php new file mode 100644 index 00000000..937d03be --- /dev/null +++ b/resources/views/auth/register.blade.php @@ -0,0 +1,89 @@ +@extends('layouts.app') +@section('title','Neuer Benutzer'); + +@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 +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php new file mode 100644 index 00000000..de73a980 --- /dev/null +++ b/resources/views/home.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
Dashboard
+ +
+ You are logged in! +
+
+
+
+
+@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6a790ba2..d19e87fa 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,5 +1,5 @@ - + @@ -18,15 +18,22 @@