Compare commits

...

11 commits

25 changed files with 215 additions and 37 deletions

View file

@ -29,6 +29,7 @@
], ],
"styles": [ "styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/bootstrap/dist/css/bootstrap.min.css",
"node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [ "scripts": [

17
package-lock.json generated
View file

@ -19,6 +19,7 @@
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^18.0.0",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.15.0" "zone.js": "~0.15.0"
@ -5840,6 +5841,22 @@
"@popperjs/core": "^2.11.8" "@popperjs/core": "^2.11.8"
} }
}, },
"node_modules/bootstrap-icons": {
"version": "1.11.3",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
"integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/twbs"
},
{
"type": "opencollective",
"url": "https://opencollective.com/bootstrap"
}
],
"license": "MIT"
},
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

View file

@ -21,6 +21,7 @@
"@ng-bootstrap/ng-bootstrap": "^18.0.0", "@ng-bootstrap/ng-bootstrap": "^18.0.0",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.15.0" "zone.js": "~0.15.0"
@ -39,4 +40,4 @@
"karma-jasmine-html-reporter": "~2.1.0", "karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.7.2" "typescript": "~5.7.2"
} }
} }

View file

@ -1,2 +1,19 @@
<app-toast-container aria-live="polite" aria-atomic="true"/> <app-toast-container aria-live="polite" aria-atomic="true"/>
<nav class="navbar navbar-expand-sm bg-body-secondary">
<div class="container-fluid">
<button class="navbar-toggler" type="button" (click)="isMenuCollapsed = !isMenuCollapsed">&#9776;</button>
<div [ngbCollapse]="isMenuCollapsed" class="collapse navbar-collapse">
<ul class="navbar-nav">
@for (route of routes; track $index; ) {
@if (route.component !== undefined) {
<li class="nav-item">
<a class="nav-link text-capitalize" [routerLink]="route.path" routerLinkActive="active"
(click)="isMenuCollapsed = true">{{ route.path }}</a>
</li>
}
}
</ul>
</div>
</div>
</nav>
<router-outlet/> <router-outlet/>

View file

@ -1,5 +1,5 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { AppComponent } from './app.component'; import {AppComponent} from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async () => { beforeEach(async () => {

View file

@ -1,13 +1,17 @@
import { Component } from '@angular/core'; import {Component} from '@angular/core';
import { RouterOutlet } from '@angular/router'; import {RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router';
import {ToastContainerComponent} from '../components/toast-container/toast-container/toast-container.component'; import {ToastContainerComponent} from '../components/toast-container/toast-container/toast-container.component';
import {NgbCollapse} from '@ng-bootstrap/ng-bootstrap';
import {routes} from './app.routes';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
imports: [RouterOutlet, ToastContainerComponent], imports: [RouterOutlet, ToastContainerComponent, NgbCollapse, RouterLink, RouterLinkActive],
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrl: './app.component.css' styleUrl: './app.component.css'
}) })
export class AppComponent { export class AppComponent {
title = 'untitled'; title = 'untitled';
isMenuCollapsed: boolean = true;
protected readonly routes = routes;
} }

View file

