diff --git a/projects/bellumgens/src/app/app.component.html b/projects/bellumgens/src/app/app.component.html index da807f36..826f776f 100644 --- a/projects/bellumgens/src/app/app.component.html +++ b/projects/bellumgens/src/app/app.component.html @@ -144,6 +144,12 @@ + + + + + + diff --git a/projects/bellumgens/src/app/app.component.ts b/projects/bellumgens/src/app/app.component.ts index 3a77eec9..27a41099 100644 --- a/projects/bellumgens/src/app/app.component.ts +++ b/projects/bellumgens/src/app/app.component.ts @@ -52,7 +52,7 @@ import { QuickSearchComponent } from './search/quick-search/quick-search.compone import { SearchComponent } from './search/search/search.component'; import { LoginComponent } from '../../../common/src/lib/login/login.component'; import { LanguagesComponent } from '../../../common/src/lib/languages/languages.component'; -import { battlenet, discord, facebook, heartCare, instagram, linkedin, steam, tiktok, twitch, twitter } from '@igniteui/material-icons-extended'; +import { battlenet, discord, facebook, heartCare, instagram, linkedin, steam, tiktok, twitch, twitter, youtube } from '@igniteui/material-icons-extended'; import { IgxResourceStringsBG } from 'igniteui-angular-i18n'; @Component({ @@ -154,7 +154,7 @@ export class AppComponent implements OnInit { } private initSvgIcons() { - const complogos = [discord, steam, twitch, battlenet, facebook, twitter, instagram, linkedin, tiktok]; + const complogos = [discord, steam, twitch, battlenet, facebook, twitter, instagram, linkedin, tiktok, youtube]; complogos.forEach(c => this.iconService.addSvgIconFromText(c.name, c.value, 'login-icons', true)); this.iconService.addSvgIconFromText(heartCare.name, heartCare.value, 'health-icons'); diff --git a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html index a2e258af..e16c7ca5 100644 --- a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html +++ b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html @@ -73,7 +73,7 @@

Participants

Participants {{ cell.row.data.player1.username }} + @if (cell.row.data.player1Points > cell.row.data.player2Points) { + check + } vs. @@ -114,6 +117,9 @@

Participants

{{ cell.row.data.player2.username }} + @if (cell.row.data.player2Points > cell.row.data.player1Points) { + check + } @@ -122,8 +128,8 @@

Participants

@if (value) { - link - link + + Video } @@ -134,13 +140,13 @@

Participants

@if (value) { link - link + Replay } - +
diff --git a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.scss b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.scss index 1fa5e0af..52c083e8 100644 --- a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.scss +++ b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.scss @@ -65,6 +65,12 @@ height: 20px; } + .grid-team-name { + display: flex; + width: 120px; + align-items: center; + } + // @media only screen and (min-width: 1921px) { // .group-columns { // display: grid; diff --git a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.ts b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.ts index 1f5be10b..469261c1 100644 --- a/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.ts +++ b/projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { BaseDirective } from '../../base/base.component'; import { Title, Meta } from '@angular/platform-browser'; import { ActivatedRoute, RouterLink } from '@angular/router'; -import { TournamentParticipant, TournamentGroup, TournamentSC2Match, Tournament, ApiTournamentsService, Sc2MapNamePipe, CountrySVGPipe } from '../../../../../common/src/public_api'; +import { TournamentParticipant, TournamentGroup, TournamentSC2Match, Tournament, ApiTournamentsService, CountrySVGPipe } from '../../../../../common/src/public_api'; import { AsyncPipe, DatePipe } from '@angular/common'; import { IGX_CARD_DIRECTIVES, IgxCircularProgressBarComponent, IgxAvatarComponent, IgxDividerDirective, IGX_GRID_DIRECTIVES, IgxIconComponent, IgxButtonDirective, IGroupingExpression, SortingDirection, DefaultSortingStrategy } from '@infragistics/igniteui-angular'; import { Observable } from 'rxjs'; @@ -21,7 +21,6 @@ import { Observable } from 'rxjs'; IGX_GRID_DIRECTIVES, IgxIconComponent, IgxButtonDirective, - Sc2MapNamePipe, CountrySVGPipe, AsyncPipe ], diff --git a/projects/bellumgens/src/app/home/home.component.html b/projects/bellumgens/src/app/home/home.component.html index 8cf93d21..39792156 100644 --- a/projects/bellumgens/src/app/home/home.component.html +++ b/projects/bellumgens/src/app/home/home.component.html @@ -163,6 +163,12 @@

