Vorbereitung Release 0.2.0
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
h1 {
|
||||
color: blue;
|
||||
}
|
||||
|
||||
.app {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
/* max-width: 500px; */
|
||||
margin: auto;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
<div class="app">
|
||||
<kontor-header />
|
||||
<app-navigation/>
|
||||
<main>
|
||||
<router-outlet />
|
||||
</main>
|
||||
|
||||
<kontor-footer />
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
import { KontorHeaderComponent } from "./kontor/header/header.component";
|
||||
import { KontorFooterComponent } from './kontor/footer/footer.component';
|
||||
import { NavigationComponent } from "./kontor/navigation/navigation.component";
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
imports: [RouterOutlet, KontorHeaderComponent, KontorFooterComponent, NavigationComponent],
|
||||
templateUrl: './app.component.html',
|
||||
styleUrl: './app.component.css'
|
||||
})
|
||||
export class AppComponent {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import { ApplicationConfig, provideBrowserGlobalErrorListeners, provideZoneChangeDetection } from '@angular/core';
|
||||
import { provideRouter, withComponentInputBinding } from '@angular/router';
|
||||
import { routes } from './app.routes';
|
||||
import { provideHttpClient } from '@angular/common/http';
|
||||
|
||||
export const appConfig: ApplicationConfig = {
|
||||
providers: [
|
||||
provideBrowserGlobalErrorListeners(),
|
||||
provideZoneChangeDetection({ eventCoalescing: true }),
|
||||
provideRouter(routes, withComponentInputBinding()),
|
||||
provideHttpClient(),
|
||||
]
|
||||
};
|
||||
@@ -0,0 +1,26 @@
|
||||
import { Routes } from '@angular/router';
|
||||
import { KontorComponent } from './kontor/kontor.component';
|
||||
import { Auth } from './common/auth/auth';
|
||||
import { ComicSectionComponent } from './kontor/comic/comic-section/comic-section.component';
|
||||
import { comicRoutes } from './kontor/comic/comic-section/comic-section.routes';
|
||||
import { TyscSectionComponent } from './kontor/tysc/tysc-section/tysc-section.component';
|
||||
import { tyscRoutes } from './kontor/tysc/tysc-section/tysc-section.routes';
|
||||
import { MediaSectionComponent } from './kontor/media/media-section/media-section.component';
|
||||
import { mediaRoutes } from './kontor/media/media-section/media-section.routes';
|
||||
|
||||
export const routes: Routes = [
|
||||
{ path: '', component: KontorComponent, },
|
||||
{ path: 'login', component: Auth, },
|
||||
{
|
||||
path: 'comic', component: ComicSectionComponent,
|
||||
children: comicRoutes,
|
||||
},
|
||||
{
|
||||
path: 'tysc', component: TyscSectionComponent,
|
||||
children: tyscRoutes,
|
||||
},
|
||||
{
|
||||
path: 'media', component: MediaSectionComponent,
|
||||
children: mediaRoutes,
|
||||
},
|
||||
];
|
||||
@@ -0,0 +1,23 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { App } from './app';
|
||||
|
||||
describe('App', () => {
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [App],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
it('should create the app', () => {
|
||||
const fixture = TestBed.createComponent(App);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
const fixture = TestBed.createComponent(App);
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, kontor-angular');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,16 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { AuthService } from './auth-service';
|
||||
|
||||
describe('AuthService', () => {
|
||||
let service: AuthService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(AuthService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { HttpClient, HttpParams } from '@angular/common/http';
|
||||
import { inject, Injectable } from '@angular/core';
|
||||
import { catchError, Observable, throwError } from 'rxjs';
|
||||
|
||||
|
||||
interface AuthResponseData {
|
||||
kind: string;
|
||||
idToken: string;
|
||||
email: string;
|
||||
refreshToken: string;
|
||||
expiresIn: string;
|
||||
}
|
||||
|
||||
export interface TokenData {
|
||||
access_token: string;
|
||||
token_type: string;
|
||||
}
|
||||
|
||||
@Injectable({providedIn: 'root'})
|
||||
export class AuthService {
|
||||
private http = inject(HttpClient);
|
||||
|
||||
signup(email: string, password: string) {
|
||||
return this.http.post<TokenData>('http://localhost:8800/signup',
|
||||
{
|
||||
username: email,
|
||||
password: password
|
||||
}
|
||||
).pipe(catchError(errorRes => {
|
||||
let errorMessage = 'An unknown error occurred!';
|
||||
const err = Error(errorMessage);
|
||||
if (!errorRes.error) {
|
||||
return throwError(() => err);
|
||||
}
|
||||
switch(errorRes.statusText) {
|
||||
case 'ERROR':
|
||||
errorMessage = 'Uups...';
|
||||
}
|
||||
return throwError(() => Error(errorMessage));
|
||||
}));
|
||||
}
|
||||
|
||||
login(email: string, password: string): Observable<TokenData> {
|
||||
const params = new HttpParams()
|
||||
.set('username', email)
|
||||
.append('password', password);
|
||||
return this.http.post<TokenData>('http://127.0.0.1:8800/api/login/token', params,
|
||||
{
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
|
||||
button {
|
||||
text-align: center;
|
||||
padding: 10px;
|
||||
border-radius: 10px;
|
||||
margin-left: 14px;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
<div class="row">
|
||||
<div style="margin-top: 16px;">
|
||||
@if(error) {
|
||||
<div class="alert alter-danger">
|
||||
<p>{{ error }}</p>
|
||||
</div>
|
||||
}
|
||||
@if(isLoading) {
|
||||
<div style="text-align: center;">
|
||||
<app-loading-spinner></app-loading-spinner>
|
||||
</div>
|
||||
}
|
||||
@else {
|
||||
<form (ngSubmit)="onSubmit(authForm)" #authForm="ngForm">
|
||||
<div class="form-group" style="margin-bottom: 7px;">
|
||||
<label for="email">E-Mail</label>
|
||||
<input type="email" id="email" class="form-control" ngModel name="email" required email=""/>
|
||||
</div>
|
||||
<div class="form-group" style="margin-bottom: 7px;">
|
||||
<label for="password">Password</label>
|
||||
<input type="password" id="password" class="form-control" ngModel name="password" required/>
|
||||
</div>
|
||||
<div>
|
||||
<button class="btn btn-primary" type="submit" [disabled]="!authForm.valid">
|
||||
{{ isLoginMode ? 'Login' : 'Sign Up' }}
|
||||
</button>
|
||||
<button class="btn btn-primary" (click)="onSwitchMode()" type="button">
|
||||
Switch to {{ isLoginMode ? 'Sign Up' : 'Login' }}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { Auth } from './auth';
|
||||
|
||||
describe('Auth', () => {
|
||||
let component: Auth;
|
||||
let fixture: ComponentFixture<Auth>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [Auth]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(Auth);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { NgForm } from '@angular/forms';
|
||||
import { AuthService, TokenData } from './auth-service';
|
||||
import { LoadingSpinner } from "../../shared/loading-spinner/loading-spinner";
|
||||
import { Observable } from 'rxjs';
|
||||
import { HttpErrorResponse } from '@angular/common/http';
|
||||
|
||||
@Component({
|
||||
selector: 'app-auth',
|
||||
imports: [FormsModule, LoadingSpinner],
|
||||
templateUrl: './auth.html',
|
||||
styleUrl: './auth.css'
|
||||
})
|
||||
export class Auth {
|
||||
isLoginMode = true;
|
||||
isLoading = false;
|
||||
error: string | null = null;
|
||||
|
||||
constructor(private authService: AuthService) {}
|
||||
|
||||
onSwitchMode() {
|
||||
this.isLoginMode =!this.isLoginMode;
|
||||
}
|
||||
|
||||
onSubmit(form: NgForm) {
|
||||
if (!form.valid) {
|
||||
return;
|
||||
}
|
||||
const email = form.value.email;
|
||||
const password = form.value.password;
|
||||
|
||||
let authObservable: Observable<TokenData>;
|
||||
|
||||
this.isLoading = true;
|
||||
if (this.isLoginMode) {
|
||||
authObservable = this.authService.login(email, password);
|
||||
} else {
|
||||
authObservable = this.authService.signup(email, password)
|
||||
}
|
||||
|
||||
authObservable.subscribe({
|
||||
next: token => {
|
||||
console.log(token);
|
||||
localStorage.setItem('userToken', JSON.stringify(token));
|
||||
this.isLoading = false;
|
||||
},
|
||||
error: err => {
|
||||
console.log(err);
|
||||
this.isLoading = false;
|
||||
}
|
||||
});
|
||||
form.reset();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
div {
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1);
|
||||
overflow: hidden;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<div>
|
||||
<a [routerLink]="['/', 'comic', 'artist', artist().id]" routerLinkActive="active">
|
||||
<span>{{ artist().name }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicArtistComponent } from './comic-artist.component';
|
||||
|
||||
describe('ComicArtistComponent', () => {
|
||||
let component: ComicArtistComponent;
|
||||
let fixture: ComponentFixture<ComicArtistComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicArtistComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicArtistComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { Artist } from '../comic.model';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-artist',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-artist.component.html',
|
||||
styleUrl: './comic-artist.component.css'
|
||||
})
|
||||
export class ComicArtistComponent {
|
||||
artist = input.required<Artist>();
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
ul {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
<ul>
|
||||
@for (artist of artists(); track artist.id) {
|
||||
<li>
|
||||
<app-comic-artist [artist]="artist"/>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicArtistsListComponent } from './comic-artists-list.component';
|
||||
|
||||
describe('ComicArtistsListComponent', () => {
|
||||
let component: ComicArtistsListComponent;
|
||||
let fixture: ComponentFixture<ComicArtistsListComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicArtistsListComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicArtistsListComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import { Artist } from '../comic.model';
|
||||
import { ComicArtistComponent } from '../comic-artist/comic-artist.component';
|
||||
import { ArtistService } from '../comic-artists/artist.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-artists-list',
|
||||
imports: [ComicArtistComponent],
|
||||
templateUrl: './comic-artists-list.component.html',
|
||||
styleUrl: './comic-artists-list.component.css'
|
||||
})
|
||||
export class ComicArtistsListComponent implements OnInit {
|
||||
|
||||
artists = signal<Artist[]>([]);
|
||||
isFetching = signal(false);
|
||||
error = signal('');
|
||||
private artistService = inject(ArtistService);
|
||||
private destroyRef = inject(DestroyRef);
|
||||
|
||||
ngOnInit() {
|
||||
this.isFetching.set(true);
|
||||
const subscription = this.artistService.loadArtists().subscribe({
|
||||
next: (artists) => {
|
||||
this.artists.set(artists);
|
||||
},
|
||||
error: (error: Error) => {
|
||||
this.error.set(error.message);
|
||||
},
|
||||
complete: () => {
|
||||
this.isFetching.set(false);
|
||||
},
|
||||
});
|
||||
|
||||
this.destroyRef.onDestroy(() => {
|
||||
subscription.unsubscribe();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import { inject, Injectable, signal } from "@angular/core";
|
||||
import { HttpClient } from "@angular/common/http";
|
||||
import { catchError, map, throwError } from "rxjs";
|
||||
import { ErrorService } from "../../../shared/error.service";
|
||||
import { Artist, ArtistDetails } from "../comic.model";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ArtistService {
|
||||
private errorService = inject(ErrorService);
|
||||
private httpClient = inject(HttpClient);
|
||||
private artists = signal<Artist[]>([]);
|
||||
|
||||
loadedArtists = this.artists.asReadonly();
|
||||
|
||||
loadArtists() {
|
||||
return this.fetchArtists('http://127.0.0.1:8800/api/comics/artists', 'Someting went wrong fetching artists. Please try again later-');
|
||||
}
|
||||
|
||||
loadArtistDetails(artistId: string | null) {
|
||||
return this.fetchArtistDetails('http://127.0.0.1:8800/api/comics/artists/' + artistId, 'Someting went wrong fetching comic artists. Please try again later.');
|
||||
}
|
||||
|
||||
private fetchArtists(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<Artist[]>(url).pipe(
|
||||
map((resData) => resData),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private fetchArtistDetails(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<ArtistDetails>(url).pipe(
|
||||
map((resData) => {
|
||||
console.log(resData);
|
||||
return resData;
|
||||
}),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
.grid-container {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-gap: 20px;
|
||||
}
|
||||
section {
|
||||
margin-left: 10px;
|
||||
padding: 10px;
|
||||
background-color: darkgrey;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
article {
|
||||
margin-left: 10px;
|
||||
padding: 5px;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<div class="grid-container">
|
||||
<div>
|
||||
<app-comic-artists-list />
|
||||
</div>
|
||||
<div>
|
||||
@if (artist()) {
|
||||
<section>
|
||||
<h2>{{ artist().name }}</h2>
|
||||
<a href="{{ artist().weblink }}" style="background-color: green;">{{ artist().name }}</a>
|
||||
</section>
|
||||
<section>
|
||||
@for (work of artist().comic_works; track work.worktype.id) {
|
||||
<app-comic-worktype [worktype]="work.worktype"/>
|
||||
@for (comic of work.comics; track comic.id) {
|
||||
<article>
|
||||
<app-comic-comic [comic]="comic"/>
|
||||
</article>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
<section>
|
||||
@for (work of artist().issue_works; track work.worktype.id) {
|
||||
<app-comic-worktype [worktype]="work.worktype"/>
|
||||
@for (issue of work.issues; track issue.id) {
|
||||
<article>
|
||||
<app-comic-comic [comic]="issue.comic"/>
|
||||
</article>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
} @else {
|
||||
<h2>Artist Details</h2>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicArtistsComponent } from './comic-artists.component';
|
||||
|
||||
describe('ComicArtistsComponent', () => {
|
||||
let component: ComicArtistsComponent;
|
||||
let fixture: ComponentFixture<ComicArtistsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicArtistsComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicArtistsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,25 @@
|
||||
import { Component, inject, input } from '@angular/core';
|
||||
import { ComicArtistsListComponent } from '../comic-artists-list/comic-artists-list.component';
|
||||
import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router';
|
||||
import { ArtistService } from './artist.service';
|
||||
import { ComicComicComponent } from "../comic-comic/comic-comic.component";
|
||||
import { ComicWorktypeComponent } from "../comic-worktype/comic-worktype.component";
|
||||
import { ArtistDetails } from '../comic.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-artists',
|
||||
imports: [ComicArtistsListComponent, ComicComicComponent, ComicWorktypeComponent],
|
||||
templateUrl: './comic-artists.component.html',
|
||||
styleUrl: './comic-artists.component.css'
|
||||
})
|
||||
export class ComicArtistsComponent {
|
||||
artist = input.required<ArtistDetails>();
|
||||
}
|
||||
|
||||
export const artistResolver: ResolveFn<ArtistDetails> = (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
|
||||
const artistService = inject(ArtistService);
|
||||
const artistId = route.paramMap.get('artistId');
|
||||
const artistDetails = artistService.loadArtistDetails(artistId);
|
||||
console.log(artistDetails);
|
||||
return artistDetails;
|
||||
};
|
||||
@@ -0,0 +1,5 @@
|
||||
<div>
|
||||
<a [routerLink]="['/', 'comic', 'comics', comic().id]" routerLinkActive="active">
|
||||
<span>{{ comic().title }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicComicComponent } from './comic-comic.component';
|
||||
|
||||
describe('ComicComicComponent', () => {
|
||||
let component: ComicComicComponent;
|
||||
let fixture: ComponentFixture<ComicComicComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicComicComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicComicComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { Comic } from '../comic.model';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-comic',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-comic.component.html',
|
||||
styleUrl: './comic-comic.component.css'
|
||||
})
|
||||
export class ComicComicComponent {
|
||||
comic = input.required<Comic>();
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
ul {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
<div>
|
||||
<input #searchQuery type="text" (input)="search($event.target.value)" placeholder="Search" />
|
||||
</div>
|
||||
<ul>
|
||||
@for (comic of comics(); track comic.id) {
|
||||
<li>
|
||||
<app-comic-comic [comic]="comic"/>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicComicsListComponent } from './comic-comics-list.component';
|
||||
|
||||
describe('ComicComicsListComponent', () => {
|
||||
let component: ComicComicsListComponent;
|
||||
let fixture: ComponentFixture<ComicComicsListComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicComicsListComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicComicsListComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,46 @@
|
||||
import { Component, computed, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import { Comic } from '../comic.model';
|
||||
import { ComicService } from '../comic-comics/comic.service';
|
||||
import { ComicComicComponent } from '../comic-comic/comic-comic.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-comics-list',
|
||||
imports: [ComicComicComponent],
|
||||
templateUrl: './comic-comics-list.component.html',
|
||||
styleUrl: './comic-comics-list.component.css',
|
||||
})
|
||||
export class ComicComicsListComponent implements OnInit {
|
||||
comicsFetched = signal<Comic[] | undefined>(undefined);
|
||||
searchQuery = signal<string>('');
|
||||
comics = computed(() => {
|
||||
const sq = this.searchQuery();
|
||||
return this.comicsFetched()?.filter(c => c.title.toLowerCase().includes(sq.toLowerCase()));
|
||||
});
|
||||
isFetching = signal(false);
|
||||
error = signal('');
|
||||
private comicsService = inject(ComicService);
|
||||
private destroyRef = inject(DestroyRef);
|
||||
|
||||
ngOnInit() {
|
||||
this.isFetching.set(true);
|
||||
const subscription = this.comicsService.loadComics().subscribe({
|
||||
next: (comics) => {
|
||||
this.comicsFetched.set(comics);
|
||||
},
|
||||
error: (error: Error) => {
|
||||
this.error.set(error.message);
|
||||
},
|
||||
complete: () => {
|
||||
this.isFetching.set(false);
|
||||
},
|
||||
});
|
||||
|
||||
this.destroyRef.onDestroy(() => {
|
||||
subscription.unsubscribe();
|
||||
});
|
||||
}
|
||||
|
||||
search(query: string) {
|
||||
this.searchQuery.set(query);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
.float-parent-element {
|
||||
width: 50%;
|
||||
}
|
||||
.float-child-element {
|
||||
float: left;
|
||||
width: 50%;
|
||||
border-width: 10px;
|
||||
border-color: black;
|
||||
}
|
||||
.float-details-element {
|
||||
border: 1px solid darkgreen;
|
||||
background-color: lightgreen;
|
||||
margin: 5px;
|
||||
padding: 1rem;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.parent {
|
||||
border: 1px solid black;
|
||||
margin: 1rem;
|
||||
padding: 2rem 2rem;
|
||||
text-align: left;
|
||||
}
|
||||
.child {
|
||||
display: inline-block;
|
||||
border: 1px solid red;
|
||||
padding: 1rem 1rem;
|
||||
vertical-align: top;
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
<div class="grid-container">
|
||||
<div>
|
||||
<app-comic-comics-list/>
|
||||
</div>
|
||||
<div>
|
||||
@if (comic()) {
|
||||
<section>
|
||||
<h2>{{ comic().title }}</h2>
|
||||
<a href="{{ comic().weblink }}" style="background-color: green;">{{ comic().title }}</a>
|
||||
<app-comic-publisher [publisher]="comic().publisher" />
|
||||
</section>
|
||||
<section>
|
||||
@for (issue of comic().issues; track issue.id) {
|
||||
<app-comic-issue [issue]="issue"/>
|
||||
}
|
||||
</section>
|
||||
<section>
|
||||
@for (work of comic().works; track work.worktype.id) {
|
||||
<app-comic-worktype [worktype]="work.worktype"/>
|
||||
@for (artist of work.artists; track artist.id) {
|
||||
<article>
|
||||
<app-comic-artist [artist]="artist"/>
|
||||
</article>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
} @else {
|
||||
<h2>Comic Details</h2>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicComicsComponent } from './comic-comics.component';
|
||||
|
||||
describe('ComicComicsComponent', () => {
|
||||
let component: ComicComicsComponent;
|
||||
let fixture: ComponentFixture<ComicComicsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicComicsComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicComicsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,27 @@
|
||||
import { Component, inject, input } from '@angular/core';
|
||||
import { ComicComicsListComponent } from "../comic-comics-list/comic-comics-list.component";
|
||||
import { ComicDetails } from '../comic.model';
|
||||
import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router';
|
||||
import { ComicService } from './comic.service';
|
||||
import { ComicWorktypeComponent } from '../comic-worktype/comic-worktype.component';
|
||||
import { ComicArtistComponent } from '../comic-artist/comic-artist.component';
|
||||
import { ComicIssueComponent } from '../comic-issue/comic-issue.component';
|
||||
import { ComicPublisherComponent } from "../comic-publisher/comic-publisher.component";
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-comics',
|
||||
imports: [ComicComicsListComponent, ComicWorktypeComponent, ComicArtistComponent, ComicIssueComponent, ComicPublisherComponent],
|
||||
templateUrl: './comic-comics.component.html',
|
||||
styleUrl: './comic-comics.component.css'
|
||||
})
|
||||
export class ComicComicsComponent {
|
||||
comic = input.required<ComicDetails>();
|
||||
}
|
||||
|
||||
export const comicResolver: ResolveFn<ComicDetails> = (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
|
||||
const comicService = inject(ComicService);
|
||||
const comicId = route.paramMap.get('comicId');
|
||||
const comicDetails = comicService.loadComicDetails(comicId);
|
||||
console.log(comicDetails);
|
||||
return comicDetails;
|
||||
};
|
||||
@@ -0,0 +1,45 @@
|
||||
import { HttpClient } from "@angular/common/http";
|
||||
import { inject, Injectable, signal } from "@angular/core";
|
||||
import { Comic, ComicDetails } from "../comic.model";
|
||||
import { catchError, map, throwError } from "rxjs";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class ComicService {
|
||||
private httpClient = inject(HttpClient);
|
||||
private comics = signal<Comic[]>([]);
|
||||
|
||||
loadedComics = this.comics.asReadonly();
|
||||
|
||||
loadComics() {
|
||||
return this.fetchComics('http://127.0.0.1:8800/api/comics/comics', 'Someting went wrong fetching comics. Please try again later.');
|
||||
}
|
||||
|
||||
loadComicDetails(comicId: string | null) {
|
||||
return this.fetchComicDetails('http://127.0.0.1:8800/api/comics/comics/' + comicId, 'Someting went wrong fetching comics. Please try again later.');
|
||||
}
|
||||
|
||||
private fetchComicDetails(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<ComicDetails>(url).pipe(
|
||||
map((resData) => {
|
||||
console.log(resData);
|
||||
return resData;
|
||||
}),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private fetchComics(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<Comic[]>(url).pipe(
|
||||
map((resData) => resData),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<div>
|
||||
<a [routerLink]="['/', 'comic', 'issue', issue().id]" routerLinkActive="active">
|
||||
<span>{{ issue().issue_number }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicIssueComponent } from './comic-issue.component';
|
||||
|
||||
describe('ComicIssueComponent', () => {
|
||||
let component: ComicIssueComponent;
|
||||
let fixture: ComponentFixture<ComicIssueComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicIssueComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicIssueComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { Issue } from '../comic.model';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-issue',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-issue.component.html',
|
||||
styleUrl: './comic-issue.component.css'
|
||||
})
|
||||
export class ComicIssueComponent {
|
||||
issue = input.required<Issue>();
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<div class="subnav">
|
||||
<a routerLink="/comic/comics" routerLinkActive="active">Comics</a>
|
||||
<a routerLink="/comic/publisher" routerLinkActive="active">Publisher</a>
|
||||
<a routerLink="/comic/artist" routerLinkActive="active">Artists</a>
|
||||
</div>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicNavigationComponent } from './comic-navigation.component';
|
||||
|
||||
describe('ComicNavigationComponent', () => {
|
||||
let component: ComicNavigationComponent;
|
||||
let fixture: ComponentFixture<ComicNavigationComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicNavigationComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicNavigationComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-navigation',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-navigation.component.html',
|
||||
styleUrl: './comic-navigation.component.css'
|
||||
})
|
||||
export class ComicNavigationComponent {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<div>
|
||||
<a [routerLink]="['/', 'comic', 'publisher', publisher().id]" routerLinkActive="active">
|
||||
<span>{{ publisher().name }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicPublisherComponent } from './comic-publisher.component';
|
||||
|
||||
describe('ComicPublisherComponent', () => {
|
||||
let component: ComicPublisherComponent;
|
||||
let fixture: ComponentFixture<ComicPublisherComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicPublisherComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicPublisherComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { Publisher } from '../comic.model';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-publisher',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-publisher.component.html',
|
||||
styleUrl: './comic-publisher.component.css'
|
||||
})
|
||||
export class ComicPublisherComponent {
|
||||
publisher = input.required<Publisher>();
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
ul {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
<ul>
|
||||
@for (publisher of publishers(); track publisher.id) {
|
||||
<li>
|
||||
<app-comic-publisher [publisher]="publisher" />
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicPublishersListComponent } from './comic-publishers-list.component';
|
||||
|
||||
describe('ComicPublishersListComponent', () => {
|
||||
let component: ComicPublishersListComponent;
|
||||
let fixture: ComponentFixture<ComicPublishersListComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicPublishersListComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicPublishersListComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import { Publisher } from '../comic.model';
|
||||
import { PublisherService } from '../comic-publishers/publisher.service';
|
||||
import { ComicPublisherComponent } from "../comic-publisher/comic-publisher.component";
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-publishers-list',
|
||||
imports: [ComicPublisherComponent],
|
||||
templateUrl: './comic-publishers-list.component.html',
|
||||
styleUrl: './comic-publishers-list.component.css'
|
||||
})
|
||||
export class ComicPublishersListComponent implements OnInit {
|
||||
publishers = signal<Publisher[]>([]);
|
||||
isFetching = signal(false);
|
||||
error = signal('');
|
||||
private publisherService = inject(PublisherService);
|
||||
private destroyRef = inject(DestroyRef);
|
||||
|
||||
ngOnInit() {
|
||||
this.isFetching.set(true);
|
||||
const subscription = this.publisherService.loadPublishers().subscribe({
|
||||
next: (publishers) => {
|
||||
this.publishers.set(publishers);
|
||||
},
|
||||
error: (error: Error) => {
|
||||
this.error.set(error.message);
|
||||
},
|
||||
complete: () => {
|
||||
this.isFetching.set(false);
|
||||
},
|
||||
});
|
||||
|
||||
this.destroyRef.onDestroy(() => {
|
||||
subscription.unsubscribe();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<div class="grid-container">
|
||||
<div>
|
||||
<app-comic-publishers-list />
|
||||
</div>
|
||||
<div>
|
||||
@if (publisher()) {
|
||||
<section>
|
||||
<h2>{{ publisher().name }}</h2>
|
||||
@if (publisher().parent_publisher) {
|
||||
<app-comic-publisher [publisher]="publisher().parent_publisher" />
|
||||
}
|
||||
</section>
|
||||
<section>
|
||||
@for (imprint of publisher().imprints; track imprint.id) {
|
||||
<article>
|
||||
<app-comic-publisher [publisher]="imprint" />
|
||||
</article>
|
||||
}
|
||||
</section>
|
||||
<section>
|
||||
@for (comic of publisher().comics; track comic.id) {
|
||||
<article>
|
||||
<app-comic-comic [comic]="comic" />
|
||||
</article>
|
||||
}
|
||||
</section>
|
||||
} @else {
|
||||
<h2>Publisher Details</h2>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicPublishersComponent } from './comic-publishers.component';
|
||||
|
||||
describe('ComicPublishersComponent', () => {
|
||||
let component: ComicPublishersComponent;
|
||||
let fixture: ComponentFixture<ComicPublishersComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicPublishersComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicPublishersComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,25 @@
|
||||
import { Component, inject, input } from '@angular/core';
|
||||
import { Publisher, PublisherDetails } from '../comic.model';
|
||||
import { ComicPublishersListComponent } from '../comic-publishers-list/comic-publishers-list.component';
|
||||
import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router';
|
||||
import { PublisherService } from './publisher.service';
|
||||
import { ComicPublisherComponent } from "../comic-publisher/comic-publisher.component";
|
||||
import { ComicComicComponent } from "../comic-comic/comic-comic.component";
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-publishers',
|
||||
imports: [ComicPublishersListComponent, ComicPublisherComponent, ComicComicComponent],
|
||||
templateUrl: './comic-publishers.component.html',
|
||||
styleUrl: './comic-publishers.component.css'
|
||||
})
|
||||
export class ComicPublishersComponent {
|
||||
publisher = input.required<PublisherDetails>();
|
||||
}
|
||||
|
||||
export const publisherResolver: ResolveFn<PublisherDetails> = (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => {
|
||||
const publisherService = inject(PublisherService);
|
||||
const publisherId = route.paramMap.get('publisherId');
|
||||
const publisherDetails = publisherService.loadPublisherDetails(publisherId);
|
||||
console.log(publisherDetails);
|
||||
return publisherDetails;
|
||||
};
|
||||
@@ -0,0 +1,47 @@
|
||||
import { inject, Injectable, signal } from "@angular/core";
|
||||
import { HttpClient } from "@angular/common/http";
|
||||
import { catchError, map, throwError } from "rxjs";
|
||||
import { ErrorService } from "../../../shared/error.service";
|
||||
import { Publisher, PublisherDetails } from "../comic.model";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class PublisherService {
|
||||
private errorService = inject(ErrorService);
|
||||
private httpClient = inject(HttpClient);
|
||||
private publishers = signal<Publisher[]>([]);
|
||||
|
||||
loadedPublishers = this.publishers.asReadonly();
|
||||
|
||||
loadPublishers() {
|
||||
return this.fetchPublishers('http://127.0.0.1:8800/api/comics/publishers', 'Someting went wrong fetching artists. Please try again later-');
|
||||
}
|
||||
|
||||
loadPublisherDetails(artistId: string | null) {
|
||||
return this.fetchPublisherDetails('http://127.0.0.1:8800/api/comics/publishers/' + artistId, 'Someting went wrong fetching comic artists. Please try again later.');
|
||||
}
|
||||
|
||||
private fetchPublishers(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<Publisher[]>(url).pipe(
|
||||
map((resData) => resData),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private fetchPublisherDetails(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<PublisherDetails>(url).pipe(
|
||||
map((resData) => {
|
||||
console.log(resData);
|
||||
return resData;
|
||||
}),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
<app-comic-navigation />
|
||||
<router-outlet></router-outlet>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicSectionComponent } from './comic-section.component';
|
||||
|
||||
describe('ComicSectionComponent', () => {
|
||||
let component: ComicSectionComponent;
|
||||
let fixture: ComponentFixture<ComicSectionComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicSectionComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicSectionComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ComicNavigationComponent } from "../comic-navigation/comic-navigation.component";
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-section',
|
||||
imports: [ComicNavigationComponent, RouterOutlet],
|
||||
templateUrl: './comic-section.component.html',
|
||||
styleUrl: './comic-section.component.css'
|
||||
})
|
||||
export class ComicSectionComponent {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
import { Routes } from "@angular/router";
|
||||
import { artistResolver, ComicArtistsComponent } from "../comic-artists/comic-artists.component";
|
||||
import { ComicPublishersComponent, publisherResolver } from './../comic-publishers/comic-publishers.component';
|
||||
import { ComicComicsComponent, comicResolver } from "../comic-comics/comic-comics.component";
|
||||
|
||||
export const comicRoutes: Routes = [
|
||||
{
|
||||
path: 'comics',
|
||||
component: ComicComicsComponent
|
||||
},
|
||||
{
|
||||
path: 'comics/:comicId',
|
||||
component: ComicComicsComponent,
|
||||
resolve: {
|
||||
comic: comicResolver
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'publisher',
|
||||
component: ComicPublishersComponent
|
||||
},
|
||||
{
|
||||
path: 'publisher/:publisherId',
|
||||
component: ComicPublishersComponent,
|
||||
resolve: {
|
||||
publisher: publisherResolver
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'artist',
|
||||
component: ComicArtistsComponent
|
||||
},
|
||||
{
|
||||
path: 'artist/:artistId',
|
||||
component: ComicArtistsComponent,
|
||||
resolve: {
|
||||
artist: artistResolver
|
||||
}
|
||||
},
|
||||
];
|
||||
@@ -0,0 +1,5 @@
|
||||
<div>
|
||||
<a [routerLink]="['/', 'comic', 'worktype', worktype().id]" routerLinkActive="active">
|
||||
<span>{{ worktype().name }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ComicWorktypeComponent } from './comic-worktype.component';
|
||||
|
||||
describe('ComicWorktypeComponent', () => {
|
||||
let component: ComicWorktypeComponent;
|
||||
let fixture: ComponentFixture<ComicWorktypeComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [ComicWorktypeComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(ComicWorktypeComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
import { Worktype } from '../comic.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-comic-worktype',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './comic-worktype.component.html',
|
||||
styleUrl: './comic-worktype.component.css'
|
||||
})
|
||||
export class ComicWorktypeComponent {
|
||||
worktype = input.required<Worktype>();
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
export interface Artist {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface Worktype {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface Publisher {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface Comic {
|
||||
id: string;
|
||||
title: string;
|
||||
completed: boolean;
|
||||
}
|
||||
|
||||
export interface Volume {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface Issue {
|
||||
id: string;
|
||||
issue_number: string;
|
||||
in_stock: boolean;
|
||||
is_read: boolean;
|
||||
comic: Comic;
|
||||
volume: Volume;
|
||||
}
|
||||
|
||||
export interface ComicWork {
|
||||
worktype: string;
|
||||
}
|
||||
|
||||
export interface ComicWorktypeArtists {
|
||||
worktype: Worktype;
|
||||
artists: Artist[];
|
||||
}
|
||||
|
||||
export interface PublisherDetails {
|
||||
id: string;
|
||||
name: string;
|
||||
parent_publisher: Publisher;
|
||||
imprints: Publisher[];
|
||||
comics: Comic[];
|
||||
}
|
||||
|
||||
export interface ComicDetails {
|
||||
id: string;
|
||||
created: string;
|
||||
title: string;
|
||||
completed: boolean;
|
||||
current_order: boolean;
|
||||
weblink: string;
|
||||
publisher: Publisher;
|
||||
issues: Issue[];
|
||||
volumes: Volume[];
|
||||
works: ComicWorktypeArtists[];
|
||||
}
|
||||
|
||||
export interface ArtistWorktypeComics {
|
||||
worktype: Worktype;
|
||||
comics: Comic[];
|
||||
}
|
||||
|
||||
export interface ArtistWorktypeIssues {
|
||||
worktype: Worktype;
|
||||
issues: Issue[];
|
||||
}
|
||||
export interface ArtistDetails {
|
||||
id: string;
|
||||
name: string;
|
||||
weblink: string;
|
||||
comic_works: ArtistWorktypeComics[];
|
||||
issue_works: ArtistWorktypeIssues[];
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
/* Footer */
|
||||
.footer {
|
||||
padding: 20px;
|
||||
text-align: center;
|
||||
background-color: lightblue;
|
||||
position: sticky;
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
.footer a {
|
||||
font-size: 20px;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<!-- <div> -->
|
||||
<footer class="footer">
|
||||
<a href="{{ footerUrl }}">{{ footerLink }}</a>
|
||||
</footer>
|
||||
<!-- </div> -->
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { KontorFooterComponent } from './footer.component';
|
||||
|
||||
describe('KontorFooterComponent', () => {
|
||||
let component: KontorFooterComponent;
|
||||
let fixture: ComponentFixture<KontorFooterComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [KontorFooterComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(KontorFooterComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'kontor-footer',
|
||||
imports: [],
|
||||
templateUrl: './footer.component.html',
|
||||
styleUrl: './footer.component.css'
|
||||
})
|
||||
export class KontorFooterComponent {
|
||||
footerUrl = "https://kontor.thpeetz.de";
|
||||
footerLink = "kontor.thpeetz.de";
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
/* Header/Blog Title */
|
||||
.header {
|
||||
padding: 30px;
|
||||
text-align: center;
|
||||
background-color: lightblue;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
font-size: 50px;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<header class="header">
|
||||
<section>
|
||||
<h1>{{ title() }}</h1>
|
||||
</section>
|
||||
</header>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { KontorHeaderComponent } from './header.component';
|
||||
|
||||
describe('Header', () => {
|
||||
let component: KontorHeaderComponent;
|
||||
let fixture: ComponentFixture<KontorHeaderComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [KontorHeaderComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(KontorHeaderComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Component, signal } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'kontor-header',
|
||||
imports: [],
|
||||
templateUrl: './header.component.html',
|
||||
styleUrl: './header.component.css'
|
||||
})
|
||||
export class KontorHeaderComponent {
|
||||
protected readonly title = signal('Kontor');
|
||||
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<p>kontor works!</p>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { KontorComponent } from './kontor.component';
|
||||
|
||||
describe('Kontor', () => {
|
||||
let component: KontorComponent;
|
||||
let fixture: ComponentFixture<KontorComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [KontorComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(KontorComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,11 @@
|
||||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-kontor',
|
||||
imports: [],
|
||||
templateUrl: './kontor.component.html',
|
||||
styleUrl: './kontor.component.css'
|
||||
})
|
||||
export class KontorComponent {
|
||||
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
<p>media-actors works!</p>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MediaActorsComponent } from './media-actors.component';
|
||||
|
||||
describe('MediaActorsComponent', () => {
|
||||
let component: MediaActorsComponent;
|
||||
let fixture: ComponentFixture<MediaActorsComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [MediaActorsComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(MediaActorsComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,11 @@
|
||||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-media-actors',
|
||||
imports: [],
|
||||
templateUrl: './media-actors.component.html',
|
||||
styleUrl: './media-actors.component.css'
|
||||
})
|
||||
export class MediaActorsComponent {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
<div>
|
||||
<article>
|
||||
<a [routerLink]="['/', 'media', 'file', mediafile().id]" routerLinkActive="active">
|
||||
<span>{{ mediafile().title }}</span>
|
||||
</a>
|
||||
<a href="{{ mediafile().url }}"> >></a>
|
||||
<p>
|
||||
<span>
|
||||
@if (mediafile().review) {
|
||||
Review<img class="images" src="tick.png" />
|
||||
} @else {
|
||||
Review<img class="images" src="cross.png" />
|
||||
}
|
||||
</span>
|
||||
</p>
|
||||
</article>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MediaFileComponent } from './media-file.component';
|
||||
|
||||
describe('MediaFileComponent', () => {
|
||||
let component: MediaFileComponent;
|
||||
let fixture: ComponentFixture<MediaFileComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [MediaFileComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(MediaFileComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,13 @@
|
||||
import { Component, input } from '@angular/core';
|
||||
import { MediaFile } from '../media-files/media-file.model';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
selector: 'app-media-file',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './media-file.component.html',
|
||||
styleUrl: './media-file.component.css'
|
||||
})
|
||||
export class MediaFileComponent {
|
||||
mediafile = input.required<MediaFile>();
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
ul {
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
<ul>
|
||||
@for (mediafile of files(); track mediafile.id) {
|
||||
<li>
|
||||
<app-media-file [mediafile]="mediafile" />
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MediaFilesListComponent } from './media-files-list.component';
|
||||
|
||||
describe('MediaFilesListComponent', () => {
|
||||
let component: MediaFilesListComponent;
|
||||
let fixture: ComponentFixture<MediaFilesListComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [MediaFilesListComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(MediaFilesListComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,37 @@
|
||||
import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core';
|
||||
import { MediaFileComponent } from '../media-file/media-file.component';
|
||||
import { MediaFileService } from '../media-files/media-file.service';
|
||||
import { MediaFile } from '../media-files/media-file.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-media-files-list',
|
||||
imports: [MediaFileComponent],
|
||||
templateUrl: './media-files-list.component.html',
|
||||
styleUrl: './media-files-list.component.css'
|
||||
})
|
||||
export class MediaFilesListComponent implements OnInit {
|
||||
files = signal<MediaFile[]>([]);
|
||||
isFetching = signal(false);
|
||||
error = signal('');
|
||||
private mediaFileService = inject(MediaFileService);
|
||||
private destroyRef = inject(DestroyRef);
|
||||
|
||||
ngOnInit() {
|
||||
this.isFetching.set(true);
|
||||
const subscription = this.mediaFileService.loadFiles().subscribe({
|
||||
next: (files) => {
|
||||
this.files.set(files);
|
||||
},
|
||||
error: (error: Error) => {
|
||||
this.error.set(error.message);
|
||||
},
|
||||
complete: () => {
|
||||
this.isFetching.set(false);
|
||||
},
|
||||
});
|
||||
|
||||
this.destroyRef.onDestroy(() => {
|
||||
subscription.unsubscribe();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
import { StreamingResourceOptions } from "@angular/core";
|
||||
|
||||
export interface MediaFile {
|
||||
id: string;
|
||||
title: string;
|
||||
file_name: string;
|
||||
cloud_link: string;
|
||||
url: string;
|
||||
review: boolean;
|
||||
should_download: boolean;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import { inject, Injectable, signal } from "@angular/core";
|
||||
import { ErrorService } from "../../../shared/error.service";
|
||||
import { HttpClient } from "@angular/common/http";
|
||||
import { MediaFile } from "./media-file.model";
|
||||
import { catchError, map, throwError } from "rxjs";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class MediaFileService {
|
||||
private errorService = inject(ErrorService);
|
||||
private httpClient = inject(HttpClient);
|
||||
private files = signal<MediaFile[]>([]);
|
||||
|
||||
loadedFiles = this.files.asReadonly();
|
||||
|
||||
loadFiles() {
|
||||
return this.fetchMediaFiles('http://127.0.0.1:8800/api/media/files', 'Someting went wrong fetching artists. Please try again later-');
|
||||
}
|
||||
|
||||
private fetchMediaFiles(url: string, errorMessage: string) {
|
||||
return this.httpClient.get<MediaFile[]>(url).pipe(
|
||||
map((resData) => resData),
|
||||
catchError((error) => {
|
||||
console.log(error);
|
||||
return throwError(() => new Error(errorMessage));
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
.grid-container {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-gap: 20px;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
<div class="grid-container">
|
||||
<div>
|
||||
<app-media-files-list />
|
||||
</div>
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,23 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MediaFilesComponent } from './media-files.component';
|
||||
|
||||
describe('MediaFilesComponent', () => {
|
||||
let component: MediaFilesComponent;
|
||||
let fixture: ComponentFixture<MediaFilesComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [MediaFilesComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(MediaFilesComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,12 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { MediaFilesListComponent } from '../media-files-list/media-files-list.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-media-files',
|
||||
imports: [MediaFilesListComponent],
|
||||
templateUrl: './media-files.component.html',
|
||||
styleUrl: './media-files.component.css'
|
||||
})
|
||||
export class MediaFilesComponent {
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user