Revert "move Kontor related components to subfolder kontor"

This reverts commit 9ee1a04a5c.

kontor-angular/angular.json

@@ -15,6 +15,7 @@
           "options": {
             "browser": "src/main.ts",
             "polyfills": [
+              "zone.js"
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [

kontor-angular/src/app/app.component.html

@@ -1,6 +1,5 @@
 <div class="app">
   <kontor-header />
-  <app-kontor-navigation />
   <main>
     <router-outlet />
   </main>

kontor-angular/src/app/app.component.ts

@@ -2,11 +2,10 @@ 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 { KontorNavigationComponent } from "./kontor/navigation/kontor-navigation/kontor-navigation.component";
 
 @Component({
   selector: 'app-root',
-  imports: [RouterOutlet, KontorHeaderComponent, KontorFooterComponent, KontorNavigationComponent],
+  imports: [RouterOutlet, KontorHeaderComponent, KontorFooterComponent],
   templateUrl: './app.component.html',
   styleUrl: './app.component.css'
 })

kontor-angular/src/app/app.config.ts

@@ -1,4 +1,4 @@
-import { ApplicationConfig, provideBrowserGlobalErrorListeners, provideZoneChangeDetection, provideZonelessChangeDetection } from '@angular/core';
+import { ApplicationConfig, provideBrowserGlobalErrorListeners, provideZoneChangeDetection } from '@angular/core';
 import { provideRouter, withComponentInputBinding } from '@angular/router';
 
 import { routes } from './app.routes';
@@ -7,8 +7,7 @@ import { provideHttpClient } from '@angular/common/http';
 export const appConfig: ApplicationConfig = {
   providers: [
     provideBrowserGlobalErrorListeners(),
-    provideZonelessChangeDetection(),
+    provideZoneChangeDetection({ eventCoalescing: true }),
-    // provideZoneChangeDetection({ eventCoalescing: true }),
     provideRouter(routes, withComponentInputBinding()),
     provideHttpClient(),
   ]

kontor-angular/src/app/app.routes.ts

@@ -1,27 +1,52 @@
 import { Routes } from '@angular/router';
-import { routes as comicRoutes } from './kontor/comic/comic.routes';
+import { KontorComponent } from './kontor/kontor.component';
-import { routes as tyscRoutes } from './kontor/tysc/tysc.routes';
+import { Login } from './common/login/login';
-import { routes as mediaRoutes } from './kontor/media/media.routes';
+import { ComicOverviewComponent } from './comic/comic-overview/comic-overview.component';
-import { TyscSectionComponent } from './kontor/tysc/tysc-section.component';
+import { MediaOverviewComponent } from './media/media-overview/media-overview.component';
-import { ComicSectionComponent } from './kontor/comic/comic-section.component';
+import { ArtistListComponent } from './comic/artist/artist-list/artist-list.component';
-import { MediaComponent } from './kontor/media/media.component';
+import { ComicListComponent } from './comic/comic/comic-list/comic-list.component';
-import { KontorHomeComponent } from './kontor/home/kontor-home/kontor-home.component';
+import { MediaFileListComponent } from './media/media-file/media-file-list/media-file-list.component';
+import { MediaActorListComponent } from './media/media-actor/media-actor-list/media-actor-list.component';
+import { MediaVideoListComponent } from './media/media-video/media-video-list/media-video-list.component';
+import { PublisherListComponent } from './comic/publisher/publisher-list/publisher-list.component';
+import { TyscMenuComponent } from './tysc/tysc-menu/tysc-menu.component';
+import { TeamListComponent } from './tysc/team/team-list/team-list.component';
+import { VendorListComponent } from './tysc/vendor/vendor-list/vendor-list.component';
+import { CardsetListComponent } from './tysc/cardset/cardset-list/cardset-list.component';
+import { PositionListComponent } from './tysc/position/position-list/position-list.component';
+import { PlayerListComponent } from './tysc/player/player-list/player-list.component';
+import { SportListComponent } from './tysc/sport/sport-list/sport-list.component';
 
 export const routes: Routes = [
+  { path: '', component: KontorComponent, },
+  { path: 'login', component: Login, },
   {
-    path: '',
+    path: 'comic', component: ComicOverviewComponent,
-    component: KontorHomeComponent,
+    children: [
+      { path: '', component: ComicListComponent},
+      { path: 'comics', component: ComicListComponent},
+      { path: 'publisher', component: PublisherListComponent},
+      { path: 'artist', component: ArtistListComponent},
+    ],
   },
   {
-    path: 'comic', component: ComicSectionComponent,
+    path: 'tysc', component: TyscMenuComponent,
-    children: comicRoutes,
+    children: [
+      { path: '', component: SportListComponent},
+      { path: 'team', component: TeamListComponent},
+      { path: 'player', component: PlayerListComponent},
+      { path: 'position', component: PositionListComponent},
+      { path: 'cardset', component: CardsetListComponent},
+      { path: 'vendor', component: VendorListComponent},
+    ],
   },
   {
-    path: 'tysc', component: TyscSectionComponent,
+    path: 'media', component: MediaOverviewComponent,
-    children: tyscRoutes,
+    children: [
-  },
+      { path: '', component: MediaFileListComponent},
-  {
+      { path: 'mediafiles', component: MediaFileListComponent},
-    path: 'media', component: MediaComponent,
+      { path: 'mediaactors', component: MediaActorListComponent},
-    children: mediaRoutes,
+      { path: 'mediavideos', component: MediaVideoListComponent},
+    ],
   },
 ];

kontor-angular/src/app/comic/artist/artist-detail/artist-detail.component.css

@@ -0,0 +1,5 @@
+div {
+  border-radius: 6px;
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+}

kontor-angular/src/app/comic/artist/artist-detail/artist-detail.component.html

@@ -0,0 +1,5 @@
+<div>
+  <a [routerLink]="[artist().id]" routerLinkActive="active">
+    <span>{{ artist().name }}</span>
+  </a>
+</div>

kontor-angular/src/app/comic/artist/artist-detail/artist-detail.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ComicDetailsComponent } from './comic-details.component';
+import { ArtistDetailComponent } from './artist-detail.component';
 
-describe('ComicDetailsComponent', () => {
+describe('ArtistDetailComponent', () => {
-  let component: ComicDetailsComponent;
+  let component: ArtistDetailComponent;
-  let fixture: ComponentFixture<ComicDetailsComponent>;
+  let fixture: ComponentFixture<ArtistDetailComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ComicDetailsComponent]
+      imports: [ArtistDetailComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(ComicDetailsComponent);
+    fixture = TestBed.createComponent(ArtistDetailComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

kontor-angular/src/app/comic/artist/artist-detail/artist-detail.component.ts

@@ -0,0 +1,14 @@
+import { Component, input, signal } from '@angular/core';
+import { Artist } from '../artist.model';
+import { RouterLink, RouterLinkActive } from '@angular/router';
+
+@Component({
+  selector: 'app-artist-detail',
+  imports: [RouterLink, RouterLinkActive],
+  templateUrl: './artist-detail.component.html',
+  styleUrl: './artist-detail.component.css'
+})
+export class ArtistDetailComponent {
+  artist = input.required<Artist>();
+
+}

kontor-angular/src/app/comic/artist/artist-list/artist-list.component.html

@@ -1,7 +1,7 @@
 <ul>
   @for (artist of artists(); track artist.id) {
     <li>
-      <app-artist [artist]="artist"/>
+      <app-artist-detail [artist]="artist"/>
     </li>
   }
 </ul>

kontor-angular/src/app/comic/artist/artist-list/artist-list.component.ts

@@ -1,11 +1,11 @@
-import { ArtistComponent } from './../artist/artist.component';
 import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core';
 import { Artist } from '../artist.model';
-import { ArtistsService } from '../artists.service';
+import { ArtistService } from '../artist.service';
+import { ArtistDetailComponent } from "../artist-detail/artist-detail.component";
 
 @Component({
   selector: 'app-artist-list',
-  imports: [ArtistComponent],
+  imports: [ArtistDetailComponent],
   templateUrl: './artist-list.component.html',
   styleUrl: './artist-list.component.css'
 })
@@ -13,12 +13,12 @@ export class ArtistListComponent implements OnInit {
   artists = signal<Artist[] | undefined>(undefined);
   isFetching = signal(false);
   error = signal('');
-  private artistsService = inject(ArtistsService);
+  private artistService = inject(ArtistService);
   private destroyRef = inject(DestroyRef);
 
   ngOnInit() {
     this.isFetching.set(true);
-    const subscription = this.artistsService.loadArtists().subscribe({
+    const subscription = this.artistService.loadArtists().subscribe({
       next: (artists) => {
         this.artists.set(artists);
       },
@@ -27,11 +27,12 @@ export class ArtistListComponent implements OnInit {
       },
       complete: () => {
         this.isFetching.set(false);
-      }
+      },
     });
 
     this.destroyRef.onDestroy(() => {
       subscription.unsubscribe();
-    })
+    });
   }
+
 }

kontor-angular/src/app/comic/artist/artist.service.ts

@@ -1,19 +1,21 @@
-import { HttpClient } from "@angular/common/http";
 import { inject, Injectable, signal } from "@angular/core";
+import { ErrorService } from "../../shared/error.service";
+import { HttpClient } from "@angular/common/http";
 import { Artist } from "./artist.model";
 import { catchError, map, throwError } from "rxjs";
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
-export class ArtistsService {
+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.');
+    return this.fetchArtists('http://127.0.0.1:8800/api/comics/artists', 'Someting went wrong fetching artists. Please try again later-');
   }
 
   private fetchArtists(url: string, errorMessage: string) {

kontor-angular/src/app/comic/comic-overview/comic-overview.component.html

@@ -0,0 +1,16 @@
+<!-- <p>comic-overview works!</p>
+<div class="subnav">
+  <ul>
+    <li><a routerLink="/comic/comics" routerLinkActive>Comics</a></li>
+    <li><a routerLink="/comic/publisher">Publisher</a></li>
+    <li><a routerLink="/comic/artist">Artists</a></li>
+  </ul>
+  <h4>Child Routes Result</h4>
+  <router-outlet></router-outlet>
+</div> -->
+<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>
+<router-outlet></router-outlet>

kontor-angular/src/app/comic/comic-overview/comic-overview.component.spec.ts

@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TeamsComponent } from './teams.component';
+import { ComicOverview } from './comic-overview.component';
 
-describe('TeamsComponent', () => {
+describe('ComicOverview', () => {
-  let component: TeamsComponent;
+  let component: ComicOverview;
-  let fixture: ComponentFixture<TeamsComponent>;
+  let fixture: ComponentFixture<ComicOverview>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [TeamsComponent]
+      imports: [ComicOverview]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(TeamsComponent);
+    fixture = TestBed.createComponent(ComicOverview);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

kontor-angular/src/app/comic/comic-overview/comic-overview.component.ts

@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { RouterLink, RouterOutlet, RouterLinkActive } from '@angular/router';
+
+@Component({
+  selector: 'app-comic-overview',
+  imports: [RouterLink, RouterOutlet, RouterLinkActive],
+  templateUrl: './comic-overview.component.html',
+  styleUrl: './comic-overview.component.css'
+})
+export class ComicOverviewComponent {
+
+}

kontor-angular/src/app/comic/comic/comic-list/comic-list.component.html

@@ -0,0 +1 @@
+<p>comic-list works!</p>

kontor-angular/src/app/comic/comic/comic-list/comic-list.component.ts

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-comic-list',
+  imports: [],
+  templateUrl: './comic-list.component.html',
+  styleUrl: './comic-list.component.css'
+})
+export class ComicListComponent {
+
+}

kontor-angular/src/app/comic/publisher/publisher-list/publisher-list.component.html

@@ -0,0 +1 @@
+<p>publisher-list works!</p>

kontor-angular/src/app/comic/publisher/publisher-list/publisher-list.component.spec.ts

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

kontor-angular/src/app/comic/publisher/publisher-list/publisher-list.component.ts

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-publisher-list',
+  imports: [],
+  templateUrl: './publisher-list.component.html',
+  styleUrl: './publisher-list.component.css'
+})
+export class PublisherListComponent {
+
+}

kontor-angular/src/app/kontor/comic/artists/artist/artist.component.html

@@ -1,5 +0,0 @@
-<div>
-  <a [routerLink]="['/', 'comic', 'artists', artist().id]" routerLinkActive="active">
-    <span>{{ artist().name }}</span>
-  </a>
-</div>

kontor-angular/src/app/kontor/comic/artists/artist/artist.component.ts

@@ -1,13 +0,0 @@
-import { Component, input } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-import { Artist } from '../artist.model';
-
-@Component({
-  selector: 'app-artist',
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './artist.component.html',
-  styleUrl: './artist.component.css'
-})
-export class ArtistComponent {
-  artist = input.required<Artist>();
-}

kontor-angular/src/app/kontor/comic/artists/artists.component.html

@@ -1,7 +0,0 @@
-<p>artists works!</p>
-<div>
-  <app-artist-list />
-</div>
-<div>
-  <h2>Artist Details</h2>
-</div>

kontor-angular/src/app/kontor/comic/artists/artists.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { ArtistListComponent } from "./artist-list/artist-list.component";
-
-@Component({
-  selector: 'app-artists',
-  imports: [ArtistListComponent],
-  templateUrl: './artists.component.html',
-  styleUrl: './artists.component.css'
-})
-export class ArtistsComponent {
-
-}

kontor-angular/src/app/kontor/comic/comic-navigation/comic-navigation.component.html

@@ -1,5 +0,0 @@
-<div class="subnav">
-  <a routerLink="/comic/comics" routerLinkActive="active">Comics</a>
-  <a routerLink="/comic/publishers" routerLinkActive="active">Publisher</a>
-  <a routerLink="/comic/artists" routerLinkActive="active">Artists</a>
-</div>

kontor-angular/src/app/kontor/comic/comic-navigation/comic-navigation.component.spec.ts

@@ -1,23 +0,0 @@
-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();
-  });
-});

kontor-angular/src/app/kontor/comic/comic-navigation/comic-navigation.component.ts

@@ -1,12 +0,0 @@
-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 {
-
-}

kontor-angular/src/app/kontor/comic/comic-section.component.html

@@ -1,2 +0,0 @@
-<app-comic-navigation />
-<router-outlet></router-outlet>

kontor-angular/src/app/kontor/comic/comic-section.component.ts

@@ -1,13 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterOutlet } from '@angular/router';
-import { ComicNavigationComponent } from "./comic-navigation/comic-navigation.component";
-
-@Component({
-  selector: 'app-comic-section',
-  imports: [RouterOutlet, ComicNavigationComponent],
-  templateUrl: './comic-section.component.html',
-  styleUrl: './comic-section.component.css'
-})
-export class ComicSectionComponent {
-
-}

kontor-angular/src/app/kontor/comic/comic.routes.ts

@@ -1,39 +0,0 @@
-import { Routes } from "@angular/router";
-import { ArtistsComponent } from "./artists/artists.component";
-import { PublishersComponent } from "./publishers/publishers.component";
-import { ComicDetailsComponent } from "./comics/comic-details/comic-details.component";
-import { ComicSectionComponent } from "./comic-section.component";
-import { ComicsComponent } from "./comics/comics.component";
-
-export const routes: Routes = [
-  {
-    path: '',
-    component: ComicSectionComponent,
-    children: [
-      {
-        path: 'comics',
-        component: ComicsComponent,
-      },
-      {
-        path: 'comics/:comicId',
-        component: ComicDetailsComponent,
-      },
-      {
-        path: 'artists',
-        component: ArtistsComponent,
-      },
-      {
-        path: 'artists/:artistId',
-        component: ArtistsComponent,
-      },
-      {
-        path: 'publishers',
-        component: PublishersComponent,
-      },
-      {
-        path: 'publishers/:publisherId',
-        component: PublishersComponent,
-      },
-    ],
-  },
-];

kontor-angular/src/app/kontor/comic/comics/comic-details/comic-details.component.html

@@ -1,7 +0,0 @@
-<p>comic-details works!</p>
-<div>
-  <app-comic-list />
-</div>
-<div>
-  <h2>Comic Title</h2>
-</div>

kontor-angular/src/app/kontor/comic/comics/comic-details/comic-details.component.ts

@@ -1,13 +0,0 @@
-import { Component, input } from '@angular/core';
-import { ComicListComponent } from "../comic-list/comic-list.component";
-import { Comic } from '../comic.model';
-
-@Component({
-  selector: 'app-comic-details',
-  imports: [ComicListComponent],
-  templateUrl: './comic-details.component.html',
-  styleUrl: './comic-details.component.css'
-})
-export class ComicDetailsComponent {
-  comic = input.required<Comic>();
-}

kontor-angular/src/app/kontor/comic/comics/comic-list/comic-list.component.html

@@ -1,8 +0,0 @@
-<p>comic-list works!</p>
-<ul>
-  @for (comic of comics(); track comic.id) {
-    <li>
-      <app-comic [comic]="comic"/>
-    </li>
-  }
-</ul>

kontor-angular/src/app/kontor/comic/comics/comic-list/comic-list.component.ts

@@ -1,38 +0,0 @@
-import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core';
-import { Comic } from '../comic.model';
-import { ComicComponent } from "../comic/comic.component";
-import { ComicsService } from '../comics.service';
-
-@Component({
-  selector: 'app-comic-list',
-  imports: [ComicComponent],
-  templateUrl: './comic-list.component.html',
-  styleUrl: './comic-list.component.css'
-})
-export class ComicListComponent implements OnInit {
-  comics = signal<Comic[] | undefined>(undefined);
-  isFetching = signal(false);
-  error = signal('');
-  private comicsService = inject(ComicsService);
-  private destroyRef = inject(DestroyRef);
-
-  ngOnInit() {
-    this.isFetching.set(true);
-    const subscription = this.comicsService.loadComics().subscribe({
-      next: (comics) => {
-        this.comics.set(comics);
-      },
-      error: (error: Error) => {
-        this.error.set(error.message);
-      },
-      complete: () => {
-        this.isFetching.set(false);
-      }
-    });
-
-    this.destroyRef.onDestroy(() => {
-      subscription.unsubscribe();
-    })
-  }
-
-}

kontor-angular/src/app/kontor/comic/comics/comic.model.ts

@@ -1,5 +0,0 @@
-export interface Comic {
-  id: string;
-  title: string;
-  completed: boolean;
-}

kontor-angular/src/app/kontor/comic/comics/comic/comic.component.html

@@ -1,6 +0,0 @@
-<p>comic works!</p>
-<div>
-  <a [routerLink]="['/', 'comic', 'comics', comic().id]" routerLinkActive="active">
-    <span>{{ comic().title }}</span>
-  </a>
-</div>

kontor-angular/src/app/kontor/comic/comics/comic/comic.component.ts

@@ -1,13 +0,0 @@
-import { Component, input } from '@angular/core';
-import { Comic } from '../comic.model';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-@Component({
-  selector: 'app-comic',
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './comic.component.html',
-  styleUrl: './comic.component.css'
-})
-export class ComicComponent {
-  comic = input.required<Comic>();
-}

kontor-angular/src/app/kontor/comic/comics/comics.component.html

@@ -1,4 +0,0 @@
-<p>comics works!</p>
-<div>
-  <app-comic-list />
-</div>

kontor-angular/src/app/kontor/comic/comics/comics.component.spec.ts

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

kontor-angular/src/app/kontor/comic/comics/comics.component.ts

@@ -1,12 +0,0 @@
-import { Component, signal } from '@angular/core';
-import { ComicListComponent } from "./comic-list/comic-list.component";
-import { ComicDetailsComponent } from './comic-details/comic-details.component';
-
-@Component({
-  selector: 'app-comics',
-  imports: [ComicListComponent],
-  templateUrl: './comics.component.html',
-  styleUrl: './comics.component.css'
-})
-export class ComicsComponent {
-}

kontor-angular/src/app/kontor/comic/comics/comics.service.ts

@@ -1,29 +0,0 @@
-import { HttpClient } from "@angular/common/http";
-import { inject, Injectable, signal } from "@angular/core";
-import { Comic } from "./comic.model";
-import { catchError, map, throwError } from "rxjs";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ComicsService {
-  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.');
-  }
-
-  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));
-      })
-    );
-  }
-}
-

