1.2 #11

Merged
jank merged 6 commits from main into prod 2025-01-21 12:37:13 +00:00
6 changed files with 24 additions and 16 deletions
Showing only changes of commit 88e9ffdb4a - Show all commits

View file

@ -1,5 +1,5 @@
<h2 mat-dialog-title>Are you sure?</h2>
<mat-dialog-content>Are you sure you would like to visit {{link}} now?</mat-dialog-content>
<h2 mat-dialog-title>{{data.title}}</h2>
<mat-dialog-content>{{data.description}}</mat-dialog-content>
<mat-dialog-actions>
<button mat-flat-button color="warn" (click)="close()">No</button>
<button mat-flat-button (click)="accept()">Yes</button>

View file

@ -1,18 +1,18 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { VisitLinkConfirmationComponent } from './visit-link-confirmation.component';
import { ConfirmationModalComponent } from './confirmation-modal.component';
describe('VisitLinkConfirmationComponent', () => {
let component: VisitLinkConfirmationComponent;
let fixture: ComponentFixture<VisitLinkConfirmationComponent>;
let component: ConfirmationModalComponent;
let fixture: ComponentFixture<ConfirmationModalComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [VisitLinkConfirmationComponent]
imports: [ConfirmationModalComponent]
})
.compileComponents();
fixture = TestBed.createComponent(VisitLinkConfirmationComponent);
fixture = TestBed.createComponent(ConfirmationModalComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

View file

@ -8,16 +8,17 @@ import {
MatDialogRef,
} from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { ConfirmationModalDto } from '../models/confirmation-modal';
@Component({
selector: 'app-visit-link-confirmation',
selector: 'app-confirmation-modal',
imports: [MatDialogTitle, MatDialogContent, MatDialogActions, MatButtonModule],
templateUrl: './visit-link-confirmation.component.html',
styleUrl: './visit-link-confirmation.component.css'
templateUrl: './confirmation-modal.component.html',
styleUrl: './confirmation-modal.component.css'
})
export class VisitLinkConfirmationComponent {
public link: string = inject(MAT_DIALOG_DATA);
constructor(private dialogRef: MatDialogRef<VisitLinkConfirmationComponent>) {}
export class ConfirmationModalComponent {
public data: ConfirmationModalDto = inject(MAT_DIALOG_DATA);
constructor(private dialogRef: MatDialogRef<ConfirmationModalComponent>) {}
close() {
this.dialogRef.close(false);

View file

@ -8,7 +8,7 @@ import { MatCardModule } from '@angular/material/card';
import { Link } from '../models/link';
import { MatButtonModule } from '@angular/material/button';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { VisitLinkConfirmationComponent } from '../visit-link-confirmation/visit-link-confirmation.component';
import { ConfirmationModalComponent } from '../confirmation-modal/confirmation-modal.component';
@Component({
selector: 'app-dashboard',
@ -31,8 +31,11 @@ export class DashboardComponent {
}
goToLink(link: Link) {
this.dialog.open(VisitLinkConfirmationComponent, {
data: link.link,
this.dialog.open(ConfirmationModalComponent, {
data: {
title: "Are you sure?",
description: "Are you sure that you want to open " + link.link + " now?",
},
}).afterClosed().subscribe((accepted: Boolean) => {
if (accepted) {
this.router.navigate([link.id]);

View file

@ -0,0 +1,4 @@
export interface ConfirmationModalDto {
title: string,
description: string,
}