feat(projection): use the container & presenter architecture

UI now presentational. Uses content projection and outputs for better reusability. Refs: Challenge 1

Author: Justin24506

.gitignore

@@ -51,3 +51,4 @@ package-lock.json
 npm-shrinkwrap.json
 
 __screenshots__/
+.idea/

apps/angular/1-projection/src/app/app.component.ts

@@ -5,6 +5,7 @@ import { TeacherCardComponent } from './component/teacher-card/teacher-card.comp
 
 @Component({
   selector: 'app-root',
+  standalone: true,
   template: `
     <div class="grid grid-cols-3 gap-3">
       <app-teacher-card />

apps/angular/1-projection/src/app/card-item.ts

@@ -0,0 +1,7 @@
+import { Directive } from '@angular/core';
+
+@Directive({
+  standalone: true,
+  selector: '[appCardItem]',
+})
+export class CardItemDirective {}

apps/angular/1-projection/src/app/component/city-card/city-card.component.ts

@@ -1,9 +1,52 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { NgOptimizedImage } from '@angular/common';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { CardItemDirective } from '../../card-item';
+import { CityStore } from '../../data-access/city.store';
+import {
+  FakeHttpService,
+  randomCity,
+} from '../../data-access/fake-http.service';
+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: [],
+  standalone: true,
+  template: `
+    <app-card
+      (addClicked)="store.addOne(randCity())"
+      [list]="cities()"
+      customClass="bg-blue-100">
+      <img
+        ngSrc="../../../assets/img/city.png"
+        width="200"
+        height="200"
+        alt="City Icon" />
+
+      <ng-template appCardItem let-item>
+        <app-list-item
+          [id]="item.id"
+          [name]="item.name"
+          (deleteClicked)="store.deleteOne(item.id)"></app-list-item>
+      </ng-template>
+    </app-card>
+  `,
+  imports: [
+    CardComponent,
+    ListItemComponent,
+    NgOptimizedImage,
+    CardItemDirective,
+  ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CityCardComponent {}
+export class CityCardComponent {
+  protected store = inject(CityStore);
+  private http = inject(FakeHttpService);
+
+  cities = this.store.cities;
+  protected readonly randCity = randomCity;
+
+  ngOnInit(): void {
+    this.http.fetchCities$.subscribe((s) => this.store.addAll(s));
+  }
+}

apps/angular/1-projection/src/app/component/student-card/student-card.component.ts

@@ -1,38 +1,56 @@
+import { NgOptimizedImage } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
   inject,
   OnInit,
 } from '@angular/core';
-import { FakeHttpService } from '../../data-access/fake-http.service';
+import { CardItemDirective } from '../../card-item';
+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',
+  standalone: true,
   template: `
     <app-card
+      (addClicked)="store.addOne(randStudent())"
       [list]="students()"
-      [type]="cardType"
-      customClass="bg-light-green" />
+      customClass="bg-green-100">
+      <img
+        ngSrc="../../../assets/img/student.webp"
+        width="200"
+        height="200"
+        alt="Student Icon" />
+
+      <ng-template appCardItem let-item>
+        <app-list-item
+          [id]="item.id"
+          [name]="item.firstName"
+          (deleteClicked)="store.deleteOne(item.id)"></app-list-item>
+      </ng-template>
+    </app-card>
   `,
-  styles: [
-    `
-      ::ng-deep .bg-light-green {
-        background-color: rgba(0, 250, 0, 0.1);
-      }
-    `,
+  styles: [],
+  imports: [
+    CardComponent,
+    ListItemComponent,
+    NgOptimizedImage,
+    CardItemDirective,
   ],
-  imports: [CardComponent],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class StudentCardComponent implements OnInit {
   private http = inject(FakeHttpService);
-  private store = inject(StudentStore);
+  protected store = inject(StudentStore);
 
   students = this.store.students;
-  cardType = CardType.STUDENT;
+  protected readonly randStudent = randStudent;
 
   ngOnInit(): void {
     this.http.fetchStudents$.subscribe((s) => this.store.addAll(s));

apps/angular/1-projection/src/app/component/teacher-card/teacher-card.component.ts

@@ -1,34 +1,54 @@
+import { NgOptimizedImage } from '@angular/common';
 import { Component, inject, OnInit } from '@angular/core';
-import { FakeHttpService } from '../../data-access/fake-http.service';
+import { CardItemDirective } from '../../card-item';
+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',
+  standalone: true,
   template: `
     <app-card
+      (addClicked)="store.addOne(randTeacher())"
       [list]="teachers()"
-      [type]="cardType"
-      customClass="bg-light-red"></app-card>
+      customClass="bg-red-100">
+      <img
+        ngSrc="../../../assets/img/teacher.png"
+        width="200"
+        height="200"
+        priority
+        alt="Teacher Icon" />
+
+      <ng-template appCardItem let-item>
+        <app-list-item
+          [id]="item.id"
+          [name]="item.firstName"
+          (deleteClicked)="store.deleteOne(item.id)"></app-list-item>
+      </ng-template>
+    </app-card>
   `,
-  styles: [
-    `
-      ::ng-deep .bg-light-red {
-        background-color: rgba(250, 0, 0, 0.1);
-      }
-    `,
+  styles: [],
+  imports: [
+    CardComponent,
+    ListItemComponent,
+    NgOptimizedImage,
+    CardItemDirective,
   ],
-  imports: [CardComponent],
 })
 export class TeacherCardComponent implements OnInit {
   private http = inject(FakeHttpService);
-  private store = inject(TeacherStore);
+  protected store = inject(TeacherStore);
 
   teachers = this.store.teachers;
-  cardType = CardType.TEACHER;
 
   ngOnInit(): void {
     this.http.fetchTeachers$.subscribe((t) => this.store.addAll(t));
   }
+
+  protected readonly randTeacher = randTeacher;
 }

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);

apps/angular/1-projection/src/app/model/card.model.ts

@@ -1,58 +1,50 @@
-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 { NgTemplateOutlet } from '@angular/common';
+import {
+  Component,
+  contentChild,
+  input,
+  output,
+  TemplateRef,
+} from '@angular/core';
+import { CardItemDirective } from '../../card-item';
 
 @Component({
   selector: 'app-card',
+  standalone: true,
   template: `
     <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></ng-content>
 
       <section>
-        @for (item of list(); track item) {
-          <app-list-item
-            [name]="item.firstName"
-            [id]="item.id"
-            [type]="type()"></app-list-item>
+        @for (item of list(); track item.id) {
+          <ng-container
+            *ngTemplateOutlet="
+              itemTemplate();
+              context: { $implicit: item }
+            "></ng-container>
         }
       </section>
 
       <button
         class="rounded-sm border border-blue-500 bg-blue-300 p-2"
-        (click)="addNewItem()">
+        (click)="onAddClicked()">
         Add
       </button>
     </div>
   `,
-  imports: [ListItemComponent, NgOptimizedImage],
+  imports: [NgTemplateOutlet],
 })
 export class CardComponent {
-  private teacherStore = inject(TeacherStore);
-  private studentStore = inject(StudentStore);
-
-  readonly list = input<any[] | null>(null);
-  readonly type = input.required<CardType>();
+  readonly list = input<any[]>();
+  readonly itemTemplate = contentChild.required(CardItemDirective, {
+    read: TemplateRef,
+  });
   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());
-    }
+  addClicked = output<void>();
+  onAddClicked() {
+    this.addClicked.emit();
   }
 }

apps/angular/1-projection/src/app/ui/card/card.component.ts

@@ -1,39 +1,29 @@
 import {
   ChangeDetectionStrategy,
   Component,
-  inject,
   input,
+  output,
 } from '@angular/core';
-import { StudentStore } from '../../data-access/student.store';
-import { TeacherStore } from '../../data-access/teacher.store';
-import { CardType } from '../../model/card.model';
 
 @Component({
   selector: 'app-list-item',
+  standalone: true,
   template: `
     <div class="border-grey-300 flex justify-between border px-2 py-1">
       {{ name() }}
-      <button (click)="delete(id())">
+      <button (click)="onDeleteClicked()">
         <img class="h-5" src="assets/svg/trash.svg" />
       </button>
     </div>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ListItemComponent {
-  private teacherStore = inject(TeacherStore);
-  private studentStore = inject(StudentStore);
-
   readonly id = input.required<number>();
   readonly name = input.required<string>();
-  readonly type = input.required<CardType>();
 
-  delete(id: number) {
-    const type = this.type();
-    if (type === CardType.TEACHER) {
-      this.teacherStore.deleteOne(id);
-    } else if (type === CardType.STUDENT) {
-      this.studentStore.deleteOne(id);
-    }
+  deleteClicked = output<number>();
+  onDeleteClicked() {
+    this.deleteClicked.emit(this.id());
   }
 }