kontor-angular/src/app/kontor/comic/publishers/publishers.component.html

@@ -1 +0,0 @@
-<p>publishers works!</p>

kontor-angular/src/app/kontor/comic/publishers/publishers.component.spec.ts

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

kontor-angular/src/app/kontor/comic/publishers/publishers.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-publishers',
-  imports: [],
-  templateUrl: './publishers.component.html',
-  styleUrl: './publishers.component.css'
-})
-export class PublishersComponent {
-
-}

kontor-angular/src/app/kontor/footer/kontor-footer/kontor-footer.component.css

@@ -1,9 +0,0 @@
-footer {
-  padding: 30px;
-  text-align: center;
-  background-color: lightblue;
-}
-
-footer div {
-  font-size: 20px;
-}

kontor-angular/src/app/kontor/footer/kontor-footer/kontor-footer.component.html

@@ -1,3 +0,0 @@
-<footer>
-  <div>Kontor Footer</div>
-</footer>

kontor-angular/src/app/kontor/footer/kontor-footer/kontor-footer.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-kontor-footer',
-  imports: [],
-  templateUrl: './kontor-footer.component.html',
-  styleUrl: './kontor-footer.component.css'
-})
-export class KontorFooterComponent {
-
-}

kontor-angular/src/app/kontor/header/header.component.html