Follow us for updates

Twitter + + Instagram + + + YouTube + Linked-in diff --git a/projects/bellumgens/src/locale/messages.bg.xlf b/projects/bellumgens/src/locale/messages.bg.xlf index 8073bbcd..dcaa11c3 100644 --- a/projects/bellumgens/src/locale/messages.bg.xlf +++ b/projects/bellumgens/src/locale/messages.bg.xlf @@ -186,6 +186,30 @@ 162,163 + + Follow us on Instagram + Последвайте ни в Instagram + + projects/bellumgens/src/app/app.component.html + 147 + + + projects/bellumgens/src/app/home/home.component.html + 166 + + + + Subscribe to our Youtube channel + Абонирайте се за нашия Youtube канал + + projects/bellumgens/src/app/app.component.html + 150 + + + projects/bellumgens/src/app/home/home.component.html + 169 + + Follow us on Linked-in Последвайте ни в Linked-in @@ -362,6 +386,18 @@ 90 + + Winner + Победител + + projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html + 106 + + + projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html + 121 + + Video Видео @@ -378,14 +414,6 @@ 125 - - Forfeited - Служебна победа - - projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 157,158 - - The match has not been played yet, or there's no results on record... Мачът все още не е игран или няма резултати... diff --git a/projects/bellumgens/src/locale/messages.en.xlf b/projects/bellumgens/src/locale/messages.en.xlf index 55a68b90..2f640a3c 100644 --- a/projects/bellumgens/src/locale/messages.en.xlf +++ b/projects/bellumgens/src/locale/messages.en.xlf @@ -169,8 +169,8 @@ 163 - - Follow us on Linked-in + + Follow us on Instagram projects/bellumgens/src/app/app.component.html 147 @@ -180,8 +180,8 @@ 166 - - Join our Discord server + + Subscribe to our Youtube channel projects/bellumgens/src/app/app.component.html 150 @@ -191,8 +191,8 @@ 169 - - Follow us on Twitch + + Follow us on Linked-in projects/bellumgens/src/app/app.component.html 153 @@ -202,6 +202,28 @@ 172 + + Join our Discord server + + projects/bellumgens/src/app/app.component.html + 156 + + + projects/bellumgens/src/app/home/home.component.html + 175 + + + + Follow us on Twitch + + projects/bellumgens/src/app/app.component.html + 159 + + + projects/bellumgens/src/app/home/home.component.html + 178 + + StarCraft II Circuit @@ -288,63 +310,68 @@ No matches found... projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 78,79 + 79,80 Match Results projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 82 + 83 Weekly Bracket projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 84,85 + 85,86 Start time projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 88,89 + 89,90 Match projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 94 + 95 + + + + Winner + + projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html + 106 + + + projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html + 121 Video projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 120 + 127 - - - Replay projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 131 + 132,133 - - Forfeited + + Replay projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 160,161 + 138 - - - The match has not been played yet, or there's no results on record... projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html - 164,165 + 143,144 @@ -686,7 +713,7 @@ projects/bellumgens/src/app/home/home.component.html - 182,183 + 188,189 projects/common/src/lib/registration/registration.component.html @@ -1054,18 +1081,18 @@ Subscribe projects/bellumgens/src/app/home/home.component.html - 177,179 + 183,185 projects/bellumgens/src/app/home/home.component.html - 195,196 + 201,202 Get email updates from us! projects/bellumgens/src/app/home/home.component.html - 192 + 198 @@ -1300,17 +1327,6 @@ 170,171 - - Competitions - - projects/bellumgens/src/app/player-section/player.component.html - 23,24 - - - projects/bellumgens/src/app/team-section/team.component.html - 35,36 - - Players playing as @@ -2053,6 +2069,13 @@ 27,28 + + Competitions + + projects/bellumgens/src/app/team-section/team.component.html + 35,36 + + Settings diff --git a/projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html b/projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html index 67307983..3e09de9e 100644 --- a/projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html +++ b/projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html @@ -74,7 +74,7 @@ class="margin-top" cellSelection="none" [data]="matches" - height="550px" + height="650px" [primaryKey]="'id'" [groupingExpressions]="grouping" (rowDeleted)="deleteMatch($event)" @@ -132,8 +132,8 @@ @if (value) { - link - link + + Video } @else { No video @@ -146,7 +146,7 @@ @if (value) { link - link + Replay } @else { No replay diff --git a/projects/ebleague/src/app/app.component.html b/projects/ebleague/src/app/app.component.html index 3a154393..ad81e738 100644 --- a/projects/ebleague/src/app/app.component.html +++ b/projects/ebleague/src/app/app.component.html @@ -101,7 +101,7 @@ - + diff --git a/projects/ebleague/src/app/home/home.component.html b/projects/ebleague/src/app/home/home.component.html index 1f3d7548..1136213c 100644 --- a/projects/ebleague/src/app/home/home.component.html +++ b/projects/ebleague/src/app/home/home.component.html @@ -80,7 +80,7 @@

Follow us for updates

Linked-in - + YouTube diff --git a/projects/ebleague/src/locale/messages.en.xlf b/projects/ebleague/src/locale/messages.en.xlf index 376e5483..63d4cc91 100644 --- a/projects/ebleague/src/locale/messages.en.xlf +++ b/projects/ebleague/src/locale/messages.en.xlf @@ -222,19 +222,19 @@
projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 463 + 464 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 467 + 468 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 471 + 472 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 475 + 476
@@ -335,7 +335,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 82,83 + 83,84 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -365,11 +365,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 93,94 + 94,95 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 318,319 + 319,320 @@ -384,11 +384,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 98,99 + 99,100 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 330,331 + 331,332 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -407,7 +407,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 104 + 105 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -426,7 +426,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 130 + 131 + + + projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html + 136,137 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -445,7 +449,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 138,139 + 139,140 @@ -478,11 +482,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 182,183 + 183,184 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 450 + 451 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -501,7 +505,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 186,187 + 187,188 projects/ebleague/src/app/tournaments/tournament-csgo/tournament-csgo.component.html @@ -520,7 +524,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 194,195 + 195,196 @@ -531,7 +535,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 195,197 + 196,198 @@ -542,11 +546,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 219,220 + 220,221 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 267,268 + 268,269 projects/ebleague/src/app/tournaments/tournament-sc2/tournament-sc2.component.html @@ -565,11 +569,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 240,241 + 241,242 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 289,290 + 290,291 @@ -580,7 +584,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 250 + 251 @@ -595,11 +599,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 251 + 252 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 444,445 + 445,446 @@ -610,7 +614,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 286,287 + 287,288 @@ -629,15 +633,15 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 304,305 + 305,306 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 321 + 322 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 407 + 408 @@ -668,15 +672,15 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 305,306 + 306,307 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 324 + 325 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 409 + 410 @@ -695,7 +699,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 326,327 + 327,328 @@ -706,7 +710,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 334,335 + 335,336 @@ -717,7 +721,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 339 + 340 @@ -742,7 +746,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 369,370 + 370,371 @@ -753,7 +757,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 386,387 + 387,388 @@ -764,7 +768,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 405,406 + 406,407 @@ -779,11 +783,11 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 413,414 + 414,415 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 418,419 + 419,420 @@ -794,7 +798,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 426,427 + 427,428 @@ -816,7 +820,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 458,459 + 459,460 @@ -827,7 +831,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 464,465 + 465,466 @@ -838,7 +842,7 @@ projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 468,469 + 469,470 @@ -982,14 +986,18 @@ StarCraft II matches projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 86 + 87 Replay projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 143 + 144 + + + projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html + 149,150 projects/ebleague/src/app/tournaments/tournament-sc2/tournament-sc2.component.html @@ -1000,49 +1008,49 @@ No replay projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 151,152 + 152,153 Remove from group projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 274 + 275 Player 1 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 343,344 + 344,345 Player 2 projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 357,358 + 358,359 Winner projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 432,433 + 433,434 This will send emails to all registrants... projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 472,473 + 473,474 This will reset all checkin states and make their status pending... projects/ebleague/src/app/admin/admin-sc2/admin-sc2.component.html - 476,477 + 477,478