fix: edit list items

This reverts commit 51f650352e.

.gitignore

@@ -1,42 +1,245 @@
-# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
+# Created by https://www.toptal.com/developers/gitignore/api/angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
+# Edit at https://www.toptal.com/developers/gitignore?templates=angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
 
-# Compiled output
+### Angular ###
-/dist
+## Angular ##
-/tmp
+# compiled output
-/out-tsc
+dist/
-/bazel-out
+tmp/
+app/**/*.js
+app/**/*.js.map
 
-# Node
+# dependencies
-/node_modules
+node_modules/
-npm-debug.log
+bower_components/
-yarn-error.log
 
 # IDEs and editors
 .idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
 
-# Visual Studio Code
+# misc
+.sass-cache/
+connect.lock/
+coverage/
+libpeerconnection.log/
+npm-debug.log
+testem.log
+typings/
+.angular/
+
+# e2e
+e2e/*.js
+e2e/*.map
+
+# System Files
+.DS_Store/
+
+### Bazel ###
+# gitignore template for Bazel build system
+# website: https://bazel.build/
+
+# Ignore all bazel-* symlinks. There is no full list since this can change
+# based on the name of the directory bazel is cloned into.
+/bazel-*
+
+# Directories for the Bazel IntelliJ plugin containing the generated
+# IntelliJ project files and plugin configuration. Seperate directories are
+# for the IntelliJ, Android Studio and CLion versions of the plugin.
+/.ijwb/
+/.aswb/
+/.clwb/
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+### Sass ###
+*.css.map
+*.sass.map
+*.scss.map
+
+### SonarQube ###
+# SonarQube ignore files.
+#
+# https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner
+# Sonar Scanner working directories
+.sonar/
+.sonarqube/
+.scannerwork/
+
+# http://www.sonarlint.org/commandline/
+# SonarLint working directories, configuration files (including credentials)
+.sonarlint/
+
+### VisualStudioCode ###
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-.history/*
+!.vscode/*.code-snippets
 
-# Miscellaneous
+# Local History for Visual Studio Code
-/.angular/cache
+.history/
-.sass-cache/
+
-/connect.lock
+# Built Visual Studio Code Extensions
-/coverage
+*.vsix
-/libpeerconnection.log
+
-testem.log
+### VisualStudioCode Patch ###
-/typings
+# Ignore all local history of files
+.history
+.ionide
+
+### yarn ###
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.yarn/*
+!.yarn/releases
+!.yarn/patches
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+
+# if you are NOT using Zero-installs, then:
+# comment the following lines
+!.yarn/cache
+
+# and uncomment the following lines
+# .pnp.*
+
+# End of https://www.toptal.com/developers/gitignore/api/angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
 
-# System files
-.DS_Store
-Thumbs.db

angular.json

@@ -30,10 +30,12 @@
               {
                 "glob": "**/*",
                 "input": "public"
-              }
+              },
+              "src/sw.js"
             ],
             "styles": [
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
               "src/styles.less"
             ],
             "scripts": [],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vb",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,31 +12,34 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^19.0.5",
+    "@angular/animations": "^19.2.7",
-    "@angular/cdk": "~19.0.1",
+    "@angular/cdk": "~19.2.10",
-    "@angular/common": "^19.0.5",
+    "@angular/common": "^19.2.7",
-    "@angular/compiler": "^19.0.5",
+    "@angular/compiler": "^19.2.7",
-    "@angular/core": "^19.0.5",
+    "@angular/core": "^19.2.7",
-    "@angular/forms": "^19.0.5",
+    "@angular/forms": "^19.2.7",
-    "@angular/platform-browser": "^19.0.5",
+    "@angular/platform-browser": "^19.2.7",
-    "@angular/platform-browser-dynamic": "^19.0.5",
+    "@angular/platform-browser-dynamic": "^19.2.7",
-    "@angular/platform-server": "^19.0.5",
+    "@angular/platform-server": "^19.2.7",
-    "@angular/router": "^19.0.5",
+    "@angular/router": "^19.2.7",
-    "@angular/service-worker": "^19.0.5",
+    "@angular/service-worker": "^19.2.7",
-    "@angular/ssr": "^19.0.6",
+    "@angular/ssr": "^19.2.9",
     "@ng-bootstrap/ng-bootstrap": "^18.0.0",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
