Merge pull request #435 from BellumGens/sm-updates

feat: updating social media links
BellumGens · Dec 13, 2024 · bced952 · bced952
2 parents 4ebfbb3 + 2244674
commit bced952
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 114 deletions.
diff --git a/projects/bellumgens/src/app/app.component.html b/projects/bellumgens/src/app/app.component.html
@@ -144,6 +144,12 @@
             <a href="https://twitter.com/BellumGens" i18n-title title="Follow us on Twitter" target="_blank" rel="noopener">
               <igx-icon family="login-icons" name="twitter"></igx-icon>
             </a>
+            <a href="https://www.instagram.com/bellumgenselitestarazagora/" i18n-title title="Follow us on Instagram" target="_blank" rel="noopener">
+              <igx-icon family="login-icons" name="instagram"></igx-icon>
+            </a>
+            <a href="http://youtube.com/@BGEStaraZagora" i18n-title title="Subscribe to our Youtube channel" target="_blank" rel="noopener">
+              <igx-icon family="login-icons" name="youtube"></igx-icon>
+            </a>
             <a href="https://www.linkedin.com/company/bellum-gens/" i18n-title title="Follow us on Linked-in" target="_blank" rel="noopener">
               <igx-icon family="login-icons" name="linkedin"></igx-icon>
             </a>

diff --git 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
@@ -73,7 +73,7 @@ <h4 i18n>Participants</h4>
 
       <igx-grid cellSelection="none"
         [data]="sc2matches | async"
-        height="550px"
+        height="650px"
         [groupingExpressions]="grouping"
         i18n-emptyGridMessage
         emptyGridMessage="No matches found..."
@@ -102,6 +102,9 @@ <h4 i18n>Participants</h4>
             </igx-avatar>
             <span [class]="cell.row.data.player1Points > cell.row.data.player2Points ? 'highlight grid-team-name color-success' : 'grid-team-name'">
               {{ cell.row.data.player1.username }}
+              @if (cell.row.data.player1Points > cell.row.data.player2Points) {
+                <igx-icon i18n-title title="Winner">check</igx-icon>
+              }
             </span>
 
             <span class="grid-vs-divider">vs.</span>
@@ -114,6 +117,9 @@ <h4 i18n>Participants</h4>
             </igx-avatar>
             <span [class]="cell.row.data.player2Points > cell.row.data.player1Points ? 'highlight grid-team-name color-success' : 'grid-team-name'">
               {{ cell.row.data.player2.username }}
+              @if (cell.row.data.player2Points > cell.row.data.player1Points) {
+                <igx-icon i18n-title title="Winner">check</igx-icon>
+              }
             </span>
           </div>
         </igx-column>
@@ -122,8 +128,8 @@ <h4 i18n>Participants</h4>
           <ng-template igxCell let-value>
             @if (value) {
               <a [href]="value" target="_blank" class="horizontal-center">
-                <igx-icon>link</igx-icon>
-                <span>link</span>
+                <igx-icon name="youtube" family="login-icons"></igx-icon>
+                <span i18n>Video</span>
               </a>
             }
           </ng-template>
@@ -134,13 +140,13 @@ <h4 i18n>Participants</h4>
             @if (value) {
               <a [href]="value" target="_blank" class="horizontal-center">
                 <igx-icon>link</igx-icon>
-                <span>link</span>
+                <span i18n>Replay</span>
               </a>
             }
           </ng-template>
         </igx-column>
 
-        <ng-template igxGridDetail let-dataItem>
+        <!-- <ng-template igxGridDetail let-dataItem>
           @for (map of dataItem.maps; track map.id) {
             <div class="horizontal-center">
               <div class="score-container">
@@ -164,7 +170,7 @@ <h4 i18n>Participants</h4>
           @if (!dataItem.maps.length && !dataItem.noShow) {
             <div class="horizontal-center" i18n>The match has not been played yet, or there's no results on record...</div>
           }
-        </ng-template>
+        </ng-template> -->
       </igx-grid>
     </igx-card-content>
   </igx-card>

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
@@ -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
@@ -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
@@ -163,6 +163,12 @@ <h2 i18n id="contacts">Follow us for updates</h2>
       <a href="https://twitter.com/BellumGens" i18n-title title="Follow us on Twitter" target="_blank" rel="noopener">
         <img ngSrc="/assets/social/twitter-150x150.webp" width="150" height="150" alt="Twitter" />
       </a>
+      <a href="https://www.instagram.com/bellumgenselitestarazagora/" i18n-title title="Follow us on Instagram" target="_blank" rel="noopener">
+        <img ngSrc="/assets/social/instagram-150x150.webp" width="150" height="150" alt="Instagram" />
+      </a>
+      <a href="http://youtube.com/@BGEStaraZagora" i18n-title title="Subscribe to our Youtube channel" target="_blank" rel="noopener">
+        <img ngSrc="/assets/social/youtube-150x150.webp" width="150" height="150" alt="YouTube" />
+      </a>
       <a href="https://www.linkedin.com/company/bellum-gens/" i18n-title title="Follow us on Linked-in" target="_blank" rel="noopener">
         <img ngSrc="/assets/social/linkedin-150x150.webp" width="150" height="150" alt="Linked-in" />
       </a>

diff --git a/projects/bellumgens/src/locale/messages.bg.xlf b/projects/bellumgens/src/locale/messages.bg.xlf
@@ -186,6 +186,30 @@
           <context context-type="linenumber">162,163</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5303831169234339262" datatype="html">
+        <source>Follow us on Instagram</source>
+        <target>Последвайте ни в Instagram</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/app.component.html</context>
+          <context context-type="linenumber">147</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/home/home.component.html</context>
+          <context context-type="linenumber">166</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6509103536762295146" datatype="html">
+        <source>Subscribe to our Youtube channel</source>
+        <target>Абонирайте се за нашия Youtube канал</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/app.component.html</context>
+          <context context-type="linenumber">150</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/home/home.component.html</context>
+          <context context-type="linenumber">169</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="5728193055695832804" datatype="html">
         <source>Follow us on Linked-in</source>
 		    <target>Последвайте ни в Linked-in</target>
@@ -362,6 +386,18 @@
           <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="3787050687842841344" datatype="html">
+        <source>Winner</source>
+        <target>Победител</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html</context>
+          <context context-type="linenumber">106</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html</context>
+          <context context-type="linenumber">121</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6549265851868599441" datatype="html">
         <source>Video</source>
         <target>Видео</target>
@@ -378,14 +414,6 @@
           <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4220387386577088457" datatype="html">
-        <source>Forfeited</source>
-        <target>Служебна победа</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">projects/bellumgens/src/app/events/bge-balkan/bge-balkan.component.html</context>
-          <context context-type="linenumber">157,158</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="3425062088724754850" datatype="html">
         <source>The match has not been played yet, or there&apos;s no results on record...</source>
         <target>Мачът все още не е игран или няма резултати...</target>