diff --git a/nise-frontend/src/app/app.component.ts b/nise-frontend/src/app/app.component.ts index df51986..4b773cd 100644 --- a/nise-frontend/src/app/app.component.ts +++ b/nise-frontend/src/app/app.component.ts @@ -1,10 +1,17 @@ import {Component} from '@angular/core'; -import {Router} from "@angular/router"; +import {Router, RouterLink, RouterOutlet} from "@angular/router"; import {UserService} from "../corelib/service/user.service"; - +import {NgIf} from '@angular/common'; +import {FormsModule} from '@angular/forms'; @Component({ selector: 'app-root', + standalone: true, + imports: [ + RouterLink, + FormsModule, + NgIf, RouterOutlet + ], templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) @@ -14,7 +21,8 @@ export class AppComponent { constructor(private router: Router, public userService: UserService - ) { } + ) { + } onSubmit(): void { this.router.navigate(['/u/' + this.term]) diff --git a/nise-frontend/src/app/app.module.ts b/nise-frontend/src/app/app.module.ts deleted file mode 100644 index d842df3..0000000 --- a/nise-frontend/src/app/app.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; - -import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './app.component'; -import {HTTP_INTERCEPTORS, HttpClientModule} from "@angular/common/http"; -import { ViewSuspiciousScoresComponent } from './view-suspicious-scores/view-suspicious-scores.component'; -import { ViewSimilarReplaysComponent } from './view-similar-replays/view-similar-replays.component'; -import { HomeComponent } from './home/home.component'; -import { NgChartsModule } from 'ng2-charts'; -import {FormsModule} from "@angular/forms"; -import {NgOptimizedImage} from "@angular/common"; -import {rxStompServiceFactory} from "../corelib/stomp/stomp.factory"; -import {RxStompService} from "../corelib/stomp/stomp.service"; -import {NiseHttpInterceptor} from "../corelib/nise-http.interceptor"; - -@NgModule({ - declarations: [ - AppComponent, - ViewSuspiciousScoresComponent, - ViewSimilarReplaysComponent, - HomeComponent, - ], - imports: [ - BrowserModule, - AppRoutingModule, - HttpClientModule, - NgChartsModule, - FormsModule, - NgOptimizedImage - ], - providers: [ - { - provide: RxStompService, - useFactory: rxStompServiceFactory, - }, - { provide: HTTP_INTERCEPTORS, useClass: NiseHttpInterceptor, multi: true } - ], - bootstrap: [AppComponent] -}) -export class AppModule { } diff --git a/nise-frontend/src/app/home/home.component.ts b/nise-frontend/src/app/home/home.component.ts index b162e84..24fdecf 100644 --- a/nise-frontend/src/app/home/home.component.ts +++ b/nise-frontend/src/app/home/home.component.ts @@ -5,6 +5,8 @@ import {LocalCacheService} from "../../corelib/service/local-cache.service"; import {RxStompService} from "../../corelib/stomp/stomp.service"; import {Message} from "@stomp/stompjs/esm6"; import {ReplayData} from "../replays"; +import {DecimalPipe, NgForOf, NgIf} from "@angular/common"; +import {RouterLink} from "@angular/router"; interface Statistics { total_beatmaps: number; @@ -14,10 +16,16 @@ interface Statistics { total_replay_similarity: number; } - @Component({ selector: 'app-home', + standalone: true, templateUrl: './home.component.html', + imports: [ + DecimalPipe, + RouterLink, + NgIf, + NgForOf + ], styleUrls: ['./home.component.css'] }) export class HomeComponent implements OnInit, OnDestroy { diff --git a/nise-frontend/src/app/view-similar-replays/view-similar-replays.component.ts b/nise-frontend/src/app/view-similar-replays/view-similar-replays.component.ts index 5e9e03f..1b818d0 100644 --- a/nise-frontend/src/app/view-similar-replays/view-similar-replays.component.ts +++ b/nise-frontend/src/app/view-similar-replays/view-similar-replays.component.ts @@ -3,8 +3,10 @@ import {SimilarReplay} from "../replays"; import {Observable} from "rxjs"; import {environment} from "../../environments/environment"; import {LocalCacheService} from "../../corelib/service/local-cache.service"; -import {ActivatedRoute, Router} from "@angular/router"; +import {ActivatedRoute, Router, RouterLink} from "@angular/router"; import {FilterManagerService} from "../filter-manager.service"; +import {FormsModule} from "@angular/forms"; +import {DecimalPipe, NgForOf, NgIf, NgOptimizedImage} from "@angular/common"; export interface FilterStolenReplays { sorting?: string; @@ -21,7 +23,16 @@ export interface FilterStolenReplays { @Component({ selector: 'app-view-similar-replays', + standalone: true, templateUrl: './view-similar-replays.component.html', + imports: [ + FormsModule, + DecimalPipe, + NgOptimizedImage, + NgForOf, + RouterLink, + NgIf + ], styleUrls: ['./view-similar-replays.component.css'] }) export class ViewSimilarReplaysComponent implements OnInit { diff --git a/nise-frontend/src/app/view-suspicious-scores/view-suspicious-scores.component.ts b/nise-frontend/src/app/view-suspicious-scores/view-suspicious-scores.component.ts index 7d2cfe7..efa069a 100644 --- a/nise-frontend/src/app/view-suspicious-scores/view-suspicious-scores.component.ts +++ b/nise-frontend/src/app/view-suspicious-scores/view-suspicious-scores.component.ts @@ -3,8 +3,10 @@ import {environment} from "../../environments/environment"; import {SuspiciousScore} from "../replays"; import {Observable, Subscription, timer} from 'rxjs'; import {LocalCacheService} from "../../corelib/service/local-cache.service"; -import {ActivatedRoute, Router} from "@angular/router"; +import {ActivatedRoute, Router, RouterLink} from "@angular/router"; import {FilterManagerService} from "../filter-manager.service"; +import {FormsModule} from "@angular/forms"; +import {DecimalPipe, NgForOf, NgIf, NgOptimizedImage} from "@angular/common"; export interface SuspiciousScoresFilter { sorting?: string; @@ -21,7 +23,16 @@ export interface SuspiciousScoresFilter { @Component({ selector: 'app-view-suspicious-scores', + standalone: true, templateUrl: './view-suspicious-scores.component.html', + imports: [ + FormsModule, + RouterLink, + NgForOf, + DecimalPipe, + NgOptimizedImage, + NgIf + ], styleUrls: ['./view-suspicious-scores.component.css'] }) export class ViewSuspiciousScoresComponent implements OnInit, OnDestroy { diff --git a/nise-frontend/src/main.ts b/nise-frontend/src/main.ts index be6bfab..0747380 100644 --- a/nise-frontend/src/main.ts +++ b/nise-frontend/src/main.ts @@ -1,9 +1,30 @@ /// -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { AppModule } from './app/app.module'; +import {importProvidersFrom} from '@angular/core'; +import {AppComponent} from './app/app.component'; +import {NgOptimizedImage} from '@angular/common'; +import {FormsModule} from '@angular/forms'; +import {NgChartsModule} from 'ng2-charts'; +import {AppRoutingModule} from './app/app-routing.module'; +import {bootstrapApplication, BrowserModule} from '@angular/platform-browser'; +import {NiseHttpInterceptor} from './corelib/nise-http.interceptor'; +import {HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; +import {rxStompServiceFactory} from './corelib/stomp/stomp.factory'; +import {RxStompService} from './corelib/stomp/stomp.service'; -platformBrowserDynamic().bootstrapModule(AppModule) +bootstrapApplication(AppComponent, { + providers: [ + importProvidersFrom(BrowserModule, AppRoutingModule, NgChartsModule, FormsModule, NgOptimizedImage), + { + provide: RxStompService, + useFactory: rxStompServiceFactory, + }, + { + provide: HTTP_INTERCEPTORS, + useClass: NiseHttpInterceptor, multi: true + }, + provideHttpClient(withInterceptorsFromDi()) + ] +}) .catch(err => console.error(err));