-
-
-
-
-
-
- #{{ban.id}} {{ban.player_name}}
-
-
- {{ban.timestamp | date:'dd/MM/YYYY hh:mm:ss'}}
-
-
- А хуй знает я еще не приудмал
-
-
+
+
+
+
+ Искать по...
+
+
+
+
+
+
+
+
+
+ Обновить
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Слишком много запросов или сервер не отвечает, обнови страницу.
+
+
+
+
+
+
+ | ID бана |
+ {{row.id}}
+ |
+
+
+ Имя игрока |
+ {{row.player_name}}
+
+
+
+ |
+
+
+ Время |
+ {{row.timestamp | date:"HH:mm dd/MM/yyyy"}}
+
+
+
+ |
+
+
+ Причина |
+ {{row.ban_reason}} |
+
+
+ Модератор |
+ {{row.banned_by}} |
+
+
+ Действие |
+ пук |
+
+
+
+ |
+ |
+
+
+
+
+ | Бан лист пуст |
+
+
+
+
+
+
diff --git a/src/app/pages/banlist-page/banlist-page.component.scss b/src/app/pages/banlist-page/banlist-page.component.scss
index e69de29..10fb7c5 100644
--- a/src/app/pages/banlist-page/banlist-page.component.scss
+++ b/src/app/pages/banlist-page/banlist-page.component.scss
@@ -0,0 +1,20 @@
+.loading-shade {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ background: rgba(0, 0, 0, 0.15);
+ z-index: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.err {
+ max-width: 360px;
+ text-align: center;
+ background: white;
+ border-radius: 15px;
+ border: 0px solid black;
+}
diff --git a/src/app/pages/banlist-page/banlist-page.component.ts b/src/app/pages/banlist-page/banlist-page.component.ts
index dd6176b..1793798 100644
--- a/src/app/pages/banlist-page/banlist-page.component.ts
+++ b/src/app/pages/banlist-page/banlist-page.component.ts
@@ -2,35 +2,63 @@ import { Component, OnInit } from '@angular/core';
import {AuthService} from "../../services/auth.service";
import {BanService} from "../../services/ban.service";
import {Ban} from "../../entities/ban/Ban";
+import {AbstractSearchTable} from "../internal-components/abstract-search-table.component";
+import {BanSearchFilter} from "../../entities/search/BanSearchFilter";
+import {ServerService} from "../../services/server.service";
+import {PlayerService} from "../../services/player.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {MatTableDataSource} from "@angular/material/table";
@Component({
selector: 'app-banlist-page',
templateUrl: './banlist-page.component.html',
styleUrls: ['./banlist-page.component.scss']
})
-export class BanlistPageComponent implements OnInit {
- loading: boolean | null = null;
- bans: Ban[] = [];
- total: number = 0;
+export class BanlistPageComponent extends AbstractSearchTable
{
- constructor(public authService: AuthService,
+ displayedColumns: string[] = ['id', 'player_name', 'date', 'reason', 'admin_name', 'action'];
+ constructor(public override authService: AuthService,
+ protected override serverService: ServerService,
+ protected override playerService: PlayerService,
+ protected override router: Router,
+ protected override route: ActivatedRoute,
private banService: BanService) {
+ super(authService, serverService, playerService, route, router);
+ super.filter = new BanSearchFilter();
}
- ngOnInit(): void {
- if (this.authService.isAuth()) {
- this.getBanList();
- }
- }
-
- getBanList() {
+ private getBanList(): boolean {
+ this.filter.updated = false;
this.loading = true;
- this.banService.getBanList().subscribe(
+ this.banService.getBanList(this.filter, this.paginator).subscribe(
(res) => {
- this.bans = res.data;
- this.total = res.count;
- }, () => {}, () => this.loading = false
+ this.dataSource = new MatTableDataSource(res.data);
+ this.err = false;
+ }, (e) => this.err = true, () => this.loading = false
)
+ return true;
}
+ override updateData() {
+ super.updateData();
+ this.getBanList();
+ }
+
+ addAdminIdToSearch(name: string) {
+ if (this.filter.admin_ids == null)
+ this.filter.admin_ids = [];
+ if (this.filter.admin_ids.indexOf(name) == -1)
+ this.filter.admin_ids.push(name);
+ this.filter.updated = true;
+ }
+
+ removeAdminIdFromSearch(name: string) {
+ if (this.filter.admin_ids == null) return;
+ this.filter.admin_ids = this.filter.admin_ids.filter(v => v !== name);
+ this.filter.updated = true;
+ }
+
+ getCount() {
+ return this.paginator?.length;
+ }
}
diff --git a/src/app/pages/internal-components/abstract-search-table.component.ts b/src/app/pages/internal-components/abstract-search-table.component.ts
index 957a54a..49a5e0c 100644
--- a/src/app/pages/internal-components/abstract-search-table.component.ts
+++ b/src/app/pages/internal-components/abstract-search-table.component.ts
@@ -7,6 +7,8 @@ import {MatSort} from "@angular/material/sort";
import {SearchFilter} from "../../entities/search/SearchFilter";
import {ServerService} from "../../services/server.service";
import {ActivatedRoute, Router} from "@angular/router";
+import {AuthService} from "../../services/auth.service";
+import {PlayerService} from "../../services/player.service";
@Component({template: ''})
export abstract class AbstractSearchTable implements AfterViewInit {
@@ -20,7 +22,9 @@ export abstract class AbstractSearchTable implements A
err: boolean = false;
- protected constructor(protected serverService: ServerService,
+ protected constructor(protected authService: AuthService,
+ protected serverService: ServerService,
+ protected playerService: PlayerService,
protected route: ActivatedRoute,
protected router: Router) {
this.filter = new SearchFilter() as U;
@@ -49,79 +53,17 @@ export abstract class AbstractSearchTable implements A
)
}
- changeAccountToSearch(prev: string, name: any) {
- this.removeAccountFromSearch(prev);
- this.addAccountToSearch(name.target.value);
- this.filter.updated = true;
- }
-
- addAccountToSearch(name: string) {
- if (this.filter.accounts == null)
- this.filter.accounts = [];
- if (this.filter.accounts.indexOf(name) == -1)
- this.filter.accounts.push(name);
- this.filter.updated = true;
- }
-
- removeAccountFromSearch(name: string) {
- if (this.filter.accounts == null) return;
- this.filter.accounts = this.filter.accounts.filter(v => v !== name);
- this.filter.updated = true;
- }
-
- addServerToSearch(server_id: string|null = null) {
- this.filter.serverId = server_id == null ? "%" : server_id;
- if (server_id != null) {
- this.filter.updated = true;
+ searchPlayer(account_id: number) {
+ if (!this.authService.isAuth()) {
+ return;
}
- }
- removeServerFromSearch() {
- this.filter.serverId = null;
- this.filter.updated = true;
- }
-
- getServerName(server_id: string|null) {
- try {
- // @ts-ignore
- return this.serverList.filter(s => s.server_id == server_id).pop().name;
- } catch (e) {
- return "Выбрать сервер";
- }
- }
-
- addBeginTimeToSearch(custom_date: any = null) {
- if (custom_date == null) {
- const d: Date = new Date();
- d.setUTCHours(0, 0, 0, 0);
- this.filter.begin = d;
- }
- else this.filter.begin = new Date(custom_date);
-
- this.filter.updated = true;
- }
-
- removeBeginTimeFromSearch() {
- this.filter.begin = null;
- this.filter.updated = true;
- }
-
- addEndTimeToSearch(custom_date: number|null = null) {
- if (custom_date == null) {
- const d: Date = new Date();
- d.setUTCHours(23, 59, 59, 999);
- this.filter.end = d;
- }
- else this.filter.end = new Date(custom_date);
- this.filter.updated = true;
- }
-
- removeEndTimeFromSearch() {
- this.filter.end = null;
- this.filter.updated = true;
- }
-
- filterChanges(event:any) {
- this.filter.updated = true;
+ this.playerService.searchProfile(`[U:1:${account_id}]`).subscribe(
+ (res) => {
+ if (res.steam64 != null)
+ this.router.navigate(['profile', res.steam64])
+ },
+ (err) => {}
+ )
}
}
diff --git a/src/app/pages/internal-components/search-filters/FilterMatChipBanId.ts b/src/app/pages/internal-components/search-filters/FilterMatChipBanId.ts
new file mode 100644
index 0000000..a293c7d
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/FilterMatChipBanId.ts
@@ -0,0 +1,28 @@
+import {Component, Input} from "@angular/core";
+import {BanSearchFilter} from "../../../entities/search/BanSearchFilter";
+
+@Component({
+ selector: "app-filter-mat-chip-banid",
+ template: `
+
+ Ид: {{acId}}
+
+
+
+ Ид бана без #
+
+
+
+
+
`
+})
+export class FilterMatChipBanId {
+
+ @Input("filter")
+ filter: BanSearchFilter|undefined;
+}
diff --git a/src/app/pages/internal-components/search-filters/FilterMatChipMessage.ts b/src/app/pages/internal-components/search-filters/FilterMatChipMessage.ts
new file mode 100644
index 0000000..f7a3bd9
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/FilterMatChipMessage.ts
@@ -0,0 +1,26 @@
+import {Component, Input} from "@angular/core";
+import {SearchFilter} from "../../../entities/search/SearchFilter";
+import {MessageSearchFilter} from "../../../entities/search/MessageSearchFilter";
+
+@Component({
+ selector: "app-filter-mat-chip-message",
+ template: `
+ Сообщение содержит: {{filter.message}}
+
+
+
+ Сообщение содержит...
+
+
+
+
+ `
+})
+export class FilterMatChipMessage {
+ @Input("filter")
+ filter: MessageSearchFilter|undefined;
+}
diff --git a/src/app/pages/internal-components/search-filters/base/FilterMatChipAccount.ts b/src/app/pages/internal-components/search-filters/base/FilterMatChipAccount.ts
new file mode 100644
index 0000000..d6ecdf8
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/base/FilterMatChipAccount.ts
@@ -0,0 +1,28 @@
+import {Component, Input} from "@angular/core";
+import {SearchFilter} from "../../../../entities/search/SearchFilter";
+
+@Component({
+ selector: "app-filter-mat-chip-account",
+ template: `
+
+ Профиль: {{acId}}
+
+
+
+ Ссылка, имя, все что угодно
+
+
+
+
+
`
+})
+export class FilterMatChipAccount {
+
+ @Input("filter")
+ filter: SearchFilter|undefined;
+}
diff --git a/src/app/pages/internal-components/search-filters/base/FilterMatChipDateBegin.ts b/src/app/pages/internal-components/search-filters/base/FilterMatChipDateBegin.ts
new file mode 100644
index 0000000..937afe1
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/base/FilterMatChipDateBegin.ts
@@ -0,0 +1,29 @@
+import {Component, Input} from "@angular/core";
+import {SearchFilter} from "../../../../entities/search/SearchFilter";
+
+@Component({
+ selector: "app-filter-mat-chip-date-begin",
+ template: `
+
+ Дата после {{filter.begin | date:"HH:mm dd/MM/yyyy"}}
+
+
+
+ Дата после
+
+
+
+ `
+})//todo mb abstract
+export class FilterMatChipDateBegin {
+ @Input("filter")
+ filter: SearchFilter|undefined;
+}
diff --git a/src/app/pages/internal-components/search-filters/base/FilterMatChipDateEnd.ts b/src/app/pages/internal-components/search-filters/base/FilterMatChipDateEnd.ts
new file mode 100644
index 0000000..cbc25e4
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/base/FilterMatChipDateEnd.ts
@@ -0,0 +1,29 @@
+import {Component, Input} from "@angular/core";
+import {SearchFilter} from "../../../../entities/search/SearchFilter";
+
+@Component(
+ { selector: "app-filter-mat-chip-date-end",
+ template: `
+
+ Дата до {{filter.end | date:"HH:mm dd/MM/yyyy"}}
+
+
+
+ Дата после
+
+
+
+ `}
+)
+export class FilterMatChipDateEnd {
+ @Input("filter")
+ filter: SearchFilter|undefined;
+}
diff --git a/src/app/pages/internal-components/search-filters/base/FilterMatChipServer.ts b/src/app/pages/internal-components/search-filters/base/FilterMatChipServer.ts
new file mode 100644
index 0000000..e39d9a8
--- /dev/null
+++ b/src/app/pages/internal-components/search-filters/base/FilterMatChipServer.ts
@@ -0,0 +1,34 @@
+import {Component, Input} from "@angular/core";
+import {SearchFilter} from "../../../../entities/search/SearchFilter";
+
+@Component({
+ selector: "app-filter-mat-chip-server",
+ template: `
+
+ {{getServerName?getServerName(filter.serverId):filter.serverId}}
+
+
+
+
+
+ `
+})
+export class FilterMatChipServer {
+ @Input("filter")
+ filter: SearchFilter|undefined;
+
+ @Input("serverList")
+ serverList:{name: string, server_id: string }[] = []
+
+ getServerName(server_id: string|null) {
+ try {
+ // @ts-ignore
+ return this.serverList.filter(s => s.server_id == server_id).pop().name;
+ } catch (e) {
+ return "Выбрать сервер";
+ }
+ }
+}
diff --git a/src/app/pages/messages-page/messages-page.component.html b/src/app/pages/messages-page/messages-page.component.html
index 7e8a96d..08d22a6 100644
--- a/src/app/pages/messages-page/messages-page.component.html
+++ b/src/app/pages/messages-page/messages-page.component.html
@@ -11,95 +11,33 @@
Искать по...
-
+
-
-
+
+
-
-
+
+
Обновить
-
- Профиль: {{acId}}
-
-
-
- Ссылка, имя, все что угодно
-
-
-
-
-
- Сообщение содержит: {{filter.message}}
-
-
-
- Сообщение содержит...
-
-
-
-
-
-
- {{getServerName(filter.serverId)}}
-
-
-
-
-
-
-
- Дата после {{filter.begin | date:"HH:mm dd/MM/yyyy"}}
-
-
-
- Дата после
-
-
-
-
-
-
- Дата до {{filter.end | date:"HH:mm dd/MM/yyyy"}}
-
-
-
- Дата после
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -109,6 +47,8 @@
Слишком много запросов или сервер не отвечает, обнови страницу.
+
+
@@ -116,7 +56,7 @@
| Игрок |
{{row.account_name}}
-
+
|
@@ -125,8 +65,8 @@
Дата |
{{row.utime*1000 | date:"HH:mm:ss dd/MM/yyyy"}}
-
-
+
+
|
@@ -135,7 +75,7 @@
Сообщение |
{{row.message}}
-
+
|
@@ -143,7 +83,7 @@
Сервер |
{{row.serverName}}
-
+
|
diff --git a/src/app/pages/messages-page/messages-page.component.ts b/src/app/pages/messages-page/messages-page.component.ts
index 433ec05..116e5eb 100644
--- a/src/app/pages/messages-page/messages-page.component.ts
+++ b/src/app/pages/messages-page/messages-page.component.ts
@@ -21,13 +21,13 @@ export class MessagesPageComponent extends AbstractSearchTable {
- if (res.steam64 != null)
- this.router.navigate(['profile', res.steam64])
- },
- (err) => {}
- )
- }
}
diff --git a/src/app/services/ban.service.ts b/src/app/services/ban.service.ts
index 1654a96..060ffdc 100644
--- a/src/app/services/ban.service.ts
+++ b/src/app/services/ban.service.ts
@@ -3,6 +3,9 @@ import {HttpClient} from "@angular/common/http";
import {ShityPaginator} from "../entities/ShityPaginator";
import {Ban} from "../entities/ban/Ban";
import {map, Observable} from "rxjs";
+import {BanSearchFilter} from "../entities/search/BanSearchFilter";
+import {MatPaginator} from "@angular/material/paginator";
+import {PagingAndSortingPaginator} from "../entities/PagingAndSortingPaginator";
@Injectable({
providedIn: 'root'
@@ -11,9 +14,11 @@ export class BanService {
constructor(private http: HttpClient) { }
- getBanList(): Observable> {
- return this.http.get("api/web/banlist").pipe(
- map((res) => ShityPaginator.newObj().fromData(res, "bans"))
- )
+ getBanList(filters: BanSearchFilter, paginator: MatPaginator | undefined) {
+ return this.http.post(`api/web/banlist`,
+ filters,
+ {params: {size: paginator?paginator.pageSize:20, page: paginator?paginator.pageIndex:0}}).pipe(
+ map((res) => PagingAndSortingPaginator.newObj().fromData(res).updatePaginator(paginator))
+ );
}
}
diff --git a/src/app/services/message.service.ts b/src/app/services/message.service.ts
index 4afde67..9c4b42c 100644
--- a/src/app/services/message.service.ts
+++ b/src/app/services/message.service.ts
@@ -4,7 +4,7 @@ import {MatPaginator} from "@angular/material/paginator";
import {map} from "rxjs";
import {PagingAndSortingPaginator} from "../entities/PagingAndSortingPaginator";
import {Message} from "../entities/profile/Message";
-import {SearchFilter} from "../entities/search/SearchFilter";
+import {MessageSearchFilter} from "../entities/search/MessageSearchFilter";
@Injectable({
providedIn: 'root'
@@ -13,12 +13,12 @@ export class MessageService {
constructor(private http: HttpClient) { }
- getMessages(filters: SearchFilter, paginator: MatPaginator | undefined) {
+ getMessages(filters: MessageSearchFilter, paginator: MatPaginator | undefined) {
return this.http.post(
`/api/profile/messages/pages`,
filters,
{params: {size: paginator?paginator.pageSize:20, page: paginator?paginator.pageIndex:0}}).pipe(
- (map((res) => PagingAndSortingPaginator.newObj().fromData(res).updatePaginator(paginator)))
+ map((res) => PagingAndSortingPaginator.newObj().fromData(res).updatePaginator(paginator))
);
}
}