From a318d684df19525a3742992ee5f767921cc84eb6 Mon Sep 17 00:00:00 2001
From: Mimo-07 <59221049+Mimo-07@users.noreply.github.com>
Date: Sat, 21 Jun 2025 22:18:46 +0000
Subject: [PATCH 1/2] refactor(angular-1-projection): added content projection
 ability in ui component

---
 .../student-card/student-card.component.ts    | 37 +++++++++++---
 .../teacher-card/teacher-card.component.ts    | 41 +++++++++++++---
 .../src/app/ui/card/card.component.ts         | 49 +++----------------
 3 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/apps/angular/1-projection/src/app/component/student-card/student-card.component.ts b/apps/angular/1-projection/src/app/component/student-card/student-card.component.ts
index bdfa4abd4..1463a547d 100644
--- a/apps/angular/1-projection/src/app/component/student-card/student-card.component.ts
+++ b/apps/angular/1-projection/src/app/component/student-card/student-card.component.ts
@@ -1,21 +1,42 @@
+import { NgOptimizedImage } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
   inject,
   OnInit,
 } from '@angular/core';
-import { FakeHttpService } from '../../data-access/fake-http.service';
+import {
+  FakeHttpService,
+  randStudent,
+} from '../../data-access/fake-http.service';
 import { StudentStore } from '../../data-access/student.store';
 import { CardType } from '../../model/card.model';
 import { CardComponent } from '../../ui/card/card.component';
