41 Commits

Author SHA1 Message Date
eneller
563116331f fix: edit list items 2026-02-01 10:28:19 +01:00
eneller
1946c599be fix: minor misc ui and data 2026-02-01 10:19:16 +01:00
eneller
7c7762515b feat: navbar 2026-01-31 23:03:42 +01:00
eneller
aaa0ab0638 feat: remove players 2026-01-31 21:05:23 +01:00
eneller
4082932095 feat: dataservice 2026-01-31 20:36:49 +01:00
eneller
b6d34ce262 wip: rotations accordion 2026-01-31 17:12:37 +01:00
eneller
764ce43138 refactor: basic screen 2026-01-31 16:29:11 +01:00
eneller
1bc97df0da feat: deduplicated player adding 2026-01-31 15:52:06 +01:00
eneller
5408a8d9b6 central players list 2026-01-31 00:37:32 +01:00
eneller
665cb25d34 feat: modal 2026-01-30 23:15:42 +01:00
eneller
3b8e5145c3 wip: player modal 2026-01-30 22:51:09 +01:00
eneller
51414f5a99 refactor: extract randomizer to component 2026-01-30 22:03:48 +01:00
eneller
7e7313916b refactor: query params 2026-01-28 14:24:35 +01:00
eneller
c66040f51f build: sonarqube 2025-08-05 09:55:45 +02:00
eneller
3bf3ab9096 bump version number 2025-06-28 16:00:26 +02:00
eneller
cf4bc99816 Revert "fix: try prefetch installMode"
This reverts commit 51f650352e.
2025-06-26 14:01:38 +02:00
eneller
aa718a512d fix: try removing client hydration 2025-06-25 21:10:18 +02:00
eneller
51f650352e fix: try prefetch installMode 2025-05-23 18:07:31 +02:00
eneller
c22b305fcb chore: update angular/core 2025-04-23 13:07:33 +02:00
eneller
5d5a616702 chore: update angular/cdk 2025-04-23 13:06:45 +02:00
eneller
8afc50b459 chore: update angular/cli 2025-04-23 13:06:18 +02:00
eneller
2c27570e2b minor refactor 2025-04-23 12:42:39 +02:00
eneller
e023ee2453 chore: audit fix 2025-03-27 15:24:05 +01:00
eneller
8b2be9b5d1 feat: padding 2025-03-23 21:46:29 +01:00
eneller
544aac895a fix: remove css 2025-03-23 21:04:23 +01:00
eneller
6845f9afd3 fix: use ng searchparams
use ng ActivatedRoute replacing window.location.search
2025-03-23 20:57:47 +01:00
eneller
df43802b61 chore: npm upgrade 2025-03-23 20:33:32 +01:00
eneller
1936c50465 chore: update angular/cdk 2025-03-23 20:31:15 +01:00
eneller
d8670f653c chore: update angular/core 2025-03-23 20:29:17 +01:00
eneller
e5a5f7f60e chore: update angular/cli 2025-03-23 20:28:45 +01:00
eneller
33496a7ebd fix: sidescrolling 2025-03-23 20:26:36 +01:00
eneller
884734b23e chore: audit fix 2025-03-13 00:01:21 +01:00
eneller
29633a94c0 feat: better table formatting 2025-03-12 22:57:53 +01:00
eneller
3d3a177b7c fix: ServiceWorker intercepting requests
created wrapper for SW to exclude paths because ngsw-config only
disables caching, but the SW would still handle the request
2025-03-05 22:57:56 +01:00
eneller
07b84586b6 Revert "fix: serviceworker doesnt intercept other urls"
This reverts commit 5267eb6ab1.
2025-03-05 21:16:49 +01:00
eneller
5267eb6ab1 fix: serviceworker doesnt intercept other urls
since i am using the same subdomain also for '/redirects', they were
being intercepted by the service worker
chrome now blocks the redirect altogether because of CORS when redirects
are not allowed (default on linux chromium)
2025-03-04 23:44:50 +01:00
eneller
5daa64d962 chore: audit fix 2025-03-02 00:10:51 +01:00
eneller
b939f4d4f3 style: better type hint 2025-03-01 23:38:00 +01:00
eneller
8e04cc97ba feat: use URL query parameters to initialize textarea
?names parameter is now used to initialize the playerNames textarea
2025-02-02 15:15:35 +01:00
eneller
5b66e1907c chore: npm audit fix 2025-02-02 13:21:59 +01:00
eneller
55bea1a923 doc: README.md 2025-02-02 09:45:13 +01:00
32 changed files with 3602 additions and 2588 deletions

261
.gitignore vendored
View File

@@ -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
/dist
/tmp
/out-tsc
/bazel-out
### Angular ###
## Angular ##
# compiled output
dist/
tmp/
app/**/*.js
app/**/*.js.map
# Node
/node_modules
npm-debug.log
yarn-error.log
# dependencies
node_modules/
bower_components/
# 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
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
### VisualStudioCode Patch ###
# 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

