improve tags

fr0tt · Aug 22, 2022 · 14eb031 · 14eb031
1 parent e535578
commit 14eb031
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\PostTag;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Tag;
@@ -83,6 +84,8 @@ public function destroy($id)
             return response()->json('Tag not found.', 400);
         }
         $this->authorize('delete', $tag);
+
+        PostTag::where('tag_id', $id)->delete();
         $tag->delete();
 
         return response()->json('', 204);

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "App for bookmarks and notes.",
     "keywords": ["laravel", "lumen", "bookmark", "notes"],
     "license": "MIT",
-    "version": "2.2.9-p1",
+    "version": "2.2.9-p2",
     "type": "project",
     "require": {
         "php": "^7.2.5",

diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/service-worker.js b/public/service-worker.js
diff --git a/resources/js/components/PostItemTags.vue b/resources/js/components/PostItemTags.vue
@@ -31,6 +31,7 @@ export default {
         }
     }
     .tags.item-text {
+        position: absolute;
         margin-top: -0.875rem;
     }
     .tags .tag:hover {

diff --git a/resources/js/components/PostItemText.vue b/resources/js/components/PostItemText.vue
@@ -24,7 +24,7 @@
                     class="text-orange-600 text-xl bg-transparent font-semibold" />
                 <EditorContent :editor="editor" class="editorContent" />
             </div>
-            <PostItemTags :tags="post.tags" class="item-text" />
+            <PostItemTags v-if="!isActive" :tags="post.tags" class="item-text" />
         </div>
         <svg
             v-if="permission > 4"

diff --git a/resources/js/components/pages/Post.vue b/resources/js/components/pages/Post.vue
@@ -275,18 +275,18 @@ export default {
                         })
                         .then((response) => {
                             existingTags = existingTags.concat(response.data.data)
-                            resolve(existingTags.map((tag) => tag.id))
+                            resolve(existingTags)
                         })
                         .catch(() => {
                             this.$store.dispatch('notification/setNotification', {
                                 type: 'error',
                                 title: 'Error',
                                 description: 'Tag(s) could not be created.',
                             })
-                            resolve(existingTags.map((tag) => tag.id))
+                            resolve(existingTags)
                         })
                 } else {
-                    resolve(existingTags.map((tag) => tag.id))
+                    resolve(existingTags)
                 }
             })
         },

diff --git a/resources/js/store/modules/post.js b/resources/js/store/modules/post.js
@@ -146,7 +146,7 @@ export default {
             params.content = post.content
             params.collection_id = post.collection_id
             params.is_uncategorized = (post.collection_id <= 0) | 0
-            params.tags = post.tags
+            params.tags = post.tags.map((tag) => tag.id)
             if (restore) {
                 params.is_archived = false
             }