diff --git a/app/Http/Controllers/Admin/MemberNoteController.php b/app/Http/Controllers/Admin/MemberNoteController.php index d664883..efd291a 100644 --- a/app/Http/Controllers/Admin/MemberNoteController.php +++ b/app/Http/Controllers/Admin/MemberNoteController.php @@ -15,7 +15,7 @@ class MemberNoteController extends Controller */ public function index(Member $member) { - $notes = $member->notes()->with('author')->get(); + $notes = $member->notes()->with('author:id,name')->latest('created_at')->get(); return response()->json(['notes' => $notes]); } diff --git a/package-lock.json b/package-lock.json index 130093d..7857184 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,9 @@ "requires": true, "packages": { "": { + "dependencies": { + "@alpinejs/collapse": "^3.15.8" + }, "devDependencies": { "@tailwindcss/forms": "^0.5.2", "alpinejs": "^3.4.2", @@ -28,6 +31,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@alpinejs/collapse": { + "version": "3.15.8", + "resolved": "https://registry.npmjs.org/@alpinejs/collapse/-/collapse-3.15.8.tgz", + "integrity": "sha512-zZhD8DHdHuzGFe8+cHNH99K//oFutzKwcy6vagydb3KFlTzmqxTnHZo5sSV81lAazhV7qKsYCKtNV14tR9QkJw==", + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", diff --git a/package.json b/package.json index 31208d1..5209566 100644 --- a/package.json +++ b/package.json @@ -14,5 +14,8 @@ "postcss": "^8.4.31", "tailwindcss": "^3.1.0", "vite": "^5.0.0" + }, + "dependencies": { + "@alpinejs/collapse": "^3.15.8" } } diff --git a/resources/js/app.js b/resources/js/app.js index a8093be..fb7bf52 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,7 +1,9 @@ import './bootstrap'; import Alpine from 'alpinejs'; +import collapse from '@alpinejs/collapse'; +Alpine.plugin(collapse); window.Alpine = Alpine; Alpine.start(); diff --git a/resources/views/admin/members/index.blade.php b/resources/views/admin/members/index.blade.php index 152347e..0f35e49 100644 --- a/resources/views/admin/members/index.blade.php +++ b/resources/views/admin/members/index.blade.php @@ -193,22 +193,30 @@
@forelse ($members as $member) -+ + · + +
+尚無備註
+ + + + +找不到符合的備忘錄
+ +