Merge pull request #75 from Kovah/dev

v0.0.25
Kovah · Oct 29, 2019 · 82ff258 · 82ff258
2 parents f77cc7b + 13d327e
commit 82ff258
Show file tree

Hide file tree

Showing 60 changed files with 932 additions and 1,025 deletions.
diff --git a/app/Http/Controllers/API/AjaxController.php b/app/Http/Controllers/API/AjaxController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Link;
+use App\Models\LinkList;
 use App\Models\Tag;
 use Illuminate\Http\Request;
 
@@ -45,6 +46,37 @@ public function getTags(Request $request)
         return response()->json($tags);
     }
 
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getLists(Request $request)
+    {
+        $query = $request->get('query', false);
+
+        if (!$query) {
+            return response()->json([]);
+        }
+
+        // Search for tags
+        $tags = LinkList::byUser(auth()->user()->id)
+            ->where('name', 'like', '%' . $query . '%')
+            ->orderBy('name', 'asc')
+            ->get();
+
+        if (!$tags->isEmpty()) {
+            // Properly format the results
+            $tags = $tags->map(function ($item) {
+                return [
+                    'value' => $item->name,
+                    'text' => $item->name,
+                ];
+            });
+        }
+
+        return response()->json($tags);
+    }
+
     /**
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse

diff --git a/app/Http/Controllers/App/DashboardController.php b/app/Http/Controllers/App/DashboardController.php
@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Category;
 use App\Models\Link;
+use App\Models\LinkList;
 use App\Models\Note;
 use App\Models\Tag;
 
@@ -28,7 +29,7 @@ public function index()
 
         $stats = [
             'total_links' => Link::count(),
-            'total_categories' => Category::count(),
+            'total_lists' => LinkList::count(),
             'total_tags' => Tag::count(),
             'total_notes' => Note::count(),
             'total_broken_links' => $broken_links,

diff --git a/.../Controllers/Guest/CategoryController.php → ...Http/Controllers/Guest/ListController.php b/.../Controllers/Guest/CategoryController.php → ...Http/Controllers/Guest/ListController.php
@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Guest;
 
 use App\Http\Controllers\Controller;
-use App\Models\Category;
+use App\Models\LinkList;
 use Illuminate\Http\Request;
 
-class CategoryController extends Controller
+class ListController extends Controller
 {
     /**
      * Display the specified resource.
@@ -17,14 +17,14 @@ class CategoryController extends Controller
      */
     public function show(Request $request, $id)
     {
-        $category = Category::find($id);
+        $list = LinkList::find($id);
 
-        if (empty($category)) {
+        if (empty($list)) {
             abort(404);
         }
 
         // Get links of the category
-        $links = $category->links()->privateOnly(false);
+        $links = $list->links()->privateOnly(false);
 
         if ($request->has('orderBy') && $request->has('orderDir')) {
             $links->orderBy($request->get('orderBy'), $request->get('orderDir'));
@@ -34,9 +34,9 @@ public function show(Request $request, $id)
 
         $links = $links->paginate(getPaginationLimit());
 
-        return view('guest.categories.show', [
-            'category' => $category,
-            'category_links' => $links,
+        return view('guest.lists.show', [
+            'list' => $list,
+            'list_links' => $links,
             'route' => $request->getBaseUrl(),
             'order_by' => $request->get('orderBy'),
             'order_dir' => $request->get('orderDir'),

diff --git a/app/Http/Controllers/Models/CategoryController.php b/app/Http/Controllers/Models/CategoryController.php
diff --git a/app/Http/Controllers/Models/LinkController.php b/app/Http/Controllers/Models/LinkController.php
@@ -53,11 +53,7 @@ public function create()
         // Reset the bookmarklet session identifier to prevent issues on regular pages
         session()->forget('bookmarklet.create');
 
-        return view('models.links.create')
-            ->with('categories', Category::parentOnly()
-                ->byUser(auth()->user()->id)
-                ->orderBy('name')
-                ->get());
+        return view('models.links.create');
     }
 
     /**
@@ -134,10 +130,6 @@ public function edit($id)
         }
 
         return view('models.links.edit')
-            ->with('categories', Category::parentOnly()
-                ->byUser(auth()->user()->id)
-                ->orderBy('name', 'asc')
-                ->get())
             ->with('link', $link);
     }