Merge pull request #12 from deniskond/feature/gh-11

DFWC integration

package.json

@@ -27,6 +27,7 @@
     "@ngrx/store": "^7.2.0",
     "chart.js": "^2.8.0",
     "core-js": "^2.4.1",
+    "html-entities": "^1.2.1",
     "less": "^3.9.0",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",

src/app/components/player-cell/player-cell.component.html

@@ -1,4 +1,5 @@
-<div mat-ripple
+<div *ngIf="playerId"
+    mat-ripple
     [@hoveredCell]="getHoveredState()"
     (mouseenter)="darkenPlayerRow()" 
     (mouseleave)="lightenPlayerRow()" 
@@ -7,4 +8,9 @@
 
     <app-flag [country]="country" [class.light]="style === playerCellStyles.TRANSPARENT" class="flag"></app-flag>
     <div [class.light]="style === playerCellStyles.TRANSPARENT" class="player-nick">{{ nick }}</div>
-</div>  
+</div>
+
+<div *ngIf="!playerId" class="player-nick-container no-hover">
+    <app-flag [country]="country" [class.light]="style === playerCellStyles.TRANSPARENT" class="flag"></app-flag>
+    <div [class.light]="style === playerCellStyles.TRANSPARENT" class="player-nick">{{ nick }}</div>
+</div>

src/app/components/player-cell/player-cell.component.less

@@ -15,6 +15,10 @@
     font-family: inherit;
     letter-spacing: inherit;
 
