diff --git a/motorradig/app/Http/Controllers/AdminController.php b/motorradig/app/Http/Controllers/AdminController.php index 7455267..bba4a2a 100644 --- a/motorradig/app/Http/Controllers/AdminController.php +++ b/motorradig/app/Http/Controllers/AdminController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Page; +use Illuminate\Support\Facades\Log; class AdminController extends Controller { @@ -14,21 +15,24 @@ class AdminController extends Controller public function store_tourplan(Request $request) { + Log::debug("Store Tourplan"); $request->validate( [ 'tourplan'=>'required|mimes:pdf|max:2048' ] ); - $request->file('tourplan')->storeAs('pdf', 'tourenplan.pdf','public2'); - - return view ('/home'); + $path=$request->file('tourplan')->storeAs('pdf', 'Tourenplan.pdf','img_storage'); + Log::debug("Stored Tourenplan to: ".$path." in private folder (storage/img_storage)"); + return redirect('/'); } public function upload_mitgliedsantrag(Request $request) { + Log::debug("*** Show Form: UPLOAD MITGLIEDSANTRAG ***"); + return view ('admin.upload_mitgliedsantrag'); } @@ -36,13 +40,15 @@ class AdminController extends Controller { $request->validate( [ - 'mitgliedsantrag' => 'required|mimes:pdf|max:2048' + 'mitgliedsantrag' => 'required|mimes:pdf' ] ); - $request->file('mitgliedsantrag')->storeAs('pdf', 'mitgliedsantrag.pdf', 'public2'); + //$request->file('mitgliedsantrag')->storeAs('pdf_storage', 'mitgliedsantrag.pdf_storage', 'public2'); + $path = $request->file('mitgliedsantrag')->storeAs('pdf', 'Mitgliedsantrag.pdf', 'public'); + Log::debug("Stored mitgliedsantrag to: ".$path." in public folder (public/img)"); - return view('/home'); + return redirect('/'); } diff --git a/motorradig/app/Http/Controllers/ImageController.php b/motorradig/app/Http/Controllers/ImageController.php index b00d6b7..9ca96e6 100644 --- a/motorradig/app/Http/Controllers/ImageController.php +++ b/motorradig/app/Http/Controllers/ImageController.php @@ -17,7 +17,6 @@ class ImageController extends Controller } } - error_log("User is not authorized"); return response()->file(public_path()."/img/placeholder/icon_unknown.png"); } diff --git a/motorradig/app/Http/Kernel.php b/motorradig/app/Http/Kernel.php index 36ced13..6317b25 100644 --- a/motorradig/app/Http/Kernel.php +++ b/motorradig/app/Http/Kernel.php @@ -63,5 +63,6 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'member' => \App\Http\Middleware\IsMember::class, ]; } diff --git a/motorradig/app/Http/Middleware/IsMember.php b/motorradig/app/Http/Middleware/IsMember.php new file mode 100644 index 0000000..b7aec51 --- /dev/null +++ b/motorradig/app/Http/Middleware/IsMember.php @@ -0,0 +1,23 @@ +role == 'ADMIN' || \Auth::user()->role == 'MEMBER') { + return $next($request); + } + return redirect('/'); + } +} diff --git a/motorradig/config/filesystems.php b/motorradig/config/filesystems.php index df679c3..0ba4a42 100644 --- a/motorradig/config/filesystems.php +++ b/motorradig/config/filesystems.php @@ -50,13 +50,15 @@ return [ 'public' => [ 'driver' => 'local', - 'root' => storage_path('app/public'), + 'root' => public_path('img'), 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], - 'public2' => [ + 'img_storage' => [ 'driver' => 'local', - 'root' => '.' + 'root' => storage_path('img_storage'), + 'url' => env('APP_URL').'/img', + 'visibility' => 'private', ], 's3' => [ 'driver' => 's3', diff --git a/motorradig/config/logging.php b/motorradig/config/logging.php index 088c204..1add420 100644 --- a/motorradig/config/logging.php +++ b/motorradig/config/logging.php @@ -37,10 +37,16 @@ return [ 'channels' => [ 'stack' => [ 'driver' => 'stack', - 'channels' => ['single'], + 'channels' => ['single','stdout'], 'ignore_exceptions' => false, ], - + 'stdout' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'with' => [ + 'stream' => 'php://stdout', + ], + ], 'single' => [ 'driver' => 'single', 'path' => storage_path('logs/laravel.log'), @@ -72,6 +78,10 @@ return [ ], ], + + + + 'stderr' => [ 'driver' => 'monolog', 'handler' => StreamHandler::class, diff --git a/motorradig/config/mail.php b/motorradig/config/mail.php index 54299aa..5523a4b 100644 --- a/motorradig/config/mail.php +++ b/motorradig/config/mail.php @@ -84,8 +84,8 @@ return [ */ 'from' => [ - 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => env('MAIL_FROM_NAME', 'Example'), + 'address' => env('MAIL_FROM_ADDRESS', 'info@motorrad-ig.de'), + 'name' => env('MAIL_FROM_NAME', 'Motorrad IG'), ], /* diff --git a/motorradig/public/img/pdf/Mitgliedsantrag.pdf b/motorradig/public/img/pdf/Mitgliedsantrag.pdf new file mode 100644 index 0000000..6eac10a Binary files /dev/null and b/motorradig/public/img/pdf/Mitgliedsantrag.pdf differ diff --git a/motorradig/resources/lang/en/auth.php b/motorradig/resources/lang/en/auth.php index e5506df..47dc6e5 100644 --- a/motorradig/resources/lang/en/auth.php +++ b/motorradig/resources/lang/en/auth.php @@ -13,7 +13,13 @@ return [ | */ + /* 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + */ + 'failed' => 'Logindaten stimmen nicht mit Datenbank überein.', + 'throttle' => 'Zu viele Login-Versuche. Versuche es wieder in :seconds Sekunden.', + + ]; diff --git a/motorradig/resources/lang/en/mailtext.php b/motorradig/resources/lang/en/mailtext.php new file mode 100644 index 0000000..f9fb0a9 --- /dev/null +++ b/motorradig/resources/lang/en/mailtext.php @@ -0,0 +1,17 @@ + + 'Du erhältst diese E-Mail, weil die Motorrad-IG eine Rücksetzungsanfrage für Deinen Account erhalten hat.', +]; diff --git a/motorradig/resources/lang/en/pagination.php b/motorradig/resources/lang/en/pagination.php index d481411..74e8d43 100644 --- a/motorradig/resources/lang/en/pagination.php +++ b/motorradig/resources/lang/en/pagination.php @@ -13,7 +13,11 @@ return [ | */ + /* 'previous' => '« Previous', 'next' => 'Next »', +*/ + 'previous' => '« Zurück', + 'next' => 'Weiter »', ]; diff --git a/motorradig/resources/lang/en/passwords.php b/motorradig/resources/lang/en/passwords.php index 2345a56..1c25d1f 100644 --- a/motorradig/resources/lang/en/passwords.php +++ b/motorradig/resources/lang/en/passwords.php @@ -12,11 +12,18 @@ return [ | has failed, such as for an invalid token or invalid new password. | */ - +/* 'reset' => 'Your password has been reset!', 'sent' => 'We have emailed your password reset link!', 'throttled' => 'Please wait before retrying.', 'token' => 'This password reset token is invalid.', 'user' => "We can't find a user with that email address.", +*/ + 'reset' => 'Dein Passwort wurde zurückgesetzt!', + 'sent' => 'Dir wurde ein Zurücksetzungslink zugesendet.', + 'throttled' => 'Bitte vor dem nächsten Versuche etwas warten.', + 'token' => 'Das Zurücksetzungstoken ist ungültig.', + 'user' => "Es gibt niemandem mit dieser E-Mail Adresse in der Datenbank", + ]; diff --git a/motorradig/resources/views/auth/login.blade.php b/motorradig/resources/views/auth/login.blade.php index c12b97e..161a157 100644 --- a/motorradig/resources/views/auth/login.blade.php +++ b/motorradig/resources/views/auth/login.blade.php @@ -12,7 +12,7 @@ @csrf
- +
@@ -26,7 +26,7 @@
- +
@@ -45,7 +45,7 @@
@@ -59,7 +59,7 @@ @if (Route::has('password.request')) - {{ __('Forgot Your Password?') }} + Passwort vergessen? @endif
diff --git a/motorradig/resources/views/auth/passwords/confirm.blade.php b/motorradig/resources/views/auth/passwords/confirm.blade.php index ca78fc1..dd7f237 100644 --- a/motorradig/resources/views/auth/passwords/confirm.blade.php +++ b/motorradig/resources/views/auth/passwords/confirm.blade.php @@ -5,16 +5,16 @@
-
{{ __('Confirm Password') }}
+
Passwort bestätigen
- {{ __('Please confirm your password before continuing.') }} + Bitte bestätige dein Passwort
@csrf
- +
@@ -30,12 +30,12 @@
@if (Route::has('password.request')) - {{ __('Forgot Your Password?') }} + Passwort vergessen ? @endif
diff --git a/motorradig/resources/views/auth/passwords/email.blade.php b/motorradig/resources/views/auth/passwords/email.blade.php index 1fea984..463ec51 100644 --- a/motorradig/resources/views/auth/passwords/email.blade.php +++ b/motorradig/resources/views/auth/passwords/email.blade.php @@ -5,7 +5,7 @@
-
{{ __('Reset Password') }}
+
Passwort zurücksetzen}
@if (session('status')) @@ -18,7 +18,7 @@ @csrf
- +
@@ -34,7 +34,7 @@
diff --git a/motorradig/resources/views/auth/passwords/reset.blade.php b/motorradig/resources/views/auth/passwords/reset.blade.php index 989931d..5e483d9 100644 --- a/motorradig/resources/views/auth/passwords/reset.blade.php +++ b/motorradig/resources/views/auth/passwords/reset.blade.php @@ -5,7 +5,7 @@
-
{{ __('Reset Password') }}
+
Passwort zurücksetzen
@@ -14,7 +14,7 @@
- +
@@ -28,7 +28,7 @@
- +
@@ -42,7 +42,7 @@
- +
@@ -52,7 +52,7 @@
diff --git a/motorradig/resources/views/auth/register.blade.php b/motorradig/resources/views/auth/register.blade.php index a03f4b7..057ed07 100644 --- a/motorradig/resources/views/auth/register.blade.php +++ b/motorradig/resources/views/auth/register.blade.php @@ -12,7 +12,7 @@ @csrf
- +
@@ -26,7 +26,7 @@
- +
@@ -40,7 +40,7 @@
- +
@@ -54,7 +54,7 @@
- +
diff --git a/motorradig/resources/views/auth/verify.blade.php b/motorradig/resources/views/auth/verify.blade.php index 9f8c1bc..1abc908 100644 --- a/motorradig/resources/views/auth/verify.blade.php +++ b/motorradig/resources/views/auth/verify.blade.php @@ -5,20 +5,20 @@
-
{{ __('Verify Your Email Address') }}
+
E-Mail Adresse bestätigen
@if (session('resent')) @endif - {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, + Bitte überprüfe, ob Du den Bestätigungs-Link per E-Mail erhalten hast. + Wenn Du keine E-Mail erhalten hast, @csrf - . + .
diff --git a/motorradig/resources/views/tour/index.blade.php b/motorradig/resources/views/tour/index.blade.php index a5f58ff..9ebfaec 100644 --- a/motorradig/resources/views/tour/index.blade.php +++ b/motorradig/resources/views/tour/index.blade.php @@ -6,14 +6,14 @@ diff --git a/motorradig/resources/views/users/become_member.blade.php b/motorradig/resources/views/users/become_member.blade.php index af82dee..41e6554 100644 --- a/motorradig/resources/views/users/become_member.blade.php +++ b/motorradig/resources/views/users/become_member.blade.php @@ -15,7 +15,7 @@

 

- -> Mitgliedsantrag herunterladen <- + -> Mitgliedsantrag herunterladen <-

diff --git a/motorradig/routes/web.php b/motorradig/routes/web.php index 377b15e..ae59987 100644 --- a/motorradig/routes/web.php +++ b/motorradig/routes/web.php @@ -52,8 +52,10 @@ Route::get('/tour/{tour_id}/join', 'TourController@join')->middleware('auth'); Route::get('/tour/{tour_id}/cancelBooking', 'TourController@cancelBooking')->middleware('auth'); Route::get('/tour/{tour_id}/cancelBookingAdmin/{user_id}', 'TourController@cancelBookingAdmin')->middleware('auth'); -Route::get('/img_storage/{category}/{imageName}','ImageController@getImage')->middleware('auth'); +Route::get('/img_storage/{category}/{imageName}','ImageController@getImage'); // no middleware auth needed, its checked in Controller Auth::routes(); +/* Cache clearing on remote server */ +Route::get('/clear-cache', function() { Artisan::call('cache:clear');Artisan::call('config:clear'); return "Cache cleared, Config reloaded"; }); //Route::get('/home', 'HomeController@index')->name('home'); diff --git a/motorradig/storage/img_storage/pdf/Tourenplan.pdf b/motorradig/storage/img_storage/pdf/Tourenplan.pdf new file mode 100644 index 0000000..6eac10a Binary files /dev/null and b/motorradig/storage/img_storage/pdf/Tourenplan.pdf differ diff --git a/motorradig/storage/pdf_storage/Tourenplan.pdf b/motorradig/storage/pdf_storage/Tourenplan.pdf new file mode 100644 index 0000000..6eac10a Binary files /dev/null and b/motorradig/storage/pdf_storage/Tourenplan.pdf differ diff --git a/motorradig/public/pdf/mitgliedsantrag.pdf b/motorradig/tests/mitgliedsantrag.pdf similarity index 100% rename from motorradig/public/pdf/mitgliedsantrag.pdf rename to motorradig/tests/mitgliedsantrag.pdf diff --git a/motorradig/public/pdf/tourenplan.pdf b/motorradig/tests/tourenplan.pdf similarity index 100% rename from motorradig/public/pdf/tourenplan.pdf rename to motorradig/tests/tourenplan.pdf