Rename LogAction - LogActivity

bpocallaghan · bpocallaghan · commit c62c99f3a415 · 2017-06-26T14:23:16.000+01:00
diff --git a/app/Events/ActionWasTriggered.php b/app/Events/ActionWasTriggered.php
diff --git a/app/Events/ActivityWasTriggered.php b/app/Events/ActivityWasTriggered.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Events;
+
+class ActivityWasTriggered extends BaseEvent
+{
+    public $title;
+
+    public $description;
+
+    /**
+     * Create a new event instance.
+     * @param string $title
+     * @param string $description
+     * @param        $subject
+     */
+    public function __construct($title = '', $description = '', $subject = null)
+    {
+        $this->title = $title;
+        $this->eloquent = $subject;
+        $this->description = $description;
+    }
+}
diff --git a/app/Http/Controllers/Admin/General/BannersController.php b/app/Http/Controllers/Admin/General/BannersController.php
@@ -51,7 +51,7 @@ public function store(Request $request)
             $banner = $this->createEntry(Banner::class, $request->except('photo'));
         }
 
-        log_action('Banner Created', 'Banner was created ' . $banner->title);
+        log_activity('Banner Created', 'Banner was created ' . $banner->title);
 
         return redirect_to_resource();
     }
@@ -99,7 +99,7 @@ public function update(Banner $banner, Request $request)
 
         $this->updateEntry($banner, $request->except('photo'));
 
-        log_action('Banner Updated', 'Banner was updated. ' . $banner->title);
+        log_activity('Banner Updated', 'Banner was updated. ' . $banner->title);
 
         return redirect_to_resource();
     }
diff --git a/app/Http/Controllers/Admin/General/TestimonialsController.php b/app/Http/Controllers/Admin/General/TestimonialsController.php
@@ -45,7 +45,7 @@ public function store(Request $request)
         $testimonial = $this->createEntry(Testimonial::class,
             $request->only(['customer', 'link', 'description']));
 
-        log_action('Testimonial Created', 'Testimonial was created ' . $testimonial->customer);
+        log_activity('Testimonial Created', 'Testimonial was created ' . $testimonial->customer);
 
         return redirect_to_resource();
     }
@@ -85,7 +85,7 @@ public function update(Testimonial $testimonial, Request $request)
 
         $this->updateEntry($testimonial, $request->only(['customer', 'link', 'description']));
 
-        log_action('Testimonial Updated', 'Testimonial was updated. ' . $testimonial->customer);
+        log_activity('Testimonial Updated', 'Testimonial was updated. ' . $testimonial->customer);
 
         return redirect_to_resource();
     }
diff --git a/app/Http/Controllers/Admin/History/HistoryController.php b/app/Http/Controllers/Admin/History/HistoryController.php
@@ -3,15 +3,15 @@
 namespace App\Http\Controllers\Admin\History;
 
 use App\Http\Requests;
-use App\Models\LogAction;
+use App\Models\LogActivity;
 use App\Models\LogAdminActivity;
 use Titan\Controllers\TitanAdminController;
 
 class HistoryController extends TitanAdminController
 {
     public function website()
     {
-        $actions = LogAction::getLatest();
+        $actions = LogActivity::getLatest();
 
         return $this->view('history.website', compact('actions'));
     }
diff --git a/app/Http/Controllers/Admin/Settings/Website/ChangelogsController.php b/app/Http/Controllers/Admin/Settings/Website/ChangelogsController.php
@@ -44,7 +44,7 @@ public function store(Request $request)
 
         $changelog = $this->createEntry(Changelog::class, $request->only(['version', 'date_at', 'content']));
 
-        log_action('Changelog Updated', 'Changelog was updated. ' . $changelog->version);
+        log_activity('Changelog Updated', 'Changelog was updated. ' . $changelog->version);
 
         return redirect_to_resource();
     }
@@ -84,7 +84,7 @@ public function update(Changelog $changelog, Request $request)
 
         $this->updateEntry($changelog, $request->only(['version', 'date_at', 'content']));
 
