From ef2a965d97923ca3f0d4f5d39167f842407ef4b5 Mon Sep 17 00:00:00 2001 From: Peter Rossa Date: Tue, 23 May 2023 19:46:49 +0200 Subject: [PATCH] Adjust imports --- .../src/app/components/header/header.component.ts | 4 ++-- .../app/components/interceptors/authInterceptor.ts | 1 - .../app/components/loginPage/login.component.ts | 4 ++-- .../meter-data-wrapper.component.ts | 1 - .../src/app/core/services/error.service.ts | 4 ++-- .../src/app/core/services/notification.service.ts | 14 +++++++------- .../meter-data-add-dialog.component.ts | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/rossa-tech-cli/src/app/components/header/header.component.ts b/rossa-tech-cli/src/app/components/header/header.component.ts index caa7b8d..40de268 100644 --- a/rossa-tech-cli/src/app/components/header/header.component.ts +++ b/rossa-tech-cli/src/app/components/header/header.component.ts @@ -2,10 +2,10 @@ import { HttpErrorResponse } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { AuthService } from 'src/app/auth/auth.service'; import { LoginService } from 'src/app/auth/login.service'; -import { ErrorService } from 'src/app/services/error.service'; import { PageSecurityService } from 'src/app/auth/pageSecurity.service'; import { LoaderService } from '../loader/loader.service'; -import { NotificationService } from 'src/app/services/notification.service'; +import { ErrorService } from 'src/app/core/services/error.service'; +import { NotificationService } from 'src/app/core/services/notification.service'; @Component({ selector: 'app-header', diff --git a/rossa-tech-cli/src/app/components/interceptors/authInterceptor.ts b/rossa-tech-cli/src/app/components/interceptors/authInterceptor.ts index 06b7c09..7d2fc0b 100644 --- a/rossa-tech-cli/src/app/components/interceptors/authInterceptor.ts +++ b/rossa-tech-cli/src/app/components/interceptors/authInterceptor.ts @@ -9,7 +9,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { AuthService } from 'src/app/auth/auth.service'; import { LoginService } from 'src/app/auth/login.service'; -import { UserService } from 'src/app/services/user.service'; @Injectable() export class AuthInterceptor implements HttpInterceptor { diff --git a/rossa-tech-cli/src/app/components/loginPage/login.component.ts b/rossa-tech-cli/src/app/components/loginPage/login.component.ts index 15171e0..bb1c256 100644 --- a/rossa-tech-cli/src/app/components/loginPage/login.component.ts +++ b/rossa-tech-cli/src/app/components/loginPage/login.component.ts @@ -4,11 +4,11 @@ import { Router } from '@angular/router'; import { LoginUser } from '../../core/dataModels/loginUser.type'; import { LoginService } from '../../auth/login.service'; -import { FormsService } from '../../services/forms.service'; import { AuthService } from 'src/app/auth/auth.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { LoaderService } from '../loader/loader.service'; -import { NotificationService } from 'src/app/services/notification.service'; +import { FormsService } from 'src/app/core/services/forms.service'; +import { NotificationService } from 'src/app/core/services/notification.service'; @Component({ selector: 'app-root', diff --git a/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts b/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts index 232a763..e61309b 100644 --- a/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts +++ b/rossa-tech-cli/src/app/components/subcomponents/meter-data-wrapper/meter-data-wrapper.component.ts @@ -1,7 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; import { MeterData } from 'src/app/core/dataModels/Meterdata'; import { UsageType } from 'src/app/core/dataModels/UsageType'; -import { GlobalService } from 'src/app/services/global.service'; @Component({ selector: 'app-meter-data-wrapper', diff --git a/rossa-tech-cli/src/app/core/services/error.service.ts b/rossa-tech-cli/src/app/core/services/error.service.ts index eed5132..ee86f02 100644 --- a/rossa-tech-cli/src/app/core/services/error.service.ts +++ b/rossa-tech-cli/src/app/core/services/error.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { NotificationService } from './notification.service'; -import { LoginService } from '../auth/login.service'; -import { PageSecurityService } from '../auth/pageSecurity.service'; +import { LoginService } from 'src/app/auth/login.service'; +import { PageSecurityService } from 'src/app/auth/pageSecurity.service'; @Injectable({ providedIn: 'root', diff --git a/rossa-tech-cli/src/app/core/services/notification.service.ts b/rossa-tech-cli/src/app/core/services/notification.service.ts index 502776b..d6eda5b 100644 --- a/rossa-tech-cli/src/app/core/services/notification.service.ts +++ b/rossa-tech-cli/src/app/core/services/notification.service.ts @@ -1,7 +1,7 @@ -import { Injectable, OnDestroy } from "@angular/core"; -import { MatSnackBar } from "@angular/material/snack-bar"; -import { Subscription } from "rxjs"; -import { SnackbarComponent } from "../components/snackbar/snackbar.component"; +import { Injectable, OnDestroy } from '@angular/core'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { Subscription } from 'rxjs'; +import { SnackbarComponent } from 'src/app/components/snackbar/snackbar.component'; interface SnackbarData { message: string; @@ -11,7 +11,7 @@ interface SnackbarData { } @Injectable({ - providedIn: "root", + providedIn: 'root', }) export class NotificationService implements OnDestroy { // Configuration api subscription @@ -64,8 +64,8 @@ export class NotificationService implements OnDestroy { this.toast.openFromComponent(SnackbarComponent, { data, duration, - horizontalPosition: "left", - verticalPosition: "bottom", + horizontalPosition: 'left', + verticalPosition: 'bottom', }); } } diff --git a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts index 32fda5f..7f07ada 100644 --- a/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts +++ b/rossa-tech-cli/src/app/dialogs/meter-data-add-dialog/meter-data-add-dialog.component.ts @@ -4,7 +4,7 @@ import { MatDialogRef } from '@angular/material/dialog'; import { Meter, Meters } from 'src/app/core/dataModels/Meter'; import { MeterData } from 'src/app/core/dataModels/Meterdata'; import { UsageType } from 'src/app/core/dataModels/UsageType'; -import { DatabaseService } from 'src/app/services/database.service'; +import { DatabaseService } from 'src/app/core/services/database.service'; @Component({ selector: 'app-meter-data-add-dialog',