diff --git a/README.md b/README.md index a2aab66c..efb62c26 100755 --- a/README.md +++ b/README.md @@ -389,7 +389,7 @@ php artisan vendor:publish --tag=laravel-email-database-log-migration - Use Laravel HTML Facade with [Laravel Collective](https://laravelcollective.com/): ``` - {!! html()->link(route('social.redirect', ['provider' => 'twitch']), 'Twitch', array('class' => 'btn btn-lg btn-primary btn-block twitch')) !!} + {!! html()->a(route('social.redirect', ['provider' => 'twitch']), 'Twitch', array('class' => 'btn btn-lg btn-primary btn-block twitch')) !!} ``` ### Other API keys diff --git a/app/Http/Controllers/ProfilesController.php b/app/Http/Controllers/ProfilesController.php index f1baf535..70b5c933 100755 --- a/app/Http/Controllers/ProfilesController.php +++ b/app/Http/Controllers/ProfilesController.php @@ -10,15 +10,14 @@ use App\Models\User; use App\Notifications\SendGoodbyeEmail; use App\Traits\CaptureIpTrait; -use File; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Session; -use Image; +use Illuminate\Support\Facades\Validator; +use Intervention\Image\Facades\Image; use jeremykenedy\Uuid\Uuid; -use Validator; -use View; class ProfilesController extends Controller { @@ -143,7 +142,7 @@ public function update(UpdateUserProfile $request, $username) */ public function updateUserAccount(Request $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $emailCheck = ($request->input('email') !== '') && ($request->input('email') !== $user->email); $ipAddress = new CaptureIpTrait(); @@ -203,7 +202,7 @@ public function updateUserAccount(Request $request, $id) */ public function updateUserPassword(UpdateUserPasswordRequest $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); @@ -226,7 +225,7 @@ public function updateUserPassword(UpdateUserPasswordRequest $request, $id) public function upload(Request $request) { if ($request->hasFile('file')) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $avatar = $request->file('file'); $filename = 'avatar.'.$avatar->getClientOriginalExtension(); $save_path = storage_path().'/users/id/'.$currentUser->id.'/uploads/images/avatar/'; @@ -270,7 +269,7 @@ public function userProfileAvatar($id, $image) */ public function deleteUserAccount(DeleteUserAccount $request, $id) { - $currentUser = \Auth::user(); + $currentUser = Auth::user(); $user = User::findOrFail($id); $ipAddress = new CaptureIpTrait(); @@ -310,7 +309,7 @@ public function deleteUserAccount(DeleteUserAccount $request, $id) /** * Send GoodBye Email Function via Notify. * - * @param array $user + * @param User $user * @param string $token * @return void */ diff --git a/app/Http/Controllers/ThemesManagementController.php b/app/Http/Controllers/ThemesManagementController.php index 7e549a4d..26863378 100755 --- a/app/Http/Controllers/ThemesManagementController.php +++ b/app/Http/Controllers/ThemesManagementController.php @@ -5,7 +5,7 @@ use App\Models\Theme; use App\Models\User; use Illuminate\Http\Request; -use Validator; +use Illuminate\Support\Facades\Validator; class ThemesManagementController extends Controller { diff --git a/app/Http/Controllers/UsersManagementController.php b/app/Http/Controllers/UsersManagementController.php index 0f3f244f..224995a8 100755 --- a/app/Http/Controllers/UsersManagementController.php +++ b/app/Http/Controllers/UsersManagementController.php @@ -6,11 +6,11 @@ use App\Models\Role; use App\Models\User; use App\Traits\CaptureIpTrait; -use Auth; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; -use Validator; +use Illuminate\Support\Facades\Validator; class UsersManagementController extends Controller { diff --git a/composer.json b/composer.json index 4b9d1a32..1780773b 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "jeremykenedy/laravel-email-database-log": "^12.0", "jeremykenedy/laravel-exception-notifier": "^4.1", "jeremykenedy/laravel-https": "^2.0", - "jeremykenedy/laravel-logger": "^10.0", + "jeremykenedy/laravel-logger": "^11.0", "jeremykenedy/laravel-phpinfo": "^1.3", "jeremykenedy/laravel-roles": "^11.5", "jeremykenedy/laravel2step": "^4.0", @@ -101,6 +101,6 @@ "pestphp/pest-plugin": true } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true } diff --git a/config/app.php b/config/app.php index 42bf97c3..c634b7a7 100755 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,6 @@ use App\Providers\MacroServiceProvider; use Creativeorange\Gravatar\Facades\Gravatar; use Illuminate\Support\Facades\Facade; -use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Redis; use Intervention\Image\Facades\Image; use jeremykenedy\Uuid\Uuid; @@ -220,7 +219,6 @@ 'aliases' => Facade::defaultAliases()->merge([ 'Redis' => Redis::class, 'Socialite' => Socialite::class, - 'Input' => Input::class, 'Gravatar' => Gravatar::class, 'Image' => Image::class, 'Uuid' => Uuid::class, diff --git a/resources/views/profiles/edit.blade.php b/resources/views/profiles/edit.blade.php index 7efd8585..abf76ec4 100755 --- a/resources/views/profiles/edit.blade.php +++ b/resources/views/profiles/edit.blade.php @@ -55,7 +55,7 @@ - {{ html()->model($user->profile) }} + @php( html()->model($user->profile) ) {{ html()->form('POST', route('profile.update', $user->name)) ->id('user_profile_form') ->class('form-horizontal') @@ -161,11 +161,11 @@ {{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() )
- {{ html()->model($user) }} + @php( html()->model($user) ) {{ html()->form('POST', action([App\Http\Controllers\ProfilesController::class, 'updateUserAccount'], $user->id)) ->id('user_basics_form') ->open() }} @@ -265,7 +265,7 @@
{{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() )
@@ -289,7 +289,7 @@ {{ trans('profile.changePwTitle') }} - {{ html()->model($user) }} + @php( html()->model($user) ) {{ html()->form('POST', action([App\Http\Controllers\ProfilesController::class, 'updateUserPassword'], $user->id)) ->attribute('autocomplete', 'new-password') ->open() }} @@ -340,7 +340,7 @@
{{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() ) @@ -357,7 +357,7 @@
- {{ html()->model($user) }} + @php( html()->model($user) ) {{ html()->form('POST', action([App\Http\Controllers\ProfilesController::class, 'deleteUserAccount'], $user->id)) ->open() }} @@ -374,19 +374,19 @@
{{ html()->button('' . trans('profile.deleteAccountBtn')) - ->class('btn btn-block btn-danger') - ->id('delete_account_trigger') - ->disabled() - ->type('button') - ->attribute('data-toggle', 'modal') - ->attribute('data-submit', trans('profile.deleteAccountBtnConfirm')) - ->attribute('data-target', '#confirmForm') - ->attribute('data-modalClass', 'modal-danger') - ->attribute('data-title', trans('profile.deleteAccountConfirmTitle')) - ->attribute('data-message', trans('profile.deleteAccountConfirmMsg')) }} + ->class('btn btn-block btn-danger') + ->id('delete_account_trigger') + ->disabled() + ->type('button') + ->attribute('data-toggle', 'modal') + ->attribute('data-submit', trans('profile.deleteAccountBtnConfirm')) + ->attribute('data-target', '#confirmForm') + ->attribute('data-modalClass', 'modal-danger') + ->attribute('data-title', trans('profile.deleteAccountConfirmTitle')) + ->attribute('data-message', trans('profile.deleteAccountConfirmMsg')) }} {{ html()->form()->close() }} - {{ html()->endModel() }} + @php( html()->endModel() )
diff --git a/resources/views/profiles/show.blade.php b/resources/views/profiles/show.blade.php index f6dcbf04..51a2121c 100755 --- a/resources/views/profiles/show.blade.php +++ b/resources/views/profiles/show.blade.php @@ -100,7 +100,7 @@ {{ trans('profile.showProfileTwitterUsername') }}
- {!! html()->link('https://twitter.com/'.$user->profile->twitter_username, $user->profile->twitter_username, array('class' => 'twitter-link', 'target' => '_blank')) !!} + {!! html()->a('https://twitter.com/'.$user->profile->twitter_username, $user->profile->twitter_username, array('class' => 'twitter-link', 'target' => '_blank')) !!}
@endif @@ -109,7 +109,7 @@ {{ trans('profile.showProfileGitHubUsername') }}
- {!! html()->link('https://github.com/'.$user->profile->github_username, $user->profile->github_username, array('class' => 'github-link', 'target' => '_blank')) !!} + {!! html()->a('https://github.com/'.$user->profile->github_username, $user->profile->github_username, array('class' => 'github-link', 'target' => '_blank')) !!}
@endif @endif diff --git a/resources/views/scripts/form-modal-script.blade.php b/resources/views/scripts/form-modal-script.blade.php index cdfa6353..e58a5b04 100755 --- a/resources/views/scripts/form-modal-script.blade.php +++ b/resources/views/scripts/form-modal-script.blade.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php new file mode 100644 index 00000000..3f984557 --- /dev/null +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -0,0 +1,36 @@ +@if ($paginator->hasPages()) + +@endif