fix: edit list items

src/app/app.component.html

@@ -3,8 +3,8 @@
 </main>
 <nav>
   <ul ngbNav [activeId]="route.fragment | async" class="nav-tabs custom-navbar bg-body-secondary">
-    <li ngbNavItem="" class="custom-navitem"><a ngbNavLink routerLink="" routerLinkActive="active"><i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a></li>
+    <li ngbNavItem="/edit" class="custom-navitem"><a ngbNavLink routerLink="/edit" routerLinkActive="active"><i class="bi bi-pencil-square"></i>{{ data.getPlayers().length }}</a></li>
-    <li ngbNavItem="/basic.t" class="custom-navitem"><a ngbNavLink routerLink="/basic.t" routerLinkActive="active"><i class="bi bi-shuffle"></i></a></li>
+    <li ngbNavItem="/basic" class="custom-navitem"><a ngbNavLink routerLink="/basic" routerLinkActive="active"><i class="bi bi-shuffle"></i></a></li>
-    <li ngbNavItem="/rotations.t" class="custom-navitem"><a ngbNavLink routerLink="/rotations.t" routerLinkActive="active"><i class="bi bi-arrow-repeat"></i></a></li>
+    <li ngbNavItem="/rotations" class="custom-navitem"><a ngbNavLink routerLink="/rotations" routerLinkActive="active"><i class="bi bi-arrow-repeat"></i></a></li>
   </ul>
 </nav>

src/app/app.component.less

