Merge remote-tracking branch 'origin/master'

src/app/share/side-menu/app-side-menu.html

@@ -3,34 +3,34 @@
     <p class="menu-title">メニュー</p>
 
     <nav class="menu-list">
-      <a routerLink="/dashboard" routerLinkActive="active" class="menu-button">
+
+      <a routerLink="/dashboard" routerLinkActive="active" 
+        class="menu-button">
         ホーム
       </a>
 
-      <a routerLink="/danka-list" routerLinkActive="active">
+      <a routerLink="/danka-list" [class.active]="isDankaActive()" class="menu-button">
         檀家
       </a>
 
-      <a routerLink="/danka-new" routerLinkActive="active" class="menu-button">
+      <a routerLink="/danka-new" routerLinkActive="active" 
+        class="menu-button">
         檀家登録
       </a>
 
-      <a routerLink="/memorial-list" routerLinkActive="active" class="menu-button">
+      <a routerLink="/memorial-list" routerLinkActive="active" 
+        class="menu-button">
         年次法要
       </a>
 
-      <a routerLink="/event" routerLinkActive="active" class="menu-button">
+      <a routerLink="/event" routerLinkActive="active"  class="menu-button">
         行事
       </a>
 
-      <a routerLink="/search" routerLinkActive="active" class="menu-button">
+      <a routerLink="/search" routerLinkActive="active"  class="menu-button">
         まとめて検索
       </a>
 
-      <!--  ユーザー数が増えた際に実装    -->
-      <!--      <a routerLink="/user-setting" routerLinkActive="active" class="menu-button">-->
-      <!--        利用者設定-->
-      <!--      </a>-->
     </nav>
   </div>
 </aside>

src/app/share/side-menu/app-side-menu.ts

@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
-import { Router, RouterModule } from '@angular/router';
+import { Router, RouterLink, RouterLinkActive } from '@angular/router';
 
 @Component({
   selector: 'app-side-menu',
   standalone: true,
-  imports: [RouterModule],
+  imports: [RouterLink, RouterLinkActive],
   templateUrl: './app-side-menu.html',
   styleUrl: './app-side-menu.scss',
 })
@@ -12,7 +12,21 @@ export class AppSideMenu {
 
   constructor(public router: Router) {}
 
-  isDankaActive(): boolean {
-    return this.router.url.includes('danka');
-  }
+isDankaActive(): boolean {
+  const url = this.router.url.split('?')[0];
+
+  const dankaPages = [
+    '/danka-list',
+    '/danka-detail',
+    '/danka-edit',
+  ];
+
+  const isDankaPage = dankaPages.some(path =>
+    url.startsWith(path)
+  );
+
+  const isExcluded = url.startsWith('/danka-new');
+
+  return isDankaPage && !isExcluded;
+}
 }