Skip to content

Commit 6e2d709

Browse files
committed
feat: enhance active route selection and table logic
1 parent 17d47c2 commit 6e2d709

4 files changed

Lines changed: 27 additions & 6 deletions

File tree

eventz-ui/src/components/admin/side-nav/side-nav.component.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component } from '@angular/core';
1+
import { Component, OnInit } from '@angular/core';
22
import { ISideNav } from '../../../interfaces/interface';
33
import { sideNavLinks } from '../data/side-nav-links';
44
import { FaIconComponent } from "@fortawesome/angular-fontawesome";
@@ -12,10 +12,21 @@ import { Router } from '@angular/router';
1212
templateUrl: './side-nav.component.html',
1313
styleUrl: './side-nav.component.scss'
1414
})
15-
export class SideNavComponent {
15+
export class SideNavComponent implements OnInit {
1616
links: ISideNav[] = sideNavLinks;
17+
activeLink: ISideNav | undefined;
1718

1819
constructor ( private router:Router) {}
20+
ngOnInit(): void {
21+
console.log(this.router.url.split('/')[2]);
22+
this.activeLink = this.links.find(link => link.name.toLowerCase() === (this.router.url.split('/')[2] || 'dashboard'));
23+
if (this.activeLink) {
24+
this.links = this.links.map((l) => ({
25+
...l,
26+
isActive: l.name === this.activeLink?.name ? true : false
27+
}));
28+
}
29+
}
1930

2031
handleNavigation (link: ISideNav) {
2132
this.links = this.links.map((l) => ({

eventz-ui/src/pages/admin/ticket-list-table/ticket-list-table.component.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2 class="font-semibold text-lg text-eventTableColor">Tickets List</h2>
1515
</div>
1616
<div
1717
*ngIf="showHeaderDropDown"
18-
class="absolute right-4 mt-28 w-28 bg-white border rounded shadow z-10 cursor-pointer"
18+
class="absolute right-4 mt-28 w-auto bg-white border rounded shadow z-10 cursor-pointer"
1919
>
2020
<button class="block w-full text-left px-4 py-2 hover:bg-gray-100">
2121
Add Ticket
@@ -37,8 +37,8 @@ <h2 class="font-semibold text-lg text-eventTableColor">Tickets List</h2>
3737
</thead>
3838

3939
<tbody>
40+
@for (ticket of paginatedTickets; let i = $index; track $index) {
4041
<tr
41-
*ngFor="let ticket of paginatedTickets; let i = index"
4242
class="hover:bg-gray-50 hover:cursor-pointer text-eventTableColor"
4343
>
4444
<td class="px-4 py-3 font-medium">{{ ticket.ticketNo }}</td>
@@ -72,11 +72,18 @@ <h2 class="font-semibold text-lg text-eventTableColor">Tickets List</h2>
7272
class="absolute right-4 mt-2 w-32 bg-white border rounded shadow z-10"
7373
>
7474
<button class="block w-full text-left px-4 py-2 text-red-600 hover:bg-gray-100">
75-
Deactivate
75+
Revoke
7676
</button>
7777
</div>
7878
</td>
7979
</tr>
80+
} @empty {
81+
<tr>
82+
<td colspan="6" class="px-4 py-3 text-center text-eventTableColor">
83+
No tickets found.
84+
</td>
85+
</tr>
86+
}
8087
</tbody>
8188
</table>
8289

eventz-ui/src/pages/admin/ticket-list-table/ticket-list-table.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class TicketListTableComponent {
3535
return Math.ceil(this.tickets.length / this.pageSize);
3636
}
3737

38-
get paginatedTickets(): Ticket[] {
38+
get paginatedTickets(): Ticket[] | [] {
3939
const start = (this.currentPage - 1) * this.pageSize;
4040
return this.tickets.slice(start, start + this.pageSize);
4141
}

eventz-ui/src/pages/admin/user-list-table/user-list-table.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ <h2 class="font-semibold text-lg text-eventTableColor">Users List</h2>
7070
*ngIf="openMenuIndex === i"
7171
class="absolute right-4 mt-2 w-32 bg-white border rounded shadow z-10"
7272
>
73+
<button class="block w-full text-left px-4 py-2 hover:bg-gray-100">
74+
View
75+
</button>
7376
<button class="block w-full text-left px-4 py-2 text-red-600 hover:bg-gray-100">
7477
Deactivate
7578
</button>

0 commit comments

Comments
 (0)