@ -1,4 +1,4 @@
import { Routes } from '@angular/router'; import {Routes} from '@angular/router';
import {ShowsComponent} from '../pages/shows/shows.component'; import {ShowsComponent} from '../pages/shows/shows.component';
export const routes: Routes = [ export const routes: Routes = [

View file

@ -2,8 +2,9 @@
<h4 class="modal-title"> Add new show</h4> <h4 class="modal-title"> Add new show</h4>
<button type="button" class="btn-close" aria-label="Close" (click)="dismiss()"></button> <button type="button" class="btn-close" aria-label="Close" (click)="dismiss()"></button>
</div> </div>
<div class="modal-body"> <form [formGroup]="newShowForm" (submit)="formSubmitted(newShowForm)">
<form [formGroup]="newShowForm" (ngSubmit)="formSubmitted(newShowForm)"> <div class="modal-body">
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Title</label> <label class="form-label">Title</label>
<input formControlName="title" type="text" class="form-control"/> <input formControlName="title" type="text" class="form-control"/>
@ -24,8 +25,8 @@
<label class="form-label">Description</label> <label class="form-label">Description</label>
<input formControlName="description" type="text" class="form-control"/> <input formControlName="description" type="text" class="form-control"/>
</div> </div>
<div class="d-grid justify-content-md-end"> </div>
<button type="submit" class="btn btn-success" [disabled]="newShowForm.invalid">Submit</button> <div class="modal-footer">
</div> <button type="submit" class="btn btn-success" [disabled]="newShowForm.invalid">Submit</button>
</form> </div>
</div> </form>

View file

@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from '@angular/core/testing';
import { CreateModalComponent } from './create-modal.component'; import {CreateModalComponent} from './create-modal.component';
describe('CreateModalComponent', () => { describe('CreateModalComponent', () => {
let component: CreateModalComponent; let component: CreateModalComponent;
@ -10,7 +10,7 @@ describe('CreateModalComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [CreateModalComponent] imports: [CreateModalComponent]
}) })
.compileComponents(); .compileComponents();
fixture = TestBed.createComponent(CreateModalComponent); fixture = TestBed.createComponent(CreateModalComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View file

@ -0,0 +1,25 @@
<div class="modal-header">
<h4 class="modal-title text-truncate">Delete {{ showName }}?</h4>
<button type="button" class="btn-close" aria-label="Close" (click)="this.activeModal.dismiss()"></button>
</div>
<div class="modal-body">
<p>Are you sure you want to delete this show?</p>
<b class="text-danger-emphasis">This cannot be reversed</b>
<div class="card" #collapse="ngbCollapse" [(ngbCollapse)]="formHidden">
<div class="card-body">
<form [formGroup]="confirmationForm" (ngSubmit)="formSubmitted()">
<label class="form-label">To avoid mistakes, please type the name of the show to continue:</label>
<input formControlName="name" type="text" class="form-control">
</form>
</div>
</div>
</div>
<div class="modal-footer">
<button
type="submit"
class="btn btn-danger"
(click)="deletePressed()"
[disabled]="confirmationForm.invalid && buttonDisabled"
>Delete
</button>
</div>

View file

@ -0,0 +1,23 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {DeleteModalComponent} from './delete-modal.component';
describe('DeleteModalComponent', () => {
let component: DeleteModalComponent;
let fixture: ComponentFixture<DeleteModalComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [DeleteModalComponent]
})
.compileComponents();
fixture = TestBed.createComponent(DeleteModalComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View file

@ -0,0 +1,46 @@
import {Component, inject} from '@angular/core';
import {NgbActiveModal, NgbCollapse} from '@ng-bootstrap/ng-bootstrap';
import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms';
@Component({
selector: 'app-delete-modal',
imports: [
NgbCollapse,
FormsModule,
ReactiveFormsModule
],
templateUrl: './delete-modal.component.html',
styleUrl: './delete-modal.component.css'
})
export class DeleteModalComponent {
protected activeModal: NgbActiveModal = inject(NgbActiveModal)
showName: string = ""
formHidden: boolean = true;
buttonDisabled: boolean = false;
confirmationForm: FormGroup
constructor() {
this.confirmationForm = new FormGroup({
name: new FormControl("", Validators.required)
})
}
deletePressed() {
if (this.formHidden) {
const regex = new RegExp(this.showName)
const control = new FormControl("", [Validators.required, Validators.pattern(regex)])
this.confirmationForm.setControl("name", control)
this.formHidden = false;
this.buttonDisabled = true;
} else {
this.formSubmitted()
}
}
formSubmitted() {
if (this.confirmationForm.valid) {
this.activeModal.close(true)
}
}
}

View file

@ -3,5 +3,6 @@
[header]="toast.header || ''" [autohide]="true" [delay]="toast.delay || 5000" [header]="toast.header || ''" [autohide]="true" [delay]="toast.delay || 5000"
(hidden)="toastService.remove(toast)" (hidden)="toastService.remove(toast)"
[animation]="true" [class]="toast.htmlClass" [animation]="true" [class]="toast.htmlClass"
>{{ toast.body }}</ngb-toast> >{{ toast.body }}
</ngb-toast>
} }

View file

@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from '@angular/core/testing';
import { ToastContainerComponent } from './toast-container.component'; import {ToastContainerComponent} from './toast-container.component';
describe('ToastContainerComponent', () => { describe('ToastContainerComponent', () => {
let component: ToastContainerComponent; let component: ToastContainerComponent;
@ -10,7 +10,7 @@ describe('ToastContainerComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [ToastContainerComponent] imports: [ToastContainerComponent]
}) })
.compileComponents(); .compileComponents();
fixture = TestBed.createComponent(ToastContainerComponent); fixture = TestBed.createComponent(ToastContainerComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View file

@ -8,6 +8,6 @@
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
</body> </body>
</html> </html>

View file

@ -0,0 +1,4 @@
export interface ShowsApiDeletion {
status: string
message: string
}

View file

@ -1,8 +1,8 @@
/// <reference types="@angular/localize" /> /// <reference types="@angular/localize" />
import { bootstrapApplication } from '@angular/platform-browser'; import {bootstrapApplication} from '@angular/platform-browser';
import { appConfig } from './app/app.config'; import {appConfig} from './app/app.config';
import { AppComponent } from './app/app.component'; import {AppComponent} from './app/app.component';
bootstrapApplication(AppComponent, appConfig) bootstrapApplication(AppComponent, appConfig)
.catch((err) => console.error(err)); .catch((err) => console.error(err));

View file

@ -6,6 +6,12 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title">{{ show.title }}</h5> <h5 class="card-title">{{ show.title }}</h5>
<p class="card-text">{{ show.date | date }}</p> <p class="card-text">{{ show.date | date }}</p>
<button type="button" class="btn btn-outline-danger" (click)="deleteShow(show)">
<i class="bi bi-trash"></i>
</button>
<button type="button" class="btn btn-outline-warning">
<i class="bi bi-pencil"></i>
</button>
</div> </div>
</div> </div>
} }

View file

@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from '@angular/core/testing';
import { ShowsComponent } from './shows.component'; import {ShowsComponent} from './shows.component';
describe('ShowsComponent', () => { describe('ShowsComponent', () => {
let component: ShowsComponent; let component: ShowsComponent;
@ -10,7 +10,7 @@ describe('ShowsComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [ShowsComponent] imports: [ShowsComponent]
}) })
.compileComponents(); .compileComponents();
fixture = TestBed.createComponent(ShowsComponent); fixture = TestBed.createComponent(ShowsComponent);
component = fixture.componentInstance; component = fixture.componentInstance;

View file

@ -4,10 +4,12 @@ import {Show} from '../../interfaces/show';
import {ShowsApiResponse} from '../../interfaces/shows-api-response'; import {ShowsApiResponse} from '../../interfaces/shows-api-response';
import {Toast} from '../../interfaces/toast'; import {Toast} from '../../interfaces/toast';
import {ToastService} from '../../services/toast/toast.service'; import {ToastService} from '../../services/toast/toast.service';
import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
import {CreateModalComponent} from '../../components/create-modal/create-modal/create-modal.component'; import {CreateModalComponent} from '../../components/create-modal/create-modal/create-modal.component';
import {DatePipe} from '@angular/common'; import {DatePipe} from '@angular/common';
import {ShowsApiIdResponse} from '../../interfaces/shows-api-id-response'; import {ShowsApiIdResponse} from '../../interfaces/shows-api-id-response';
import {DeleteModalComponent} from '../../components/delete-modal/delete-modal.component';
import {ShowsApiDeletion} from '../../interfaces/shows-api-deletion';
@Component({ @Component({
selector: 'app-shows', selector: 'app-shows',
@ -51,13 +53,38 @@ export class ShowsComponent {
this.api.getShow(result).subscribe({ this.api.getShow(result).subscribe({
next: (response: ShowsApiIdResponse) => { next: (response: ShowsApiIdResponse) => {
console.log(response.show)
this.shows.push(response.show) this.shows.push(response.show)
}, error: (err: any) => { }, error: (err: any) => {
console.error(`Error: ${err}`) console.error(`Error: ${err}`)
}, complete: () => {} }, complete: () => {
}
}) })
} }
) )
} }
deleteShow(show: Show) {
let modal: NgbModalRef = this.modalService.open(DeleteModalComponent)
modal.componentInstance.showName = show.title;
modal.result.then(
(result) => {
if (result) {
this.api.deleteShw(show._id).subscribe({
next: (response: ShowsApiDeletion) => {
// Do nothing
}, error: (err: any) => {
console.log(err)
}, complete: () => {
this.toastService.show({body: "Show deleted!"})
this.shows = this.shows.filter(((s: Show) => s != show))
}
}
)
}
},
(result) => {
// Dismissed, do nothing
}
)
}
} }

View file

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { ShowsApiService } from './shows-api.service'; import {ShowsApiService} from './shows-api.service';
describe('ShowsApiService', () => { describe('ShowsApiService', () => {
let service: ShowsApiService; let service: ShowsApiService;

View file

@ -4,6 +4,7 @@ import {Observable} from 'rxjs';
import {ShowsApiResponse} from '../../interfaces/shows-api-response'; import {ShowsApiResponse} from '../../interfaces/shows-api-response';
import {ShowsApiCreation} from '../../interfaces/shows-api-creation'; import {ShowsApiCreation} from '../../interfaces/shows-api-creation';
import {ShowsApiIdResponse} from '../../interfaces/shows-api-id-response'; import {ShowsApiIdResponse} from '../../interfaces/shows-api-id-response';
import {ShowsApiDeletion} from '../../interfaces/shows-api-deletion';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -23,10 +24,14 @@ export class ShowsApiService {
} }
getShow(id: string): Observable<ShowsApiIdResponse> { getShow(id: string): Observable<ShowsApiIdResponse> {
return this.http.get<ShowsApiIdResponse>(this.showsEndpoint + "id/" + id ) return this.http.get<ShowsApiIdResponse>(this.showsEndpoint + "id/" + id)
} }
sendShow(newShow: {}) { sendShow(newShow: {}) {
return this.http.post<ShowsApiCreation>(this.showsEndpoint, newShow) return this.http.post<ShowsApiCreation>(this.showsEndpoint, newShow)
} }
deleteShw(id: string): Observable<ShowsApiDeletion> {
return this.http.delete<ShowsApiDeletion>(this.showsEndpoint + "id/" + id)
}
} }

View file

@ -1,6 +1,6 @@
import { TestBed } from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import { ToastService } from './toast.service'; import {ToastService} from './toast.service';
describe('ToastService', () => { describe('ToastService', () => {
let service: ToastService; let service: ToastService;

View file

@ -1,4 +1,4 @@
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import {Toast} from '../../interfaces/toast'; import {Toast} from '../../interfaces/toast';
@Injectable({ @Injectable({