diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 7499296..a9ce6d0 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -1,12 +1,12 @@ import { Component, HostListener, inject, signal } from '@angular/core'; import { RouterOutlet } from '@angular/router'; -import { NavbarComponent } from '@shared/components/navbar/navbar.component'; -import { FooterComponent } from '@shared/components/footer/footer.component'; +import { NavbarComponent } from './shared/components/navbar/navbar.component'; +import { FooterComponent } from './shared/components/footer/footer.component'; import { LoginComponent } from './feature/auth/login/login.component'; import { RegisterComponent } from './feature/auth/register/register.component'; -import RecoverPasswordComponent from './feature/auth/recover-password/recover-password.component'; -import { PlaySoundDirective } from '@shared/directives/play-sound.directive'; -import { SoundInitializerService } from '@shared/services/sound-initializer.service'; +import { RecoverPasswordComponent } from './feature/auth/recover-password/recover-password.component'; +import { PlaySoundDirective } from './shared/directives/play-sound.directive'; +import { SoundInitializerService } from './shared/services/sound-initializer.service'; @Component({ selector: 'app-root', diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts index 88f4fe1..44c342a 100644 --- a/frontend/src/app/app.routes.ts +++ b/frontend/src/app/app.routes.ts @@ -14,68 +14,75 @@ export const routes: Routes = [ }, { path: 'verify', - loadComponent: () => import('./feature/auth/verify-email/verify-email.component'), + loadComponent: () => + import('./feature/auth/verify-email/verify-email.component').then( + (m) => m.VerifyEmailComponent + ), }, { path: 'recover-password', - loadComponent: () => import('./feature/auth/recover-password/recover-password.component'), + loadComponent: () => + import('./feature/auth/recover-password/recover-password.component').then( + (m) => m.RecoverPasswordComponent + ), }, { path: 'reset-password', - loadComponent: () => import('./feature/auth/recover-password/recover-password.component'), + loadComponent: () => + import('./feature/auth/recover-password/recover-password.component').then( + (m) => m.RecoverPasswordComponent + ), }, { path: 'oauth2/callback', children: [ { path: 'github', - loadComponent: () => import('./feature/auth/oauth2/oauth2-callback.component'), + loadComponent: () => + import('./feature/auth/oauth2/oauth2-callback.component').then( + (m) => m.OAuth2CallbackComponent + ), data: { provider: 'github' }, }, { path: 'google', - loadComponent: () => import('./feature/auth/oauth2/oauth2-callback.component'), + loadComponent: () => + import('./feature/auth/oauth2/oauth2-callback.component').then( + (m) => m.OAuth2CallbackComponent + ), data: { provider: 'google' }, }, ], }, { - path: 'game', - children: [ - { - path: 'blackjack', - loadComponent: () => import('./feature/game/blackjack/blackjack.component'), - canActivate: [authGuard], - }, - { - path: 'coinflip', - loadComponent: () => import('./feature/game/coinflip/coinflip.component'), - canActivate: [authGuard], - }, - { - path: 'slots', - loadComponent: () => import('./feature/game/slots/slots.component'), - canActivate: [authGuard], - }, - { - path: 'lootboxes', - loadComponent: () => - import('./feature/lootboxes/lootbox-selection/lootbox-selection.component'), - canActivate: [authGuard], - children: [ - { - path: 'open/:id', - loadComponent: () => - import('./feature/lootboxes/lootbox-opening/lootbox-opening.component'), - canActivate: [authGuard], - }, - ], - }, - { - path: 'dice', - loadComponent: () => import('./feature/game/dice/dice.component'), - canActivate: [authGuard], - }, - ], + path: 'game/blackjack', + loadComponent: () => import('./feature/game/blackjack/blackjack.component'), + canActivate: [authGuard], + }, + { + path: 'game/coinflip', + loadComponent: () => import('./feature/game/coinflip/coinflip.component'), + canActivate: [authGuard], + }, + { + path: 'game/slots', + loadComponent: () => import('./feature/game/slots/slots.component'), + canActivate: [authGuard], + }, + { + path: 'game/lootboxes', + loadComponent: () => + import('./feature/lootboxes/lootbox-selection/lootbox-selection.component'), + canActivate: [authGuard], + }, + { + path: 'game/lootboxes/open/:id', + loadComponent: () => import('./feature/lootboxes/lootbox-opening/lootbox-opening.component'), + canActivate: [authGuard], + }, + { + path: 'game/dice', + loadComponent: () => import('./feature/game/dice/dice.component').then((m) => m.DiceComponent), + canActivate: [authGuard], }, ]; diff --git a/frontend/src/app/feature/auth/oauth2/oauth2-callback.component.ts b/frontend/src/app/feature/auth/oauth2/oauth2-callback.component.ts index 9c4bcf3..ebd2688 100644 --- a/frontend/src/app/feature/auth/oauth2/oauth2-callback.component.ts +++ b/frontend/src/app/feature/auth/oauth2/oauth2-callback.component.ts @@ -19,7 +19,7 @@ import { Oauth2Service } from './oauth2.service'; `, }) -export default class OAuth2CallbackComponent implements OnInit { +export class OAuth2CallbackComponent implements OnInit { error: Signal = computed(() => this.oauthService.error()); private route: ActivatedRoute = inject(ActivatedRoute); diff --git a/frontend/src/app/feature/auth/recover-password/recover-password.component.ts b/frontend/src/app/feature/auth/recover-password/recover-password.component.ts index 89f5d96..905f200 100644 --- a/frontend/src/app/feature/auth/recover-password/recover-password.component.ts +++ b/frontend/src/app/feature/auth/recover-password/recover-password.component.ts @@ -10,7 +10,7 @@ import { AuthService } from '@service/auth.service'; imports: [CommonModule, ReactiveFormsModule, RouterModule], templateUrl: './recover-password.component.html', }) -export default class RecoverPasswordComponent implements OnInit { +export class RecoverPasswordComponent implements OnInit { emailForm: FormGroup; resetPasswordForm: FormGroup; errorMessage = signal(''); diff --git a/frontend/src/app/feature/auth/verify-email/verify-email.component.ts b/frontend/src/app/feature/auth/verify-email/verify-email.component.ts index 54f4c2f..6e04877 100644 --- a/frontend/src/app/feature/auth/verify-email/verify-email.component.ts +++ b/frontend/src/app/feature/auth/verify-email/verify-email.component.ts @@ -7,7 +7,7 @@ import { AuthService } from '@service/auth.service'; imports: [], templateUrl: './verify-email.component.html', }) -export default class VerifyEmailComponent implements OnInit { +export class VerifyEmailComponent implements OnInit { route: ActivatedRoute = inject(ActivatedRoute); router: Router = inject(Router); authService: AuthService = inject(AuthService); diff --git a/frontend/src/app/feature/game/dice/dice.component.ts b/frontend/src/app/feature/game/dice/dice.component.ts index b4ced3f..fe50cf6 100644 --- a/frontend/src/app/feature/game/dice/dice.component.ts +++ b/frontend/src/app/feature/game/dice/dice.component.ts @@ -24,7 +24,7 @@ type DiceFormGroup = FormGroup<{ imports: [CommonModule, ReactiveFormsModule], templateUrl: './dice.component.html', }) -export default class DiceComponent implements OnInit { +export class DiceComponent implements OnInit { private readonly formBuilder = inject(FormBuilder); private readonly diceService = inject(DiceService); private readonly userService = inject(UserService); diff --git a/frontend/src/app/feature/landing/landing.component.ts b/frontend/src/app/feature/landing/landing.component.ts index d354fa4..aa1867e 100644 --- a/frontend/src/app/feature/landing/landing.component.ts +++ b/frontend/src/app/feature/landing/landing.component.ts @@ -11,8 +11,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router'; import { AuthService } from '@service/auth.service'; import { LoginComponent } from '../auth/login/login.component'; import { RegisterComponent } from '../auth/register/register.component'; -import '../auth/recover-password/recover-password.component'; -import RecoverPasswordComponent from '../auth/recover-password/recover-password.component'; +import { RecoverPasswordComponent } from '../auth/recover-password/recover-password.component'; @Component({ selector: 'app-landing-page',