+    "bootstrap-icons": "^1.13.1",
     "express": "^4.18.2",
     "rxjs": "~7.8.0",
+    "sonarqube-scanner": "^4.3.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.15.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^19.0.6",
+    "@angular-devkit/build-angular": "^19.2.9",
-    "@angular/cli": "^19.0.6",
+    "@angular/cli": "^19.2.9",
-    "@angular/compiler-cli": "^19.0.5",
+    "@angular/compiler-cli": "^19.2.7",
-    "@angular/localize": "^19.0.5",
+    "@angular/localize": "^19.2.7",
+    "@sonar/scan": "^4.3.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",

src/app/app.component.html

@@ -1,63 +1,10 @@
-<style>
-  *{
-    text-align: center;
-  }
-</style>
 <main class="main">
-  <div class="row justify-content-md-center">
+    <router-outlet></router-outlet>
-    <h1>Please select the number of teams:</h1>
-  <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>
-
-  <form>
-    <div class="container">
-    <label for="playerNames">Names</label>
-    <textarea [(ngModel)]="playerNamesValue"
-      class="form-control mb-3"
-      rows="18" 
-      cols="30"
-      style="text-align: left;" 
-      name="playerNames"
-      #playerNames
-      id="playerNames"
-      ></textarea>
-    </div>
-  <button type="button" (click)="onButtonGenerate(playerNames.value)" class="btn btn-primary">Generate</button>
-  </form>
-
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th scope="col">Size</th>
-        <th scope="col">Names</th>
-      </tr>
-    </thead>
-    <tbody>
-      @for (team of teamsArray; track $index) {
-        <tr>
-          <td>{{ team.length | number }}</td>
-          <td>{{ team }}</td>
-        </tr>
-      }
-    </tbody>
-  </table>
-
-</div>
 </main>
-
+<nav>
-<router-outlet />
+  <ul ngbNav [activeId]="route.fragment | async" class="nav-tabs custom-navbar bg-body-secondary">
+    <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" class="custom-navitem"><a ngbNavLink routerLink="/basic" routerLinkActive="active"><i class="bi bi-shuffle"></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

@@ -0,0 +1,38 @@
+html, body{
+    max-width: 100%;
+    overflow-x: hidden;
+}
+*{
+    text-align: center;
+}
+.custom-table {
+    //table-layout: fixed;
+    max-width: 100%;
+}
+tr{
+    padding-right: .2em;
+}
+.wrap-cell{
+    word-break: break-all;
+    white-space: normal;
+}
+.main{
+    margin-bottom: 5rem;
+    padding: 1rem;
+    overflow-y: auto;
+}
+.custom-navbar{
+    height: 3rem;
+    width: 100vw;
+    position: fixed;
+    bottom: 0;
+    display: flex;
+    justify-content: space-around; /* Distribute items evenly */
+    z-index: 1000;
+}
+.custom-navitem{
+    text-align: center; /* Center the content of each item */
+    flex: 1;
+}
+.nav-link.active{
+}

src/app/app.component.ts

