fix(demo): improve ssr demo

push-based · Mar 18, 2024 · 37dd1bc · 37dd1bc
1 parent 5dc761a
commit 37dd1bc
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 5 deletions.
diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/angular.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/angular.component.ts
@@ -7,6 +7,7 @@ import { ControllerComponent } from '../misc/controller.component';
 import { IconTester } from '../misc/icon-tester.service';
 import { SUPPORTED_ICONS } from '../misc/icon-data';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -31,6 +32,7 @@ import { BaseDemoComponent } from '../misc/base-demo.component';
 export class AngularComponent extends BaseDemoComponent {
   constructor() {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.ANGULAR);
     this.tester.defineSet(
       SUPPORTED_ICONS.map((i) => `assets/svg-icons/${i}.svg`)
     );

diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/ant.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/ant.component.ts
@@ -9,6 +9,7 @@ import { SUPPORTED_ICONS } from '../misc/icon-data';
 
 import { AllIcons } from './ant-icons';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -33,6 +34,7 @@ import { BaseDemoComponent } from '../misc/base-demo.component';
 export class AntComponent extends BaseDemoComponent {
   constructor(private iconService: IconService) {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.ANT);
     this.tester.defineSet(SUPPORTED_ICONS);
     this.iconService.addIcon(...(AllIcons));
   }

diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/fast-icon.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/fast-icon.component.ts
@@ -7,6 +7,7 @@ import { ControllerComponent } from '../misc/controller.component';
 import { IconTester } from '../misc/icon-tester.service';
 import { SUPPORTED_ICONS } from '../misc/icon-data';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -31,6 +32,7 @@ import { BaseDemoComponent } from '../misc/base-demo.component';
 export class FastIconRouteComponent extends BaseDemoComponent {
   constructor() {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.FAST_SVG);
     this.tester.defineSet(SUPPORTED_ICONS);
   }
 }
diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome.component.ts
@@ -7,6 +7,7 @@ import { faCircleUser } from '@fortawesome/free-solid-svg-icons';
 import { ControllerComponent } from '../misc/controller.component';
 import { IconTester } from '../misc/icon-tester.service';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -31,6 +32,7 @@ import { BaseDemoComponent } from '../misc/base-demo.component';
 export class FontAwesomeComponent extends BaseDemoComponent {
   constructor() {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.FONT_AWESOME);
     this.tester.defineSet([
       faCircleUser,
       faCircleUser,

diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/ionic.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/ionic.component.ts
@@ -6,6 +6,7 @@ import { IonIcon } from '@ionic/angular/standalone';
 import { ControllerComponent } from '../misc/controller.component';
 import { SUPPORTED_ICONS } from '../misc/icon-data';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -30,6 +31,7 @@ import { BaseDemoComponent } from '../misc/base-demo.component';
 export class IonicComponent extends BaseDemoComponent {
   constructor() {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.IONIC);
     this.tester.defineSet(
       SUPPORTED_ICONS.map((i) => `assets/svg-icons/${i}.svg`)
     );

diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/material.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/material.component.ts
@@ -8,6 +8,7 @@ import { ControllerComponent } from '../misc/controller.component';
 import { IconTester } from '../misc/icon-tester.service';
 import { SUPPORTED_ICONS } from '../misc/icon-data';
 import { BaseDemoComponent } from '../misc/base-demo.component';
+import { DEMO_ROUTE } from '../misc/constants';
 
 @Component({
   standalone: true,
@@ -35,6 +36,7 @@ export class MaterialComponent extends BaseDemoComponent {
     private matIconRegistry: MatIconRegistry,
   ) {
     super();
+    this.tester.activeDemo.set(DEMO_ROUTE.MATERIAL);
     this.tester.defineSet(SUPPORTED_ICONS);
     SUPPORTED_ICONS.forEach((i) => {
       this.matIconRegistry.addSvgIcon(

diff --git a/packages/ngx-fast-icon-demo/src/app/misc/base-demo.component.ts b/packages/ngx-fast-icon-demo/src/app/misc/base-demo.component.ts
@@ -14,7 +14,6 @@ export class BaseDemoComponent implements OnInit {
   protected tester = inject(IconTester);
 
   ngOnInit() {
-    this.tester.activeDemo.set('angular');
     this.tester.activeLayoutSetting.set(this.layout() as any);
     this.tester.iconListCount.set(this.count());
   }

diff --git a/packages/ngx-fast-icon-demo/src/app/misc/icon-tester.service.ts b/packages/ngx-fast-icon-demo/src/app/misc/icon-tester.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, signal } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons';
 import { LAYOUT_SETTING, LayoutSetting } from './constants';
 
@@ -12,7 +12,7 @@ export class IconTester {
 
   icons?: string[] | IconDefinition[];
 
-  constructor(private activatedRoute: ActivatedRoute, private router: Router) {}
+  constructor(private router: Router) {}
 
   setLayout(setting: LayoutSetting) {
     this.activeLayoutSetting.set(setting);
@@ -34,8 +34,7 @@ export class IconTester {
 
   private updateLocation(): void {
     this.router.navigate(
-      [this.activeDemo(), this.activeLayoutSetting(), this.iconListCount()],
-      { relativeTo: this.activatedRoute }
+      [this.activeDemo(), this.activeLayoutSetting(), this.iconListCount()]
     );
   }
 }