From 04633240b328af62ee5d6196fa8d04807be23040 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 3 Apr 2024 00:34:47 +0200 Subject: [PATCH] [DEV] find how to fix the error but not Ok with the result --- front/package.json | 4 ++-- front/pnpm-lock.yaml | 15 ++------------- front/src/app/app.module.ts | 3 ++- front/src/app/back-api/data-resource.ts | 2 +- front/src/app/back-api/gender-resource.ts | 4 ++-- front/src/app/service/playlist.ts | 3 +-- front/src/app/service/track.ts | 5 +---- readme.md | 7 ++++++- 8 files changed, 17 insertions(+), 26 deletions(-) diff --git a/front/package.json b/front/package.json index 338e847..fb82777 100644 --- a/front/package.json +++ b/front/package.json @@ -30,7 +30,7 @@ "rxjs": "^7.8.1", "zone.js": "^0.14.4", "zod": "3.22.4", - "@kangaroo-and-rabbit/kar-cw": "0.1.5" + "@kangaroo-and-rabbit/kar-cw": "^0.1.5" }, "devDependencies": { "@angular-devkit/build-angular": "^17.3.1", @@ -43,6 +43,6 @@ "@angular/compiler-cli": "^17.3.1", "@angular/language-service": "^17.3.1", "npm-check-updates": "^16.14.17", - "tslib": "^2.6.2" + "tslib": "^2.6.2" } } \ No newline at end of file diff --git a/front/pnpm-lock.yaml b/front/pnpm-lock.yaml index dee2a5d..28941b7 100644 --- a/front/pnpm-lock.yaml +++ b/front/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: 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) '@kangaroo-and-rabbit/kar-cw': - specifier: 0.1.5 - version: 0.1.5(@angular/common@17.3.1)(@angular/core@17.3.1) + specifier: ^0.1.5 + version: link:../../kar-cw/dist/kar-cw rxjs: specifier: ^7.8.1 version: 7.8.1 @@ -2433,17 +2433,6 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /@kangaroo-and-rabbit/kar-cw@0.1.5(@angular/common@17.3.1)(@angular/core@17.3.1): - resolution: {integrity: sha512-c3TAH3mMVo8kv+QAqaaPhQ1Sh4Bztrz9ERZSWmLwZyXmfcXfPxraLEFQ52p18RZAcwFeWUfiLhFC/6fbKayuVQ==, tarball: https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/npm/%40kangaroo-and-rabbit%2Fkar-cw/-/0.1.5/kar-cw-0.1.5.tgz} - peerDependencies: - '@angular/common': ^17.3.0 - '@angular/core': ^17.3.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) - tslib: 2.6.2 - dev: false - /@leichtgewicht/ip-codec@2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: true diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts index df45ddd..d2831ce 100644 --- a/front/src/app/app.module.ts +++ b/front/src/app/app.module.ts @@ -5,7 +5,7 @@ */ import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { HttpClientModule } from '@angular/common/http'; import { AppRoutingModule } from './app-routing.module'; @@ -82,5 +82,6 @@ import { KarCWModule } from '@kangaroo-and-rabbit/kar-cw'; bootstrap: [ AppComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA], }) export class AppModule { } diff --git a/front/src/app/back-api/data-resource.ts b/front/src/app/back-api/data-resource.ts index dafbce4..2eefc02 100644 --- a/front/src/app/back-api/data-resource.ts +++ b/front/src/app/back-api/data-resource.ts @@ -76,7 +76,7 @@ export namespace DataResource { }); }; /** - * Get back some data from the data environment (with a beautifull name (permit download with basic name) + * Get back some data from the data environment (with a beautiful name (permit download with basic name) */ // TODO: unmanaged "Response" type: please specify @AsyncType or considered as 'void'. export function retrieveDataFull({ restConfig, queries, params, data, }: { diff --git a/front/src/app/back-api/gender-resource.ts b/front/src/app/back-api/gender-resource.ts index d743343..8e635bd 100644 --- a/front/src/app/back-api/gender-resource.ts +++ b/front/src/app/back-api/gender-resource.ts @@ -1,8 +1,8 @@ /** * API of the server (auto-generated code) */ -import { HTTPMimeType, HTTPRequestModel, RESTConfig, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools" -import { UUID, Long, Gender, isGender, } from "./model" +import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools" +import {UUID, Long, Gender, isGender, } from "./model" export namespace GenderResource { export function remove({ restConfig, params, }: { diff --git a/front/src/app/service/playlist.ts b/front/src/app/service/playlist.ts index 63fbfd4..621b336 100644 --- a/front/src/app/service/playlist.ts +++ b/front/src/app/service/playlist.ts @@ -10,8 +10,7 @@ import { Playlist, PlaylistResource, UUID } from 'app/back-api'; import { RESTConfig } from 'app/back-api/rest-tools'; import { environment } from 'environments/environment'; import { GenericDataService } from './GenericDataService'; -import { SessionService } from '@kangaroo-and-rabbit/kar-cw/service'; -import { DataStore } from '@kangaroo-and-rabbit/kar-cw/utils/data-store'; +import { SessionService, DataStore } from '@kangaroo-and-rabbit/kar-cw'; @Injectable() export class PlaylistService extends GenericDataService { diff --git a/front/src/app/service/track.ts b/front/src/app/service/track.ts index 62da994..a9b3a6c 100644 --- a/front/src/app/service/track.ts +++ b/front/src/app/service/track.ts @@ -10,10 +10,7 @@ import { RESTConfig } from 'app/back-api/rest-tools'; import { environment } from 'environments/environment'; import { Track, TrackResource, UUID } from 'app/back-api'; import { GenericDataService } from './GenericDataService'; -import { TypeCheck, isArrayOf, isNumber } from '@kangaroo-and-rabbit/kar-cw/utils'; -import { SessionService } from '@kangaroo-and-rabbit/kar-cw'; -import { DataTools } from '@kangaroo-and-rabbit/kar-cw/utils/data-tools'; -import { DataStore } from '@kangaroo-and-rabbit/kar-cw/utils/data-store'; +import { TypeCheck, isArrayOf, isNumber, DataStore, DataTools, SessionService } from '@kangaroo-and-rabbit/kar-cw'; @Injectable() export class TrackService extends GenericDataService { diff --git a/readme.md b/readme.md index 5c311cb..3c0b32a 100644 --- a/readme.md +++ b/readme.md @@ -34,4 +34,9 @@ docker push gitea.atria-soft.org/kangaroo-and-rabbit/karusic:latest convert in an angular application: -https://betterprogramming.pub/how-to-convert-your-angular-application-to-a-native-mobile-app-android-and-ios-c212b38976df \ No newline at end of file +https://betterprogramming.pub/how-to-convert-your-angular-application-to-a-native-mobile-app-android-and-ios-c212b38976df + + + + +pnpm link ../../kar-cw/dist/kar-cw/