ciyidogan commited on
Commit
9f145bf
·
verified ·
1 Parent(s): fd0199a

Update flare-ui/src/app/components/main/main.component.ts

Browse files
flare-ui/src/app/components/main/main.component.ts CHANGED
@@ -8,7 +8,6 @@ import { MatIconModule } from '@angular/material/icon';
8
  import { MatMenuModule } from '@angular/material/menu';
9
  import { MatBadgeModule } from '@angular/material/badge';
10
  import { MatDividerModule } from '@angular/material/divider';
11
- import { MatTooltipModule } from '@angular/material/tooltip';
12
  import { AuthService } from '../../services/auth.service';
13
  import { ActivityLogComponent } from '../activity-log/activity-log.component';
14
 
@@ -27,7 +26,6 @@ import { ActivityLogComponent } from '../activity-log/activity-log.component';
27
  MatMenuModule,
28
  MatBadgeModule,
29
  MatDividerModule,
30
- MatTooltipModule,
31
  ActivityLogComponent
32
  ],
33
  template: `
@@ -53,9 +51,11 @@ import { ActivityLogComponent } from '../activity-log/activity-log.component';
53
  <mat-icon>notifications</mat-icon>
54
  </button>
55
 
56
- <div class="activity-log-wrapper" *ngIf="showActivityLog" (click)="$event.stopPropagation()">
57
- <app-activity-log (close)="toggleActivityLog()"></app-activity-log>
58
- </div>
 
 
59
 
60
  <button mat-icon-button [matMenuTriggerFor]="userMenu" matTooltip="User Menu">
61
  <mat-icon>account_circle</mat-icon>
@@ -76,7 +76,7 @@ import { ActivityLogComponent } from '../activity-log/activity-log.component';
76
  </mat-toolbar-row>
77
  </mat-toolbar>
78
 
79
- <nav mat-tab-nav-bar class="nav-tabs">
80
  <a mat-tab-link
81
  routerLink="/user-info"
82
  routerLinkActive #rla1="routerLinkActive"
@@ -127,16 +127,19 @@ import { ActivityLogComponent } from '../activity-log/activity-log.component';
127
 
128
  <a mat-tab-link
129
  routerLink="/test"
130
- routerLinkActive #rla7="routerLinkActive"
131
- [active]="rla7.isActive">
132
  <mat-icon>bug_report</mat-icon>
133
  Test
134
  </a>
135
  </nav>
136
 
137
- <main class="content">
138
- <router-outlet></router-outlet>
139
- </main>
 
 
 
140
  </div>
141
  `,
142
  styles: [`
 
8
  import { MatMenuModule } from '@angular/material/menu';
9
  import { MatBadgeModule } from '@angular/material/badge';
10
  import { MatDividerModule } from '@angular/material/divider';
 
11
  import { AuthService } from '../../services/auth.service';
12
  import { ActivityLogComponent } from '../activity-log/activity-log.component';
13
 
 
26
  MatMenuModule,
27
  MatBadgeModule,
28
  MatDividerModule,
 
29
  ActivityLogComponent
30
  ],
31
  template: `
 
51
  <mat-icon>notifications</mat-icon>
52
  </button>
53
 
54
+ @if (showActivityLog) {
55
+ <div class="activity-log-wrapper" (click)="$event.stopPropagation()">
56
+ <app-activity-log (close)="toggleActivityLog()"></app-activity-log>
57
+ </div>
58
+ }
59
 
60
  <button mat-icon-button [matMenuTriggerFor]="userMenu" matTooltip="User Menu">
61
  <mat-icon>account_circle</mat-icon>
 
76
  </mat-toolbar-row>
77
  </mat-toolbar>
78
 
79
+ <nav mat-tab-nav-bar class="nav-tabs" #navBar="matTabNavBar">
80
  <a mat-tab-link
81
  routerLink="/user-info"
82
  routerLinkActive #rla1="routerLinkActive"
 
127
 
128
  <a mat-tab-link
129
  routerLink="/test"
130
+ routerLinkActive #rla5="routerLinkActive"
131
+ [active]="rla5.isActive">
132
  <mat-icon>bug_report</mat-icon>
133
  Test
134
  </a>
135
  </nav>
136
 
137
+ <mat-tab-nav-panel #tabPanel>
138
+ <main class="content">
139
+ <router-outlet></router-outlet>
140
+ </main>
141
+ </mat-tab-nav-panel>
142
+
143
  </div>
144
  `,
145
  styles: [`