5 Commits

Author SHA1 Message Date
eneller
e3824b15b8 wip 2026-03-16 17:16:26 +01:00
eneller
66fff4ee07 fix: pwa and external interop 2026-02-01 12:19:14 +01:00
eneller
8493e742e9 refactor: remove player list workaround 2026-02-01 12:01:42 +01:00
eneller
2999d8eee7 fix: prettier navbar 2026-02-01 10:49:21 +01:00
eneller
c4a2307530 feat: 3 screens for rotations
commit 563116331f
Author: eneller <erikneller@gmx.de>
Date:   Sun Feb 1 10:28:19 2026 +0100

    fix: edit list items

commit 1946c599be
Author: eneller <erikneller@gmx.de>
Date:   Sun Feb 1 10:19:16 2026 +0100

    fix: minor misc ui and data

commit 7c7762515b
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 23:02:01 2026 +0100

    feat: navbar

commit aaa0ab0638
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 21:05:23 2026 +0100

    feat: remove players

commit 4082932095
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 20:36:49 2026 +0100

    feat: dataservice

commit b6d34ce262
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 17:12:37 2026 +0100

    wip: rotations accordion

commit 764ce43138
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 16:29:11 2026 +0100

    refactor: basic screen

commit 1bc97df0da
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 15:52:06 2026 +0100

    feat: deduplicated player adding

commit 5408a8d9b6
Author: eneller <erikneller@gmx.de>
Date:   Sat Jan 31 00:31:01 2026 +0100

    central players list

commit 665cb25d34
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 23:15:16 2026 +0100

    feat: modal

commit 3b8e5145c3
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 22:51:09 2026 +0100

    wip: player modal

commit 51414f5a99
Author: eneller <erikneller@gmx.de>
Date:   Fri Jan 30 22:03:48 2026 +0100

    refactor: extract randomizer to component
2026-02-01 10:40:05 +01:00
12 changed files with 79 additions and 45 deletions

View File

@@ -3,8 +3,8 @@
</main>
<nav>
<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>
<li ngbNavItem="" class="custom-navitem"><a ngbNavLink routerLink="" 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="/rotations.t" class="custom-navitem"><a ngbNavLink routerLink="/rotations.t" routerLinkActive="active"><i class="bi bi-arrow-repeat"></i></a></li>
</ul>
</nav>

View File

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

View File

@@ -2,16 +2,18 @@ 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: '', redirectTo: 'edit', pathMatch: 'full' },
{ path: 'edit', component: ScreenEditComponent },
{ path: 'basic', component: ScreenBasicComponent },
{ path: 'rotations', component: ScreenRotationsComponent }
{ path: '', component: ScreenEditComponent },
/* IMPORTANT: all routes have to include a `.` (dot)
this is a workaround used in `sw.js`
to allow hosting services on the same subdomain as this PWA
*/
{ path: 'basic.t', component: ScreenBasicComponent },
{ path: 'rotations.t', component: ScreenRotationsComponent }
]
}
];

View File

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

View File

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

View File

@@ -0,0 +1,16 @@
<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>

View File

@@ -0,0 +1,23 @@
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();
});
});

View File

@@ -0,0 +1,19 @@
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";
}

View File

@@ -1,21 +1,5 @@
<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>
<app-radio-nteams></app-radio-nteams>
<h1>Random Teams</h1>
<form>
@@ -30,7 +14,7 @@
</tr>
</thead>
<tbody>
@for (team of teamsArray; track $index) {
@for (team of data.teams; track $index) {
<tr>
<td style="text-wrap: wrap;">{{ team.length | number }}</td>
<td class="wrap-cell">{{ team }}</td>

View File

@@ -7,29 +7,20 @@ 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],
imports: [NgbModule, RouterOutlet, CommonModule, FormsModule, RadioNteamsComponent],
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 }, () => []);
let teams = Array.from({ length: this.data.numTeams }, () => []);
// clone array here
let localPlayers: Player[] = this.data.getPlayers();
@@ -40,10 +31,10 @@ export class ScreenBasicComponent {
let n = localPlayers[index];
localPlayers.splice(index,1);
let team = iterator.next().value;
team.push(n.name);
team.push(n);
}
this.teamsArray = teams;
this.data.teams = teams;
}
}

View File

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