1
0
Fork 0
mirror of https://codeberg.org/beerbrawl/beerbrawl.git synced 2024-09-22 21:20:52 +02:00

chore: frontend: update prettier

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss 2024-08-22 19:20:26 +02:00
parent 75ff5fdb14
commit ff4002fbe3
Signed by: c8h4
GPG key ID: 6817E9C75C0785D7
6 changed files with 15 additions and 15 deletions

View file

@ -2,7 +2,7 @@
## First Steps ## First Steps
Navigate to the root folder of the project and execute `npm install`. Based on the *package.json* file, npm will download all required node_modules to run an Angular application. Navigate to the root folder of the project and execute `npm install`. Based on the _package.json_ file, npm will download all required node_modules to run an Angular application.
Afterwards, execute `npm install -g @angular/cli` to install the Angular CLI globally. Afterwards, execute `npm install -g @angular/cli` to install the Angular CLI globally.
## Development ## Development

View file

@ -63,7 +63,7 @@
"karma-jasmine": "5.1.0", "karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0", "karma-jasmine-html-reporter": "2.1.0",
"nyc": "^17.0.0", "nyc": "^17.0.0",
"prettier": "^3.3.2", "prettier": "^3.3.3",
"puppeteer": "^22.11.2", "puppeteer": "^22.11.2",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"typescript": "5.4.5" "typescript": "5.4.5"
@ -15585,9 +15585,9 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "3.3.2", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
"integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
"dev": true, "dev": true,
"bin": { "bin": {
"prettier": "bin/prettier.cjs" "prettier": "bin/prettier.cjs"

View file

@ -71,7 +71,7 @@
"karma-jasmine": "5.1.0", "karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0", "karma-jasmine-html-reporter": "2.1.0",
"nyc": "^17.0.0", "nyc": "^17.0.0",
"prettier": "^3.3.2", "prettier": "^3.3.3",
"puppeteer": "^22.11.2", "puppeteer": "^22.11.2",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"typescript": "5.4.5" "typescript": "5.4.5"

View file

@ -80,7 +80,7 @@ export class InfoscreenKnockoutPhaseTreeComponent implements OnInit {
? ['winner'] ? ['winner']
: node.id === matchId && parentTeam && node.team && parentTeam.id !== node.team.id : node.id === matchId && parentTeam && node.team && parentTeam.id !== node.team.id
? ['loser'] ? ['loser']
: node.preceedingStandings?.flatMap(n => findNodeById(n, node.team)) ?? ['loser']; : (node.preceedingStandings?.flatMap(n => findNodeById(n, node.team)) ?? ['loser']);
const [targetNode] = findNodeById(this.tree); const [targetNode] = findNodeById(this.tree);
@ -99,7 +99,7 @@ export class InfoscreenKnockoutPhaseTreeComponent implements OnInit {
findNode = (node: KoStandingDto, matchId: number): KoStandingDto[] => findNode = (node: KoStandingDto, matchId: number): KoStandingDto[] =>
node.id === matchId node.id === matchId
? [node] ? [node]
: node.preceedingStandings?.flatMap(n => this.findNode(n, matchId)) ?? []; : (node.preceedingStandings?.flatMap(n => this.findNode(n, matchId)) ?? []);
isBeginnerNode(preceedingStandings: KoStandingDto[] | undefined): boolean { isBeginnerNode(preceedingStandings: KoStandingDto[] | undefined): boolean {
return !preceedingStandings || preceedingStandings.length === 0; return !preceedingStandings || preceedingStandings.length === 0;

View file

@ -55,7 +55,7 @@ export class EditKnockoutPhaseTreeComponent implements OnInit {
const getTeamsFromTree = (node: KoStandingDto): TeamDto[] => const getTeamsFromTree = (node: KoStandingDto): TeamDto[] =>
node.team node.team
? [node.team, ...(node.preceedingStandings?.flatMap(getTeamsFromTree) ?? [])] ? [node.team, ...(node.preceedingStandings?.flatMap(getTeamsFromTree) ?? [])]
: node.preceedingStandings?.flatMap(getTeamsFromTree) ?? []; : (node.preceedingStandings?.flatMap(getTeamsFromTree) ?? []);
const map = new Map<number, TeamDto>(); const map = new Map<number, TeamDto>();
for (const team of getTeamsFromTree(this.tree)) { for (const team of getTeamsFromTree(this.tree)) {
@ -174,12 +174,12 @@ export class EditKnockoutPhaseTreeComponent implements OnInit {
findNode = (node: KoStandingDto, matchId: number): KoStandingDto[] => findNode = (node: KoStandingDto, matchId: number): KoStandingDto[] =>
node.id === matchId node.id === matchId
? [node] ? [node]
: node.preceedingStandings?.flatMap(n => this.findNode(n, matchId)) ?? []; : (node.preceedingStandings?.flatMap(n => this.findNode(n, matchId)) ?? []);
findParentNode = (node: KoStandingDto, matchId: number): KoStandingDto[] => findParentNode = (node: KoStandingDto, matchId: number): KoStandingDto[] =>
node.preceedingStandings?.some(n => n.id === matchId) node.preceedingStandings?.some(n => n.id === matchId)
? [node] ? [node]
: node.preceedingStandings?.flatMap(n => this.findParentNode(n, matchId)) ?? []; : (node.preceedingStandings?.flatMap(n => this.findParentNode(n, matchId)) ?? []);
canSelectMatchWinner = (matchId: number) => { canSelectMatchWinner = (matchId: number) => {
if (!this.tree) { if (!this.tree) {

View file

@ -9,15 +9,15 @@ module.exports = function (config) {
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma') require('@angular-devkit/build-angular/plugins/karma'),
], ],
client: { client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false, // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../coverage'), dir: require('path').join(__dirname, '../coverage'),
reports: ['html', 'lcovonly'], reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true,
}, },
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
@ -25,6 +25,6 @@ module.exports = function (config) {
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
browsers: ['Chrome'], browsers: ['Chrome'],
singleRun: false singleRun: false,
}); });
}; };