From f74f5ed15ff210d960b1ae55ab4e1085720d0c93 Mon Sep 17 00:00:00 2001 From: ManojKiran Date: Tue, 5 May 2020 08:48:58 +0530 Subject: [PATCH 1/3] controller and form requests refactoring --- app/Campaign.php | 55 +++++++++++++++++++++ app/Http/Controllers/CampaignController.php | 29 ++++++----- app/Http/Controllers/ListsController.php | 27 +++++----- app/Http/Requests/CampaignStoreRequest.php | 8 +-- app/Http/Requests/FieldStoreRequest.php | 2 +- app/Http/Requests/ImportSaveRequest.php | 2 +- app/Http/Requests/ListStoreRequest.php | 4 +- app/Http/Requests/ListUpdateRequest.php | 4 +- app/Http/Requests/SendCampaignRequest.php | 2 +- app/Http/Requests/SendTestMailRequest.php | 2 +- app/Http/Requests/SettingsUpdateRequest.php | 4 +- app/Http/Requests/SmtpSettings.php | 12 ++--- app/Http/Requests/TemplateStoreRequest.php | 4 +- routes/web.php | 3 ++ 14 files changed, 108 insertions(+), 50 deletions(-) diff --git a/app/Campaign.php b/app/Campaign.php index 37aa645..0c12d3e 100644 --- a/app/Campaign.php +++ b/app/Campaign.php @@ -11,6 +11,61 @@ class Campaign extends Model const DRAFT = 'draft'; const SENDING = 'sending'; const SENT = 'sent'; + const FINISHED = 'finished'; + + /** + * Checks if Current Campaign status is as Specified + * + * @param string $status + * @return bool + **/ + public function isInStatus(string $status):bool + { + if($this->status === $status){ + return true; + } + return false; + } + + /** + * Checks if Current Campaign status is Draft + * + * @return bool + **/ + public function isDraft() + { + return $this->isInStatus($this::DRAFT); + } + + /** + * Checks if Current Campaign status is Not Draft + * + * @return bool + **/ + public function isNotDraft() + { + return ! $this->isDraft(); + } + + /** + * Checks if Current Campaign status is Finished + * + * @return bool + **/ + public function isFinished() + { + return $this->isInStatus($this::FINISHED); + } + + /** + * Checks if Current Campaign status is Not FINISHED + * + * @return bool + **/ + public function isNotFinished() + { + return ! $this->isFinished(); + } /** * The "booting" method of the model. diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index 7e185fe..53d01d3 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -90,9 +90,10 @@ public function store(CampaignStoreRequest $request) */ public function show(Campaign $campaign) { - $lists = Lists::pluck('name', 'id'); + $lists = DB::table((new Lists)->getTable()) + ->pluck('name', 'id'); - if ($campaign->status == 'finished') { + if ($campaign->isFinished()) { return redirect()->to(route('campaigns.report', $campaign->id)); } @@ -107,8 +108,7 @@ public function show(Campaign $campaign) */ public function edit(Campaign $campaign) { - // @todo refactor this - if ($campaign->status != 'draft') { + if ($campaign->isNotDraft()) { return back(); } @@ -124,18 +124,17 @@ public function edit(Campaign $campaign) */ public function update(CampaignStoreRequest $request, Campaign $campaign) { - // @todo refactor this - if ($campaign->status != 'draft') { + if ($campaign->isNotDraft()) { return back(); } - // @todo add validation - $campaign->subject = $request->subject; - $campaign->sending_name = $request->sending_name; - $campaign->sending_email = $request->sending_email; - $campaign->content = $request->content; - $campaign->track_clicks = $request->track_clicks ? 1 : 0; - $campaign->track_opens = $request->track_opens ? 1 : 0; - $campaign->save(); + + $updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email','content']), + [ + 'track_clicks' => $request->track_clicks ? 1 : 0, + 'track_opens' => $request->track_opens ? 1 : 0, + ]); + + $campaign->update($updationArray); return redirect()->route('campaigns.show', $campaign->id); } @@ -168,7 +167,7 @@ public function sendTestMail(SendTestMailRequest $request, Campaign $campaign) public function send(SendCampaignRequest $request, Campaign $campaign) { - if ($campaign->status != 'draft') { + if ($campaign->isNotDraft()) { return back()->with(['error' => 'Campaign must be in draft mode.']); } diff --git a/app/Http/Controllers/ListsController.php b/app/Http/Controllers/ListsController.php index 686cc74..018030a 100644 --- a/app/Http/Controllers/ListsController.php +++ b/app/Http/Controllers/ListsController.php @@ -49,13 +49,11 @@ public function create() */ public function store(ListStoreRequest $request) { - $double_opt_in = $request->double_opt_in ? $request->double_opt_in : 0; - $list = Lists::create([ - 'name' => $request->name, - 'double_opt_in' => $double_opt_in, - 'from_name' => $request->from_name, - 'from_email' => $request->from_email, - ]); + if(! $request->exists('double_opt_in')){ + $request->request->add(['double_opt_in' => 0]); + } + + $list = Lists::create($request->except(['__token'])); return redirect()->route('lists.show', $list->id); } @@ -68,7 +66,10 @@ public function store(ListStoreRequest $request) */ public function show(Request $request, Lists $lists) { - $contacts = Contact::where('list_id', $lists->id)->where('subscribed', ! $request->subscribed)->orderBy('id', 'desc')->paginate(10); + $contacts = Contact::where('list_id','=',$lists->id) + ->where('subscribed', ! $request->subscribed) + ->orderBy('id', 'desc') + ->paginate(10); return view('lists.show', ['list' => $lists, 'contacts' => $contacts, 'subscribed' => $request->subscribed]); } @@ -93,13 +94,11 @@ public function edit(Lists $lists) */ public function update(ListUpdateRequest $request, Lists $lists) { - $double_opt_in = $request->double_opt_in ? $request->double_opt_in : 0; + if(! $request->exists('double_opt_in')){ + $request->request->add(['double_opt_in' => 0]); + } - $lists->double_opt_in = $double_opt_in; - $lists->name = $request->name; - $lists->from_name = $request->from_name; - $lists->from_email = $request->from_email; - $lists->save(); + $lists->update($request->except(['__token'])); return redirect(route('lists.show', $lists->id)); } diff --git a/app/Http/Requests/CampaignStoreRequest.php b/app/Http/Requests/CampaignStoreRequest.php index 931f303..e00d666 100644 --- a/app/Http/Requests/CampaignStoreRequest.php +++ b/app/Http/Requests/CampaignStoreRequest.php @@ -24,9 +24,10 @@ public function authorize() public function rules() { return [ - 'subject' => 'required', - 'sending_name' => 'required', - 'sending_email' => 'required|email', + 'subject' => ['required'], + 'sending_name' => ['required'], + 'sending_email' => ['required','email'], + 'content' => ['required'], ]; } @@ -55,6 +56,7 @@ public function attributes() 'subject' => 'Subject', 'sending_name' => 'Sending Name', 'sending_email' => 'Sending Email', + 'content' => 'Content', ]; } } diff --git a/app/Http/Requests/FieldStoreRequest.php b/app/Http/Requests/FieldStoreRequest.php index a158120..3ded600 100644 --- a/app/Http/Requests/FieldStoreRequest.php +++ b/app/Http/Requests/FieldStoreRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'name' => 'required', + 'name' => ['required'], ]; } diff --git a/app/Http/Requests/ImportSaveRequest.php b/app/Http/Requests/ImportSaveRequest.php index 5363a91..b62370d 100644 --- a/app/Http/Requests/ImportSaveRequest.php +++ b/app/Http/Requests/ImportSaveRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'file' => 'required|mimes:csv,txt', + 'file' => ['required','mimes:csv,txt'], ]; } } diff --git a/app/Http/Requests/ListStoreRequest.php b/app/Http/Requests/ListStoreRequest.php index 5dbae6f..a1130e1 100644 --- a/app/Http/Requests/ListStoreRequest.php +++ b/app/Http/Requests/ListStoreRequest.php @@ -24,8 +24,8 @@ public function authorize() public function rules() { return [ - 'name' => 'required', - 'from_email' => 'email', + 'name' => ['required'], + 'from_email' => ['email'], ]; } diff --git a/app/Http/Requests/ListUpdateRequest.php b/app/Http/Requests/ListUpdateRequest.php index c7acf10..12d92b4 100644 --- a/app/Http/Requests/ListUpdateRequest.php +++ b/app/Http/Requests/ListUpdateRequest.php @@ -24,8 +24,8 @@ public function authorize() public function rules() { return [ - 'name' => 'required', - 'from_email' => 'email', + 'name' => ['required'], + 'from_email' => ['email'], ]; } } diff --git a/app/Http/Requests/SendCampaignRequest.php b/app/Http/Requests/SendCampaignRequest.php index b5846f9..2de9bd6 100644 --- a/app/Http/Requests/SendCampaignRequest.php +++ b/app/Http/Requests/SendCampaignRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'lists' => 'required', + 'lists' => ['required'], ]; } } diff --git a/app/Http/Requests/SendTestMailRequest.php b/app/Http/Requests/SendTestMailRequest.php index 23afa87..9c9fe55 100644 --- a/app/Http/Requests/SendTestMailRequest.php +++ b/app/Http/Requests/SendTestMailRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'email' => 'email|required', + 'email' => ['email','required'], ]; } } diff --git a/app/Http/Requests/SettingsUpdateRequest.php b/app/Http/Requests/SettingsUpdateRequest.php index b14eacd..f2dae87 100644 --- a/app/Http/Requests/SettingsUpdateRequest.php +++ b/app/Http/Requests/SettingsUpdateRequest.php @@ -24,8 +24,8 @@ public function authorize() public function rules() { return [ - 'name' => 'required', - 'email' => 'required|email', + 'name' => ['required'], + 'email' => ['required','email'], ]; } } diff --git a/app/Http/Requests/SmtpSettings.php b/app/Http/Requests/SmtpSettings.php index 56e34d2..d5e436b 100644 --- a/app/Http/Requests/SmtpSettings.php +++ b/app/Http/Requests/SmtpSettings.php @@ -24,12 +24,12 @@ public function authorize() public function rules() { return [ - 'host' => 'required', - 'port' => 'required|integer', - 'username' => 'required', - 'password' => 'required', - 'name' => 'required', - 'address' => 'required|email', + 'host' => ['required'], + 'port' => ['required','integer'], + 'username' => ['required'], + 'password' => ['required'], + 'name' => ['required'], + 'address' => ['required','email'], ]; } } diff --git a/app/Http/Requests/TemplateStoreRequest.php b/app/Http/Requests/TemplateStoreRequest.php index edbcc1f..385183f 100644 --- a/app/Http/Requests/TemplateStoreRequest.php +++ b/app/Http/Requests/TemplateStoreRequest.php @@ -24,8 +24,8 @@ public function authorize() public function rules() { return [ - 'name' => 'required', - 'content' => 'required', + 'name' => ['required'], + 'content' => ['required'], ]; } } diff --git a/routes/web.php b/routes/web.php index fae06f4..fb23014 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,8 @@ Date: Tue, 5 May 2020 10:42:06 +0530 Subject: [PATCH 2/3] view components wip --- app/Providers/AppServiceProvider.php | 5 +- .../Components/CheckErrorExistsComponent.php | 32 +++++++++ app/View/Components/ErrorAlertComponent.php | 31 ++++++++ composer.json | 3 +- composer.lock | 72 ++++++++++++++++++- resources/views/campaigns/create.blade.php | 40 ++++------- resources/views/campaigns/edit.blade.php | 48 ++++++------- resources/views/campaigns/index.blade.php | 5 +- .../check-error-exists-component.blade.php | 5 ++ .../error-alert-component.blade.php | 3 + resources/views/layouts/main.blade.php | 5 +- resources/views/lists/create.blade.php | 22 +++--- resources/views/templates/create.blade.php | 47 ++++++------ resources/views/templates/edit.blade.php | 36 +++++----- 14 files changed, 239 insertions(+), 115 deletions(-) create mode 100644 app/View/Components/CheckErrorExistsComponent.php create mode 100644 app/View/Components/ErrorAlertComponent.php create mode 100644 resources/views/components/check-error-exists-component.blade.php create mode 100644 resources/views/components/error-alert-component.blade.php diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9adca9c..995f6e9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,9 +2,11 @@ namespace App\Providers; +use App\View\Components\CheckErrorExistsComponent; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; use Laravel\Dusk\DuskServiceProvider; +use Illuminate\Support\Facades\Blade; class AppServiceProvider extends ServiceProvider { @@ -17,7 +19,7 @@ public function register() { if ($this->app->environment('local', 'testing')) { $this->app->register(DuskServiceProvider::class); - } + } } /** @@ -28,5 +30,6 @@ public function register() public function boot() { Schema::defaultStringLength(191); + Blade::component('errorExists', CheckErrorExistsComponent::class); } } diff --git a/app/View/Components/CheckErrorExistsComponent.php b/app/View/Components/CheckErrorExistsComponent.php new file mode 100644 index 0000000..9660e8b --- /dev/null +++ b/app/View/Components/CheckErrorExistsComponent.php @@ -0,0 +1,32 @@ +controlName = $controlName; + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\View\View|string + */ + public function render() + { + return view('components.check-error-exists-component'); + } +} diff --git a/app/View/Components/ErrorAlertComponent.php b/app/View/Components/ErrorAlertComponent.php new file mode 100644 index 0000000..f684195 --- /dev/null +++ b/app/View/Components/ErrorAlertComponent.php @@ -0,0 +1,31 @@ +errorMessage = $errorMessage; + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\View\View|string + */ + public function render() + { + return view('components.error-alert-component'); + } +} diff --git a/composer.json b/composer.json index 034ff8f..b061baf 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "fruitcake/laravel-cors": "^1.0", "laravel/framework": "^7.0", "laravel/tinker": "^2.0", - "laravel/ui": "^2.0" + "laravel/ui": "^2.0", + "laravelcollective/html": "^6.1" }, "require-dev": { "beyondcode/laravel-dump-server": "^1.4", diff --git a/composer.lock b/composer.lock index f363c34..e552f33 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "22c74ad04b0f018f00d3352ca325a4fc", + "content-hash": "ead18808541a134f0505cc7d67c090e1", "packages": [ { "name": "asm89/stack-cors", @@ -881,6 +881,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -927,6 +928,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -1199,6 +1201,74 @@ ], "time": "2020-03-03T20:16:46+00:00" }, + { + "name": "laravelcollective/html", + "version": "v6.1.0", + "source": { + "type": "git", + "url": "https://github.com/LaravelCollective/html.git", + "reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64f2268bf41bf02b3a9dd3c30f102e934d721664", + "reference": "64f2268bf41bf02b3a9dd3c30f102e934d721664", + "shasum": "" + }, + "require": { + "illuminate/http": "^6.0|^7.0", + "illuminate/routing": "^6.0|^7.0", + "illuminate/session": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0", + "illuminate/view": "^6.0|^7.0", + "php": ">=7.2.5" + }, + "require-dev": { + "illuminate/database": "^6.0|^7.0", + "mockery/mockery": "~1.0", + "phpunit/phpunit": "~7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.0-dev" + }, + "laravel": { + "providers": [ + "Collective\\Html\\HtmlServiceProvider" + ], + "aliases": { + "Form": "Collective\\Html\\FormFacade", + "Html": "Collective\\Html\\HtmlFacade" + } + } + }, + "autoload": { + "psr-4": { + "Collective\\Html\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Adam Engebretson", + "email": "adam@laravelcollective.com" + }, + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "HTML and Form Builders for the Laravel Framework", + "homepage": "https://laravelcollective.com", + "time": "2020-03-02T16:41:28+00:00" + }, { "name": "league/commonmark", "version": "1.3.2", diff --git a/resources/views/campaigns/create.blade.php b/resources/views/campaigns/create.blade.php index 530160a..9023a65 100644 --- a/resources/views/campaigns/create.blade.php +++ b/resources/views/campaigns/create.blade.php @@ -11,47 +11,31 @@ - @if($errors->has('subject')) - - @endif + + -@if($errors->has('sending_name')) - - @endif - + -@if($errors->has('sending_email')) - - @endif + +
- +
- @if($errors->has('track_clicks')) - - @endif + +
- +
- @if($errors->has('track_opens')) - - @endif + +
Select template: diff --git a/resources/views/campaigns/edit.blade.php b/resources/views/campaigns/edit.blade.php index 4ed680c..ec1b865 100644 --- a/resources/views/campaigns/edit.blade.php +++ b/resources/views/campaigns/edit.blade.php @@ -2,41 +2,36 @@ @section('content') - -

Edit campaign

- -@csrf + @method('PUT') + @csrf -@if($errors->has('subject')) - - @endif + + + -@if($errors->has('sending_name')) - - @endif + + + -@if($errors->has('sending_email')) - - @endif + + +
track_clicks) checked @endif value="1" > - +
@if($errors->has('track_clicks'))
+@endsection + +@push('pageSpecificJS') + - -@endsection \ No newline at end of file +@endpush \ No newline at end of file diff --git a/resources/views/campaigns/index.blade.php b/resources/views/campaigns/index.blade.php index 7c28aa8..8df9d5e 100644 --- a/resources/views/campaigns/index.blade.php +++ b/resources/views/campaigns/index.blade.php @@ -10,10 +10,11 @@ @foreach($campaigns as $campaign)
- {{ $campaign->subject }} {{ $campaign->status }} + {{ $campaign->subject }} + {{ $campaign->status }}
- @if($campaign->status == 'draft') + @if($campaign->isDraft()) Edit @endif
diff --git a/resources/views/components/check-error-exists-component.blade.php b/resources/views/components/check-error-exists-component.blade.php new file mode 100644 index 0000000..183d29b --- /dev/null +++ b/resources/views/components/check-error-exists-component.blade.php @@ -0,0 +1,5 @@ +@error($controlName) + + +@enderror \ No newline at end of file diff --git a/resources/views/components/error-alert-component.blade.php b/resources/views/components/error-alert-component.blade.php new file mode 100644 index 0000000..6ea0919 --- /dev/null +++ b/resources/views/components/error-alert-component.blade.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 5c58091..0a45304 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -9,6 +9,8 @@ + @stack('pageSpecificCss') + @@ -17,7 +19,6 @@
@yield('content')
- - + @stack('pageSpecificJS') \ No newline at end of file diff --git a/resources/views/lists/create.blade.php b/resources/views/lists/create.blade.php index ba6a15d..7edb54a 100644 --- a/resources/views/lists/create.blade.php +++ b/resources/views/lists/create.blade.php @@ -13,24 +13,26 @@ @csrf + - @if($errors->has('name')) - - @endif + + + + + - @if($errors->has('from_email')) - - @endif + + +
diff --git a/resources/views/templates/create.blade.php b/resources/views/templates/create.blade.php index 2137563..ef1c21b 100644 --- a/resources/views/templates/create.blade.php +++ b/resources/views/templates/create.blade.php @@ -2,40 +2,33 @@ @section('content') - - -
-

Create new template

+

Create new template

- - @csrf + + @csrf + + + +
- - @if($errors->has('name')) - - @endif + -
+ + - + + +@endsection + +@push('pageSpecificJS') + - @if($errors->has('content')) - - @endif - - - - - - -@endsection \ No newline at end of file +@endpush \ No newline at end of file diff --git a/resources/views/templates/edit.blade.php b/resources/views/templates/edit.blade.php index 39e0b83..c463dd9 100644 --- a/resources/views/templates/edit.blade.php +++ b/resources/views/templates/edit.blade.php @@ -2,8 +2,7 @@ @section('content') - - +

Edit template: {{ $template->name }}

@@ -13,26 +12,27 @@ @csrf -@if($errors->has('name')) - - @endif + + - -@if($errors->has('content')) - - @endif + + + -@endsection \ No newline at end of file +@endsection + +@push('pageSpecificJS') + + +@endpush \ No newline at end of file From 76c83f205ac6db770cb38b59bd286ffe939468bb Mon Sep 17 00:00:00 2001 From: Manojkiran Appathurai Date: Tue, 5 May 2020 05:15:29 +0000 Subject: [PATCH 3/3] Apply fixes from StyleCI --- app/Campaign.php | 15 ++++++++------- app/Http/Controllers/CampaignController.php | 10 +++++----- app/Http/Controllers/ListsController.php | 6 +++--- app/Http/Requests/CampaignStoreRequest.php | 2 +- app/Http/Requests/ImportSaveRequest.php | 2 +- app/Http/Requests/SendTestMailRequest.php | 2 +- app/Http/Requests/SettingsUpdateRequest.php | 2 +- app/Http/Requests/SmtpSettings.php | 4 ++-- app/Providers/AppServiceProvider.php | 4 ++-- app/View/Components/CheckErrorExistsComponent.php | 3 +-- app/View/Components/ErrorAlertComponent.php | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/Campaign.php b/app/Campaign.php index 0c12d3e..28c6b8e 100644 --- a/app/Campaign.php +++ b/app/Campaign.php @@ -14,21 +14,22 @@ class Campaign extends Model const FINISHED = 'finished'; /** - * Checks if Current Campaign status is as Specified + * Checks if Current Campaign status is as Specified. * * @param string $status * @return bool **/ - public function isInStatus(string $status):bool + public function isInStatus(string $status): bool { - if($this->status === $status){ + if ($this->status === $status) { return true; } + return false; } /** - * Checks if Current Campaign status is Draft + * Checks if Current Campaign status is Draft. * * @return bool **/ @@ -38,7 +39,7 @@ public function isDraft() } /** - * Checks if Current Campaign status is Not Draft + * Checks if Current Campaign status is Not Draft. * * @return bool **/ @@ -48,7 +49,7 @@ public function isNotDraft() } /** - * Checks if Current Campaign status is Finished + * Checks if Current Campaign status is Finished. * * @return bool **/ @@ -58,7 +59,7 @@ public function isFinished() } /** - * Checks if Current Campaign status is Not FINISHED + * Checks if Current Campaign status is Not FINISHED. * * @return bool **/ diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index 53d01d3..c1aa305 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -128,12 +128,12 @@ public function update(CampaignStoreRequest $request, Campaign $campaign) return back(); } - $updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email','content']), + $updationArray = array_merge($request->only(['subject', 'sending_name', 'sending_email', 'content']), [ - 'track_clicks' => $request->track_clicks ? 1 : 0, - 'track_opens' => $request->track_opens ? 1 : 0, - ]); - + 'track_clicks' => $request->track_clicks ? 1 : 0, + 'track_opens' => $request->track_opens ? 1 : 0, + ]); + $campaign->update($updationArray); return redirect()->route('campaigns.show', $campaign->id); diff --git a/app/Http/Controllers/ListsController.php b/app/Http/Controllers/ListsController.php index 018030a..8c6f53a 100644 --- a/app/Http/Controllers/ListsController.php +++ b/app/Http/Controllers/ListsController.php @@ -49,7 +49,7 @@ public function create() */ public function store(ListStoreRequest $request) { - if(! $request->exists('double_opt_in')){ + if (! $request->exists('double_opt_in')) { $request->request->add(['double_opt_in' => 0]); } @@ -66,7 +66,7 @@ public function store(ListStoreRequest $request) */ public function show(Request $request, Lists $lists) { - $contacts = Contact::where('list_id','=',$lists->id) + $contacts = Contact::where('list_id', '=', $lists->id) ->where('subscribed', ! $request->subscribed) ->orderBy('id', 'desc') ->paginate(10); @@ -94,7 +94,7 @@ public function edit(Lists $lists) */ public function update(ListUpdateRequest $request, Lists $lists) { - if(! $request->exists('double_opt_in')){ + if (! $request->exists('double_opt_in')) { $request->request->add(['double_opt_in' => 0]); } diff --git a/app/Http/Requests/CampaignStoreRequest.php b/app/Http/Requests/CampaignStoreRequest.php index e00d666..7056add 100644 --- a/app/Http/Requests/CampaignStoreRequest.php +++ b/app/Http/Requests/CampaignStoreRequest.php @@ -26,7 +26,7 @@ public function rules() return [ 'subject' => ['required'], 'sending_name' => ['required'], - 'sending_email' => ['required','email'], + 'sending_email' => ['required', 'email'], 'content' => ['required'], ]; } diff --git a/app/Http/Requests/ImportSaveRequest.php b/app/Http/Requests/ImportSaveRequest.php index b62370d..d29c2b9 100644 --- a/app/Http/Requests/ImportSaveRequest.php +++ b/app/Http/Requests/ImportSaveRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'file' => ['required','mimes:csv,txt'], + 'file' => ['required', 'mimes:csv,txt'], ]; } } diff --git a/app/Http/Requests/SendTestMailRequest.php b/app/Http/Requests/SendTestMailRequest.php index 9c9fe55..fb9c6d1 100644 --- a/app/Http/Requests/SendTestMailRequest.php +++ b/app/Http/Requests/SendTestMailRequest.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'email' => ['email','required'], + 'email' => ['email', 'required'], ]; } } diff --git a/app/Http/Requests/SettingsUpdateRequest.php b/app/Http/Requests/SettingsUpdateRequest.php index f2dae87..354d3e1 100644 --- a/app/Http/Requests/SettingsUpdateRequest.php +++ b/app/Http/Requests/SettingsUpdateRequest.php @@ -25,7 +25,7 @@ public function rules() { return [ 'name' => ['required'], - 'email' => ['required','email'], + 'email' => ['required', 'email'], ]; } } diff --git a/app/Http/Requests/SmtpSettings.php b/app/Http/Requests/SmtpSettings.php index d5e436b..e8c0086 100644 --- a/app/Http/Requests/SmtpSettings.php +++ b/app/Http/Requests/SmtpSettings.php @@ -25,11 +25,11 @@ public function rules() { return [ 'host' => ['required'], - 'port' => ['required','integer'], + 'port' => ['required', 'integer'], 'username' => ['required'], 'password' => ['required'], 'name' => ['required'], - 'address' => ['required','email'], + 'address' => ['required', 'email'], ]; } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 995f6e9..b33c825 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,10 +3,10 @@ namespace App\Providers; use App\View\Components\CheckErrorExistsComponent; +use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; use Laravel\Dusk\DuskServiceProvider; -use Illuminate\Support\Facades\Blade; class AppServiceProvider extends ServiceProvider { @@ -19,7 +19,7 @@ public function register() { if ($this->app->environment('local', 'testing')) { $this->app->register(DuskServiceProvider::class); - } + } } /** diff --git a/app/View/Components/CheckErrorExistsComponent.php b/app/View/Components/CheckErrorExistsComponent.php index 9660e8b..6ccbee9 100644 --- a/app/View/Components/CheckErrorExistsComponent.php +++ b/app/View/Components/CheckErrorExistsComponent.php @@ -6,8 +6,7 @@ class CheckErrorExistsComponent extends Component { - /** @var string $controlName */ - + /** @var string */ public $controlName; /** diff --git a/app/View/Components/ErrorAlertComponent.php b/app/View/Components/ErrorAlertComponent.php index f684195..5196334 100644 --- a/app/View/Components/ErrorAlertComponent.php +++ b/app/View/Components/ErrorAlertComponent.php @@ -6,7 +6,7 @@ class ErrorAlertComponent extends Component { - /** @var string $errorMessage */ + /** @var string */ public $errorMessage; /**