-        log_action('Changelog Updated', 'Changelog was updated. ' . $changelog->version);
+        log_activity('Changelog Updated', 'Changelog was updated. ' . $changelog->version);
 
         return redirect_to_resource();
     }
@@ -100,7 +100,7 @@ public function destroy(Changelog $changelog, Request $request)
     {
         $this->deleteEntry($changelog, $request);
 
-        log_action('Changelog deleted', 'Changelog was deleted.');
+        log_activity('Changelog deleted', 'Changelog was deleted.');
 
         return redirect_to_resource();
     }
diff --git a/app/Http/Controllers/Api/NotificationsController.php b/app/Http/Controllers/Api/NotificationsController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Models\LogAction;
+use App\Models\LogActivity;
 use App\Models\Notification;
 use App\User;
 use Illuminate\Http\Request;
@@ -69,13 +69,13 @@ public function read(User $user, Notification $notification)
      */
     public function getLatestActions()
     {
-        $activities = LogAction::getLatestMinutes(12 * 60);
+        $activities = LogActivity::getLatestMinutes(12 * 60);
 
         $items = [];
         foreach ($activities as $k => $item) {
             $items [] = [
-                'title'      => $item->type,
-                'message'    => $item->message,
+                'title'      => $item->title,
+                'message'    => $item->description,
                 'created_at' => $item->created_at->diffForHumans(),
             ];
         }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -117,7 +117,7 @@ private function sendLoginResponse(Request $request)
 
         $this->clearLoginAttempts($request);
 
-        log_action('Login', user()->fullname . ' logged in.');
+        log_activity('Login', user()->fullname . ' logged in.');
 
         return redirect()->intended('/admin');
     }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -72,7 +72,7 @@ function ($message) use ($user) {
         alert()->success('Thank you,',
             'your account has been created, please check your inbox for further instructions.');
 
-        log_action('User Registered',
+        log_activity('User Registered',
             $user->fullname . ' registered on ' . Carbon::now()->format('d M Y'), $user);
 
         return redirect(route('login'));
@@ -98,15 +98,15 @@ public function confirmRegister($token)
 
                 alert()->success('Success', 'Congratulations, your account has been activated');
 
-                log_action('User Confirmed',
+                log_activity('User Confirmed',
                     $user->fullname . ' confirmed account ' . Carbon::now()->format('d M Y'),
                     $user);
             }
         }
         else {
             alert()->error('Whoops!', 'Sorry, the token does not exist');
 
-            log_action('User Confirmed', 'INVALID TOKEN');
+            log_activity('User Confirmed', 'INVALID TOKEN');
         }
 
         return redirect(route('login'));
diff --git a/app/Listeners/EmailContactUsToAdmin.php b/app/Listeners/EmailContactUsToAdmin.php
@@ -26,7 +26,7 @@ public function handle(ContactUsFeedback $event)
             $user->notify(new ContactUsSubmitted($data));
         }
 
-        log_action('Contact Us', $data->fullname . ' submitted Contact Us.', $data);
+        log_activity('Contact Us', $data->fullname . ' submitted Contact Us.', $data);
         //Mail::send('emails.contactus_admin', ['obj' => $data], function ($message) use ($data) {
         //    $message = mail_to_admins($message);
         //    $message->subject($data->type . ' - ' . env('app.name'));