View File

@@ -1,8 +1,11 @@
# Vb
A Team Randomizer built using Angular and Bootstrap, installable as a progressive web app (PWA).
Supports setting names using URL query parameters:
```url
https://vb.example.org?names=Me,Myself,I
```
This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 19.0.2.
## Development server
## Development
To start a local development server, run:
@@ -12,18 +15,10 @@ ng serve
Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
## Code scaffolding
Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
Alternatively, to open the server to the network instead of just localhost, use
```bash
ng generate component component-name
```
For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
```bash
ng generate --help
npm run serve
```
## Building
@@ -34,26 +29,5 @@ To build the project run:
ng build
```
This will compile your project and store the build artifacts in the `dist/` directory. By default, the production build optimizes your application for performance and speed.
## Running unit tests
To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
```bash
ng test
```
## Running end-to-end tests
For end-to-end (e2e) testing, run:
```bash
ng e2e
```
Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
## Additional Resources
For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
This will compile your project and store the build artifacts in the `dist/` directory.
As this is a static site, simply move the contents of `dist/vb/browser/` to a directory that can be served by nginx or apache.

View File

@@ -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": [],

5039
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -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/cdk": "~19.0.1",
"@angular/common": "^19.0.5",
"@angular/compiler": "^19.0.5",
"@angular/core": "^19.0.5",
"@angular/forms": "^19.0.5",
"@angular/platform-browser": "^19.0.5",
"@angular/platform-browser-dynamic": "^19.0.5",
"@angular/platform-server": "^19.0.5",
"@angular/router": "^19.0.5",
"@angular/service-worker": "^19.0.5",
"@angular/ssr": "^19.0.6",
"@angular/animations": "^19.2.7",
"@angular/cdk": "~19.2.10",
"@angular/common": "^19.2.7",
"@angular/compiler": "^19.2.7",
"@angular/core": "^19.2.7",
"@angular/forms": "^19.2.7",
"@angular/platform-browser": "^19.2.7",
"@angular/platform-browser-dynamic": "^19.2.7",
"@angular/platform-server": "^19.2.7",
"@angular/router": "^19.2.7",
"@angular/service-worker": "^19.2.7",
"@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/cli": "^19.0.6",
"@angular/compiler-cli": "^19.0.5",
"@angular/localize": "^19.0.5",
"@angular-devkit/build-angular": "^19.2.9",
"@angular/cli": "^19.2.9",
"@angular/compiler-cli": "^19.2.7",
"@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",

View File

@@ -1,60 +1,10 @@
<style>
*{
text-align: center;
}
</style>
<main class="main">
<div class="row justify-content-md-center">
<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 class="form-control mb-3"
rows="18"
cols="30"
style="text-align: left;"
#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>
<router-outlet></router-outlet>
</main>
<router-outlet />
<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>
</ul>
</nav>

View File

@@ -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{
}

View File

@@ -1,59 +1,40 @@
import { Component } from '@angular/core';
import { Component, inject, OnInit} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterOutlet } 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 {
export class AppComponent implements OnInit {
title = 'vb';
numTeamsSelectorValue = "2";
numTeamsSelected = 2;
nTeamsValue = "4";
teamsArray: string[][] = [];
displayedColumns = ["teamCount", "teamNames"];
data = inject(DataService);
onButtonGenerate(textinput: string): void{
if(this.numTeamsSelectorValue === 'n'){
this.numTeamsSelected = Number(this.nTeamsValue);
}
else{
this.numTeamsSelected = Number(this.numTeamsSelectorValue);
}
let names = textinput
.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)];
constructor(public route: ActivatedRoute){}
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++;
ngOnInit(): void {
this.route.queryParams.pipe(
filter(params => Object.keys(params).length > 0), // Only proceed if params are not empty
take(1)
).subscribe(params => {
if (params['names']){
this.data.setPlayers(
params['names'].split(',').map((name: string) => new Player(name))
);
}
}
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;
});
}
}

View File

@@ -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'
})]

View File

@@ -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 }
]
}
];

View File

@@ -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();
});
});

33
src/app/data.service.ts Normal file
View File

@@ -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
}
}

View File

@@ -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>

View File

@@ -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();
});
});

View File

@@ -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);
}
}

42
src/app/model.ts Normal file
View File

@@ -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
}
}

View File

@@ -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>

View File

@@ -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();
});
});

View File

@@ -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;
}
}

View File

@@ -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>

View File

@@ -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();
});
});

View File

@@ -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.`);
}
}

View File

@@ -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>

View File

@@ -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();
});
});

View File

@@ -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);
}
}

7
src/app/util.ts Normal file
View File

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

View File

@@ -1,4 +1,17 @@
/* You can add global styles to this file, and also import other style files */
html, body { height: 100%; }
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
html, body {
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%;
}

12
src/sw.js Normal file
View File

@@ -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');