@@ -2,4 +2,18 @@
   <section>
     <h1>{{ title() }}</h1>
   </section>
+  <!-- <nav>
+    <ul>
+      <li><a routerLink="/">Kontor</a></li>
+      <li><a routerLink="/comic">Comics</a></li>
+      <li><a routerLink="/tysc">TradeYourSportsCards</a></li>
+      <li><a routerLink="/media">Media</a></li>
+    </ul>
+  </nav> -->
 </header>
+<div class="topnav">
+  <a routerLink="/" routerLinkActive="active">Kontor</a>
+  <a routerLink="/comic"  routerLinkActive="active">Comics</a>
+  <a routerLink="/tysc"  routerLinkActive="active">TradeYourSportsCards</a>
+  <a routerLink="/media"  routerLinkActive="active">Media</a>
+</div>

kontor-angular/src/app/kontor/header/header.component.ts

@@ -3,7 +3,7 @@ import { RouterLink, RouterLinkActive } from '@angular/router';
 
 @Component({
   selector: 'kontor-header',
-  imports: [],
+  imports: [RouterLink, RouterLinkActive],
   templateUrl: './header.component.html',
   styleUrl: './header.component.css'
 })

kontor-angular/src/app/kontor/header/kontor-header/kontor-header.component.css

@@ -1,9 +0,0 @@
-.header {
-  padding: 30px;
-  text-align: center;
-  background-color: lightblue;
-}
-
-.header h1 {
-  font-size: 50px;
-}

