Add notes to trash handling, fix some issues (#11)

Author: Kovah

app/Http/Controllers/App/TrashController.php

@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Category;
 use App\Models\Link;
+use App\Models\Note;
 use App\Models\Tag;
 use Illuminate\Http\Request;
 
@@ -29,10 +30,15 @@ public function index()
             ->byUser(auth()->id())
             ->get();
 
+        $notes = Note::onlyTrashed()
+            ->byUser(auth()->id())
+            ->get();
+
         return view('actions.trash.index', [
             'links' => $links,
             'categories' => $categories,
             'tags' => $tags,
+            'notes' => $notes,
         ]);
     }
 
@@ -63,6 +69,11 @@ public function clearTrash(Request $reques, $model)
                     ->byUser(auth()->id())
                     ->get();
                 break;
+            case 'notes':
+                $entries = Note::onlyTrashed()
+                    ->byUser(auth()->id())
+                    ->get();
+                break;
         }
 
         if (empty($entries)) {
@@ -72,6 +83,7 @@ public function clearTrash(Request $reques, $model)
 
         foreach ($entries as $entry) {
             $entry->forceDelete();
+            $entry->flushCache();
         }
 
         alert(trans('trash.delete_success.' . $model), 'success');
@@ -101,6 +113,9 @@ public function restoreEntry(Request $request, $model, $id)
             case 'tag':
                 $entry = Tag::withTrashed()->find($id);
                 break;
+            case 'note':
+                $entry = Note::withTrashed()->find($id);
+                break;
         }
 
         if (empty($entry)) {
@@ -112,8 +127,9 @@ public function restoreEntry(Request $request, $model, $id)
         }
 
         $entry->restore();
+        $entry->flushCache();
 
-        alert(trans('trash.delete_success.' . $model), 'success');
+        alert(trans('trash.delete_restore.' . $model), 'success');
 
         return redirect()->route('get-trash');
     }

resources/lang/en/trash.php

@@ -7,6 +7,7 @@
     'deleted_links' => 'Trashed links',
     'deleted_categories' => 'Trashed categories',
     'deleted_tags' => 'Trashed tags',
+    'deleted_notes' => 'Trashed notes',
 
     'restore' => 'Restore entry',
 
@@ -17,9 +18,11 @@
     'delete_success.links' => 'Permanently deleted all links.',
     'delete_success.categories' => 'Permanently deleted all categories.',
     'delete_success.tags' => 'Permanently deleted all tags.',
+    'delete_success.notes' => 'Permanently deleted all notes.',
 
-    'delete_restore.links' => 'Restored the link from trash.',
-    'delete_restore.categories' => 'Restored the category from trash.',
-    'delete_restore.tags' => 'Restored the tag from trash.',
+    'delete_restore.link' => 'Restored the link from trash.',
+    'delete_restore.category' => 'Restored the category from trash.',
+    'delete_restore.tag' => 'Restored the tag from trash.',
+    'delete_restore.note' => 'Restored the note from trash.',
 
 ];

resources/views/actions/trash/index.blade.php

@@ -65,4 +65,23 @@ class="btn btn-sm btn-danger" title="@lang('trash.clear_trash')">
         </div>
     </div>
 
+    <div class="card mt-4">
+        <div class="card-header d-flex align-items-center">
+            <div>
+                @lang('trash.deleted_notes')
+            </div>
+            <div class="ml-auto">
+                <a href="{{ route('clear-trash', ['notes']) }}"
+                    class="btn btn-sm btn-danger" title="@lang('trash.clear_trash')">
+                    <i class="fa fa-recycle"></i> @lang('trash.clear_trash')
+                </a>
+            </div>
+        </div>
+        <div class="card-body">
+
+            @include('actions.trash.partials.note-table', ['notes' => $notes])
+
+        </div>
+    </div>
+
 @endsection

resources/views/actions/trash/partials/category-table.blade.php

@@ -1,5 +1,5 @@
 <div class="table-responsive">
-    <table class="table table-bordered table-hover mb-0">
+    <table class="table table-sm table-bordered table-hover mb-0">
         <thead>
         <tr>
             <th>@lang('category.name')</th>

resources/views/actions/trash/partials/link-table.blade.php

@@ -1,5 +1,5 @@
 <div class="table-responsive">
-    <table class="table table-bordered table-hover mb-0">
+    <table class="table table-sm table-bordered table-hover mb-0">
         <thead>
         <tr>
             <th>@lang('link.url')</th>

resources/views/actions/trash/partials/note-table.blade.php

@@ -0,0 +1,37 @@
+<div class="table-responsive">
+    <table class="table table-sm table-bordered table-hover mb-0">
+        <thead>
+        <tr>
+            <th>@lang('link.link')</th>
+            <th>@lang('note.note_content')</th>
+            <th>@lang('linkace.added_at')</th>
+            <th></th>
+        </tr>
+        </thead>
+        <tbody>
+
+        @foreach($notes as $note)
+            <tr>
+                <td>
+                    <a href="{{ $note->link->url }}" title="{{ $note->link->title }}" target="_blank">
+                        {{ $note->link->title }}
+                    </a>
+                </td>
+                <td>
+                    {{ $note->note }}
+                </td>
+                <td>
+                    {{ formatDateTime($note->created_at) }}
+                </td>
+                <td class="text-right">
+                    <a href="{{ route('trash-restore', ['note', $note->id]) }}"
+                        class="btn btn-sm btn-outline-primary" title="@lang('trash.restore')">
+                        <i class="fa fa-reply"></i>
+                    </a>
+                </td>
+            </tr>
+        @endforeach
+
+        </tbody>
+    </table>
+</div>

resources/views/actions/trash/partials/tag-table.blade.php

@@ -1,5 +1,5 @@
 <div class="table-responsive">
-    <table class="table table-bordered table-hover mb-0">
+    <table class="table table-sm table-bordered table-hover mb-0">
         <thead>
         <tr>
             <th>@lang('tag.name')</th>