|
1 | | -import { Component, OnInit, AfterViewInit } from '@angular/core'; |
| 1 | +import { Component, signal, effect, DestroyRef, inject } from '@angular/core'; |
2 | 2 | import { RouterLink } from '@angular/router'; |
3 | 3 | import { CommonModule } from '@angular/common'; |
4 | 4 | import { LanguageService, Language } from '../../services/language.service'; |
5 | 5 | import { trigger, style, animate, transition, query, stagger } from '@angular/animations'; |
| 6 | +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; |
6 | 7 |
|
7 | 8 | @Component({ |
8 | 9 | selector: 'app-language-selection', |
9 | 10 | standalone: true, |
10 | 11 | imports: [CommonModule, RouterLink], |
11 | 12 | template: ` |
12 | | -
|
13 | 13 | <script type="text/javascript"> |
14 | 14 | aclib.runInterstitial({ |
15 | 15 | zoneId: '9197070', |
16 | 16 | }); |
17 | 17 | </script> |
18 | 18 |
|
19 | 19 | <section class="languages"> |
20 | | - <div class="grid" [@listAnimation]="languages.length"> |
21 | | - <div |
22 | | - *ngFor="let language of languages" |
23 | | - class="card language-card" |
24 | | - [routerLink]="['/learn', fromLanguageCode, language.code, 'words']" |
25 | | - (click)="onLanguageSelect()" |
26 | | - > |
27 | | - <img |
28 | | - [src]="language.flagImage" |
29 | | - [alt]="language.name + ' flag'" |
30 | | - class="flag-image" |
31 | | - /> |
32 | | - <h2>{{ language.name }}</h2> |
33 | | - </div> |
| 20 | + <div class="grid" [@listAnimation]="languages().length"> |
| 21 | + @for (language of languages(); track language.code) { |
| 22 | + <div |
| 23 | + class="card language-card" |
| 24 | + [routerLink]="['/learn', fromLanguageCode(), language.code, 'words']" |
| 25 | + (click)="onLanguageSelect()" |
| 26 | + > |
| 27 | + <img |
| 28 | + [src]="language.flagImage" |
| 29 | + [alt]="language.name + ' flag'" |
| 30 | + class="flag-image" |
| 31 | + /> |
| 32 | + <h2>{{ language.name }}</h2> |
| 33 | + </div> |
| 34 | + } |
34 | 35 | </div> |
35 | 36 | </section> |
36 | 37 | `, |
@@ -118,30 +119,35 @@ import { trigger, style, animate, transition, query, stagger } from '@angular/an |
118 | 119 | `, |
119 | 120 | ], |
120 | 121 | }) |
121 | | -export class LanguageSelectionComponent implements OnInit, AfterViewInit { |
122 | | - languages: Language[]; |
123 | | - fromLanguageCode: string = 'en'; |
| 122 | +export class LanguageSelectionComponent { |
| 123 | + private readonly languageService = inject(LanguageService); |
| 124 | + private readonly destroyRef = inject(DestroyRef); |
| 125 | + |
| 126 | + // Constants |
124 | 127 | private readonly FROM_LANGUAGE_KEY = 'polytalk-from-language'; |
125 | 128 | private readonly TO_LANGUAGE_KEY = 'polytalk-to-language'; |
| 129 | + |
| 130 | + // Convert properties to signals |
| 131 | + languages = signal<Language[]>([]); |
| 132 | + fromLanguageCode = signal<string>('en'); |
126 | 133 |
|
127 | | - |
128 | | - constructor(private languageService: LanguageService) { |
129 | | - this.languages = this.languageService.getLanguages(); |
130 | | - } |
131 | | - |
132 | | - ngOnInit() { |
133 | | - // Load saved from language, default to 'en' if not found |
| 134 | + constructor() { |
| 135 | + // Initialize languages signal |
| 136 | + this.languages.set(this.languageService.getLanguages()); |
| 137 | + |
| 138 | + // Initialize from language signal from localStorage |
134 | 139 | const savedFromLanguage = localStorage.getItem(this.FROM_LANGUAGE_KEY); |
135 | 140 | if (savedFromLanguage) { |
136 | | - this.fromLanguageCode = savedFromLanguage; |
| 141 | + this.fromLanguageCode.set(savedFromLanguage); |
137 | 142 | } |
| 143 | + |
| 144 | + // Setup page initialization effect (replaces ngAfterViewInit) |
| 145 | + effect(() => { |
| 146 | + window.scrollTo(0, 0); |
| 147 | + }); |
138 | 148 | } |
139 | 149 |
|
140 | | - ngAfterViewInit() { |
141 | | - window.scrollTo(0, 0); |
142 | | - } |
143 | | - |
144 | | - onLanguageSelect() { |
| 150 | + onLanguageSelect(): void { |
145 | 151 | window.scrollTo(0, 0); |
146 | 152 | } |
147 | 153 | } |
0 commit comments