font fix

21 hours ago · 9a058a64b0
5 changed files with 95 additions and 65 deletions
--- 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,
--- 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(`<p>${player.name}</p>`);
    }

    //проверяем фильтр выбора команды
--- a/src/app/pages/servers-page/server-player-viewer.ts
+++ 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: `
+    <div class="container responsive-grid-100">
+      <mat-card>
+        <mat-card-title>{{player.score}}</mat-card-title>
+        <mat-card-subtitle>очков набрано</mat-card-subtitle>
+      </mat-card>
+      <mat-card>
+        <mat-card-title>{{player.deads}}</mat-card-title>
+        <mat-card-subtitle>смертей</mat-card-subtitle>
+      </mat-card>
+      <mat-card>
+        <mat-card-title>{{player.ping}}</mat-card-title>
+        <mat-card-subtitle>пинг игрока</mat-card-subtitle>
+      </mat-card>
+      <mat-card>
+        <mat-card-title>{{player.loss}}</mat-card-title>
+        <mat-card-subtitle>потери пакетов</mat-card-subtitle>
+      </mat-card>
+      <mat-card *ngIf="player.clz != null">
+        <mat-card-title>{{tf2data.TFClassType[player.clz]}}</mat-card-title>
+        <mat-card-subtitle>на сервере</mat-card-subtitle>
+      </mat-card>
+      <mat-card *ngIf="player.team != null">
+        <mat-card-title>{{tf2data.TFTeam[player.team]}}</mat-card-title>
+        <mat-card-subtitle>команда</mat-card-subtitle>
+      </mat-card>
+    </div>
+    <div class="container responsive-grid-250">
+      <mat-card>
+        <mat-card-content>
+          <p *ngIf="player.steam.steam2"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam2, true)">{{player.steam.steam2}}</p>
+          <p *ngIf="player.steam.steam3"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam3, true)">{{player.steam.steam3}}</p>
+          <p *ngIf="player.steam.steam64"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam64, true)">{{player.steam.steam64}}</p>
+        </mat-card-content>
+      </mat-card>
+      <mat-card class="clickable"
+                *ngIf="player.steam.steam64 != null"
+                (click)="authService.isAuth()?actionService.goToUrlViaRouter(['profile', player.steam.steam64]):actionService.showSnack('Сначала нужно войти на сайте')">
+        <mat-card-title>Открыть профиль</mat-card-title>
+        <mat-card-subtitle>на сайте</mat-card-subtitle>
+      </mat-card>
+      <mat-card class="clickable"
+                (click)="actionService.goToUrlViaTab(player.steam.community_url)">
+        <mat-card-title >Открыть профиль</mat-card-title>
+        <mat-card-subtitle>в стиме</mat-card-subtitle>
+      </mat-card>
+      <mat-card class="clickable"
+                (click)="authService.isAuth()?actionService.simpleAction(player.steam, 'report'):actionService.showSnack('Сначала нужно войти на сайте')">
+        <mat-card-title>Пожаловаться</mat-card-title>
+        <mat-card-subtitle>на игрока который играет</mat-card-subtitle>
+      </mat-card>
+    </div>
+    <div class="container responsive-grid-300" *ngIf="authService.isModerator()">
+      <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'ban')">
+        <mat-card-title>Забанить</mat-card-title>
+      </mat-card>
+      <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'kick')">
+        <mat-card-title>Кикнуть</mat-card-title>
+      </mat-card>
+      <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'mute')">
+        <mat-card-title>Кинуть в мут</mat-card-title>
+      </mat-card>
+    </div>
+  `
+})
+export class ServerPlayerViewer {
+
+  @Input("player")
+  player!: Player;
+
+  constructor(public actionService: ActionService,
+              public authService: AuthService,
+              public tf2data: Tf2dataService) {
+  }
+}
--- 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}}
                </mat-panel-description>
              </mat-expansion-panel-header>
-              <div class="container responsive-grid-100">
-                <mat-card>
-                  <mat-card-title>{{player.score}}</mat-card-title>
-                  <mat-card-subtitle>очков набрано</mat-card-subtitle>
-                </mat-card>
-                <mat-card>
-                  <mat-card-title>{{player.deads}}</mat-card-title>
-                  <mat-card-subtitle>смертей</mat-card-subtitle>
-                </mat-card>
-                <mat-card>
-                  <mat-card-title>{{player.ping}}</mat-card-title>
-                  <mat-card-subtitle>пинг игрока</mat-card-subtitle>
-                </mat-card>
-                <mat-card>
-                  <mat-card-title>{{player.loss}}</mat-card-title>
-                  <mat-card-subtitle>потери пакетов</mat-card-subtitle>
-                </mat-card>
-                <mat-card *ngIf="player.clz != null">
-                  <mat-card-title>{{tf2data.TFClassType[player.clz]}}</mat-card-title>
-                  <mat-card-subtitle>на сервере</mat-card-subtitle>
-                </mat-card>
-                <mat-card *ngIf="player.team != null">
-                  <mat-card-title>{{tf2data.TFTeam[player.team]}}</mat-card-title>
-                  <mat-card-subtitle>команда</mat-card-subtitle>
-                </mat-card>
-              </div>
-              <div class="container responsive-grid-250">
-                <mat-card>
-                  <mat-card-content>
-                    <p *ngIf="player.steam.steam2"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam2, true)">{{player.steam.steam2}}</p>
-                    <p *ngIf="player.steam.steam3"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam3, true)">{{player.steam.steam3}}</p>
-                    <p *ngIf="player.steam.steam64"  class="clickable" (click)="actionService.copyToClipboard(player.steam.steam64, true)">{{player.steam.steam64}}</p>
-                  </mat-card-content>
-                </mat-card>
-                <mat-card class="clickable"
-                  *ngIf="player.steam.steam64 != null"
-                  (click)="authService.isAuth()?actionService.goToUrlViaRouter(['profile', player.steam.steam64]):actionService.showSnack('Сначала нужно войти на сайте')">
-                  <mat-card-title>Открыть профиль</mat-card-title>
-                  <mat-card-subtitle>на сайте</mat-card-subtitle>
-                </mat-card>
-                <mat-card class="clickable"
-                          (click)="actionService.goToUrlViaTab(player.steam.community_url)">
-                  <mat-card-title >Открыть профиль</mat-card-title>
-                  <mat-card-subtitle>в стиме</mat-card-subtitle>
-                </mat-card>
-                <mat-card class="clickable"
-                          (click)="authService.isAuth()?actionService.simpleAction(player.steam, 'report'):actionService.showSnack('Сначала нужно войти на сайте')">
-                  <mat-card-title>Пожаловаться</mat-card-title>
-                  <mat-card-subtitle>на игрока который играет</mat-card-subtitle>
-                </mat-card>
-              </div>
-              <div class="container responsive-grid-300" *ngIf="authService.isModerator()">
-                <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'ban')">
-                  <mat-card-title>Забанить</mat-card-title>
-                </mat-card>
-                <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'kick')">
-                  <mat-card-title>Кикнуть</mat-card-title>
-                </mat-card>
-                <mat-card class="clickable" (click)="actionService.simpleAction(player.steam, 'mute')">
-                  <mat-card-title>Кинуть в мут</mat-card-title>
-                </mat-card>
-              </div>
+              <app-server-player-viewer [player]="player"></app-server-player-viewer>
            </mat-expansion-panel>
          </mat-expansion-panel>
        </div>
--- 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 {