+    &.no-hover {
+        cursor: default;
+    }
+
     .flag {
         margin-left: 8px;
 

src/app/components/player-cell/player-cell.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
 import {
     hoverableCellAnimation,
     HOVERABLE_CELL_HOVERED_STATE,
@@ -14,6 +14,7 @@ import { PlayerCellStyles } from './enums/player-cell-styles.enum';
     templateUrl: './player-cell.component.html',
     styleUrls: ['./player-cell.component.less'],
     animations: [hoverableCellAnimation],
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PlayerCellComponent {
     @Input() country: string;
@@ -43,6 +44,8 @@ export class PlayerCellComponent {
     }
 
     public navigateToPlayerProfile(playerId: string): void {
-        this.router.navigate([`/profile/${playerId}`]);
+        if (playerId) {
+            this.router.navigate([`/profile/${playerId}`]);
+        }
     }
 }

src/app/enums/news-types.enum.ts

@@ -5,4 +5,5 @@ export enum NewsTypes {
     ONLINE_RESULTS = 'online_results',
     MULTICUP_RESULTS = 'multicup_results',
     SIMPLE = 'text',
+    DFWC_RESULTS = 'dfwc_round_results',
 }

src/app/interfaces/cup.interface.ts

@@ -29,6 +29,6 @@ export interface CupInterface {
     type: string;
     useTwoServers: string;
     youtube: string;
-    customMap: string;
-    customNews: string;
+    customMap?: string;
+    customNews?: string;
 }

src/app/interfaces/valid-demo.interface.ts

@@ -10,4 +10,6 @@ export interface ValidDemoInterface {
     rating: string;
     row: string;
     time: string;
+    isPreliminaryResult?: boolean;
+    absoluteLink?: boolean;
 }

src/app/pages/dfwc2019/dfwc2019.page.html

@@ -0,0 +1,62 @@
+<div class="shadowed-main-block">
+    <h1 class="h1-block-header">DFWC 2019 Results</h1>
+
+    <div style="display: flex;">
+        <div style="flex-grow:1;margin-right:20px;">
+            <div class="physics-header">
+                VQ3
+            </div>
+            <div class="cup-results-row">
+                <div class="place-column">#</div>
+                <div class="player-column">Player</div>
+                <div class="points-column">Points</div>
+                <div class="rating-column">Rating</div>
+            </div>
+            <div *ngFor="let result of vq3TableWithChange; let i = index" class="cup-results-row">
+                <div class="place-column">
+                    <app-player-place [place]="result.place"></app-player-place>
+                </div>
+                <div class="player-column">
+                    <app-player-cell
+                        [class.transparent]="!result.playerId"
+                        [country]="result.country" 
+                        [nick]="result.nick"
+                        [playerId]="result.playerId">
+                    </app-player-cell>
+                </div>
+                <div class="points-column">{{ result.points }}</div>
+                <div class="rating-column">
+                    <app-rating-change [change]="result.change" [zeroIfNull]="false"></app-rating-change>
+                </div>
+            </div>
+        </div>
+        <div style="flex-grow:1;">
+            <div class="physics-header">
+                CPM
+            </div>
+            <div class="cup-results-row">
+                <div class="place-column">#</div>
+                <div class="player-column">Player</div>
+                <div class="points-column">Points</div>
+                <div class="rating-column">Rating</div>
+            </div>
+            <div *ngFor="let result of cpmTableWithChange; let i = index" class="cup-results-row">
+                <div class="place-column">
+                    <app-player-place [place]="i + 1"></app-player-place>
+                </div>
+                <div class="player-column">
+                    <app-player-cell
+                        [class.transparent]="!result.playerId"
+                        [country]="result.country" 
+                        [nick]="result.nick"
+                        [playerId]="result.playerId">
+                    </app-player-cell>
+                </div>
+                <div class="points-column">{{ result.points }}</div>
+                <div class="rating-column">
+                    <app-rating-change [change]="result.change" [zeroIfNull]="false"></app-rating-change>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/app/pages/dfwc2019/dfwc2019.page.less

@@ -0,0 +1,54 @@
+.physics-header {
+    text-transform: uppercase;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #eeeeee;
+    border: 1px solid #cccccc;
+    height: 32px;
+}
+
+.cup-results-row {
+    display: flex;
+    height: 32px;
+    border: 1px solid #ccc;
+    border-top: 0px;
+
+    .place-column {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 32px;
+        border-right: 1px solid #ccc;
+    }
+
+    .player-column {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-grow: 1;
+        border-right: 1px solid #ccc;
+        position: relative;
+    }
+
+    .points-column {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 80px;
+        border-right: 1px solid #ccc;
+    }
+
+    .rating-column {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 80px;
+        position: relative;
+    }
+}
+
+.transparent {
+    opacity: 0.5;
+}

src/app/pages/dfwc2019/dfwc2019.page.module.ts

@@ -0,0 +1,18 @@
+import { SharedModule } from '../../modules/shared.module';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule, Routes } from '@angular/router';
+import { Dfwc2019PageComponent } from './dfwc2019.page';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: Dfwc2019PageComponent,
+    },
+];
+
+@NgModule({
+    declarations: [Dfwc2019PageComponent],
+    imports: [SharedModule, CommonModule, RouterModule.forChild(routes)],
+})
+export class Dfwc2019PageModule {}

