+
diff --git a/src/app/core/http/admin-game-http.service.ts b/src/app/core/http/admin-game-http.service.ts
index 1f3cbfa..b6b8426 100644
--- a/src/app/core/http/admin-game-http.service.ts
+++ b/src/app/core/http/admin-game-http.service.ts
@@ -17,12 +17,17 @@ export class AdminGameHttpService {
constructor(private http: HttpClient) {}
- search(query: string, showDisabled: boolean, page?: number, limit?: number): Observable
{
- return this.http.get(`${this.apiEndpoint}/admin/games`, {
+ search(
+ form: { query: string; showDisabled: boolean; onlyShowWithoutMusics: boolean },
+ skip?: number,
+ limit?: number
+ ): Observable> {
+ return this.http.get>(`${this.apiEndpoint}/admin/games`, {
params: {
- query: query,
- ...(showDisabled && { showDisabled: 'true' }),
- ...(page && { page }),
+ query: form.query,
+ ...(form.showDisabled && { showDisabled: 'true' }),
+ ...(form.onlyShowWithoutMusics && { onlyShowWithoutMusics: 'true' }),
+ ...(skip && { skip }),
...(limit && { limit }),
},
})
diff --git a/src/app/core/http/game-http.service.ts b/src/app/core/http/game-http.service.ts
index c8d8548..f28a534 100644
--- a/src/app/core/http/game-http.service.ts
+++ b/src/app/core/http/game-http.service.ts
@@ -12,12 +12,16 @@ export class GameHttpService {
constructor(private http: HttpClient) {}
- search(query: string, myGames: boolean, page?: number, limit?: number): Observable {
- return this.http.get(`${this.apiEndpoint}/games`, {
+ search(
+ form: { query: string; myGames: boolean },
+ skip?: number,
+ limit?: number
+ ): Observable> {
+ return this.http.get>(`${this.apiEndpoint}/games`, {
params: {
- query: query,
- ...(myGames && { filterByUser: 'true' }),
- ...(page && { page }),
+ query: form.query,
+ ...(form.myGames && { filterByUser: 'true' }),
+ ...(skip && { skip }),
...(limit && { limit }),
},
})
diff --git a/src/app/modules/admin/modules/games/components/game-search/game-search.component.html b/src/app/modules/admin/modules/games/components/game-search/game-search.component.html
index 5f9c2bb..ec6e84a 100644
--- a/src/app/modules/admin/modules/games/components/game-search/game-search.component.html
+++ b/src/app/modules/admin/modules/games/components/game-search/game-search.component.html
@@ -1,31 +1,32 @@
{{ gamesCount }} games
-
-
-
-
-
-
+
-
-
-
+
@@ -34,19 +35,7 @@
{{ gamesCount }} games
-
-
+
diff --git a/src/app/modules/admin/modules/games/components/game-search/game-search.component.ts b/src/app/modules/admin/modules/games/components/game-search/game-search.component.ts
index 9827542..2ab8740 100644
--- a/src/app/modules/admin/modules/games/components/game-search/game-search.component.ts
+++ b/src/app/modules/admin/modules/games/components/game-search/game-search.component.ts
@@ -1,36 +1,66 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, forwardRef, OnInit } from '@angular/core'
import { Game } from '../../../../../../shared/models/game'
-import { Subscription } from 'rxjs'
-import { finalize } from 'rxjs/operators'
+import { debounceTime, Subscription } from 'rxjs'
import { ImportGameDialogComponent } from './import-game-dialog/import-game-dialog.component'
import { MatDialog } from '@angular/material/dialog'
-import {AdminGameHttpService} from "../../../../../../core/http/admin-game-http.service";
+import { AdminGameHttpService } from '../../../../../../core/http/admin-game-http.service'
+import { FormControl, FormGroup, Validators } from '@angular/forms'
+import { finalize } from 'rxjs/operators'
+import { ParentComponent } from '../../../../../../shared/interfaces/parent.interface'
+import { ActivatedRoute, Params, Router } from '@angular/router'
@Component({
selector: 'app-game-search',
templateUrl: './game-search.component.html',
+ providers: [{ provide: ParentComponent, useExisting: forwardRef(() => GameSearchComponent) }],
})
-export class GameSearchComponent implements OnInit {
- games: Game[] = []
+export class GameSearchComponent implements OnInit, ParentComponent {
+ name = 'xd'
+ games: Game
[] = []
gamesCount: number
query = ''
showDisabled = false
+ onlyShowWithoutMusics = false
http: Subscription
loading = false
+ form: FormGroup
- constructor(private adminGameHttpService: AdminGameHttpService, public dialog: MatDialog) {}
+ constructor(
+ private adminGameHttpService: AdminGameHttpService,
+ public dialog: MatDialog,
+ private router: Router,
+ private activatedRoute: ActivatedRoute
+ ) {}
ngOnInit(): void {
- this.search()
+ this.activatedRoute.queryParamMap
+ .subscribe((params) => {
+ this.form = new FormGroup({
+ query: new FormControl(params.get('query') ?? '', Validators.required.bind(this)),
+ showDisabled: new FormControl(params.get('showDisabled') === 'true'),
+ onlyShowWithoutMusics: new FormControl(params.get('onlyShowWithoutMusics') === 'true'),
+ })
+ this.search()
+ })
+ .unsubscribe()
+ this.form.valueChanges.pipe(debounceTime(250)).subscribe(() => {
+ this.search()
+ const queryParams: Params = this.form.value
+
+ void this.router.navigate([], {
+ relativeTo: this.activatedRoute,
+ queryParams: queryParams,
+ replaceUrl: true,
+ })
+ })
}
search(): void {
- if (this.http) {
- this.http.unsubscribe()
- }
+ console.log('??')
+ console.log(this.form.value)
this.loading = true
this.http = this.adminGameHttpService
- .search(this.query, this.showDisabled)
+ .search(this.form.value, 0, 24)
.pipe(finalize(() => (this.loading = false)))
.subscribe((res) => {
this.gamesCount = res.count
@@ -38,15 +68,19 @@ export class GameSearchComponent implements OnInit {
})
}
+ onScrollDown() {
+ this.http = this.adminGameHttpService
+ .search(this.form.value, this.games.length, 24)
+ .pipe(finalize(() => (this.loading = false)))
+ .subscribe((res) => {
+ this.games = [...this.games, ...res.data]
+ })
+ }
+
openImportDialog(): void {
const dialogRef = this.dialog.open(ImportGameDialogComponent)
dialogRef.afterClosed().subscribe(() => {
this.search()
})
}
-
- toggleShowDisabled(): void {
- this.showDisabled = !this.showDisabled
- this.search()
- }
}
diff --git a/src/app/modules/admin/modules/games/components/game-search/import-game-dialog/import-game-dialog.component.html b/src/app/modules/admin/modules/games/components/game-search/import-game-dialog/import-game-dialog.component.html
index a46a239..0f7ce2d 100644
--- a/src/app/modules/admin/modules/games/components/game-search/import-game-dialog/import-game-dialog.component.html
+++ b/src/app/modules/admin/modules/games/components/game-search/import-game-dialog/import-game-dialog.component.html
@@ -26,7 +26,7 @@ Import a game
-