+import { ListItemComponent } from '../../ui/list-item/list-item.component';
 
 @Component({
   selector: 'app-student-card',
   template: `
-    <app-card
-      [list]="students()"
-      [type]="cardType"
-      customClass="bg-light-green" />
+    <app-card customClass="bg-light-green">
+      <img ngSrc="assets/img/student.webp" width="200" height="200" />
+
+      <ng-template #listTemplate>
+        <section>
+          @for (item of students(); track item) {
+            <app-list-item
+              [name]="item.firstName"
+              [id]="item.id"
+              [type]="cardType"></app-list-item>
+          }
+        </section>
+
+        <button
+          class="rounded-sm border border-blue-500 bg-blue-300 p-2"
+          (click)="addNewItem()">
+          Add
+        </button>
+      </ng-template>
+    </app-card>
   `,
   styles: [
     `
@@ -24,7 +45,7 @@ import { CardComponent } from '../../ui/card/card.component';
       }
     `,
   ],
-  imports: [CardComponent],
+  imports: [CardComponent, ListItemComponent, NgOptimizedImage],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class StudentCardComponent implements OnInit {
@@ -37,4 +58,8 @@ export class StudentCardComponent implements OnInit {
   ngOnInit(): void {
     this.http.fetchStudents$.subscribe((s) => this.store.addAll(s));
   }
+
+  addNewItem() {
+    this.store.addOne(randStudent());
+  }
 }
diff --git a/apps/angular/1-projection/src/app/component/teacher-card/teacher-card.component.ts b/apps/angular/1-projection/src/app/component/teacher-card/teacher-card.component.ts
index adf0ad3c1..455343724 100644
--- a/apps/angular/1-projection/src/app/component/teacher-card/teacher-card.component.ts
+++ b/apps/angular/1-projection/src/app/component/teacher-card/teacher-card.component.ts
@@ -1,16 +1,37 @@
-import { Component, inject, OnInit } from '@angular/core';
-import { FakeHttpService } from '../../data-access/fake-http.service';
+import { NgOptimizedImage } from '@angular/common';
+import { Component, inject, input, OnInit } from '@angular/core';
+import {
+  FakeHttpService,
+  randTeacher,
+} from '../../data-access/fake-http.service';
 import { TeacherStore } from '../../data-access/teacher.store';
 import { CardType } from '../../model/card.model';
 import { CardComponent } from '../../ui/card/card.component';
+import { ListItemComponent } from '../../ui/list-item/list-item.component';
 
 @Component({
   selector: 'app-teacher-card',
   template: `
-    <app-card
-      [list]="teachers()"
-      [type]="cardType"
-      customClass="bg-light-red"></app-card>
+    <app-card customClass="bg-light-red">
+      <img ngSrc="assets/img/teacher.png" width="200" height="200" />
+
+      <ng-template #listTemplate>
+        <section>
+          @for (item of teachers(); track item) {
+            <app-list-item
+              [name]="item.firstName"
+              [id]="item.id"
+              [type]="cardType"></app-list-item>
+          }
+        </section>
+
+        <button
+          class="rounded-sm border border-blue-500 bg-blue-300 p-2"
+          (click)="addNewItem()">
+          Add
+        </button>
+      </ng-template>
+    </app-card>
   `,
   styles: [
     `
@@ -19,16 +40,22 @@ import { CardComponent } from '../../ui/card/card.component';
       }
     `,
   ],
-  imports: [CardComponent],
+  imports: [CardComponent, NgOptimizedImage, ListItemComponent],
 })
 export class TeacherCardComponent implements OnInit {
   private http = inject(FakeHttpService);
   private store = inject(TeacherStore);
 
+  readonly list = input<any[] | null>(null);
+
   teachers = this.store.teachers;
   cardType = CardType.TEACHER;
 
   ngOnInit(): void {
     this.http.fetchTeachers$.subscribe((t) => this.store.addAll(t));
   }
+
+  addNewItem() {
+    this.store.addOne(randTeacher());
+  }
 }
diff --git a/apps/angular/1-projection/src/app/ui/card/card.component.ts b/apps/angular/1-projection/src/app/ui/card/card.component.ts
index 1a6c3648c..f847cc8fe 100644
--- a/apps/angular/1-projection/src/app/ui/card/card.component.ts
+++ b/apps/angular/1-projection/src/app/ui/card/card.component.ts
@@ -1,10 +1,5 @@
-import { NgOptimizedImage } from '@angular/common';
-import { Component, inject, input } from '@angular/core';
-import { randStudent, randTeacher } from '../../data-access/fake-http.service';
-import { StudentStore } from '../../data-access/student.store';
-import { TeacherStore } from '../../data-access/teacher.store';
-import { CardType } from '../../model/card.model';
-import { ListItemComponent } from '../list-item/list-item.component';
+import { CommonModule } from '@angular/common';
+import { Component, ContentChild, input, TemplateRef } from '@angular/core';
 
 @Component({
   selector: 'app-card',
@@ -12,47 +7,15 @@ import { ListItemComponent } from '../list-item/list-item.component';
     <div
       class="flex w-fit flex-col gap-3 rounded-md border-2 border-black p-4"
       [class]="customClass()">
-      @if (type() === CardType.TEACHER) {
-        <img ngSrc="assets/img/teacher.png" width="200" height="200" />
-      }
-      @if (type() === CardType.STUDENT) {
-        <img ngSrc="assets/img/student.webp" width="200" height="200" />
-      }
+      <ng-content select="img"></ng-content>
 
-      <section>
-        @for (item of list(); track item) {
-          <app-list-item
-            [name]="item.firstName"
-            [id]="item.id"
-            [type]="type()"></app-list-item>
-        }
-      </section>
-
-      <button
-        class="rounded-sm border border-blue-500 bg-blue-300 p-2"
-        (click)="addNewItem()">
-        Add
-      </button>
+      <ng-container [ngTemplateOutlet]="listTemplate" />
     </div>
   `,
-  imports: [ListItemComponent, NgOptimizedImage],
+  imports: [CommonModule],
 })
 export class CardComponent {
-  private teacherStore = inject(TeacherStore);
-  private studentStore = inject(StudentStore);
-
-  readonly list = input<any[] | null>(null);
-  readonly type = input.required<CardType>();
   readonly customClass = input('');
 
-  CardType = CardType;
-
-  addNewItem() {
-    const type = this.type();
-    if (type === CardType.TEACHER) {
-      this.teacherStore.addOne(randTeacher());
-    } else if (type === CardType.STUDENT) {
-      this.studentStore.addOne(randStudent());
-    }
-  }
+  @ContentChild('listTemplate') listTemplate!: TemplateRef<any>;
 }

From e2831c7e20d9a071f6f668c3b5897616a78e4d21 Mon Sep 17 00:00:00 2001
From: Mimo-07 <59221049+Mimo-07@users.noreply.github.com>
Date: Sat, 21 Jun 2025 23:20:16 +0000
Subject: [PATCH 2/2] refactor(angular-1-projection): added city card component
 and projected content

---
 .../city-card/city-card.component.ts          | 59 +++++++++++++++++--
 .../src/app/data-access/city.store.ts         |  2 +-
 .../app/ui/list-item/list-item.component.ts   |  4 ++
 3 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/apps/angular/1-projection/src/app/component/city-card/city-card.component.ts b/apps/angular/1-projection/src/app/component/city-card/city-card.component.ts
index 8895c8c84..c3ef1498f 100644
--- a/apps/angular/1-projection/src/app/component/city-card/city-card.component.ts
+++ b/apps/angular/1-projection/src/app/component/city-card/city-card.component.ts
@@ -1,9 +1,60 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { NgOptimizedImage } from '@angular/common';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { CityStore } from '../../data-access/city.store';
+import {
+  FakeHttpService,
+  randomCity,
+} from '../../data-access/fake-http.service';
+import { CardType } from '../../model/card.model';
+import { CardComponent } from '../../ui/card/card.component';
+import { ListItemComponent } from '../../ui/list-item/list-item.component';
 
 @Component({
   selector: 'app-city-card',
-  template: 'TODO City',
-  imports: [],
+  template: `
+    <app-card customClass="bg-light-yellow">
+      <img src="assets/img/city.png" width="200" height="200" />
+
+      <ng-template #listTemplate>
+        <section>
+          @for (item of cities(); track item) {
+            <app-list-item
+              [name]="item.name"
+              [id]="item.id"
+              [type]="cardType"></app-list-item>
+          }
+        </section>
+
+        <button
+          class="rounded-sm border border-blue-500 bg-blue-300 p-2"
+          (click)="addNewItem()">
+          Add
+        </button>
+      </ng-template>
+    </app-card>
+  `,
+  imports: [CardComponent, NgOptimizedImage, ListItemComponent],
+  styles: [
+    `
+      ::ng-deep .bg-light-yellow {
+        background-color: rgba(255, 255, 224);
+      }
+    `,
+  ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CityCardComponent {}
+export class CityCardComponent {
+  private http = inject(FakeHttpService);
+  private store = inject(CityStore);
+
+  cities = this.store.cities;
+  cardType = CardType.CITY;
+
+  ngOnInit(): void {
+    this.http.fetchCities$.subscribe((c) => this.store.addAll(c));
+  }
+
+  addNewItem() {
+    this.store.addOne(randomCity());
+  }
+}
diff --git a/apps/angular/1-projection/src/app/data-access/city.store.ts b/apps/angular/1-projection/src/app/data-access/city.store.ts
index a8b523569..9fbcb346b 100644
--- a/apps/angular/1-projection/src/app/data-access/city.store.ts
+++ b/apps/angular/1-projection/src/app/data-access/city.store.ts
@@ -5,7 +5,7 @@ import { City } from '../model/city.model';
   providedIn: 'root',
 })
 export class CityStore {
-  private cities = signal<City[]>([]);
+  public cities = signal<City[]>([]);
 
   addAll(cities: City[]) {
     this.cities.set(cities);
diff --git a/apps/angular/1-projection/src/app/ui/list-item/list-item.component.ts b/apps/angular/1-projection/src/app/ui/list-item/list-item.component.ts
index 5d504f372..d46a1c044 100644
--- a/apps/angular/1-projection/src/app/ui/list-item/list-item.component.ts
+++ b/apps/angular/1-projection/src/app/ui/list-item/list-item.component.ts
@@ -4,6 +4,7 @@ import {
   inject,
   input,
 } from '@angular/core';
+import { CityStore } from '../../data-access/city.store';
 import { StudentStore } from '../../data-access/student.store';
 import { TeacherStore } from '../../data-access/teacher.store';
 import { CardType } from '../../model/card.model';
@@ -23,6 +24,7 @@ import { CardType } from '../../model/card.model';
 export class ListItemComponent {
   private teacherStore = inject(TeacherStore);
   private studentStore = inject(StudentStore);
+  private cityStore = inject(CityStore);
 
   readonly id = input.required<number>();
   readonly name = input.required<string>();
@@ -34,6 +36,8 @@ export class ListItemComponent {
       this.teacherStore.deleteOne(id);
     } else if (type === CardType.STUDENT) {
       this.studentStore.deleteOne(id);
+    } else {
+      this.cityStore.deleteOne(id);
     }
   }
 }