src/app/pages/dfwc2019/dfwc2019.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Dfwc2019PageComponent } from './dfwc2019.page';
+import { Dfwc2019PageModule } from './dfwc2019.page.module';
+
+describe('Dfwc2019PageComponent', () => {
+    let component: Dfwc2019PageComponent;
+    let fixture: ComponentFixture<Dfwc2019PageComponent>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [Dfwc2019PageModule],
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(Dfwc2019PageComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});

src/app/pages/dfwc2019/dfwc2019.page.ts

@@ -0,0 +1,31 @@
+import { LanguageService } from '../../services/language/language.service';
+import { Translations } from '../../components/translations/translations.component';
+import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import { DfwcResultInterface } from './interfaces/dfwc-result.interface';
+import { MAX_DFWC_RATING, vq3Table, cpmTable } from './constants/results.constants';
+
+@Component({
+    templateUrl: './dfwc2019.page.html',
+    styleUrls: ['./dfwc2019.page.less'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class Dfwc2019PageComponent extends Translations implements OnInit {
+    public vq3TableWithChange: DfwcResultInterface[];
+    public cpmTableWithChange: DfwcResultInterface[];
+
+    constructor(protected languageService: LanguageService) {
+        super(languageService);
+    }
+
+    ngOnInit(): void {
+        this.vq3TableWithChange = vq3Table.map((result: DfwcResultInterface) => ({
+            ...result,
+            change: Math.round((MAX_DFWC_RATING * result.points) / vq3Table[0].points),
+        }));
+
+        this.cpmTableWithChange = cpmTable.map((result: DfwcResultInterface) => ({
+            ...result,
+            change: Math.round((MAX_DFWC_RATING * result.points) / cpmTable[0].points),
+        }));
+    }
+}

src/app/pages/dfwc2019/interfaces/dfwc-result.interface.ts

@@ -0,0 +1,8 @@
+export interface DfwcResultInterface {
+    place: number;
+    country: string;
+    nick: string;
+    points: number;
+    playerId?: number;
+    change?: number;
+}

src/app/pages/main/components/news-dfwc-results/dto/dfwc-results.dto.ts

@@ -0,0 +1,6 @@
+import { DfwcSingleResultDtoInterface } from './dfwc-single-result.dto';
+
+export interface DfwcResultsDtoInterface {
+    vq3: Record<string, DfwcSingleResultDtoInterface>;
+    cpm: Record<string, DfwcSingleResultDtoInterface>;
+}

src/app/pages/main/components/news-dfwc-results/dto/dfwc-single-result.dto.ts

@@ -0,0 +1,12 @@
+export interface DfwcSingleResultDtoInterface {
+    rank: string;
+    flag: string;
+    name: string;
+    demo: string;
+    time: string;
+    points: string;
+    pid: string;
+    ref_id: string;
+    time_ms: string;
+    status: string;
+}

src/app/pages/main/components/news-dfwc-results/news-dfwc-results.component.html

@@ -0,0 +1,4 @@
+<app-news-offline-results *ngIf="mappedOfflineNews" [news]="mappedOfflineNews" [customTable]="true"></app-news-offline-results>
+<div style="font-weight: bold;margin-top: 12px;font-size: 16px;">
+    <a [href]="news.cup.customNews">>> {{ translations?.fullResultsTable }} <<</a>
+</div>

src/app/pages/main/components/news-dfwc-results/news-dfwc-results.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewsDfwcResultsComponent } from './news-dfwc-results.component';
+
+describe('NewsDfwcResultsComponent', () => {
+  let component: NewsDfwcResultsComponent;
+  let fixture: ComponentFixture<NewsDfwcResultsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NewsDfwcResultsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewsDfwcResultsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/main/components/news-dfwc-results/news-dfwc-results.component.ts

@@ -0,0 +1,26 @@
+import { LanguageService } from '../../../../services/language/language.service';
+import { Translations } from '../../../../components/translations/translations.component';
+import { NewsOfflineResultsInterface } from '../../../../services/news-service/interfaces/news-offline-results.interface';
+import { Component, Input, OnInit } from '@angular/core';
+import { DfwcResultsService } from './services/dfwc-results.service';
+
+@Component({
+    selector: 'app-news-dfwc-results',
+    templateUrl: './news-dfwc-results.component.html',
+    styleUrls: ['./news-dfwc-results.component.less'],
+})
+export class NewsDfwcResultsComponent extends Translations implements OnInit {
+    @Input()
+    news: NewsOfflineResultsInterface;
+
+    public mappedOfflineNews: NewsOfflineResultsInterface;
+
+    constructor(protected languageService: LanguageService, private dfwcResultsService: DfwcResultsService) {
+        super(languageService);
+    }
+
+    ngOnInit(): void {
+        this.mappedOfflineNews = this.dfwcResultsService.mapDfwcResultsToOfflineNews(this.news);
+        super.ngOnInit();
+    }
+}

src/app/pages/main/components/news-dfwc-results/services/dfwc-results.service.spec.ts

@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+import { DfwcResultsService } from './dfwc-results.service';
+
+describe('DfwcResultsService', () => {
+    beforeEach(() => TestBed.configureTestingModule({}));
+
+    it('should be created', () => {
+        const service: DfwcResultsService = TestBed.get(DfwcResultsService);
+
+        expect(service).toBeTruthy();
+    });
+});