From 295854606f21a7223a0a29c642920f48080fdc66 Mon Sep 17 00:00:00 2001 From: Jan Wolf Date: Sun, 23 Jun 2024 14:50:35 +0200 Subject: [PATCH] fix: downgrade bulma --- smartblueberry/angular.json | 6 ++-- smartblueberry/frontend/src/app/app.module.ts | 7 ++-- .../doors-windows/doors-windows.component.ts | 5 ++- smartblueberry/package-lock.json | 36 +++++++++---------- smartblueberry/package.json | 4 +-- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/smartblueberry/angular.json b/smartblueberry/angular.json index 4f00897..a4baa3b 100644 --- a/smartblueberry/angular.json +++ b/smartblueberry/angular.json @@ -91,10 +91,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "smartblueberry:build:production" + "buildTarget": "smartblueberry:build:production" }, "development": { - "browserTarget": "smartblueberry:build:development" + "buildTarget": "smartblueberry:build:development" } }, "defaultConfiguration": "development" @@ -102,7 +102,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "smartblueberry:build", + "buildTarget": "smartblueberry:build", "outputPath": "frontend/src/locale" } } diff --git a/smartblueberry/frontend/src/app/app.module.ts b/smartblueberry/frontend/src/app/app.module.ts index 836c868..e2f1f2e 100644 --- a/smartblueberry/frontend/src/app/app.module.ts +++ b/smartblueberry/frontend/src/app/app.module.ts @@ -6,7 +6,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations' import { DoorsWindowsComponent } from './doors-windows/doors-windows.component' import { SvgIconComponent } from './svg-icon/svg-icon.component' import { EntitySchemaComponent } from './entity-schema/entity-schema.component' -import { HttpClientModule } from '@angular/common/http' +import { provideHttpClient } from '@angular/common/http' import { DashboardComponent } from './dashboard/dashboard.component' import { SetupComponent } from './setup/setup.component' import { HAService } from './ha.service' @@ -19,7 +19,7 @@ import { ErrorComponent } from './error/error.component' import { IrrigationComponent } from './irrigation/irrigation.component' import { IrrigationChartComponent } from './irrigation-chart/irrigation-chart.component' import { NgChartsModule } from 'ng2-charts' -import { SelectComponent } from './select/select.component'; +import { SelectComponent } from './select/select.component' import { FormComponent } from './form/form.component' @NgModule({ @@ -43,12 +43,11 @@ import { FormComponent } from './form/form.component' imports: [ BrowserModule, NgChartsModule, - HttpClientModule, ReactiveFormsModule, AppRoutingModule, BrowserAnimationsModule ], - providers: [HAService], + providers: [HAService, provideHttpClient()], bootstrap: [AppComponent] }) export class AppModule {} diff --git a/smartblueberry/frontend/src/app/doors-windows/doors-windows.component.ts b/smartblueberry/frontend/src/app/doors-windows/doors-windows.component.ts index 0714f5c..9e7a977 100644 --- a/smartblueberry/frontend/src/app/doors-windows/doors-windows.component.ts +++ b/smartblueberry/frontend/src/app/doors-windows/doors-windows.component.ts @@ -29,7 +29,10 @@ export class DoorsWindowsComponent implements OnInit { const modifiedFeatures = { ...this.doorsWindowsFeatures, [feature]: state } this.haService - .post('/doors-windows-features', modifiedFeatures) + .post( + '/doors-windows-features', + modifiedFeatures + ) .subscribe({ next: (response) => { if (response.ok) { diff --git a/smartblueberry/package-lock.json b/smartblueberry/package-lock.json index b51c45b..de49d43 100644 --- a/smartblueberry/package-lock.json +++ b/smartblueberry/package-lock.json @@ -19,14 +19,14 @@ "@hapi/hapi": "^21.3.10", "@hapi/inert": "^7.1.0", "@hapi/jwt": "^3.2.0", - "bulma": "^1.0.1", + "bulma": "^0.9.4", "cryptr": "^6.3.0", "dayjs": "^1.11.11", "dotenv": "^16.4.5", "home-assistant-js-websocket": "^9.4.0", "human-interval": "^2.0.1", "joi": "^17.13.3", - "ng2-charts": "^6.0.1", + "ng2-charts": "^5.0.4", "node-json-db": "^2.3.0", "rxjs": "^7.8.1", "tslib": "^2.6.3", @@ -5512,9 +5512,9 @@ "dev": true }, "node_modules/bulma": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-1.0.1.tgz", - "integrity": "sha512-+xv/BIAEQakHkR0QVz+s+RjNqfC53Mx9ZYexyaFNFo9wx5i76HXArNdwW7bccyJxa5mgV/T5DcVGqsAB19nBJQ==" + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", + "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, "node_modules/bundle-name": { "version": "4.1.0", @@ -9478,18 +9478,18 @@ "dev": true }, "node_modules/ng2-charts": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-6.0.1.tgz", - "integrity": "sha512-pO7evbvHqjiKB7zqE12tCKWQI9gmQ8DVOEaWBBLlxJabc4fLGk7o9t4jC4+Q9pJiQrTtQkugm0dIPQ4PFHUaWA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-5.0.4.tgz", + "integrity": "sha512-AnOZ2KSRw7QjiMMNtXz9tdnO+XrIKP/2MX1TfqEEo2fwFU5c8LFJIYqmkMPkIzAEm/U9y/1psA5TDNmxxjEdgA==", "dependencies": { "lodash-es": "^4.17.15", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/cdk": ">=17.0.0", - "@angular/common": ">=17.0.0", - "@angular/core": ">=17.0.0", - "@angular/platform-browser": ">=17.0.0", + "@angular/cdk": ">=16.0.0", + "@angular/common": ">=16.0.0", + "@angular/core": ">=16.0.0", + "@angular/platform-browser": ">=16.0.0", "chart.js": "^3.4.0 || ^4.0.0", "rxjs": "^6.5.3 || ^7.4.0" } @@ -17541,9 +17541,9 @@ "dev": true }, "bulma": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-1.0.1.tgz", - "integrity": "sha512-+xv/BIAEQakHkR0QVz+s+RjNqfC53Mx9ZYexyaFNFo9wx5i76HXArNdwW7bccyJxa5mgV/T5DcVGqsAB19nBJQ==" + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz", + "integrity": "sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==" }, "bundle-name": { "version": "4.1.0", @@ -20474,9 +20474,9 @@ "dev": true }, "ng2-charts": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-6.0.1.tgz", - "integrity": "sha512-pO7evbvHqjiKB7zqE12tCKWQI9gmQ8DVOEaWBBLlxJabc4fLGk7o9t4jC4+Q9pJiQrTtQkugm0dIPQ4PFHUaWA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-5.0.4.tgz", + "integrity": "sha512-AnOZ2KSRw7QjiMMNtXz9tdnO+XrIKP/2MX1TfqEEo2fwFU5c8LFJIYqmkMPkIzAEm/U9y/1psA5TDNmxxjEdgA==", "requires": { "lodash-es": "^4.17.15", "tslib": "^2.3.0" diff --git a/smartblueberry/package.json b/smartblueberry/package.json index 8b126fe..1f7c496 100644 --- a/smartblueberry/package.json +++ b/smartblueberry/package.json @@ -27,14 +27,14 @@ "@hapi/hapi": "^21.3.10", "@hapi/inert": "^7.1.0", "@hapi/jwt": "^3.2.0", - "bulma": "^1.0.1", + "bulma": "^0.9.4", "cryptr": "^6.3.0", "dayjs": "^1.11.11", "dotenv": "^16.4.5", "home-assistant-js-websocket": "^9.4.0", "human-interval": "^2.0.1", "joi": "^17.13.3", - "ng2-charts": "^6.0.1", + "ng2-charts": "^5.0.4", "node-json-db": "^2.3.0", "rxjs": "^7.8.1", "tslib": "^2.6.3",