fix: serviceworker doesnt intercept other urls

.gitignore

@@ -1,245 +1,42 @@
-# Created by https://www.toptal.com/developers/gitignore/api/angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
+# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
-# Edit at https://www.toptal.com/developers/gitignore?templates=angular,sonarqube,node,visualstudiocode,sass,yarn,bazel
 
-### Angular ###
+# Compiled output
-## Angular ##
+/dist
-# compiled output
+/tmp
-dist/
+/out-tsc
-tmp/
+/bazel-out
-app/**/*.js
-app/**/*.js.map
 
-# dependencies
+# Node
-node_modules/
+/node_modules
-bower_components/
+npm-debug.log
+yarn-error.log
 
 # IDEs and editors
 .idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
 
-# misc
+# Visual Studio Code
-.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
-!.vscode/*.code-snippets
+.history/*
 
-# Local History for Visual Studio Code
+# Miscellaneous
-.history/
+/.angular/cache
-
+.sass-cache/
-# Built Visual Studio Code Extensions
+/connect.lock
-*.vsix
+/coverage
-
+/libpeerconnection.log
-### VisualStudioCode Patch ###
+testem.log
-# Ignore all local history of files
+/typings
-.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,8 +30,7 @@
               {
                 "glob": "**/*",
                 "input": "public"
-              },
+              }
-              "src/sw.js"
             ],
             "styles": [
               "node_modules/bootstrap/dist/css/bootstrap.min.css",

ngsw-config.json

@@ -25,6 +25,14 @@
           "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
         ]
       }
+    },
+    {
+      "name": "excluded-redirects",
+      "installMode": "lazy",
+      "updateMode": "lazy",
+      "resources": {
+        "urls": [ "/**" ]
+      }
     }
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vb",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -12,33 +12,31 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^19.2.7",
+    "@angular/animations": "^19.0.5",
-    "@angular/cdk": "~19.2.10",
+    "@angular/cdk": "~19.0.1",
-    "@angular/common": "^19.2.7",
+    "@angular/common": "^19.0.5",
-    "@angular/compiler": "^19.2.7",
+    "@angular/compiler": "^19.0.5",
-    "@angular/core": "^19.2.7",
+    "@angular/core": "^19.0.5",
-    "@angular/forms": "^19.2.7",
+    "@angular/forms": "^19.0.5",
-    "@angular/platform-browser": "^19.2.7",
+    "@angular/platform-browser": "^19.0.5",
-    "@angular/platform-browser-dynamic": "^19.2.7",
+    "@angular/platform-browser-dynamic": "^19.0.5",
-    "@angular/platform-server": "^19.2.7",
+    "@angular/platform-server": "^19.0.5",
-    "@angular/router": "^19.2.7",
+    "@angular/router": "^19.0.5",
-    "@angular/service-worker": "^19.2.7",
+    "@angular/service-worker": "^19.0.5",
-    "@angular/ssr": "^19.2.9",
+    "@angular/ssr": "^19.0.6",
     "@ng-bootstrap/ng-bootstrap": "^18.0.0",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "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.2.9",
+    "@angular-devkit/build-angular": "^19.0.6",
-    "@angular/cli": "^19.2.9",
+    "@angular/cli": "^19.0.6",
-    "@angular/compiler-cli": "^19.2.7",
+    "@angular/compiler-cli": "^19.0.5",
-    "@angular/localize": "^19.2.7",
+    "@angular/localize": "^19.0.5",
-    "@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,3 +1,8 @@
+<style>
+  *{
+    text-align: center;
+  }
+</style>
 <main class="main">
   <div class="row justify-content-md-center">
     <h1>Please select the number of teams:</h1>
@@ -35,8 +40,7 @@
   <button type="button" (click)="onButtonGenerate(playerNames.value)" class="btn btn-primary">Generate</button>
   </form>
 
-  <table class="table table-striped custom-table">
+  <table class="table table-striped">
-  <caption *ngIf="duplicateNames.length >0">Removed: {{ duplicateNames }}</caption>
     <thead>
       <tr>
         <th scope="col">Size</th>
@@ -46,8 +50,8 @@
     <tbody>
       @for (team of teamsArray; track $index) {
         <tr>
-          <td style="text-wrap: wrap;">{{ team.length | number }}</td>
+          <td>{{ team.length | number }}</td>
-          <td class="wrap-cell">{{ team }}</td>
+          <td>{{ team }}</td>
         </tr>
       }
     </tbody>

src/app/app.component.less

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

src/app/app.component.ts

@@ -18,17 +18,15 @@ export class AppComponent implements OnInit {
   numTeamsSelected = 2;
   nTeamsValue = "4";
   teamsArray: string[][] = [];
-  duplicateNames: string[] = [];
+  displayedColumns = ["teamCount", "teamNames"];
 
   constructor(private activatedRoute: ActivatedRoute){}
 
   ngOnInit(): void {
-    this.activatedRoute.queryParams.subscribe(params => {
+    //consiedr using Angular's ActivatedRoute here instead
-      const names = params['names']?.replaceAll(',', '\n');
+    const params = new URLSearchParams(window.location.search);
-      if (names) {
+    const names = params.get('names')?.replaceAll(',', '\n');
-        this.playerNamesValue = names;
+    if (names) this.playerNamesValue = names;
-      }
-    });
   }
 
   onButtonGenerate(textinput: string): void{
@@ -38,14 +36,12 @@ export class AppComponent implements OnInit {
     else{
       this.numTeamsSelected = Number(this.numTeamsSelectorValue);
     }
-    let nameslist = this.playerNamesValue
+    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
-    let namesset = new Set(nameslist);
+    names = [...new Set(names)];
-    let names = [...namesset];
-
     
     var teams = Array.from({ length: this.numTeamsSelected }, () => []);
     var playersPerTeam = Math.floor(names.length / this.numTeamsSelected);

src/app/app.config.ts

@@ -2,12 +2,15 @@ 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), provideAnimationsAsync('noop'), provideServiceWorker('./sw.js', {
+  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes),
-            enabled: !isDevMode(),
+              provideClientHydration(withEventReplay()), provideAnimationsAsync('noop'),
-            registrationStrategy: 'registerWhenStable:30000'
+              provideServiceWorker('ngsw-worker.js', {
+                enabled: !isDevMode(),
+                registrationStrategy: 'registerWhenStable:30000'
           })]
 };

src/styles.less

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

@@ -1,12 +0,0 @@
-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');