diff --git a/app/Listeners/SaveActivity.php b/app/Listeners/SaveActivity.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\LogActivity;
+use App\Events\ActivityWasTriggered;
+
+class SaveActivity
+{
+    /**
+     * Handle the event.
+     *
+     * @param ActivityWasTriggered $event
+     */
+    public function handle(ActivityWasTriggered $event)
+    {
+        $title = $event->title;
+        if (strlen($title) < 2) {
+            $title = str_replace(['App\\', 'Models\\'], '', get_class($event->eloquent));
+        }
+
+        $subject = get_class($event->eloquent);
+        $subjectId = $event->eloquent ? $event->eloquent->id : null;
+
+        if ($event->eloquent && !strpos($subject, '\Models')) {
+            $subjectId = null;
+            $subject = 'App\User';
+        }
+
+        // log adjustment
+        LogActivity::create([
+            'title'        => $title,
+            'description'  => $event->description,
+            'subject_id'   => $subjectId,
+            'subject_type' => $subject,
+            'user_id'      => user()->id,
+        ]);
+    }
+}
diff --git a/app/Models/LogActivity.php b/app/Models/LogActivity.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class LogActivity extends Model
+{
+    protected $table = 'log_activities';
+
+    protected $guarded = ['id'];
+
+    /**
+     * Get the subject of the activity.
+     *
+     * @return mixed
+     */
+    public function subject()
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * Get the latest activities on the site
+     * @param int $limit
+     * @return mixed
+     */
+    static public function getLatest($limit = 200)
+    {
+        return self::with('subject')->orderBy('created_at', 'DESC')->limit($limit)->get();
+    }
+
+    /**
+     * Get the latest activities on the site
+     * @param int $minutes
+     * @return mixed
+     */
+    static public function getLatestMinutes($minutes = 24 * 60)
+    {
+        $date = Carbon::now()->subMinutes($minutes);
+
+        return self::where('created_at', '>=', $date)->orderBy('created_at', 'DESC')->get();
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -15,7 +15,7 @@ class EventServiceProvider extends ServiceProvider
     protected $listen = [
         // log actions
         'App\Events\ActionWasTriggered' => [
-            'App\Listeners\SaveAction',
+            'App\Listeners\SaveActivity',
         ],
         'App\Events\ContactUsFeedback' => [
             'App\Listeners\EmailContactUsToClient',
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "intervention/image": "^2.3",
         "bpocallaghan/alert": "^1.0",
         "bpocallaghan/notify": "^2.0",
-        "bpocallaghan/titan": "0.2.0",
+        "bpocallaghan/titan": "^0.2.3",
         "spatie/laravel-analytics": "1.4.1",
         "yajra/laravel-datatables-oracle": "^7.7"
     },
diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2017_06_17_113455_create_log_activities_table.php b/database/migrations/2017_06_17_113455_create_log_activities_table.php
diff --git a/resources/assets/admin/css/titan/titan.css b/resources/assets/admin/css/titan/titan.css
diff --git a/resources/views/admin/history/website.blade.php b/resources/views/admin/history/website.blade.php
diff --git a/resources/views/admin/partials/navigation_list.blade.php b/resources/views/admin/partials/navigation_list.blade.php

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function store(Request $request)`
`51`	`51`	`$banner = $this->createEntry(Banner::class, $request->except('photo'));`
`52`	`52`	`}`
`53`	`53`
`54`		`- log_action('Banner Created', 'Banner was created ' . $banner->title);`
	`54`	`+ log_activity('Banner Created', 'Banner was created ' . $banner->title);`
`55`	`55`
`56`	`56`	`return redirect_to_resource();`
`57`	`57`	`}`
`@@ -99,7 +99,7 @@ public function update(Banner $banner, Request $request)`
`99`	`99`
`100`	`100`	`$this->updateEntry($banner, $request->except('photo'));`
`101`	`101`
`102`		`- log_action('Banner Updated', 'Banner was updated. ' . $banner->title);`
	`102`	`+ log_activity('Banner Updated', 'Banner was updated. ' . $banner->title);`
`103`	`103`
`104`	`104`	`return redirect_to_resource();`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function store(Request $request)`
`45`	`45`	`$testimonial = $this->createEntry(Testimonial::class,`
`46`	`46`	`$request->only(['customer', 'link', 'description']));`
`47`	`47`
`48`		`- log_action('Testimonial Created', 'Testimonial was created ' . $testimonial->customer);`
	`48`	`+ log_activity('Testimonial Created', 'Testimonial was created ' . $testimonial->customer);`
`49`	`49`
`50`	`50`	`return redirect_to_resource();`
`51`	`51`	`}`
`@@ -85,7 +85,7 @@ public function update(Testimonial $testimonial, Request $request)`
`85`	`85`
`86`	`86`	`$this->updateEntry($testimonial, $request->only(['customer', 'link', 'description']));`
`87`	`87`
`88`		`- log_action('Testimonial Updated', 'Testimonial was updated. ' . $testimonial->customer);`
	`88`	`+ log_activity('Testimonial Updated', 'Testimonial was updated. ' . $testimonial->customer);`
`89`	`89`
`90`	`90`	`return redirect_to_resource();`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@`
`3`	`3`	`namespace App\Http\Controllers\Admin\History;`
`4`	`4`
`5`	`5`	`use App\Http\Requests;`
`6`		`-use App\Models\LogAction;`
	`6`	`+use App\Models\LogActivity;`
`7`	`7`	`use App\Models\LogAdminActivity;`
`8`	`8`	`use Titan\Controllers\TitanAdminController;`
`9`	`9`
`10`	`10`	`class HistoryController extends TitanAdminController`
`11`	`11`	`{`
`12`	`12`	`public function website()`
`13`	`13`	`{`
`14`		`- $actions = LogAction::getLatest();`
	`14`	`+ $actions = LogActivity::getLatest();`
`15`	`15`
`16`	`16`	`return $this->view('history.website', compact('actions'));`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function store(Request $request)`
`44`	`44`
`45`	`45`	`$changelog = $this->createEntry(Changelog::class, $request->only(['version', 'date_at', 'content']));`
`46`	`46`
`47`		`- log_action('Changelog Updated', 'Changelog was updated. ' . $changelog->version);`
	`47`	`+ log_activity('Changelog Updated', 'Changelog was updated. ' . $changelog->version);`
`48`	`48`
`49`	`49`	`return redirect_to_resource();`
`50`	`50`	`}`
`@@ -84,7 +84,7 @@ public function update(Changelog $changelog, Request $request)`
`84`	`84`
`85`	`85`	`$this->updateEntry($changelog, $request->only(['version', 'date_at', 'content']));`
`86`	`86`
`87`		`- log_action('Changelog Updated', 'Changelog was updated. ' . $changelog->version);`
	`87`	`+ log_activity('Changelog Updated', 'Changelog was updated. ' . $changelog->version);`
`88`	`88`
`89`	`89`	`return redirect_to_resource();`
`90`	`90`	`}`
`@@ -100,7 +100,7 @@ public function destroy(Changelog $changelog, Request $request)`
`100`	`100`	`{`
`101`	`101`	`$this->deleteEntry($changelog, $request);`
`102`	`102`
`103`		`- log_action('Changelog deleted', 'Changelog was deleted.');`
	`103`	`+ log_activity('Changelog deleted', 'Changelog was deleted.');`
`104`	`104`
`105`	`105`	`return redirect_to_resource();`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private function sendLoginResponse(Request $request)`
`117`	`117`
`118`	`118`	`$this->clearLoginAttempts($request);`
`119`	`119`
`120`		`- log_action('Login', user()->fullname . ' logged in.');`
	`120`	`+ log_activity('Login', user()->fullname . ' logged in.');`
`121`	`121`
`122`	`122`	`return redirect()->intended('/admin');`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function handle(ContactUsFeedback $event)`
`26`	`26`	`$user->notify(new ContactUsSubmitted($data));`
`27`	`27`	`}`
`28`	`28`
`29`		`- log_action('Contact Us', $data->fullname . ' submitted Contact Us.', $data);`
	`29`	`+ log_activity('Contact Us', $data->fullname . ' submitted Contact Us.', $data);`
`30`	`30`	`//Mail::send('emails.contactus_admin', ['obj' => $data], function ($message) use ($data) {`
`31`	`31`	`// $message = mail_to_admins($message);`
`32`	`32`	`// $message->subject($data->type . ' - ' . env('app.name'));`