@@ -1,69 +1,40 @@
-import {  AfterViewInit, Component, OnInit} from '@angular/core';
+import { Component, inject, OnInit} from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { RouterOutlet, ActivatedRoute } from '@angular/router';
+import { RouterOutlet, ActivatedRoute, RouterLink } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { CommonModule } from '@angular/common';
+import { filter, take } from 'rxjs';
+import { ScreenBasicComponent } from "./screen-basic/screen-basic.component";
+import { ScreenRotationsComponent } from './screen-rotations/screen-rotations.component';
+import { Player } from './model';
+import { ScreenEditComponent } from './screen-edit/screen-edit.component';
+import { DataService } from './data.service';
 
 @Component({
   selector: 'app-root',
-  imports: [NgbModule, RouterOutlet, CommonModule, FormsModule],
+  imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, ScreenBasicComponent, ScreenRotationsComponent, ScreenEditComponent, RouterLink],
   templateUrl: './app.component.html',
   styleUrl: './app.component.less'
 })
 export class AppComponent implements OnInit {
   title = 'vb';
-  playerNamesValue = "";
+  data = inject(DataService);
-  numTeamsSelectorValue = "2";
-  numTeamsSelected = 2;
-  nTeamsValue = "4";
-  teamsArray: string[][] = [];
-  displayedColumns = ["teamCount", "teamNames"];
 
-  constructor(private activatedRoute: ActivatedRoute){}
+  constructor(public route: ActivatedRoute){}
 
   ngOnInit(): void {
-    //consiedr using Angular's ActivatedRoute here instead
+    this.route.queryParams.pipe(
-    const params = new URLSearchParams(window.location.search);
+      filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
-    const names = params.get('names')?.replaceAll(',', '\n');
+      take(1)
-    if (names) this.playerNamesValue = names;
+    ).subscribe(params => {
+      if (params['names']){
+        this.data.setPlayers(
+          params['names'].split(',').map((name: string) => new Player(name))
+        );
+      }
+    });
   }
 
-  onButtonGenerate(textinput: string): void{
-    if(this.numTeamsSelectorValue === 'n'){
-      this.numTeamsSelected  = Number(this.nTeamsValue);
-    }
-    else{
-      this.numTeamsSelected = Number(this.numTeamsSelectorValue);
-    }
-    let names = this.playerNamesValue
-        .split('\n')
-        .map(function(str){return str.trim();})
-        .filter(function(str){return str}); // boolean interpretation is same as non-empty
-    // remove duplicates by using a Set
-    names = [...new Set(names)];
-    
-    var teams = Array.from({ length: this.numTeamsSelected }, () => []);
-    var playersPerTeam = Math.floor(names.length / this.numTeamsSelected);
-
-    let nameslen = names.length;
-    function* iter(list: any){
-        let index = 0;
-        while(true){
-            yield list[index % list.length];
-            index++;
-        }
-    }
-    var iterator = iter(teams);
-    for(let i =0; i < nameslen; i++){
-        var index = Math.floor(Math.random()* names.length);
-        var n = names[index]; 
-        names.splice(index,1);
-        var team = iterator.next().value;
-        team.push(n);
-
-    }
-    this.teamsArray = teams;
-  }
 
 }

src/app/app.config.ts

@@ -2,12 +2,11 @@ import { ApplicationConfig, provideZoneChangeDetection, isDevMode } from '@angul
 import { provideRouter } from '@angular/router';
 
 import { routes } from './app.routes';