kontor-angular/src/app/kontor/header/kontor-header/kontor-header.component.html

@@ -1,5 +0,0 @@
-<header class="header">
-  <section>
-    <h1>{{ title() }}</h1>
-  </section>
-</header>

kontor-angular/src/app/kontor/header/kontor-header/kontor-header.component.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { KontorHeaderComponent } from './kontor-header.component';
-
-describe('KontorHeaderComponent', () => {
-  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();
-  });
-});

kontor-angular/src/app/kontor/header/kontor-header/kontor-header.component.ts

@@ -1,11 +0,0 @@
-import { Component, signal } from '@angular/core';
-
-@Component({
-  selector: 'app-kontor-header',
-  imports: [],
-  templateUrl: './kontor-header.component.html',
-  styleUrl: './kontor-header.component.css'
-})
-export class KontorHeaderComponent {
-  protected readonly title = signal('Kontor');
-}

kontor-angular/src/app/kontor/home/kontor-home/kontor-home.component.html

@@ -1 +0,0 @@
-<p>kontor-home works!</p>

kontor-angular/src/app/kontor/home/kontor-home/kontor-home.component.spec.ts

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

kontor-angular/src/app/kontor/home/kontor-home/kontor-home.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-kontor-home',
-  imports: [],
-  templateUrl: './kontor-home.component.html',
-  styleUrl: './kontor-home.component.css'
-})
-export class KontorHomeComponent {
-
-}

