Merge pull request #31 from ManojKiranA/master

View Components and Code Refactoring
emchooo · May 5, 2020 · 3d3d0b1 · 3d3d0b1
2 parents d5cc8b0 + ab918b0
commit 3d3d0b1
Show file tree

Hide file tree

Showing 28 changed files with 346 additions and 164 deletions.
diff --git a/app/Campaign.php b/app/Campaign.php
@@ -11,6 +11,62 @@ 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,8 +24,8 @@ public function authorize()
     public function rules()
     {
         return [
-            'name'  => 'required',
-            'content'   => 'required',
+            'name'  => ['required'],
+            'content'   => ['required'],
         ];
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,8 @@
 
 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;
@@ -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
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+
+class CheckErrorExistsComponent extends Component
+{
+    /** @var string */
+    public $controlName;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct($controlName)
+    {
+        $this->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
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+
+class ErrorAlertComponent extends Component
+{
+    /** @var string */
+    public $errorMessage;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct($errorMessage)
+    {
+        $this->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
@@ -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",