@@ -22,6 +22,7 @@ tr{
     overflow-y: auto;
 }
 .custom-navbar{
+    height: 3rem;
     width: 100vw;
     position: fixed;
     bottom: 0;
@@ -32,4 +33,6 @@ tr{
 .custom-navitem{
     text-align: center; /* Center the content of each item */
     flex: 1;
+}
+.nav-link.active{
 }

src/app/app.routes.ts

@@ -2,18 +2,16 @@ import { Routes } from '@angular/router';
 import { ScreenBasicComponent } from './screen-basic/screen-basic.component';
 import { ScreenEditComponent } from './screen-edit/screen-edit.component';
 import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component';
+import { AppComponent } from './app.component';
 
 export const routes: Routes = [
     {
     path: '',
     children: [
-      { path: '', component: ScreenEditComponent },
+      { path: '', redirectTo: 'edit', pathMatch: 'full' },
-      /* IMPORTANT: all routes have to include a `.` (dot)
+      { path: 'edit', component: ScreenEditComponent },
-      this is a workaround used in `sw.js`
+      { path: 'basic', component: ScreenBasicComponent },
-      to allow hosting services on the same subdomain as this PWA
+      { path: 'rotations', component: ScreenRotationsComponent }
-      */
-      { path: 'basic.t', component: ScreenBasicComponent },
-      { path: 'rotations.t', component: ScreenRotationsComponent }
     ]
   }
 ];

src/app/data.service.ts

@@ -6,8 +6,6 @@ import { Player } from './model';
 })
 export class DataService {
   private players: Player[] = [];
-  teams: Player[][] = [];
-  numTeams: number = 2;
 
   setPlayers(players: Player[]){
     for (let player of players){

src/app/model.ts

@@ -26,7 +26,7 @@ export class Player{
     return [this.name, values];
   }
   
-  toString(): string{
+  valueOf(): string{
     return this.name;
   }
   static deSerialize(name: string, values: string): Player{

src/app/radio-nteams/radio-nteams.component.html

@@ -1,16 +0,0 @@
-<div class="btn-toolbar mb-3 col justify-content-center" role="toolbar">
-<div class="btn-group me-2" id="numTeamsSelector" role="group">
-  <input value=2 [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off" checked>
-  <label class="btn btn-outline-primary" for="btnradio1">Two</label>
-
-  <input value=3 [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
-  <label class="btn btn-outline-primary" for="btnradio2">Three</label>
-
-  <input value=0 [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio3" autocomplete="off">
-  <label class="btn btn-outline-primary" for="btnradio3">n</label>
-</div>
-<div *ngIf="numTeamsSelectorValue !==2 && numTeamsSelectorValue !==3" id="nTeamsText" class="col-md-auto">
-  <label for="nTeamsField">n Teams</label>
-  <input type="number" pattern="\d*" [(ngModel)]="nTeamsValue" id="nTeamsField" class="form-control" >
-</div>
-</div>

src/app/radio-nteams/radio-nteams.component.spec.ts

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

src/app/radio-nteams/radio-nteams.component.ts

@@ -1,19 +0,0 @@
-import { Component, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { DataService } from '../data.service';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'app-radio-nteams',
-  imports: [FormsModule, NgbModule, CommonModule],
-  templateUrl: './radio-nteams.component.html',
-  styleUrl: './radio-nteams.component.less'
-})
-export class RadioNteamsComponent {
-  data = inject(DataService);
-  numTeamsSelectorValue = 2;
-  numTeamsSelected = 2;
-  nTeamsValue = "4";
-
-}

src/app/screen-basic/screen-basic.component.html

@@ -1,5 +1,21 @@
   <div class="justify-content-md-center">
-    <app-radio-nteams></app-radio-nteams>
+    <div class="btn-toolbar mb-3 col justify-content-center" role="toolbar">
+    <div class="btn-group me-2" id="numTeamsSelector" role="group"
+      value="2">
+      <input value="2" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off" checked>
+      <label class="btn btn-outline-primary" for="btnradio1">Two</label>
+
+      <input value="3" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
+      <label class="btn btn-outline-primary" for="btnradio2">Three</label>
+
+      <input value="n" [(ngModel)]="numTeamsSelectorValue" type="radio" class="btn-check" name="btnradio" id="btnradio3" autocomplete="off">
+      <label class="btn btn-outline-primary" for="btnradio3">n</label>
+    </div>
+    <div *ngIf="numTeamsSelectorValue === 'n'" id="nTeamsText" class="col-md-auto">
+      <label for="nTeamsField">n Teams</label>
+      <input type="number" pattern="\d*" [(ngModel)]="nTeamsValue" id="nTeamsField" class="form-control" >
+    </div>
+  </div>
     <h1>Random Teams</h1>
 
   <form>
@@ -14,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-      @for (team of data.teams; track $index) {
+      @for (team of teamsArray; track $index) {
         <tr>
           <td style="text-wrap: wrap;">{{ team.length | number }}</td>
           <td class="wrap-cell">{{ team }}</td>

src/app/screen-basic/screen-basic.component.ts

@@ -7,20 +7,29 @@ import { CommonModule } from '@angular/common';
 import { Player } from '../model';
 import { iter } from '../util';
 import { DataService } from '../data.service';
-import { RadioNteamsComponent } from '../radio-nteams/radio-nteams.component';
 
 @Component({
   selector: 'app-screen-basic',
-  imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RadioNteamsComponent],
+  imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
   templateUrl: './screen-basic.component.html',
   styleUrl: './screen-basic.component.less'
 })
 export class ScreenBasicComponent {
   data = inject(DataService);
+  numTeamsSelectorValue = "2";
+  numTeamsSelected = 2;
+  nTeamsValue = "4";
+  teamsArray: string[][] = [];
   
   onButtonGenerate(): void{
+    if(this.numTeamsSelectorValue === 'n'){
+      this.numTeamsSelected  = Number(this.nTeamsValue);
+    }
+    else{
+      this.numTeamsSelected = Number(this.numTeamsSelectorValue);
+    }
     
-    let teams = Array.from({ length: this.data.numTeams }, () => []);
+    let teams = Array.from({ length: this.numTeamsSelected }, () => []);
     // clone array here
     let localPlayers: Player[] = this.data.getPlayers();
 
@@ -31,10 +40,10 @@ export class ScreenBasicComponent {
         let n = localPlayers[index];
         localPlayers.splice(index,1);
         let team = iterator.next().value;
-        team.push(n);
+        team.push(n.name);
 
     }
-    this.data.teams = teams;
+    this.teamsArray = teams;
   }
 
 }

src/styles.less

@@ -9,7 +9,7 @@ html, body {
 body {
     margin:3em auto;
     font-family: Roboto, "Helvetica Neue", sans-serif;
-    padding:.5em auto;
+    padding:0 .5em;
 }
 h1,h2,h3{
     line-height:1.2;