kontor-angular/src/app/kontor/media/media-actors/media-actors.component.html

@@ -1 +0,0 @@
-<p>media-actors works!</p>

kontor-angular/src/app/kontor/media/media-actors/media-actors.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-actors',
-  imports: [],
-  templateUrl: './media-actors.component.html',
-  styleUrl: './media-actors.component.css'
-})
-export class MediaActorsComponent {
-
-}

kontor-angular/src/app/kontor/media/media-files/media-files.component.html

@@ -1 +0,0 @@
-<p>media-files works!</p>

kontor-angular/src/app/kontor/media/media-files/media-files.component.spec.ts

@@ -1,23 +0,0 @@
-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();
-  });
-});

kontor-angular/src/app/kontor/media/media-files/media-files.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-files',
-  imports: [],
-  templateUrl: './media-files.component.html',
-  styleUrl: './media-files.component.css'
-})
-export class MediaFilesComponent {
-
-}

kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.html

@@ -1,5 +0,0 @@
-<div class="subnav">
-  <a routerLink="/media/mediafiles" routerLinkActive="active">MediaFiles</a>
-  <a routerLink="/media/mediaactors" routerLinkActive="active">MediaActors</a>
-  <a routerLink="/media/mediavideos" routerLinkActive="active">MediaVideos</a>
-</div>

kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.spec.ts

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

kontor-angular/src/app/kontor/media/media-navigation/media-navigation.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-@Component({
-  selector: 'app-media-navigation',
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './media-navigation.component.html',
-  styleUrl: './media-navigation.component.css'
-})
-export class MediaNavigationComponent {
-
-}

kontor-angular/src/app/kontor/media/media-videos/media-videos.component.html

@@ -1 +0,0 @@
-<p>media-videos works!</p>

kontor-angular/src/app/kontor/media/media-videos/media-videos.component.spec.ts

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

kontor-angular/src/app/kontor/media/media-videos/media-videos.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-media-videos',
-  imports: [],
-  templateUrl: './media-videos.component.html',
-  styleUrl: './media-videos.component.css'
-})
-export class MediaVideosComponent {
-
-}

kontor-angular/src/app/kontor/media/media.component.html

@@ -1,2 +0,0 @@
-<app-media-navigation />
-<router-outlet></router-outlet>

kontor-angular/src/app/kontor/media/media.component.spec.ts

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

kontor-angular/src/app/kontor/media/media.component.ts

@@ -1,13 +0,0 @@
-import { Component } from '@angular/core';
-import { MediaNavigationComponent } from "./media-navigation/media-navigation.component";
-import { RouterOutlet } from '@angular/router';
-
-@Component({
-  selector: 'app-media',
-  imports: [MediaNavigationComponent, RouterOutlet],
-  templateUrl: './media.component.html',
-  styleUrl: './media.component.css'
-})
-export class MediaComponent {
-
-}

