Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

poohr 3 nedēļas atpakaļ
vecāks
revīzija
902303ebf0

+ 0
- 3
src/app/pages/danka-detail/danka-detail.html Parādīt failu

@@ -398,9 +398,6 @@
398 398
           <section class="family-tree-tab-content">
399 399
             <div class="section-heading">
400 400
               <h2>家系図</h2>
401
-              <p>
402
-                家族情報に登録された親子・配偶者の関係をもとに表示します。
403
-              </p>
404 401
             </div>
405 402
 
406 403
             @if (families.length > 0) {

+ 6
- 6
src/app/share/side-menu/app-side-menu.html Parādīt failu

@@ -7,7 +7,7 @@
7 7
         ホーム
8 8
       </a>
9 9
 
10
-      <a routerLink="/danka-list" routerLinkActive="active" class="menu-button">
10
+      <a routerLink="/danka-list" routerLinkActive="active">
11 11
         檀家
12 12
       </a>
13 13
 
@@ -27,10 +27,10 @@
27 27
         まとめて検索
28 28
       </a>
29 29
 
30
-<!--  ユーザー数が増えた際に実装    -->
31
-<!--      <a routerLink="/user-setting" routerLinkActive="active" class="menu-button">-->
32
-<!--        利用者設定-->
33
-<!--      </a>-->
30
+      <!--  ユーザー数が増えた際に実装    -->
31
+      <!--      <a routerLink="/user-setting" routerLinkActive="active" class="menu-button">-->
32
+      <!--        利用者設定-->
33
+      <!--      </a>-->
34 34
     </nav>
35 35
   </div>
36
-</aside>
36
+</aside>

+ 11
- 3
src/app/share/side-menu/app-side-menu.ts Parādīt failu

@@ -1,10 +1,18 @@
1 1
 import { Component } from '@angular/core';
2
-import { RouterLink, RouterLinkActive } from '@angular/router';
2
+import { Router, RouterModule } from '@angular/router';
3 3
 
4 4
 @Component({
5 5
   selector: 'app-side-menu',
6
-  imports: [RouterLink, RouterLinkActive],
6
+  standalone: true,
7
+  imports: [RouterModule],
7 8
   templateUrl: './app-side-menu.html',
8 9
   styleUrl: './app-side-menu.scss',
9 10
 })
10
-export class AppSideMenu {}
11
+export class AppSideMenu {
12
+
13
+  constructor(public router: Router) {}
14
+
15
+  isDankaActive(): boolean {
16
+    return this.router.url.includes('danka');
17
+  }
18
+}

Notiek ielāde…
Atcelt
Saglabāt