-import { provideClientHydration, withEventReplay } from '@angular/platform-browser';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { provideServiceWorker } from '@angular/service-worker';
 
 export const appConfig: ApplicationConfig = {
-  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideClientHydration(withEventReplay()), provideAnimationsAsync('noop'), provideServiceWorker('ngsw-worker.js', {
+  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideAnimationsAsync('noop'), provideServiceWorker('./sw.js', {
             enabled: !isDevMode(),
             registrationStrategy: 'registerWhenStable:30000'
           })]

src/app/app.routes.ts

@@ -1,3 +1,17 @@
 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 = [];
+export const routes: Routes = [
+    {
+    path: '',
+    children: [
+      { path: '', redirectTo: 'edit', pathMatch: 'full' },
+      { path: 'edit', component: ScreenEditComponent },
+      { path: 'basic', component: ScreenBasicComponent },
+      { path: 'rotations', component: ScreenRotationsComponent }
+    ]
+  }
+];

src/app/data.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DataService } from './data.service';
+
+describe('DataService', () => {
+  let service: DataService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(DataService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/data.service.ts

@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { Player } from './model';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DataService {
+  private players: Player[] = [];
+
+  setPlayers(players: Player[]){
+    for (let player of players){
+      this.addPlayer(player);
+    }
+  }
+  
+  addPlayer(player: Player): boolean{
+    if (player.name.trim() && Player.isNew(player, this.players)){
+      this.players.push(player);
+      return true
+    }
+    return false
+  }
+  removePlayer(player: Player){
+    const index = this.players.indexOf(player);
+    if (index !== -1) {
+      this.players.splice(index, 1);
+    }
+  }
+  getPlayers(): Player[] {
+    let clone =Object.assign([],this.players);
+    return clone
+  }
+}

src/app/modal-rotations/modal-rotations.component.html

@@ -0,0 +1,73 @@
+  <div class="modal-header">
+    <h4 class="modal-title">{{ player.name }}</h4>
+    <button
+      type="button"
+      class="btn-close"
+      (click)="activeModal.dismiss()"
+      aria-label="Close"
+    ></button>
+  </div>
+  <div class="modal-body">
+    <form>
+      <div class="form-check">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          [(ngModel)]="player.outside"
+          name="outside"
+          id="outside"
+        />
+        <label class="form-check-label" for="outside">Outside</label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          [(ngModel)]="player.middle"
+          name="middle"
+          id="middle"
+        />
+        <label class="form-check-label" for="middle">Middle</label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          [(ngModel)]="player.opposite"
+          name="opposite"
+          id="opposite"
+        />
+        <label class="form-check-label" for="opposite">Opposite</label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          [(ngModel)]="player.setter"
+          name="setter"
+          id="setter"
+        />
+        <label class="form-check-label" for="setter">Setter</label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          [(ngModel)]="player.libero"
+          name="libero"
+          id="libero"
+        />
+        <label class="form-check-label" for="libero">Libero</label>
+      </div>
+    </form>
+  </div>
+  <div class="modal-footer">
+    <button
+      type="button"
+      class="btn btn-primary"
+      (click)="savePlayer(); activeModal.close()"
+    >
+      Save
+    </button>
+  </div>
+

src/app/modal-rotations/modal-rotations.component.spec.ts

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

src/app/modal-rotations/modal-rotations.component.ts

@@ -0,0 +1,21 @@
+import { Component, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Player} from '../model';
+import { FormsModule } from '@angular/forms';
+
+@Component({
+  selector: 'app-modal-rotations',
+  imports: [FormsModule],
+  templateUrl: './modal-rotations.component.html',
+  styleUrl: './modal-rotations.component.less'
+})
+export class ModalRotationsComponent {
+ @Input() player!: Player;
+
+  constructor(public activeModal: NgbActiveModal) {}
+
+  savePlayer() {
+    // You can emit an event or handle the save logic here
+    this.activeModal.close(this.player);
+  }
+}

src/app/model.ts

@@ -0,0 +1,42 @@
+export class Player{
+  name: string;
+  outside: boolean;
+  middle: boolean;
+  opposite: boolean; // dia
+  setter: boolean;
+  libero: boolean;
+
+  constructor(
+    name:string, 
+    outside: boolean = false,
+    middle: boolean = false,
+    opposite: boolean = false, // dia
+    setter: boolean = false,
+    libero: boolean = false,
+  ){
+    this.name = name;
+    this.outside = outside;
+    this.middle = middle;
+    this.opposite = opposite;
+    this.setter = setter;
+    this.libero = libero;
+  }
+  serialize(): string[] {
+    const values = 'OOOO'
+    return [this.name, values];
+  }
+  
+  valueOf(): string{
+    return this.name;
+  }
+  static deSerialize(name: string, values: string): Player{
+    return new Player(name);
+  }
+  static isNew(newplayer:Player, players: Player[]): boolean {
+  const seen = new Set<string>(players.map(p => p.name));
+  if (seen.has(newplayer.name)){
+    return false
+  }
+  return true
+}
+}

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

@@ -0,0 +1,42 @@
+  <div class="justify-content-md-center">
+    <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>
+  <button type="button" (click)="onButtonGenerate()" class="btn btn-primary">Generate</button>
+  </form>
+
+  <table class="table table-striped custom-table">
+    <thead>
+      <tr>
+        <th scope="col">Size</th>
+        <th scope="col">Names</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (team of teamsArray; track $index) {
+        <tr>
+          <td style="text-wrap: wrap;">{{ team.length | number }}</td>
+          <td class="wrap-cell">{{ team }}</td>
+        </tr>
+      }
+    </tbody>
+  </table>
+
+</div>

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

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

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

@@ -0,0 +1,49 @@
+// Original Team Generation Screen for arbitrary size and number of teams
+import { Component, inject} from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { RouterOutlet, ActivatedRoute } from '@angular/router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { CommonModule } from '@angular/common';
+import { Player } from '../model';
+import { iter } from '../util';
+import { DataService } from '../data.service';
+
+@Component({
+  selector: 'app-screen-basic',
+  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.numTeamsSelected }, () => []);
+    // clone array here
+    let localPlayers: Player[] = this.data.getPlayers();
+
+    let nameslen = localPlayers.length;
+    let iterator = iter(teams);
+    for(let i =0; i < nameslen; i++){
+        let index = Math.floor(Math.random()* localPlayers.length);
+        let n = localPlayers[index];
+        localPlayers.splice(index,1);
+        let team = iterator.next().value;
+        team.push(n.name);
+
+    }
+    this.teamsArray = teams;
+  }
+
+}

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

@@ -0,0 +1,33 @@
+<div class="justify-content-md-center">
+  <h1>Players: {{ data.getPlayers().length }}</h1>
+  <div class="input-group mb-3">
+    <input
+      type="text"
+      [(ngModel)]="newItem"
+      class="form-control"
+      placeholder="Enter a name..."
+      (keyup.enter)="addItem()"
+    />
+    <button class="btn btn-primary" type="button" (click)="addItem()" >
+      <i class="bi bi-plus-lg"></i> Add
+    </button>
+  </div>
+  @if (alertMessage) {
+	<ngb-alert #selfClosingAlert type="danger" (closed)="alertMessage = ''">{{ alertMessage }}</ngb-alert>
+    }
+<div class="container mt-4">
+  <ul class="list-group mb-3">
+      @for (player of data.getPlayers(); track $index) {
+        <li class="list-group-item d-flex justify-content-between">
+            <a (click)="openPlayerModal(player)" style="display: block; cursor: pointer; flex-grow: 1; text-align: left;">{{ player.name }}</a>
+            <button (click)="removeItem(player)" class="btn btn-secondary btn-sm p-0 ms-2" style="width: 24px; height: 24px" >
+              <i class="bi bi-x"></i>
+            </button>
+        </li>
+      }
+  </ul>
+
+</div>
+
+
+</div>

src/app/screen-edit/screen-edit.component.spec.ts

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

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

@@ -0,0 +1,67 @@
+import { Component, inject, Input, ViewChild } from '@angular/core';
+import { NgbAlert, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Player } from '../model';
+import { ModalRotationsComponent } from '../modal-rotations/modal-rotations.component';
+import { FormsModule } from '@angular/forms';
+import { Subject } from 'rxjs/internal/Subject';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { debounceTime, tap } from 'rxjs/operators';
+import { DataService } from '../data.service';
+
+@Component({
+  selector: 'app-screen-edit',
+  imports: [FormsModule, NgbAlert],
+  templateUrl: './screen-edit.component.html',
+  styleUrl: './screen-edit.component.less'
+})
+export class ScreenEditComponent {
+  data = inject(DataService);
+  @ViewChild('selfClosingAlert', { static: false })selfClosingAlert!: NgbAlert;
+  private _message$ = new Subject<string>();
+  newItem: string = "";
+  alertMessage = '';
+
+  constructor(private modalService: NgbModal) {
+    this._message$
+			.pipe(
+				takeUntilDestroyed(),
+				tap((message) => (this.alertMessage = message)),
+				debounceTime(5000),
+			)
+			.subscribe(() => this.selfClosingAlert?.close());
+  }
+
+  addItem() {
+    const name = this.newItem.trim()
+    if (name) {
+      let newPlayer = new Player(name);
+      if(this.data.addPlayer(newPlayer)){
+        this.newItem = '';
+        return
+      }
+      else{
+        this.setAlertMessage(newPlayer.name);
+      }
+    }
+  }
+  removeItem(player: Player){
+    this.data.removePlayer(player);
+  }
+
+  openPlayerModal(player: Player){
+    const modalRef = this.modalService.open(ModalRotationsComponent);
+    modalRef.componentInstance.player = player;
+    /*
+    modalRef.result.then((updatedPlayer) => {
+      // Handle the updated player data if needed
+      console.log('Player updated:', updatedPlayer);
+    }).catch((error) => {
+      console.log('Modal dismissed');
+    });
+    */
+  }
+  public setAlertMessage(s: string) {
+		this._message$.next(`"${s}" already exists. Please choose a unique name.`);
+	}
+
+}

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

@@ -0,0 +1,75 @@
+<div class="justify-content-md-center">
+<h1>Rotations</h1>
+<div ngbAccordion>
+	<div ngbAccordionItem [collapsed]="false">
+		<h2 ngbAccordionHeader>
+			<button ngbAccordionButton>Libero: {{ LiberoPlayers.length }}</button>
+		</h2>
+		<div ngbAccordionCollapse>
+			<div ngbAccordionBody>
+				<ng-template>
+          @for (player of LiberoPlayers; track $index) {
+            {{ player.name }}
+          }
+				</ng-template>
+			</div>
+		</div>
+	</div>
+	<div ngbAccordionItem>
+		<h2 ngbAccordionHeader>
+			<button ngbAccordionButton>Setter: {{ SetterPlayers.length }}</button>
+		</h2>
+		<div ngbAccordionCollapse>
+			<div ngbAccordionBody>
+				<ng-template>
+          @for (player of SetterPlayers; track $index) {
+            {{ player.name }}
+          }
+				</ng-template>
+			</div>
+		</div>
+	</div>
+	<div ngbAccordionItem>
+		<h2 ngbAccordionHeader>
+			<button ngbAccordionButton>Opposite: {{ OppositePlayers.length }}</button>
+		</h2>
+		<div ngbAccordionCollapse>
+			<div ngbAccordionBody>
+				<ng-template>
+          @for (player of OppositePlayers; track $index) {
+            {{ player.name }}
+          }
+				</ng-template>
+			</div>
+		</div>
+	</div>
+	<div ngbAccordionItem>
+		<h2 ngbAccordionHeader>
+			<button ngbAccordionButton>Middle: {{ MiddlePlayers.length }}</button>
+		</h2>
+		<div ngbAccordionCollapse>
+			<div ngbAccordionBody>
+				<ng-template>
+          @for (player of MiddlePlayers; track $index) {
+            {{ player.name }}
+          }
+				</ng-template>
+			</div>
+		</div>
+	</div>
+	<div ngbAccordionItem>
+		<h2 ngbAccordionHeader>
+			<button ngbAccordionButton>Outside: {{ OutsidePlayers.length}}</button>
+		</h2>
+		<div ngbAccordionCollapse>
+			<div ngbAccordionBody>
+				<ng-template>
+          @for (player of OutsidePlayers; track $index) {
+            {{ player.name }}
+          }
+				</ng-template>
+			</div>
+		</div>
+	</div>
+  </div>
+</div>

src/app/screen-rotations/screen-rotations.component.spec.ts

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

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

@@ -0,0 +1,32 @@
+// Team Generation Screen respecting volleyball roles as defined by `../model/Player`
+import { Component, inject, Input } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { Player } from '../model';
+import { NgbAccordionBody, NgbAccordionCollapse, NgbAccordionHeader, NgbAccordionItem, NgbAccordionButton, NgbAccordionDirective, NgbAccordionToggle } from '@ng-bootstrap/ng-bootstrap';
+import { DataService } from '../data.service';
+
+@Component({
+  selector: 'app-screen-rotations',
+  imports: [FormsModule, NgbAccordionButton, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionBody, NgbAccordionCollapse,],
+  templateUrl: './screen-rotations.component.html',
+  styleUrl: './screen-rotations.component.less'
+})
+export class ScreenRotationsComponent {
+  data = inject(DataService);
+
+  get OutsidePlayers(): Player[] {
+    return this.data.getPlayers().filter(player => player.outside);
+  }
+  get MiddlePlayers(): Player[] {
+    return this.data.getPlayers().filter(player => player.middle);
+  }
+  get OppositePlayers(): Player[] {
+    return this.data.getPlayers().filter(player => player.opposite);
+  }
+  get SetterPlayers(): Player[] {
+    return this.data.getPlayers().filter(player => player.setter);
+  }
+  get LiberoPlayers(): Player[] {
+    return this.data.getPlayers().filter(player => player.libero);
+  }
+}

src/app/util.ts

@@ -0,0 +1,7 @@
+export function* iter(list: any[]){
+    let index = 0;
+    while(true){
+        yield list[index % list.length];
+        index++;
+    }
+}

src/styles.less

@@ -1,4 +1,17 @@
 /* You can add global styles to this file, and also import other style files */
 
-html, body { height: 100%; }
+html, body {
-body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+    height: 100%;
+    max-width: 100%;
+    overflow-x: hidden;
+    text-align: center;
+}
+body {
+    margin:3em auto;
+    font-family: Roboto, "Helvetica Neue", sans-serif;
+    padding:0 .5em;
+}
+h1,h2,h3{
+    line-height:1.2;
+    letter-spacing: -2%;
+}

src/sw.js

@@ -0,0 +1,12 @@
+self.addEventListener('fetch', event => {
+    if (event && 
+        event.request && 
+        event.request.url && 
+        // check if basename includes a dot, i.e. if it is not a file
+        ! event.request.url.split(/[\\/]/).pop().includes(".")
+    ) {
+      event.stopImmediatePropagation();
+    }
+  });
+  
+  self.importScripts('./ngsw-worker.js');