kontor-angular/src/app/kontor/media/media.routes.ts

@@ -1,26 +0,0 @@
-import { Routes } from "@angular/router";
-import { MediaComponent } from "./media.component";
-import { MediaFilesComponent } from "./media-files/media-files.component";
-import { MediaActorsComponent } from "./media-actors/media-actors.component";
-import { MediaVideosComponent } from "./media-videos/media-videos.component";
-
-export const routes: Routes = [
-  {
-    path: '',
-    component: MediaComponent,
-    children: [
-      {
-        path: 'mediafiles',
-        component: MediaFilesComponent,
-      },
-      {
-        path: 'mediaactors',
-        component: MediaActorsComponent,
-      },
-      {
-        path: 'mediavideos',
-        component: MediaVideosComponent,
-      },
-    ],
-  },
-];

kontor-angular/src/app/kontor/navigation/kontor-navigation/kontor-navigation.component.css

@@ -1 +0,0 @@
-/* Style the top navigation bar */

kontor-angular/src/app/kontor/navigation/kontor-navigation/kontor-navigation.component.html

@@ -1,6 +0,0 @@
-<div class="topnav">
-  <a routerLink="/">Kontor</a>
-  <a routerLink="/comic" routerLinkActive="active">Comic</a>
-  <a routerLink="/tysc" routerLinkActive="active">TradeYourSportsCard</a>
-  <a routerLink="/media" routerLinkActive="active">Media</a>
-</div>

