diff --git a/Dockerfile b/Dockerfile index b311d54..4fd8893 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,8 +31,7 @@ FROM builder AS buildFront RUN echo "@kangaroo-and-rabbit:registry=https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/npm/" > /root/.npmrc -ADD front/pnpm-lock.yaml \ - front/package.json \ +ADD front/package.json \ front/karma.conf.js \ front/protractor.conf.js \ /tmp/ diff --git a/front/Dockerfile b/front/Dockerfile index 6de2520..44bc43d 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -15,9 +15,7 @@ WORKDIR /application/ RUN npm install ADD e2e /application/e2e -ADD tsconfig.json /application/ -ADD tslint.json /application/ -ADD angular.json /application/ +ADD tsconfig.json tslint.json angular.json ./ ADD src /application/src # generate build diff --git a/front/package.json b/front/package.json index a72723e..9aec6f3 100644 --- a/front/package.json +++ b/front/package.json @@ -14,36 +14,37 @@ "update_packages": "ncu --upgrade", "install_dependency": "pnpm install --force", "link_kar_cw": "pnpm link ../../kar-cw/dist/kar-cw/", + "unlink_kar_cw": "pnpm unlink ../../kar-cw/dist/kar-cw/", "publish": "pnpm publish --no-git-checks" }, "private": true, "dependencies": { - "@angular/animations": "^17.3.1", - "@angular/cdk": "^17.3.1", - "@angular/common": "^17.3.1", - "@angular/compiler": "^17.3.1", - "@angular/core": "^17.3.1", - "@angular/forms": "^17.3.1", - "@angular/material": "^17.3.1", - "@angular/platform-browser": "^17.3.1", - "@angular/platform-browser-dynamic": "^17.3.1", - "@angular/router": "^17.3.1", + "@angular/animations": "^17.3.4", + "@angular/cdk": "^17.3.4", + "@angular/common": "^17.3.4", + "@angular/compiler": "^17.3.4", + "@angular/core": "^17.3.4", + "@angular/forms": "^17.3.4", + "@angular/material": "^17.3.4", + "@angular/platform-browser": "^17.3.4", + "@angular/platform-browser-dynamic": "^17.3.4", + "@angular/router": "^17.3.4", "rxjs": "^7.8.1", "zone.js": "^0.14.4", "zod": "3.22.4", - "@kangaroo-and-rabbit/kar-cw": "^0.1.7" + "@kangaroo-and-rabbit/kar-cw": "^0.2.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.3.1", + "@angular-devkit/build-angular": "^17.3.4", "@angular-eslint/builder": "17.3.0", "@angular-eslint/eslint-plugin": "17.3.0", "@angular-eslint/eslint-plugin-template": "17.3.0", "@angular-eslint/schematics": "17.3.0", "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "^17.3.1", - "@angular/compiler-cli": "^17.3.1", - "@angular/language-service": "^17.3.1", - "npm-check-updates": "^16.14.17", + "@angular/cli": "^17.3.4", + "@angular/compiler-cli": "^17.3.4", + "@angular/language-service": "^17.3.4", + "npm-check-updates": "^16.14.18", "tslib": "^2.6.2" } } \ No newline at end of file diff --git a/front/pnpm-lock.yaml b/front/pnpm-lock.yaml index 28941b7..b316136 100644 --- a/front/pnpm-lock.yaml +++ b/front/pnpm-lock.yaml @@ -6,38 +6,38 @@ settings: dependencies: '@angular/animations': - specifier: ^17.3.1 - version: 17.3.1(@angular/core@17.3.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/core@17.3.3) '@angular/cdk': - specifier: ^17.3.1 - version: 17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(rxjs@7.8.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(rxjs@7.8.1) '@angular/common': - specifier: ^17.3.1 - version: 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) '@angular/compiler': - specifier: ^17.3.1 - version: 17.3.1(@angular/core@17.3.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/core@17.3.3) '@angular/core': - specifier: ^17.3.1 - version: 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + specifier: ^17.3.3 + version: 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) '@angular/forms': - specifier: ^17.3.1 - version: 17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) '@angular/material': - specifier: ^17.3.1 - version: 17.3.1(@angular/animations@17.3.1)(@angular/cdk@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/forms@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/animations@17.3.3)(@angular/cdk@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/forms@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) '@angular/platform-browser': - specifier: ^17.3.1 - version: 17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) '@angular/platform-browser-dynamic': - specifier: ^17.3.1 - version: 17.3.1(@angular/common@17.3.1)(@angular/compiler@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/common@17.3.3)(@angular/compiler@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3) '@angular/router': - specifier: ^17.3.1 - version: 17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1) + specifier: ^17.3.3 + version: 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) '@kangaroo-and-rabbit/kar-cw': - specifier: ^0.1.5 - version: link:../../kar-cw/dist/kar-cw + specifier: ^0.1.9 + version: 0.1.9(@angular/common@17.3.3)(@angular/compiler@17.3.3)(@angular/core@17.3.3)(@angular/forms@17.3.3)(@angular/platform-browser-dynamic@17.3.3)(@angular/platform-browser@17.3.3)(@angular/router@17.3.3)(rxjs@7.8.1)(zone.js@0.14.4) rxjs: specifier: ^7.8.1 version: 7.8.1 @@ -50,8 +50,8 @@ dependencies: devDependencies: '@angular-devkit/build-angular': - specifier: ^17.3.1 - version: 17.3.2(@angular/compiler-cli@17.3.1)(typescript@5.4.3) + specifier: ^17.3.3 + version: 17.3.3(@angular/compiler-cli@17.3.3)(typescript@5.4.3) '@angular-eslint/builder': specifier: 17.3.0 version: 17.3.0(eslint@8.57.0)(typescript@5.4.3) @@ -63,21 +63,21 @@ devDependencies: version: 17.3.0(eslint@8.57.0)(typescript@5.4.3) '@angular-eslint/schematics': specifier: 17.3.0 - version: 17.3.0(@angular/cli@17.3.2)(eslint@8.57.0)(typescript@5.4.3) + version: 17.3.0(@angular/cli@17.3.3)(eslint@8.57.0)(typescript@5.4.3) '@angular-eslint/template-parser': specifier: 17.3.0 version: 17.3.0(eslint@8.57.0)(typescript@5.4.3) '@angular/cli': - specifier: ^17.3.1 - version: 17.3.2 + specifier: ^17.3.3 + version: 17.3.3 '@angular/compiler-cli': - specifier: ^17.3.1 - version: 17.3.1(@angular/compiler@17.3.1)(typescript@5.4.3) + specifier: ^17.3.3 + version: 17.3.3(@angular/compiler@17.3.3)(typescript@5.4.3) '@angular/language-service': - specifier: ^17.3.1 - version: 17.3.1 + specifier: ^17.3.3 + version: 17.3.3 npm-check-updates: - specifier: ^16.14.17 + specifier: ^16.14.18 version: 16.14.18 tslib: specifier: ^2.6.2 @@ -98,18 +98,18 @@ packages: '@jridgewell/trace-mapping': 0.3.25 dev: true - /@angular-devkit/architect@0.1703.2: - resolution: {integrity: sha512-fT5gSzwDHOyGv8zF97t8rjeoYSGSxXjWWstl3rN1nXdO0qgJ5m6Sv0fupON+HltdXDCBLRH+2khNpqx/Fh0Qww==} + /@angular-devkit/architect@0.1703.3: + resolution: {integrity: sha512-BKbdigCjmspqxOxSIQuWgPZzpyuKqZoTBDh0jDeLcAmvPsuxCgIWbsExI4OQ0CyusnQ+XT0IT39q8B9rvF56cg==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} dependencies: - '@angular-devkit/core': 17.3.2 + '@angular-devkit/core': 17.3.3 rxjs: 7.8.1 transitivePeerDependencies: - chokidar dev: true - /@angular-devkit/build-angular@17.3.2(@angular/compiler-cli@17.3.1)(typescript@5.4.3): - resolution: {integrity: sha512-muPCUyL0uHvRkLH4NLWiccER6P2vCm/Q5DDvqyN4XOzzY3tAHHLrKrpvY87sgd2oNJ6Ci8x7GPNcfzR5KELCnw==} + /@angular-devkit/build-angular@17.3.3(@angular/compiler-cli@17.3.3)(typescript@5.4.3): + resolution: {integrity: sha512-E/6Z1MIMhEB1I2sN+Pw4/zinwAFj4vLDh6dEuj856WWEPndgPiUB6fGX4EbCTsyIUzboXI5ysdNyt2Eq56bllA==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^17.0.0 @@ -150,10 +150,10 @@ packages: optional: true dependencies: '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.1703.2 - '@angular-devkit/build-webpack': 0.1703.2(webpack-dev-server@4.15.1)(webpack@5.90.3) - '@angular-devkit/core': 17.3.2 - '@angular/compiler-cli': 17.3.1(@angular/compiler@17.3.1)(typescript@5.4.3) + '@angular-devkit/architect': 0.1703.3 + '@angular-devkit/build-webpack': 0.1703.3(webpack-dev-server@4.15.1)(webpack@5.90.3) + '@angular-devkit/core': 17.3.3 + '@angular/compiler-cli': 17.3.3(@angular/compiler@17.3.3)(typescript@5.4.3) '@babel/core': 7.24.0 '@babel/generator': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 @@ -164,7 +164,7 @@ packages: '@babel/preset-env': 7.24.0(@babel/core@7.24.0) '@babel/runtime': 7.24.0 '@discoveryjs/json-ext': 0.5.7 - '@ngtools/webpack': 17.3.2(@angular/compiler-cli@17.3.1)(typescript@5.4.3)(webpack@5.90.3) + '@ngtools/webpack': 17.3.3(@angular/compiler-cli@17.3.3)(typescript@5.4.3)(webpack@5.90.3) '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.1.5) ansi-colors: 4.1.3 autoprefixer: 10.4.18(postcss@8.4.35) @@ -236,14 +236,14 @@ packages: - webpack-cli dev: true - /@angular-devkit/build-webpack@0.1703.2(webpack-dev-server@4.15.1)(webpack@5.90.3): - resolution: {integrity: sha512-w7rVFQcZK4iTCd/MLfQWIkDkwBOfAs++txNQyS9qYID8KvLs1V+oWYd2qDBRelRv1u3YtaCIS1pQx3GFKBC3OA==} + /@angular-devkit/build-webpack@0.1703.3(webpack-dev-server@4.15.1)(webpack@5.90.3): + resolution: {integrity: sha512-d0JjE8MaGVNphlJfeP1OZKhNT4wCXkEZKdSdwE0+W+vDHNUuZiUBB1czO48sb7T4xBrdjRWlV/9CzMNJ7n3ydA==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: webpack: ^5.30.0 webpack-dev-server: ^4.0.0 dependencies: - '@angular-devkit/architect': 0.1703.2 + '@angular-devkit/architect': 0.1703.3 rxjs: 7.8.1 webpack: 5.90.3(esbuild@0.20.1) webpack-dev-server: 4.15.1(webpack@5.90.3) @@ -251,8 +251,8 @@ packages: - chokidar dev: true - /@angular-devkit/core@17.3.2: - resolution: {integrity: sha512-1vxKo9+pdSwTOwqPDSYQh84gZYmCJo6OgR5+AZoGLGMZSeqvi9RG5RiUcOMLQYOnuYv0arlhlWxz0ZjyR8ApKw==} + /@angular-devkit/core@17.3.3: + resolution: {integrity: sha512-J22Sh3M7rj8Ar3iEs20ko5wgC3DE7vWfYZNdimt2IJiS4J7BEX8R3Awf+TRt+6AN3NFm3/xe1Sz4yvDh3FvNFg==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: chokidar: ^3.5.2 @@ -268,11 +268,11 @@ packages: source-map: 0.7.4 dev: true - /@angular-devkit/schematics@17.3.2: - resolution: {integrity: sha512-AYO6oc6QpFGigc1KiDzEVT1CeLnwvnIedU5Q/U3JDZ/Yqmvgc09D64g9XXER2kg6tV7iEgLxiYnonIAQOHq7eA==} + /@angular-devkit/schematics@17.3.3: + resolution: {integrity: sha512-SABqTtj2im4PJhQjNaAsSypbNkpZFW8YozJ3P748tlh5a9XoHpgiqXv5JhRbyKElLDAyk5i9fe2++JmSudPG/Q==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} dependencies: - '@angular-devkit/core': 17.3.2 + '@angular-devkit/core': 17.3.3 jsonc-parser: 3.2.1 magic-string: 0.30.8 ora: 5.4.1 @@ -333,14 +333,14 @@ packages: - supports-color dev: true - /@angular-eslint/schematics@17.3.0(@angular/cli@17.3.2)(eslint@8.57.0)(typescript@5.4.3): + /@angular-eslint/schematics@17.3.0(@angular/cli@17.3.3)(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-5yssd5EOomxlKt9vN/OXXCTCuI3Pmfj16pkjBDoW0wzC8/M2l5zlXIEfoKumHYv2wtF553LhaMXVYVU35e0lTw==} peerDependencies: '@angular/cli': '>= 17.0.0 < 18.0.0' dependencies: '@angular-eslint/eslint-plugin': 17.3.0(eslint@8.57.0)(typescript@5.4.3) '@angular-eslint/eslint-plugin-template': 17.3.0(eslint@8.57.0)(typescript@5.4.3) - '@angular/cli': 17.3.2 + '@angular/cli': 17.3.3 '@nx/devkit': 18.1.3(nx@18.1.3) ignore: 5.3.1 nx: 18.1.3 @@ -381,40 +381,40 @@ packages: - supports-color dev: true - /@angular/animations@17.3.1(@angular/core@17.3.1): - resolution: {integrity: sha512-2TZ0M5J0IizhHpb404DeqArlv8Ki9BFz5ZUuET2uFROpKW8IMDCht8fSrn/DKHpjB9lvzPUhNFaRxNWEY6klnA==} + /@angular/animations@17.3.3(@angular/core@17.3.3): + resolution: {integrity: sha512-poLW3FHe5wkxmTIsQ3em2vq4obgQHyZJz6biF+4hCqQSNMbMBS0e5ZycAiJLkUD/WLc88lQZ20muRO7qjVuMLA==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/core': 17.3.1 + '@angular/core': 17.3.3 dependencies: - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) tslib: 2.6.2 dev: false - /@angular/cdk@17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(rxjs@7.8.1): - resolution: {integrity: sha512-pHSN+KlCmdo2u9jY7Yxsry/ZK+EcjOYGzdwxXxcKragMzm7etY3BJiTl4N+qZRuV6cJlMj2PRkij8ABi/HQdEA==} + /@angular/cdk@17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(rxjs@7.8.1): + resolution: {integrity: sha512-hfS9pwaNE6CTZqP3FBh9tZPbuf//bDqZ5IpMzscfDFrwX8ycxBiI3znH/rFSf9l1rL0OQGoqWWNVfJCT+RrukA==} peerDependencies: '@angular/common': ^17.0.0 || ^18.0.0 '@angular/core': ^17.0.0 || ^18.0.0 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) rxjs: 7.8.1 tslib: 2.6.2 optionalDependencies: parse5: 7.1.2 dev: false - /@angular/cli@17.3.2: - resolution: {integrity: sha512-g6r4XZyGnh9P6GmWgaFh8RmR4L6UdQ408e3SpG3rjncuPRD57Ur8806GfCLPt6HIA9TARiKmaJ0EJ3RsIjag0g==} + /@angular/cli@17.3.3: + resolution: {integrity: sha512-veIGK2sRm0SfiLHeftx0W0xC3N8uxoqxXiSG57V6W2wIFN/fKm3aRq3sa8phz7vxUzoKGqyZh6hsT7ybkjgkGA==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true dependencies: - '@angular-devkit/architect': 0.1703.2 - '@angular-devkit/core': 17.3.2 - '@angular-devkit/schematics': 17.3.2 - '@schematics/angular': 17.3.2 + '@angular-devkit/architect': 0.1703.3 + '@angular-devkit/core': 17.3.3 + '@angular-devkit/schematics': 17.3.3 + '@schematics/angular': 17.3.3 '@yarnpkg/lockfile': 1.1.0 ansi-colors: 4.1.3 ini: 4.1.2 @@ -435,27 +435,27 @@ packages: - supports-color dev: true - /@angular/common@17.3.1(@angular/core@17.3.1)(rxjs@7.8.1): - resolution: {integrity: sha512-HyUTJ4RxhE3bOmFRV6Fv2y01ixbrUb8Hd4MxPm8REbNMGKsWCfXhR3FfxFL18Sc03SAF+o0Md0wwekjFKTNKfQ==} + /@angular/common@17.3.3(@angular/core@17.3.3)(rxjs@7.8.1): + resolution: {integrity: sha512-GwlKetNpfWKiG2j4S6bYTi6PA2iT4+eln7o8owo44xZWdQnWQjfxnH39vQuCyhi6OOQL1dozmae+fVXgQsV6jQ==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/core': 17.3.1 + '@angular/core': 17.3.3 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) rxjs: 7.8.1 tslib: 2.6.2 dev: false - /@angular/compiler-cli@17.3.1(@angular/compiler@17.3.1)(typescript@5.4.3): - resolution: {integrity: sha512-xLV9KU+zOpe57/2rQ59ku21EaStNpLSlR9+qkDYf8JR09fB+W9vY3UYbpi5RjHxAFIZBM5D9SFQjjll8rch26g==} + /@angular/compiler-cli@17.3.3(@angular/compiler@17.3.3)(typescript@5.4.3): + resolution: {integrity: sha512-vM0lqwuXQZ912HbLnIuvUblvIz2WEUsU7a5Z2ieNey6famH4zxPH12vCbVwXgicB6GLHorhOfcWC5443wD2mJw==} engines: {node: ^18.13.0 || >=20.9.0} hasBin: true peerDependencies: - '@angular/compiler': 17.3.1 + '@angular/compiler': 17.3.3 typescript: '>=5.2 <5.5' dependencies: - '@angular/compiler': 17.3.1(@angular/core@17.3.1) + '@angular/compiler': 17.3.3(@angular/core@17.3.3) '@babel/core': 7.23.9 '@jridgewell/sourcemap-codec': 1.4.15 chokidar: 3.6.0 @@ -469,20 +469,20 @@ packages: - supports-color dev: true - /@angular/compiler@17.3.1(@angular/core@17.3.1): - resolution: {integrity: sha512-8qqlWPGZEyD2FY5losOW3Aocro+lFysPDzsf0LHgQUM6Ub1b+pq4jUOjH6w0vzaxG3TfxkgzOQ9aNdWtSV67Rg==} + /@angular/compiler@17.3.3(@angular/core@17.3.3): + resolution: {integrity: sha512-ZNMRfagMxMjk1KW5H3ssCg5QL0J6ZW1JAZ1mrTXixqS7gbdwl60bTGE+EfuEwbjvovEYaj4l9cga47eMaxZTbQ==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/core': 17.3.1 + '@angular/core': 17.3.3 peerDependenciesMeta: '@angular/core': optional: true dependencies: - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) tslib: 2.6.2 - /@angular/core@17.3.1(rxjs@7.8.1)(zone.js@0.14.4): - resolution: {integrity: sha512-Qf3/sgkXS1LHwOTtqAVYprySrn0YpPIZqerPc0tK+hyQfwAz5BQlpcBhbH8RWKlfCY8eO0cqo/j0+e8DQOgYfg==} + /@angular/core@17.3.3(rxjs@7.8.1)(zone.js@0.14.4): + resolution: {integrity: sha512-O/jr3aFJMCxF6Jmymjx4jIigRHJfqM/ALIi60y2LVznBVFkk9xyMTsAjgWQIEHX+2muEIzgfKuXzpL0y30y+wA==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: rxjs: ^6.5.3 || ^7.4.0 @@ -492,44 +492,44 @@ packages: tslib: 2.6.2 zone.js: 0.14.4 - /@angular/forms@17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1): - resolution: {integrity: sha512-HndsO90k67sFHzd+sII+rhAUksffBvquFuAUCc6QR9WVjILxVg2fY7oBidgS1gKNqu0mptPG0GvuORnaW/0gSg==} + /@angular/forms@17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1): + resolution: {integrity: sha512-wqn+eAggbOZY91hr7oDjv5qdflszVOC9SZMcWJUoZTGn+8eoV6v6728GDFuDDwYkKQ9G9eQbX4IZmYoVw3TVjQ==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/common': 17.3.1 - '@angular/core': 17.3.1 - '@angular/platform-browser': 17.3.1 + '@angular/common': 17.3.3 + '@angular/core': 17.3.3 + '@angular/platform-browser': 17.3.3 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) - '@angular/platform-browser': 17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/platform-browser': 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) rxjs: 7.8.1 tslib: 2.6.2 dev: false - /@angular/language-service@17.3.1: - resolution: {integrity: sha512-awC+KHwIRXZ7biQz0Q7q+UZuuyeWHcxjxyQtvv0n1jwwyRpUo8WAXcduKRxl/wMOrxfZkB/tpGcd1/Eeql9CCw==} + /@angular/language-service@17.3.3: + resolution: {integrity: sha512-OtdWNY0Syg4UvA8j2IhQJeq/UjWHYbRiyUcZjGKPRzuqIPjUhsmMyuW3zpi7Pwx2CpBzZXcik1Ra2WZ0gbwigg==} engines: {node: ^18.13.0 || >=20.9.0} dev: true - /@angular/material@17.3.1(@angular/animations@17.3.1)(@angular/cdk@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/forms@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1): - resolution: {integrity: sha512-Md1OnO0/sQvK5GkTQyE4v1DAaMswXt1TnjjY07KG7cICTrUN8lc0a2P9dMjlSFXIhxC7PTlNH6plSZ1uspbU8Q==} + /@angular/material@17.3.3(@angular/animations@17.3.3)(@angular/cdk@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/forms@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1): + resolution: {integrity: sha512-cb3PYY+Lf3FvXxXIRmOBcTn5QS9Ghr5Eq0aiJiiYV6YVohr0YGWsndMCZ/5a2j8fxpboDo9THeTnOuuAOJv7AA==} peerDependencies: '@angular/animations': ^17.0.0 || ^18.0.0 - '@angular/cdk': 17.3.1 + '@angular/cdk': 17.3.3 '@angular/common': ^17.0.0 || ^18.0.0 '@angular/core': ^17.0.0 || ^18.0.0 '@angular/forms': ^17.0.0 || ^18.0.0 '@angular/platform-browser': ^17.0.0 || ^18.0.0 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/animations': 17.3.1(@angular/core@17.3.1) - '@angular/cdk': 17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) - '@angular/forms': 17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1) - '@angular/platform-browser': 17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1) + '@angular/animations': 17.3.3(@angular/core@17.3.3) + '@angular/cdk': 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/forms': 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) + '@angular/platform-browser': 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) '@material/animation': 15.0.0-canary.7f224ddd4.0 '@material/auto-init': 15.0.0-canary.7f224ddd4.0 '@material/banner': 15.0.0-canary.7f224ddd4.0 @@ -581,51 +581,51 @@ packages: tslib: 2.6.2 dev: false - /@angular/platform-browser-dynamic@17.3.1(@angular/common@17.3.1)(@angular/compiler@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1): - resolution: {integrity: sha512-ACW/npNaDxUNQtEomjjv/KIBY8jHEinePff5qosnAxLE0IpA4qE9eDp36zG35xoJqrPJPYjXbZCBRqqrzM7U7Q==} + /@angular/platform-browser-dynamic@17.3.3(@angular/common@17.3.3)(@angular/compiler@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3): + resolution: {integrity: sha512-jSgSNHRTXCIat20I+4tLm/e8qOvrIE3Zv7S/DtYZEiAth84uoznvo1kXnN+KREse2vP/WoNgSDKQ2JLzkwYXSQ==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/common': 17.3.1 - '@angular/compiler': 17.3.1 - '@angular/core': 17.3.1 - '@angular/platform-browser': 17.3.1 + '@angular/common': 17.3.3 + '@angular/compiler': 17.3.3 + '@angular/core': 17.3.3 + '@angular/platform-browser': 17.3.3 dependencies: - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/compiler': 17.3.1(@angular/core@17.3.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) - '@angular/platform-browser': 17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/compiler': 17.3.3(@angular/core@17.3.3) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/platform-browser': 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) tslib: 2.6.2 dev: false - /@angular/platform-browser@17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1): - resolution: {integrity: sha512-8ABAL8PElSGzkIparVwifsU0NSu0DdqnWYw9YvLhhZQ6lOuWbG+dTUo/DXzmWhA6ezQWJGNakEZPJJytFIIy+A==} + /@angular/platform-browser@17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3): + resolution: {integrity: sha512-XFWjquD+Pr9VszRzrDlT6uaf57TsY9XhL9iHCNok6Op5DpVQpIAuw1vFt2t5ZoQ0gv+lY8mVWnxgqe3CgTdYxw==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/animations': 17.3.1 - '@angular/common': 17.3.1 - '@angular/core': 17.3.1 + '@angular/animations': 17.3.3 + '@angular/common': 17.3.3 + '@angular/core': 17.3.3 peerDependenciesMeta: '@angular/animations': optional: true dependencies: - '@angular/animations': 17.3.1(@angular/core@17.3.1) - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/animations': 17.3.3(@angular/core@17.3.3) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) tslib: 2.6.2 dev: false - /@angular/router@17.3.1(@angular/common@17.3.1)(@angular/core@17.3.1)(@angular/platform-browser@17.3.1)(rxjs@7.8.1): - resolution: {integrity: sha512-H6H7lY9i5Ppu0SFwwpeWqJbCFw8cILOj8Rd1+AGoCN5m3ivPtjD2Ltz62PI2zZkqx+WhQdk19l61Wm3oRqg70A==} + /@angular/router@17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1): + resolution: {integrity: sha512-kj42+TtwvET7MFqxB3pkKyob0VNmspASlv8Y29vSpzzaOHn8J1fDf6H+8opoIC+Gmvo5NqXUDwq7nxI5aQ0mUQ==} engines: {node: ^18.13.0 || >=20.9.0} peerDependencies: - '@angular/common': 17.3.1 - '@angular/core': 17.3.1 - '@angular/platform-browser': 17.3.1 + '@angular/common': 17.3.3 + '@angular/core': 17.3.3 + '@angular/platform-browser': 17.3.3 rxjs: ^6.5.3 || ^7.4.0 dependencies: - '@angular/common': 17.3.1(@angular/core@17.3.1)(rxjs@7.8.1) - '@angular/core': 17.3.1(rxjs@7.8.1)(zone.js@0.14.4) - '@angular/platform-browser': 17.3.1(@angular/animations@17.3.1)(@angular/common@17.3.1)(@angular/core@17.3.1) + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/platform-browser': 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) rxjs: 7.8.1 tslib: 2.6.2 dev: false @@ -672,7 +672,7 @@ packages: dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.24.2 - '@babel/generator': 7.23.6 + '@babel/generator': 7.24.1 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0) '@babel/helpers': 7.24.1 @@ -2433,6 +2433,31 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true + /@kangaroo-and-rabbit/kar-cw@0.1.9(@angular/common@17.3.3)(@angular/compiler@17.3.3)(@angular/core@17.3.3)(@angular/forms@17.3.3)(@angular/platform-browser-dynamic@17.3.3)(@angular/platform-browser@17.3.3)(@angular/router@17.3.3)(rxjs@7.8.1)(zone.js@0.14.4): + resolution: {integrity: sha512-2jx3u9r0dnVx17T1SuQ9tirdukexXxEa8YevtS3WULP0h+p4+Z4asNkqP9wMjRsoj/2paHGesEpV/aQyPgX2mQ==, tarball: https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/npm/%40kangaroo-and-rabbit%2Fkar-cw/-/0.1.9/kar-cw-0.1.9.tgz} + peerDependencies: + '@angular/common': ^17.3.0 + '@angular/compiler': ^17.3.0 + '@angular/core': ^17.3.0 + '@angular/forms': ^17.3.0 + '@angular/platform-browser': ^17.3.0 + '@angular/platform-browser-dynamic': ^17.3.0 + '@angular/router': ^17.3.0 + rxjs: ~7.8.0 + zone.js: ~0.14.3 + dependencies: + '@angular/common': 17.3.3(@angular/core@17.3.3)(rxjs@7.8.1) + '@angular/compiler': 17.3.3(@angular/core@17.3.3) + '@angular/core': 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) + '@angular/forms': 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) + '@angular/platform-browser': 17.3.3(@angular/animations@17.3.3)(@angular/common@17.3.3)(@angular/core@17.3.3) + '@angular/platform-browser-dynamic': 17.3.3(@angular/common@17.3.3)(@angular/compiler@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3) + '@angular/router': 17.3.3(@angular/common@17.3.3)(@angular/core@17.3.3)(@angular/platform-browser@17.3.3)(rxjs@7.8.1) + rxjs: 7.8.1 + tslib: 2.6.2 + zone.js: 0.14.4 + dev: false + /@leichtgewicht/ip-codec@2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: true @@ -3096,15 +3121,15 @@ packages: tslib: 2.6.2 dev: false - /@ngtools/webpack@17.3.2(@angular/compiler-cli@17.3.1)(typescript@5.4.3)(webpack@5.90.3): - resolution: {integrity: sha512-E8zejFF4aJ8l2XcF+GgnE/1IqsZepnPT1xzulLB4LXtjVuXLFLoF9xkHQwxs7cJWWZsxd/SlNsCIcn/ezrYBcQ==} + /@ngtools/webpack@17.3.3(@angular/compiler-cli@17.3.3)(typescript@5.4.3)(webpack@5.90.3): + resolution: {integrity: sha512-053KMbg1Tb+Mmg4Htsv8yTpI7ABghguoxhwosQXKB0CjO6M0oexuvdaxbRDQ1vd5xYNOW9LcOfxOMPIwyU4BBA==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^17.0.0 typescript: '>=5.2 <5.5' webpack: ^5.54.0 dependencies: - '@angular/compiler-cli': 17.3.1(@angular/compiler@17.3.1)(typescript@5.4.3) + '@angular/compiler-cli': 17.3.3(@angular/compiler@17.3.3)(typescript@5.4.3) typescript: 5.4.3 webpack: 5.90.3(esbuild@0.20.1) dev: true @@ -3528,12 +3553,12 @@ packages: dev: true optional: true - /@schematics/angular@17.3.2: - resolution: {integrity: sha512-zPINvow0Qo6ionnDl25ZzSSLDyDxBjqRPEJWGHU70expbjXK4A2caQT9P/8ImhapbJAXJCfxg4GF9z1d/sWe4w==} + /@schematics/angular@17.3.3: + resolution: {integrity: sha512-kNlyjIKTBhfi8Jab3MCkxNRbbpErbzdu0lZNSL8Nidmqs6Tk23Dc1bZe4t/gPNOCkCvQlwYa6X88SjC/ntyVng==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} dependencies: - '@angular-devkit/core': 17.3.2 - '@angular-devkit/schematics': 17.3.2 + '@angular-devkit/core': 17.3.3 + '@angular-devkit/schematics': 17.3.3 jsonc-parser: 3.2.1 transitivePeerDependencies: - chokidar @@ -8190,6 +8215,7 @@ packages: /reflect-metadata@0.2.1: resolution: {integrity: sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==} + deprecated: This version has a critical bug in fallback handling. Please upgrade to reflect-metadata@0.2.2 or newer. dev: true /regenerate-unicode-properties@10.1.1: diff --git a/front/src/app/app.component.ts b/front/src/app/app.component.ts index 234cb0a..a42cf1a 100644 --- a/front/src/app/app.component.ts +++ b/front/src/app/app.component.ts @@ -111,7 +111,6 @@ export class AppComponent implements OnInit { } eventOnMenu(data: EventOnMenu): void { - //console.log(`plopppppppppp ${JSON.stringify(this.route.snapshot.url)}`); console.log(`Get event on menu: ${JSON.stringify(data, null, 4)}`); switch (data.menu.otherData) { case MenuEventType.SSO_LOGIN: diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts index f3ff7ce..0e1dddf 100644 --- a/front/src/app/app.module.ts +++ b/front/src/app/app.module.ts @@ -23,7 +23,7 @@ import { import { GenderService, DataService, PlaylistService, ArtistService, AlbumService, TrackService, ArianeService, PlayerService } from './service'; import { UploadScene } from './scene/upload/upload'; import { ElementSeriesComponent, ElementTrackComponent, ElementSeasonComponent, ElementVideoComponent, ElementPlayerAudioComponent, DescriptionAreaComponent } from './component'; -import { ALL_COMPONENTS, ALL_SCENES, ALL_SERVICES, ALL_GUARDS, KarCWModule, UserService, TopMenuComponent } from '@kangaroo-and-rabbit/kar-cw'; +import { KarCWModule } from '@kangaroo-and-rabbit/kar-cw'; import { environment } from 'environments/environment'; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; @@ -57,8 +57,6 @@ import { CommonModule } from "@angular/common"; AlbumEditScene, ArtistEditScene, UploadScene, - //...ALL_COMPONENTS, - //...ALL_SCENES, ], imports: [ FormsModule, @@ -73,8 +71,6 @@ import { CommonModule } from "@angular/common"; ], providers: [ { provide: 'ENVIRONMENT', useValue: environment }, - //...ALL_SERVICES, - //...ALL_GUARDS, ArianeService, PlayerService, GenderService, @@ -85,8 +81,6 @@ import { CommonModule } from "@angular/common"; TrackService, ], exports: [ - //...ALL_COMPONENTS, - //...ALL_SCENES, AppComponent, ElementTypeComponent, ElementSeriesComponent, diff --git a/front/src/app/back-api/rest-tools.ts b/front/src/app/back-api/rest-tools.ts index 0879a22..0b3cbb9 100644 --- a/front/src/app/back-api/rest-tools.ts +++ b/front/src/app/back-api/rest-tools.ts @@ -91,7 +91,7 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe } } if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) { - return generateUrl; + return generateUrl; } const searchParams = new URLSearchParams(); if (queries !== undefined) { diff --git a/front/src/app/component/element-player-audio/element-player-audio.less b/front/src/app/component/element-player-audio/element-player-audio.less index 7ffc572..8a9aa0e 100644 --- a/front/src/app/component/element-player-audio/element-player-audio.less +++ b/front/src/app/component/element-player-audio/element-player-audio.less @@ -13,12 +13,14 @@ transition: 1s all; display: flex; font-size: 40px; + min-width: 380px; .controls-inner { position: relative; - //width: fill; - //height: fill; + width: 100%; + height: 100%; + min-width: 350px; font-family: monospace; color: white; margin: 10px 15px 1px 15px; @@ -82,7 +84,6 @@ } .title { - width: 100%; font-size: 24px; font-weight: bold; } diff --git a/front/src/app/component/element-season/element-season.ts b/front/src/app/component/element-season/element-season.ts index 35e4385..66c497b 100644 --- a/front/src/app/component/element-season/element-season.ts +++ b/front/src/app/component/element-season/element-season.ts @@ -43,7 +43,7 @@ export class ElementSeasonComponent implements OnInit { this.prefix = this.prefixName ?? ""; this.count = undefined; this.count2 = undefined; - console.log(`element: ${JSON.stringify(this.element, null, 2)}`); + //console.log(`element: ${JSON.stringify(this.element, null, 2)}`); if (isNullOrUndefined(this.element)) { this.numberAlbum = undefined; @@ -52,9 +52,7 @@ export class ElementSeasonComponent implements OnInit { } this.numberAlbum = this.element.name; this.description = this.element.description; - console.log(`covers: ${this.element.covers}`); this.covers = this.dataService.getListThumbnailUrl(this.element.covers); - console.log(`covers ${this.element.covers} >> : ${this.covers}`); let self = this; if (!isNullOrUndefined(this.countSubTypeCallBack)) { this.countSubTypeCallBack(this.element.id) diff --git a/front/src/app/component/element-track/element-track.ts b/front/src/app/component/element-track/element-track.ts index f61537d..793810d 100644 --- a/front/src/app/component/element-track/element-track.ts +++ b/front/src/app/component/element-track/element-track.ts @@ -7,7 +7,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { isNullOrUndefined } from '@kangaroo-and-rabbit/kar-cw'; import { NodeSmall } from 'app/back-api'; -import { AlbumService, DataService } from 'app/service'; +import { DataService } from 'app/service'; @Component({ selector: 'app-element-track', @@ -26,7 +26,6 @@ export class ElementTrackComponent implements OnInit { description: string; constructor( - private albumService: AlbumService, private dataService: DataService) { } diff --git a/front/src/app/scene/album/album.ts b/front/src/app/scene/album/album.ts index 545bb6b..f272918 100644 --- a/front/src/app/scene/album/album.ts +++ b/front/src/app/scene/album/album.ts @@ -6,6 +6,7 @@ import { Component, OnInit } from '@angular/core'; import { Album, Track } from 'app/back-api'; +import { arrayUnique } from '@kangaroo-and-rabbit/kar-cw'; import { ArtistService, DataService, ArianeService, AlbumService, TrackService, PlayerService } from 'app/service'; @@ -49,13 +50,14 @@ export class AlbumScene implements OnInit { self.albumDescription = undefined; self.albumName = '???'; self.albumCovers = undefined; - // no check just ==> an error occured on album + // no check just ==> an error occurred on album }); - //console.log("all the tracks: " + self.tracksIds); + console.log(`all the tracks for a specific album: ${self.idAlbum}`); this.trackService.getTracksWithAlbumId(self.idAlbum) .then((response2: Track[]) => { self.tracks = response2; + console.log(`get tracks : ${JSON.stringify(self.tracks, null, 2)}`); self.artistIds = [] self.tracks.forEach(element => { self.artistIds = [...self.artistIds, ...element.artists]; @@ -67,6 +69,7 @@ export class AlbumScene implements OnInit { } else if (self.artistIds.length > 1) { console.error("More than 1 artist ==> not managed"); } + /* // TODO: display more than 1 ... self.artistService.get(self.artistIds[0]) .then((response) => { @@ -78,6 +81,7 @@ export class AlbumScene implements OnInit { self.name = '???'; self.artistCovers = undefined; }); + */ //console.log(`>>>>BBB get tracks : ${JSON.stringify(response2, null, 2)}`); }).catch((response) => { //console.log(`>>>>BBB plop`); @@ -124,8 +128,3 @@ export class AlbumScene implements OnInit { this.playerService.setNewPlaylistShuffle(elements); } } - -function arrayUnique(artistIds: number[]): number[] { - throw new Error('Function not implemented.'); -} - diff --git a/front/src/app/scene/upload/upload.ts b/front/src/app/scene/upload/upload.ts index 2ae32fd..54e20d6 100644 --- a/front/src/app/scene/upload/upload.ts +++ b/front/src/app/scene/upload/upload.ts @@ -287,7 +287,7 @@ export class UploadScene implements OnInit { // parsedElement: FileParsedElement[] = []; let artist: string = undefined; let album: string | null = undefined; - let trackIdnumber: number | null = undefined; + let trackIdNumber: number | null = undefined; let title: string = ''; console.log(`select file ${file.name}`); @@ -308,19 +308,19 @@ export class UploadScene implements OnInit { //console.log("ploppppp " + tmpName); const splitElement3 = tmpName.split('-'); if (splitElement3.length > 1) { - trackIdnumber = parseInt(splitElement3[0], 10); + trackIdNumber = parseInt(splitElement3[0], 10); tmpName = tmpName.substring(splitElement3[0].length + 1); } //console.log("KKKppppp " + tmpName); //console.log(" ===> " + splitElement3[0]); title = tmpName; - if (isNaN(trackIdnumber)) { - trackIdnumber = undefined; + if (isNaN(trackIdNumber)) { + trackIdNumber = undefined; } - // remove extention + // remove extension title = title.replace(new RegExp('\\.(webm|WEBM|Webm)'), ''); - let tmp = new FileParsedElement(file, artist, album, trackIdnumber, title); + let tmp = new FileParsedElement(file, artist, album, trackIdNumber, title); console.log(`==>${JSON.stringify(tmp)}`); // add it in the list. this.parsedElement.push(tmp); @@ -340,7 +340,7 @@ export class UploadScene implements OnInit { this.updateNeedSend(); return; } - // we verify fith the first value to remove all unknown ... + // we verify with the first value to remove all unknown ... // clean different gender: /*for(let iii = 1; iii < this.parsedElement.length; iii++) { console.log(`check gender [${ iii + 1 }/${ this.parsedElement.length }] '${ this.parsedElement[0].gender } !== ${ this.parsedElement[iii].gender }'`); diff --git a/front/src/assets/images/ikon_before_cut.svg b/front/src/assets/images/ikon_before_cut.svg new file mode 100644 index 0000000..293cc96 --- /dev/null +++ b/front/src/assets/images/ikon_before_cut.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/front/src/assets/images/ikon_gray.svg b/front/src/assets/images/ikon_gray.svg index 5106645..e897548 100644 --- a/front/src/assets/images/ikon_gray.svg +++ b/front/src/assets/images/ikon_gray.svg @@ -2,29 +2,33 @@ + inkscape:export-ydpi="7.1250005" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="filter5338" + x="-0.12319682" + y="-0.081815216" + width="1.2463936" + height="1.1636304"> + + + + + + + + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + id="grid4504" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" + visible="true" /> @@ -99,7 +148,6 @@ image/svg+xml - @@ -115,11 +163,10 @@ transform="matrix(0.8407653,0,0,0.83753055,-37.28971,3.4402954)" aria-label="K"> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:84.5502px;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:0.775;fill:#2b3137;fill-opacity:1;stroke-width:2.11377;filter:url(#filter5338)" + d="m 65.200545,279.95309 v 61.60223 h 8.949095 v -20.53407 l 6.392211,-6.84449 19.176632,27.37856 6.392207,-5.47534 -20.455071,-27.37918 20.455071,-21.9026 -6.392207,-6.84511 -25.568843,27.37918 v -27.37918 z m 34.623041,3.89642 0.08113,0.91996 c -0.319958,0.0205 -0.600028,0.12056 -0.843281,0.38008 -0.481327,0.51353 -0.393613,1.29347 0.321455,1.96887 0.73708,0.69622 1.51285,0.73176 2.02523,0.18511 0.24321,-0.25953 0.31335,-0.58883 0.29195,-0.94218 l 0.90904,0.0154 c 0.0722,0.61998 -0.12994,1.18923 -0.58021,1.66963 -0.83844,0.89456 -2.190053,1.07514 -3.400168,-0.0679 -1.188114,-1.12225 -1.171861,-2.52288 -0.266137,-3.48919 0.424395,-0.45279 0.991241,-0.62554 1.460989,-0.63984 z m -6.777588,6.44528 0.676714,0.6386 -0.786733,0.83975 2.228054,2.10401 0.786119,-0.83914 0.676714,0.63861 -2.333772,2.49087 -0.676714,-0.63923 0.786734,-0.83913 -2.228054,-2.10462 -0.786734,0.83913 -0.676099,-0.6386 z m -5.778189,6.97221 0.129073,0.89158 c -0.419593,0.0825 -0.731113,0.21546 -1.057173,0.56333 -0.253606,0.27057 -0.314123,0.55655 -0.105103,0.75398 0.220021,0.20783 0.524373,0.0375 0.977271,-0.18017 l 0.595582,-0.27025 c 0.615941,-0.3031 1.187271,-0.32558 1.693321,0.15241 0.599556,0.56632 0.616629,1.36433 -0.19361,2.44089 -0.677315,0.60577 -1.102122,0.82218 -1.800268,0.88108 l -0.121083,-0.98844 c 0.484299,-0.0631 0.943518,-0.25438 1.274754,-0.60776 0.320886,-0.34235 0.344427,-0.63278 0.16841,-0.79903 -0.258525,-0.24419 -0.521361,-0.0857 -0.985261,0.12155 l -0.637377,0.28198 c -0.526655,0.25209 -1.170772,0.33129 -1.693321,-0.16228 -0.594058,-0.56111 -0.565292,-1.54388 0.169639,-2.32797 0.403694,-0.4307 0.971757,-0.716 1.585146,-0.7509 z m -6.585821,6.21884 2.205312,2.08364 c 0.929589,0.87805 1.047872,1.78072 0.224957,2.65869 -0.81774,0.8725 -1.743461,0.83116 -2.67305,-0.0469 l -2.205313,-2.08364 0.765836,-0.81692 2.288288,2.16138 c 0.429042,0.40526 0.810303,0.46332 1.126013,0.12649 0.320885,-0.34235 0.244649,-0.72634 -0.184391,-1.1316 l -2.288288,-2.16138 z m -4.57965,9.20516 2.197937,0.53865 -0.853729,0.91071 -1.930571,-0.5294 -0.407503,0.43499 1.287047,1.21551 -0.760919,0.81199 -3.580867,-3.38245 1.200998,-1.28091 c 0.446394,-0.47625 0.945677,-0.80165 1.465291,-0.78175 0.311768,0.0119 0.630508,0.14843 0.950227,0.45042 0.523732,0.4947 0.617235,1.06543 0.432089,1.61224 m 4e-6,5e-5 v 0 m -1.574086,-1.01133 c -0.219842,-0.009 -0.443011,0.13842 -0.69208,0.40414 l -0.378001,0.40291 1.006773,0.95081 0.378001,-0.4029 c 0.39852,-0.42517 0.434395,-0.8287 0.08236,-1.16122 -0.134075,-0.12664 -0.265149,-0.18828 -0.397054,-0.19374 z m -7.033891,5.87578 4.63128,2.26134 -0.807017,0.86135 -1.059017,-0.58493 -1.015378,1.08286 0.645982,1.02608 -0.781816,0.8342 -2.529841,-4.50355 z m 1.278214,2.86141 0.707674,-0.7537 -1.841448,-1.03411 -0.02028,0.0222 z m 0.707674,-0.7537 0.779358,0.43005 z" + sodipodi:nodetypes="cccccccccccccccsccccscsccccccccccccccccssccssccssccssccscccccscccsccccccccscccccccccssccccccccccccccccccc" /> + diff --git a/front/tsconfig.json b/front/tsconfig.json index edc83bd..490f612 100644 --- a/front/tsconfig.json +++ b/front/tsconfig.json @@ -9,12 +9,12 @@ "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, - "target": "ES2021", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ - "ES2021", + "ES2022", "dom" ], "module": "ES2022",