diff --git a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache index da8812d2257..effe87303dd 100644 --- a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache @@ -1,14 +1,14 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { provideHttpClientTesting } from '@angular/common/http/testing'; import { HarnessLoader } from '@angular/cdk/testing'; -import { MatDialogHarness } from '@angular/material/dialog/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { MatDialogHarness } from '@angular/material/dialog/testing'; import { of } from 'rxjs'; import HealthComponent from './health.component'; -import { HealthService } from './health.service'; import { Health } from './health.model'; +import { HealthService } from './health.service'; describe('HealthComponent', () => { let comp: HealthComponent; diff --git a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.ts.mustache b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.ts.mustache index 32e3112f412..838a7625fd3 100644 --- a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.ts.mustache +++ b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.component.ts.mustache @@ -5,8 +5,8 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatTableModule } from '@angular/material/table'; -import { HealthService } from './health.service'; import { Health, HealthStatus } from './health.model'; +import { HealthService } from './health.service'; import { HealthModalComponent } from './modal/health-modal.component'; @Component({ diff --git a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache index 261de4e7915..af57643b77c 100644 --- a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache @@ -1,9 +1,9 @@ -import { TestBed } from '@angular/core/testing'; -import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing'; import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; -import { HealthService } from './health.service'; import { ApplicationConfigService } from './../../config/application-config.service'; +import { HealthService } from './health.service'; describe('HealthService Service', () => { let service: HealthService; diff --git a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.ts.mustache b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.ts.mustache index 69c10db32d7..a700dcca4f0 100644 --- a/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.ts.mustache +++ b/src/main/resources/generator/client/angular/admin/src/main/webapp/app/admin/health/health.service.ts.mustache @@ -1,5 +1,5 @@ -import { inject, Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { ApplicationConfigService } from './../../config/application-config.service'; diff --git a/src/main/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache b/src/main/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache index 976c8e5c2eb..6dbd4d0f563 100644 --- a/src/main/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache +++ b/src/main/resources/generator/client/angular/core/src/main/webapp/app/app.component.ts.mustache @@ -1,11 +1,11 @@ -import { Component, OnInit, signal } from '@angular/core'; import { CommonModule, NgOptimizedImage } from '@angular/common'; +import { Component, OnInit, signal } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; +import { MatToolbarModule } from '@angular/material/toolbar'; @Component({ selector: 'jhi-root', diff --git a/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache b/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache index 66980d6d6a2..5b0d17d36eb 100644 --- a/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache +++ b/src/main/resources/generator/client/angular/core/src/main/webapp/main.ts.mustache @@ -4,8 +4,8 @@ import { REMOVE_STYLES_ON_COMPONENT_DESTROY, bootstrapApplication } from '@angul import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { provideRouter } from '@angular/router'; -import { routes } from './app/app.route'; import { AppComponent } from './app/app.component'; +import { routes } from './app/app.route'; import { environment } from './environments/environment'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache index 97e0e70ee56..ebe82d39426 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache @@ -1,7 +1,7 @@ -import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { provideRouter } from '@angular/router'; -import { provideHttpClient } from '@angular/common/http'; import { Account } from './account.model'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.ts.mustache index bfda65e2ff0..bca76ea9afc 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/account.service.ts.mustache @@ -1,7 +1,7 @@ -import { inject, Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Observable, ReplaySubject, of } from 'rxjs'; -import { shareReplay, tap, catchError } from 'rxjs/operators'; +import { inject, Injectable } from '@angular/core'; +import { Observable, of, ReplaySubject } from 'rxjs'; +import { catchError, shareReplay, tap } from 'rxjs/operators'; import { Account } from './account.model'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache index f03f1225ce8..0e1eaff95db 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; -import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing'; import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; import { AuthServerProvider } from './auth-jwt.service'; describe('Auth JWT', () => { diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.ts.mustache index 71f8c8fe4f9..7e343524e13 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.ts.mustache @@ -1,5 +1,5 @@ -import { inject, Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache index f551f310e54..abe30f3543b 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache @@ -1,6 +1,6 @@ -import { TestBed } from '@angular/core/testing'; import { provideHttpClient, withInterceptors } from '@angular/common/http'; import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; import { AuthServerProvider } from './auth-jwt.service'; import { authInterceptor } from './auth.interceptor'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.ts.mustache index 635c98cc09c..d6be70d14a2 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.ts.mustache @@ -1,4 +1,4 @@ -import { HttpRequest, HttpHandlerFn } from '@angular/common/http'; +import { HttpHandlerFn, HttpRequest } from '@angular/common/http'; export function authInterceptor(req: HttpRequest, next: HttpHandlerFn) { const token: string | null = localStorage.getItem('authenticationToken'); diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache index c3f0e245b00..c426e5db7d8 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache @@ -1,10 +1,10 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { provideHttpClientTesting } from '@angular/common/http/testing'; import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { of, Subject, throwError } from 'rxjs'; -import { LoginService } from './login.service'; -import { AccountService } from '../auth/account.service'; import { Account } from '../auth/account.model'; +import { AccountService } from '../auth/account.service'; +import { LoginService } from './login.service'; import LoginComponent from './login.component'; diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.ts.mustache index 157fca5067b..d8c1746a1dc 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.component.ts.mustache @@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common'; import { Component, DestroyRef, inject, OnInit, signal } from '@angular/core'; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { Subject, takeUntil } from 'rxjs'; +import { Account } from '../auth/account.model'; import { AccountService } from '../auth/account.service'; import { LoginService } from '../login/login.service'; -import { Account } from '../auth/account.model'; import { MatButtonModule } from '@angular/material/button'; -import { MatInputModule } from '@angular/material/input'; import { MatCardModule } from '@angular/material/card'; +import { MatInputModule } from '@angular/material/input'; @Component({ selector: 'jhi-login', diff --git a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache index 8acf26fe352..36cb25b0113 100644 --- a/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache +++ b/src/main/resources/generator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache @@ -1,11 +1,11 @@ -import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing'; -import { TestBed } from '@angular/core/testing'; import { provideHttpClient } from '@angular/common/http'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; -import { LoginService } from './login.service'; -import { AuthServerProvider } from '../auth/auth-jwt.service'; import { of, Subject } from 'rxjs'; import { AccountService } from '../auth/account.service'; +import { AuthServerProvider } from '../auth/auth-jwt.service'; +import { LoginService } from './login.service'; describe('Login Service', () => { let service: LoginService;