kontor-angular/src/app/kontor/navigation/kontor-navigation/kontor-navigation.component.spec.ts

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

kontor-angular/src/app/kontor/navigation/kontor-navigation/kontor-navigation.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { RouterLink, RouterLinkActive } from '@angular/router';
-
-@Component({
-  selector: 'app-kontor-navigation',
-  imports: [RouterLink, RouterLinkActive],
-  templateUrl: './kontor-navigation.component.html',
-  styleUrl: './kontor-navigation.component.css'
-})
-export class KontorNavigationComponent {
-
-}

kontor-angular/src/app/kontor/tysc/cardsets/cardsets.component.html

@@ -1 +0,0 @@
-<p>cardsets works!</p>

kontor-angular/src/app/kontor/tysc/cardsets/cardsets.component.spec.ts

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

kontor-angular/src/app/kontor/tysc/cardsets/cardsets.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-cardsets',
-  imports: [],
-  templateUrl: './cardsets.component.html',
-  styleUrl: './cardsets.component.css'
-})
-export class CardsetsComponent {
-
-}

kontor-angular/src/app/kontor/tysc/players/players.component.html

@@ -1 +0,0 @@
-<p>players works!</p>

kontor-angular/src/app/kontor/tysc/players/players.component.spec.ts

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

kontor-angular/src/app/kontor/tysc/players/players.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-players',
-  imports: [],
-  templateUrl: './players.component.html',
-  styleUrl: './players.component.css'
-})
-export class PlayersComponent {
-
-}

kontor-angular/src/app/kontor/tysc/positions/positions.component.html

@@ -1 +0,0 @@
-<p>positions works!</p>

kontor-angular/src/app/kontor/tysc/positions/positions.component.spec.ts

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

kontor-angular/src/app/kontor/tysc/positions/positions.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-positions',
-  imports: [],
-  templateUrl: './positions.component.html',
-  styleUrl: './positions.component.css'
-})
-export class PositionsComponent {
-
-}

kontor-angular/src/app/kontor/tysc/sports/sports.component.html

@@ -1 +0,0 @@
-<p>sports works!</p>

kontor-angular/src/app/kontor/tysc/sports/sports.component.spec.ts

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

kontor-angular/src/app/kontor/tysc/sports/sports.component.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-sports',
-  imports: [],
-  templateUrl: './sports.component.html',
-  styleUrl: './sports.component.css'
-})
-export class SportsComponent {
-
-}

kontor-angular/src/app/kontor/tysc/teams/teams.component.html

@@ -1 +0,0 @@
-<p>teams works!</p>