diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 38deca5..af205e7 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -82,6 +82,7 @@ import {FilesUploader} from "./admin-pages/files-page/FilesUploader";
import {AuthDialogRequest} from "./pages/internal-components/dialogs/AuthDialogRequest";
import {SimpleActionDialog} from "./pages/internal-components/dialogs/simple-action-dialog.component";
import {MatTooltipModule} from "@angular/material/tooltip";
+import {ServerPlayerViewer} from "./pages/servers-page/server-player-viewer";
registerLocaleData(localeRu, "ru")
@@ -132,7 +133,8 @@ registerLocaleData(localeRu, "ru")
ReportsPageComponent,
AdminMainPageComponent,
FilesPageComponent,
- FilesUploader
+ FilesUploader,
+ ServerPlayerViewer
],
imports: [
BrowserModule,
diff --git a/src/app/pages/servers-page/livetime-server-map.ts b/src/app/pages/servers-page/livetime-server-map.ts
index 00b9f76..c9ad11a 100644
--- a/src/app/pages/servers-page/livetime-server-map.ts
+++ b/src/app/pages/servers-page/livetime-server-map.ts
@@ -151,6 +151,7 @@ export class LivetimeServerMap implements AfterViewInit {
};
this.markers[id].marker.addTo(this.map);
this.markers[id].marker.setIcon(this.getPlayerEmblem(player));
+ this.markers[id].marker.bindPopup(`${player.name}
`);
}
//проверяем фильтр выбора команды
diff --git a/src/app/pages/servers-page/server-player-viewer.ts b/src/app/pages/servers-page/server-player-viewer.ts
new file mode 100644
index 0000000..5c7239a
--- /dev/null
+++ b/src/app/pages/servers-page/server-player-viewer.ts
@@ -0,0 +1,83 @@
+import {Component, Input} from "@angular/core";
+import {ActionService} from "../../services/action.service";
+import {AuthService} from "../../services/auth.service";
+import {Player} from "../../entities/servers/Player";
+import {Tf2dataService} from "../../services/tf2data.service";
+
+@Component({
+ selector: 'app-server-player-viewer',
+ template: `
+
+
+ {{player.score}}
+ очков набрано
+
+
+ {{player.deads}}
+ смертей
+
+
+ {{player.ping}}
+ пинг игрока
+
+
+ {{player.loss}}
+ потери пакетов
+
+
+ {{tf2data.TFClassType[player.clz]}}
+ на сервере
+
+
+ {{tf2data.TFTeam[player.team]}}
+ команда
+
+
+
+
+
+ {{player.steam.steam2}}
+ {{player.steam.steam3}}
+ {{player.steam.steam64}}
+
+
+
+ Открыть профиль
+ на сайте
+
+
+ Открыть профиль
+ в стиме
+
+
+ Пожаловаться
+ на игрока который играет
+
+
+
+ Забанить
+
+
+ Кикнуть
+
+
+ Кинуть в мут
+
+
+ `
+})
+export class ServerPlayerViewer {
+
+ @Input("player")
+ player!: Player;
+
+ constructor(public actionService: ActionService,
+ public authService: AuthService,
+ public tf2data: Tf2dataService) {
+ }
+}
diff --git a/src/app/pages/servers-page/servers-page.component.html b/src/app/pages/servers-page/servers-page.component.html
index d6bc57f..86e9fc0 100644
--- a/src/app/pages/servers-page/servers-page.component.html
+++ b/src/app/pages/servers-page/servers-page.component.html
@@ -100,68 +100,7 @@
{{player.score}} / {{player.deads}} / {{player.duration}}
-
-
- {{player.score}}
- очков набрано
-
-
- {{player.deads}}
- смертей
-
-
- {{player.ping}}
- пинг игрока
-
-
- {{player.loss}}
- потери пакетов
-
-
- {{tf2data.TFClassType[player.clz]}}
- на сервере
-
-
- {{tf2data.TFTeam[player.team]}}
- команда
-
-
-
-
-
- {{player.steam.steam2}}
- {{player.steam.steam3}}
- {{player.steam.steam64}}
-
-
-
- Открыть профиль
- на сайте
-
-
- Открыть профиль
- в стиме
-
-
- Пожаловаться
- на игрока который играет
-
-
-
- Забанить
-
-
- Кикнуть
-
-
- Кинуть в мут
-
-
+
diff --git a/src/styles.scss b/src/styles.scss
index 117d752..ce66b3b 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -50,6 +50,11 @@ $f13_ang_web-theme: mat.define-light-theme((
src: url('assets/fonts/Lato-Thin.ttf') format('truetype');
}
+@font-face {
+ font-family: LatoRegular;
+ src: url('assets/fonts/Lato-Regular.ttf') format('truetype');
+}
+
html, body { height: 100%; }
body { margin: 0; font-family: Lato, Roboto, "Helvetica Neue", sans-serif; }
@@ -60,7 +65,7 @@ h1,h2,h3,h4,h5,h6 {
}
span {
- font-family: LatoThin, Roboto, "Helvetica Neue", sans-serif;
+ font-family: LatoRegular, Roboto, "Helvetica Neue", sans-serif;
}
.lato {
@@ -68,7 +73,7 @@ span {
}
.mat-card-subtitle, mat-card-content {
- font-family: LatoThin, Roboto, "Helvetica Neue", sans-serif;
+ font-family: LatoRegular, Roboto, "Helvetica Neue", sans-serif;
}
.spacer {