Esports Business League is a gaming event for your office! Build better team bonds by friendly or competative gaming, or get your team to compete against other companies to show how good you are!
- Go to EB-League + Go to EB-League @@ -24,9 +24,9 @@
Manage your CS:GO Team
Recruit your team and manage your team member roles, team strategies, practice times and more. The only online CS:GO strategy editor freely available to everyone! Discuss public strategies with everyone and build private strategies for your team.
-
+
-
+
@@ -49,7 +49,7 @@ About us
Esports Events
Bellum Gens is the organizer of the premier Bellum Gen Elite esports event. First held in the town of Stara Zagora, under the name Bellum Gens Elite - Stara Zagora, BGE brought the top Counter-Strike talent in the region to compete under one roof for a prize pool of $10,000!
- Bellum Gens Elite
+ Bellum Gens Elite
@@ -59,7 +59,7 @@ Esports Events
Team Building and Gaming
Bellum Gens is the organizer of the Esports Business League - a competitive amateur gaming event for the office. Miltiple companies in Bulgaria participated in seasons one and two of the Esports Business League both for fun and team building and to show which company has the best gamers among their employees!
- Esports Business League
+ Esports Business League
![CS:GO Team Overview]()
diff --git a/projects/bellumgens/src/app/notifications/notifications-routing.module.ts b/projects/bellumgens/src/app/notifications/notifications-routing.module.ts
deleted file mode 100644
index c08f14a2f..000000000
--- a/projects/bellumgens/src/app/notifications/notifications-routing.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { NotificationsComponent } from './notifications.component';
-
-const routes: Routes = [
- { path: '', component: NotificationsComponent }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class NotificationsRoutingModule { }
diff --git a/projects/bellumgens/src/app/notifications/notifications.module.ts b/projects/bellumgens/src/app/notifications/notifications.module.ts
deleted file mode 100644
index 14e27026a..000000000
--- a/projects/bellumgens/src/app/notifications/notifications.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { NotificationsRoutingModule } from './notifications-routing.module';
-import { NotificationsComponent } from './notifications.component';
-import { PlayerNotificationsComponent } from './player-notifications/player-notifications.component';
-import { TeamNotificationsComponent } from './team-notifications/team-notifications.component';
-import { DisabledNotificationsPipe } from '../pipes/disabled-notifications.pipe';
-import { SortNotificationsPipe } from '../pipes/sort-notifications.pipe';
-import { SortApplicationsPipe } from '../pipes/sort-applications.pipe';
-import { IgxAvatarModule, IgxButtonModule, IgxListModule, IgxRippleModule } from '@infragistics/igniteui-angular';
-import { NotificationStatePipe } from '../pipes/notification-state.pipe';
-
-
-@NgModule({
- imports: [
- CommonModule,
- NotificationsRoutingModule,
- IgxAvatarModule,
- IgxListModule,
- IgxButtonModule,
- IgxRippleModule,
- NotificationsComponent,
- PlayerNotificationsComponent,
- TeamNotificationsComponent,
- DisabledNotificationsPipe,
- SortNotificationsPipe,
- SortApplicationsPipe,
- NotificationStatePipe
- ]
-})
-export class NotificationsModule { }
diff --git a/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts b/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
index d1e9e2496..55683172c 100644
--- a/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
+++ b/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, EventEmitter, Output } from '@angular/core';
import { ACTIVE_DUTY, CSGOMapPool } from '../../../../../common/src/public_api';
import { ActiveDutyMapsPipe } from '../../../../../common/src/lib/pipes/active-duty-maps.pipe';
import { FormsModule } from '@angular/forms';
-import { IgxCardModule, IgxCheckboxModule } from '@infragistics/igniteui-angular';
+import { IGX_CARD_DIRECTIVES, IgxCheckboxComponent } from '@infragistics/igniteui-angular';
import { NgFor, NgClass, NgOptimizedImage } from '@angular/common';
@Component({
@@ -15,8 +15,8 @@ import { NgFor, NgClass, NgOptimizedImage } from '@angular/common';
NgClass,
NgOptimizedImage,
FormsModule,
- IgxCardModule,
- IgxCheckboxModule,
+ IGX_CARD_DIRECTIVES,
+ IgxCheckboxComponent,
ActiveDutyMapsPipe
]
})
diff --git a/projects/bellumgens/src/app/player-section/player-routing.module.ts b/projects/bellumgens/src/app/player-section/player-routing.module.ts
deleted file mode 100644
index bd1d080c3..000000000
--- a/projects/bellumgens/src/app/player-section/player-routing.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { PlayerComponent } from './player.component';
-
-const routes: Routes = [
- { path: ':userid', component: PlayerComponent },
- { path: ':userid/:newuser', component: PlayerComponent }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class PlayerRoutingModule { }
diff --git a/projects/bellumgens/src/app/player-section/player.component.html b/projects/bellumgens/src/app/player-section/player.component.html
index 66b276ba9..d4651000e 100644
--- a/projects/bellumgens/src/app/player-section/player.component.html
+++ b/projects/bellumgens/src/app/player-section/player.component.html
@@ -79,7 +79,7 @@ Steam account is private.
To do this go to Steam Profile --> Edit Profile --> Privacy Settings --> Set: 'My profile: Public' and 'Game details: public'
-
+
KDR
@@ -94,7 +94,7 @@ KDR
-
+
Headshot %
@@ -103,7 +103,7 @@ Headshot %
-
+
Accuracy
@@ -112,7 +112,7 @@ Accuracy
-
+
Top weapon
@@ -124,7 +124,7 @@ {{ player.userStats.favouriteWeapon?.name }}
-
+
Availability
@@ -133,7 +133,7 @@ Availability
-
+
Weapons
@@ -152,7 +152,7 @@ Weapons
-
+
{{ viewAll ? 'Showing All' : 'Showing Active Duty' }} Maps
diff --git a/projects/bellumgens/src/app/player-section/player.component.scss b/projects/bellumgens/src/app/player-section/player.component.scss
index 604f41240..ebb552294 100644
--- a/projects/bellumgens/src/app/player-section/player.component.scss
+++ b/projects/bellumgens/src/app/player-section/player.component.scss
@@ -56,6 +56,7 @@ app-player .card-wrapper {
height: fit-content;
background: transparent;
box-shadow: none;
+ border: none;
}
.player-detail__stats .igx-circular-bar__text {
@@ -87,8 +88,14 @@ app-player .card-wrapper {
}
}
-@media only screen and (min-width: 1992px) {
+@media only screen and (min-width: 1760px) {
.player-detail__stats.map-pool {
grid-column: 2 / -1;
}
}
+
+@media only screen and (min-width: 2330px) {
+ .player-detail__stats.map-pool {
+ grid-column: 2 / 8;
+ }
+}
diff --git a/projects/bellumgens/src/app/player-section/player.component.spec.ts b/projects/bellumgens/src/app/player-section/player.component.spec.ts
index 193edadf2..a9ec99240 100644
--- a/projects/bellumgens/src/app/player-section/player.component.spec.ts
+++ b/projects/bellumgens/src/app/player-section/player.component.spec.ts
@@ -1,30 +1,9 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { IgxProgressBarModule,
- IgxCardModule,
- IgxAvatarModule,
- IgxToggleModule,
- IgxDropDownModule,
- IgxIconModule,
- IgxDialogModule,
- IgxChipsModule,
- IgxTimePickerModule,
- IgxCheckboxModule,
- IgxListModule,
- IgxSelectModule,
- IgxTabsModule,
- IgxSwitchModule,
- IgxInputGroupModule,
- IgxDividerModule,
- IgxButtonModule} from '@infragistics/igniteui-angular';
-import { SteamCustomUrlPipe } from 'projects/bellumgens/src/app/pipes/steam-custom-url.pipe';
-import { TopWeaponAltPipe } from 'projects/bellumgens/src/app/pipes/top-weapon-alt.pipe';
import { RouterTestingModule } from '@angular/router/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { SortWeaponsPipe } from 'projects/bellumgens/src/app/pipes/sort-weapons.pipe';
import { ServiceWorkerModule } from '@angular/service-worker';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MapPoolComponent } from './map-pool/map-pool.component';
import { PlayerComponent } from './player.component';
describe('PlayerComponent', () => {
@@ -38,28 +17,7 @@ describe('PlayerComponent', () => {
RouterTestingModule,
NoopAnimationsModule,
ServiceWorkerModule.register('', { enabled: false }),
- IgxProgressBarModule,
- IgxCardModule,
- IgxAvatarModule,
- IgxToggleModule,
- IgxDropDownModule,
- IgxIconModule,
- IgxDialogModule,
- IgxChipsModule,
- IgxTimePickerModule,
- IgxCheckboxModule,
- IgxSelectModule,
- IgxListModule,
- IgxTabsModule,
- IgxSwitchModule,
- IgxDividerModule,
- IgxButtonModule,
- IgxInputGroupModule,
PlayerComponent,
- MapPoolComponent,
- SteamCustomUrlPipe,
- TopWeaponAltPipe,
- SortWeaponsPipe
]
}).compileComponents();
}));
diff --git a/projects/bellumgens/src/app/player-section/player.component.ts b/projects/bellumgens/src/app/player-section/player.component.ts
index cfe2f154c..0b5f353be 100644
--- a/projects/bellumgens/src/app/player-section/player.component.ts
+++ b/projects/bellumgens/src/app/player-section/player.component.ts
@@ -2,7 +2,20 @@ import { Component, ViewEncapsulation } from '@angular/core';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { Title, Meta } from '@angular/platform-browser';
-import { ISelectionEventArgs, IgxIconService, IgxAvatarModule, IgxButtonModule, IgxRippleModule, IgxToggleModule, IgxIconModule, IgxDropDownModule, IgxSelectModule, IgxInputGroupModule, IgxCardModule, IgxProgressBarModule, IgxListModule } from '@infragistics/igniteui-angular';
+import {
+ ISelectionEventArgs,
+ IgxIconService,
+ IgxAvatarComponent,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IgxToggleActionDirective,
+ IgxIconComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ IGX_SELECT_DIRECTIVES,
+ IGX_CARD_DIRECTIVES,
+ IgxCircularProgressBarComponent,
+ IGX_LIST_DIRECTIVES
+} from '@infragistics/igniteui-angular';
import {
LoginService,
@@ -34,7 +47,30 @@ import { NgIf, NgFor, AsyncPipe } from '@angular/common';
styleUrls: ['./player.component.scss'],
encapsulation: ViewEncapsulation.None,
standalone: true,
- imports: [NgIf, LoadingComponent, IgxAvatarModule, IgxButtonModule, IgxRippleModule, IgxToggleModule, IgxIconModule, IgxDropDownModule, NgFor, RouterLink, IgxSelectModule, FormsModule, IgxInputGroupModule, IgxCardModule, IgxProgressBarModule, AvailabilityComponent, IgxListModule, MapPoolComponent, AsyncPipe, CountrySVGPipe, SteamCustomUrlPipe, SortWeaponsPipe, TopWeaponAltPipe]
+ imports: [
+ NgIf,
+ LoadingComponent,
+ IgxAvatarComponent,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IgxToggleActionDirective,
+ IgxIconComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ NgFor,
+ RouterLink,
+ IGX_SELECT_DIRECTIVES,
+ FormsModule,
+ IGX_CARD_DIRECTIVES,
+ IgxCircularProgressBarComponent,
+ AvailabilityComponent,
+ IGX_LIST_DIRECTIVES,
+ MapPoolComponent,
+ AsyncPipe,
+ CountrySVGPipe,
+ SteamCustomUrlPipe,
+ SortWeaponsPipe,
+ TopWeaponAltPipe
+ ]
})
export class PlayerComponent extends BaseComponent {
public authUser: ApplicationUser;
@@ -56,42 +92,40 @@ export class PlayerComponent extends BaseComponent {
meta: Meta,
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.authManager.applicationUser.subscribe((data: ApplicationUser) => {
- if (data) {
- this.authUser = data;
- this.authManager.teamsAdmin.subscribe(teams => this.teamsAdmin = teams);
- }
- }),
- this.activatedRoute.params.subscribe(params => {
- const userid = params['userid'];
- this.newUser = params['newuser'];
- if (userid) {
- this.subs.push(this.apiService.getPlayer(userid).subscribe(
- player => {
- if (player) {
- this.player = player;
- if (player && !player.steamUserException) {
- this.titleService.setTitle('CS:GO Player: ' + player.steamUser.steamID);
- if (player.registered) {
- this.userTeams = this.apiService.getUserTeams(player.id);
- this.apiService.getAvailability(player.id).subscribe(data => this.availability = data);
- this.apiService.getMapPool(player.id).subscribe(maps => this.mapPool = maps);
- }
- if (player.userStats) {
- const weapons = new SortWeaponsPipe().transform(player.userStats.weapons);
- this.loadSvgs(weapons);
- }
- }
+ this.authManager.applicationUser.subscribe((data: ApplicationUser) => {
+ if (data) {
+ this.authUser = data;
+ this.authManager.teamsAdmin.subscribe(teams => this.teamsAdmin = teams);
+ }
+ });
+
+ this.activatedRoute.params.subscribe(params => {
+ const userid = params['userid'];
+ this.newUser = params['newuser'];
+ if (userid) {
+ this.apiService.getPlayer(userid).subscribe(
+ player => {
+ if (player) {
+ this.player = player;
+ if (player && !player.steamUserException) {
+ this.titleService.setTitle('CS:GO Player: ' + player.steamUser.steamID);
+ if (player.registered) {
+ this.userTeams = this.apiService.getUserTeams(player.id);
+ this.apiService.getAvailability(player.id).subscribe(data => this.availability = data);
+ this.apiService.getMapPool(player.id).subscribe(maps => this.mapPool = maps);
+ }
+ if (player.userStats) {
+ const weapons = new SortWeaponsPipe().transform(player.userStats.weapons);
+ this.loadSvgs(weapons);
+ }
}
}
- ),
- this.apiService.loadingPlayer.subscribe(loading => this.loading = loading)
+ }
);
- }
- })
- );
+ this.apiService.loadingPlayer.subscribe(loading => this.loading = loading);
+ }
+ });
}
public openLogin() {
diff --git a/projects/bellumgens/src/app/player-section/player.module.ts b/projects/bellumgens/src/app/player-section/player.module.ts
deleted file mode 100644
index c17775f7f..000000000
--- a/projects/bellumgens/src/app/player-section/player.module.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import {
- IgxAvatarModule,
- IgxButtonModule,
- IgxCardModule,
- IgxCheckboxModule,
- IgxDropDownModule,
- IgxListModule,
- IgxProgressBarModule,
- IgxRippleModule,
- IgxSelectModule,
- IgxToggleModule
-} from '@infragistics/igniteui-angular';
-
-import { PlayerRoutingModule } from './player-routing.module';
-import { PlayerComponent } from './player.component';
-import { MapPoolComponent } from './map-pool/map-pool.component';
-import { FormsModule } from '@angular/forms';
-import { SteamCustomUrlPipe } from '../pipes/steam-custom-url.pipe';
-import { SortWeaponsPipe } from '../pipes/sort-weapons.pipe';
-import { TopWeaponAltPipe } from '../pipes/top-weapon-alt.pipe';
-
-
-
-@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- PlayerRoutingModule,
- IgxCardModule,
- IgxProgressBarModule,
- IgxButtonModule,
- IgxRippleModule,
- IgxSelectModule,
- IgxAvatarModule,
- IgxDropDownModule,
- IgxToggleModule,
- IgxListModule,
- IgxCheckboxModule,
- PlayerComponent,
- MapPoolComponent,
- SteamCustomUrlPipe,
- SortWeaponsPipe,
- TopWeaponAltPipe
-]
-})
-export class PlayerModule { }
diff --git a/projects/bellumgens/src/app/player-section/player.routes.ts b/projects/bellumgens/src/app/player-section/player.routes.ts
new file mode 100644
index 000000000..d133b240e
--- /dev/null
+++ b/projects/bellumgens/src/app/player-section/player.routes.ts
@@ -0,0 +1,7 @@
+import { Routes } from '@angular/router';
+import { PlayerComponent } from './player.component';
+
+export const routes: Routes = [
+ { path: ':userid', component: PlayerComponent },
+ { path: ':userid/:newuser', component: PlayerComponent }
+];
diff --git a/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts b/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts
index 52021597f..723fe5596 100644
--- a/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts
+++ b/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts
@@ -27,16 +27,14 @@ export class PlayerResultsComponent extends BaseComponent {
meta: Meta,
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.activeRoute.params.subscribe(params => {
- if (params.query) {
- this.query = params.query;
- this.apiService.searchPlayers(params.query);
- }
- }),
- this.apiService.loadingSearch.subscribe(loading => this.loading = loading),
- this.apiService.playerSearchResult.subscribe(players => this.players = players)
- );
+ this.activeRoute.params.subscribe(params => {
+ if (params.query) {
+ this.query = params.query;
+ this.apiService.searchPlayers(params.query);
+ }
+ });
+ this.apiService.loadingSearch.subscribe(loading => this.loading = loading);
+ this.apiService.playerSearchResult.subscribe(players => this.players = players);
this.iconService.addSvgIcon('headshot', '/assets/headshot24x24.svg', 'weapon-icons');
}
diff --git a/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts b/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts
index c2f1e39f5..5e5e0fb69 100644
--- a/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts
+++ b/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts
@@ -25,15 +25,13 @@ export class TeamResultsComponent extends BaseComponent {
meta: Meta,
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.activeRoute.params.subscribe(params => {
- if (params.query) {
- this.query = params.query;
- this.apiService.searchTeams(params.query);
- }
- }),
- this.apiService.loadingSearch.subscribe(loading => this.loading = loading),
- this.apiService.teamSearchResult.subscribe(players => this.teams = players)
- );
+ this.activeRoute.params.subscribe(params => {
+ if (params.query) {
+ this.query = params.query;
+ this.apiService.searchTeams(params.query);
+ }
+ });
+ this.apiService.loadingSearch.subscribe(loading => this.loading = loading);
+ this.apiService.teamSearchResult.subscribe(players => this.teams = players);
}
}
diff --git a/projects/bellumgens/src/app/strategies/strategies.component.html b/projects/bellumgens/src/app/strategies/strategies.component.html
index 17f3bc615..232c695b8 100644
--- a/projects/bellumgens/src/app/strategies/strategies.component.html
+++ b/projects/bellumgens/src/app/strategies/strategies.component.html
@@ -4,7 +4,7 @@
diff --git a/projects/bellumgens/src/app/strategies/strategies.component.ts b/projects/bellumgens/src/app/strategies/strategies.component.ts
index ebabb8ece..50e462d93 100644
--- a/projects/bellumgens/src/app/strategies/strategies.component.ts
+++ b/projects/bellumgens/src/app/strategies/strategies.component.ts
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
import { ActivatedRoute, RouterLink } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/common';
import {
BellumgensApiService,
CSGOStrategy, VoteDirection,
@@ -14,8 +16,20 @@ import {
CSGOActiveDutyMap,
ACTIVE_DUTY
} from '../../../../common/src/public_api';
-import { IChipSelectEventArgs, IgxButtonModule, IgxRippleModule, IgxChipsModule, IgxSelectModule, IgxInputGroupModule, IgxCardModule, IgxIconModule, IgxToggleModule, IgxBadgeModule, IgxDropDownModule, IgxAvatarModule } from '@infragistics/igniteui-angular';
-import { SafeResourceUrl } from '@angular/platform-browser';
+import {
+ IChipSelectEventArgs,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_CHIPS_DIRECTIVES,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ IGX_CARD_DIRECTIVES,
+ IgxIconComponent,
+ IgxToggleActionDirective,
+ IGX_SELECT_DIRECTIVES,
+ IgxBadgeComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ IgxAvatarComponent
+} from '@infragistics/igniteui-angular';
import { StratFilterPipe } from '../pipes/strat-filter.pipe';
import { SideStratsPipe } from '../pipes/sidestrats.pipe';
import { IsStratOwnerPipe } from '../pipes/is-strat-owner.pipe';
@@ -29,8 +43,6 @@ import { CSGOMapnamePipe } from '../../../../common/src/lib/pipes/csgomapname.pi
import { ConfirmComponent } from '../../../../common/src/lib/confirm/confirm.component';
import { NewStrategyComponent } from './new-strategy/new-strategy.component';
import { LoadingComponent } from '../../../../common/src/lib/loading/loading.component';
-import { FormsModule } from '@angular/forms';
-import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/common';
@Component({
selector: 'app-team-strategies',
@@ -45,18 +57,18 @@ import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/commo
DatePipe,
RouterLink,
FormsModule,
- IgxButtonModule,
- IgxRippleModule,
- IgxChipsModule,
- IgxSelectModule,
- IgxInputGroupModule,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_CHIPS_DIRECTIVES,
+ IGX_SELECT_DIRECTIVES,
+ IGX_INPUT_GROUP_DIRECTIVES,
LoadingComponent,
- IgxCardModule,
- IgxIconModule,
- IgxToggleModule,
- IgxBadgeModule,
- IgxDropDownModule,
- IgxAvatarModule,
+ IGX_CARD_DIRECTIVES,
+ IgxIconComponent,
+ IgxToggleActionDirective,
+ IgxBadgeComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ IgxAvatarComponent,
NewStrategyComponent,
ConfirmComponent,
CSGOMapnamePipe,
@@ -75,10 +87,9 @@ export class StrategiesComponent {
public isEditor: boolean = null;
public strats: CSGOStrategy [];
- public maps: CSGOActiveDutyMap [] = ACTIVE_DUTY;
+ public maps: CSGOActiveDutyMap [] = structuredClone(ACTIVE_DUTY);
public team: CSGOTeam;
public authUser: ApplicationUser;
- public sanitizedUrl: SafeResourceUrl;
public pipeTrigger = 0;
public viewAll = false;
public loading = false;
@@ -96,6 +107,7 @@ export class StrategiesComponent {
private authManager: LoginService,
private commService: CommunicationService,
private socialMedia: SocialMediaStrategyService) {
+ this.maps.forEach(map => map.isPlayed = true);
this.activatedRoute.url.subscribe(value => {
if (value?.length && value[0]?.path === 'user') {
this.authManager.applicationUser.subscribe(user => {
diff --git a/projects/bellumgens/src/app/strategies/strategies.module.ts b/projects/bellumgens/src/app/strategies/strategies.module.ts
deleted file mode 100644
index 15d15b6a5..000000000
--- a/projects/bellumgens/src/app/strategies/strategies.module.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import {
- IgxAvatarModule,
- IgxBadgeModule,
- IgxButtonGroupModule,
- IgxButtonModule,
- IgxCardModule,
- IgxCheckboxModule,
- IgxChipsModule,
- IgxDialogModule,
- IgxDividerModule,
- IgxDragDropModule,
- IgxDropDownModule,
- IgxIconModule,
- IgxLayoutModule,
- IgxListModule,
- IgxRadioModule,
- IgxRippleModule,
- IgxSelectModule,
- IgxSwitchModule,
- IgxToggleModule
-} from '@infragistics/igniteui-angular';
-
-import { StrategiesRoutingModule } from './strategies-routing.module';
-import { StrategiesComponent } from './strategies.component';
-import { StrategyDetailsComponent } from './strategy-details/strategy-details.component';
-import { NewStrategyComponent } from './new-strategy/new-strategy.component';
-import { StrategyEditorComponent } from './strategy-editor/strategy-editor.component';
-import { TruncateTextPipe } from '../pipes/truncate-text.pipe';
-import { SafeVideoLinkPipe } from '../pipes/safe-video-link.pipe';
-import { IsVideoPipe } from '../pipes/is-video.pipe';
-import { HasVotedPipe } from '../pipes/has-voted.pipe';
-import { VotesPipe } from '../pipes/votes.pipe';
-import { IsStratOwnerPipe } from '../pipes/is-strat-owner.pipe';
-import { SideStratsPipe } from '../pipes/sidestrats.pipe';
-
-import { StratFilterPipe } from '../pipes/strat-filter.pipe';
-
-
-@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- StrategiesRoutingModule,
- IgxCardModule,
- IgxAvatarModule,
- IgxIconModule,
- IgxBadgeModule,
- IgxButtonModule,
- IgxRippleModule,
- IgxButtonGroupModule,
- IgxDragDropModule,
- IgxSelectModule,
- IgxListModule,
- IgxDropDownModule,
- IgxToggleModule,
- IgxDividerModule,
- IgxChipsModule,
- IgxLayoutModule,
- IgxRadioModule,
- IgxDialogModule,
- IgxSwitchModule,
- IgxCheckboxModule,
- StrategiesComponent,
- StrategyDetailsComponent,
- NewStrategyComponent,
- StrategyEditorComponent,
- TruncateTextPipe,
- SafeVideoLinkPipe,
- IsVideoPipe,
- HasVotedPipe,
- VotesPipe,
- IsStratOwnerPipe,
- SideStratsPipe,
- StratFilterPipe
-]
-})
-export class StrategiesModule { }
diff --git a/projects/bellumgens/src/app/strategies/strategies-routing.module.ts b/projects/bellumgens/src/app/strategies/strategies.routes.ts
similarity index 73%
rename from projects/bellumgens/src/app/strategies/strategies-routing.module.ts
rename to projects/bellumgens/src/app/strategies/strategies.routes.ts
index 819481823..47ce667f1 100644
--- a/projects/bellumgens/src/app/strategies/strategies-routing.module.ts
+++ b/projects/bellumgens/src/app/strategies/strategies.routes.ts
@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes } from '@angular/router';
import { StrategiesComponent } from './strategies.component';
import { StrategyDetailsComponent } from './strategy-details/strategy-details.component';
import { StrategyEditorComponent } from './strategy-editor/strategy-editor.component';
-const routes: Routes = [
+export const routes: Routes = [
{ path: '', component: StrategiesComponent },
{ path: 'public', component: StrategiesComponent },
{ path: 'user', component: StrategiesComponent },
@@ -12,9 +11,3 @@ const routes: Routes = [
{ path: 'edit/:stratid', component: StrategyEditorComponent },
{ path: 'details/:stratid', component: StrategyDetailsComponent, data: { title: 'Bellum Gens CS:GO Strategy' } },
];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class StrategiesRoutingModule { }
diff --git a/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts b/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
index f5d977502..a26f2e2cd 100644
--- a/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
+++ b/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
@@ -72,27 +72,25 @@ export class StrategyDetailsComponent extends BaseComponent {
meta: Meta,
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.activeRoute.params.subscribe(params => {
- const stratid = params['stratid'];
- if (stratid) {
- this.meta.updateTag({ name: 'og:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
- this.meta.updateTag({ name: 'twitter:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
- this.apiService.getStrategy(stratid).subscribe(strat => {
- if (strat) {
- this.strat = strat;
- this.newComment.stratId = strat.id;
- }
- });
- }
- }),
- this.authManager.applicationUser.subscribe(user => {
- this.authUser = user;
- if (user) {
- this.newComment.userId = user.id;
- }
- })
- );
+ this.activeRoute.params.subscribe(params => {
+ const stratid = params['stratid'];
+ if (stratid) {
+ this.meta.updateTag({ name: 'og:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
+ this.meta.updateTag({ name: 'twitter:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
+ this.apiService.getStrategy(stratid).subscribe(strat => {
+ if (strat) {
+ this.strat = strat;
+ this.newComment.stratId = strat.id;
+ }
+ });
+ }
+ });
+ this.authManager.applicationUser.subscribe(user => {
+ this.authUser = user;
+ if (user) {
+ this.newComment.userId = user.id;
+ }
+ });
this.resize();
}
diff --git a/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html b/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
index 8002c55d2..9c2161164 100644
--- a/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
+++ b/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
@@ -97,7 +97,7 @@
-
diff --git a/projects/bellumgens/src/app/team-section/team-application/team-application.component.css b/projects/bellumgens/src/app/team-section/team-application/team-application.component.scss
similarity index 100%
rename from projects/bellumgens/src/app/team-section/team-application/team-application.component.css
rename to projects/bellumgens/src/app/team-section/team-application/team-application.component.scss
diff --git a/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts b/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
index 754633e1e..25e82910f 100644
--- a/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
+++ b/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
@@ -1,5 +1,11 @@
import { Component, ViewChild, Input } from '@angular/core';
-import { IgxDialogComponent, IgxButtonModule, IgxRippleModule, IgxDialogModule, IgxInputGroupModule, IgxIconModule } from '@infragistics/igniteui-angular';
+import {
+ IgxDialogComponent,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ IgxIconComponent
+} from '@infragistics/igniteui-angular';
import {
ApplicationUser,
TeamApplication, CSGOTeam,
@@ -12,9 +18,17 @@ import { FormsModule } from '@angular/forms';
@Component({
selector: 'app-team-application',
templateUrl: './team-application.component.html',
- styleUrls: ['./team-application.component.css'],
+ styleUrls: ['./team-application.component.scss'],
standalone: true,
- imports: [IgxButtonModule, IgxRippleModule, IgxDialogModule, IgxInputGroupModule, FormsModule, NgIf, IgxIconModule]
+ imports: [
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IgxDialogComponent,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ FormsModule,
+ NgIf,
+ IgxIconComponent
+ ]
})
export class TeamApplicationComponent {
@ViewChild(IgxDialogComponent, { static: true }) public dialog: IgxDialogComponent;
diff --git a/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts b/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
index ac2d9ca3d..a0ea21891 100644
--- a/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
+++ b/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
@@ -1,19 +1,19 @@
import { Component, ViewChildren, QueryList, ElementRef } from '@angular/core';
-import { IDropDroppedEventArgs, IgxAvatarComponent, IgxCardModule, IgxAvatarModule, IgxDragDropModule } from '@infragistics/igniteui-angular';
+import { IDropDroppedEventArgs, IgxAvatarComponent, IGX_CARD_DIRECTIVES, IGX_DRAG_DROP_DIRECTIVES } from '@infragistics/igniteui-angular';
import {
PlaystyleRole, RoleSlot,
TeamMember, TEAM_PLACEHOLDER,
BellumgensApiService,
Availability,
LoginService,
- ApplicationUser
+ ApplicationUser,
+ AvailabilityComponent,
+ ConfirmComponent,
+ CountrySVGPipe
} from '../../../../../common/src/public_api';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { BaseComponent } from '../../base/base.component';
import { Title, Meta } from '@angular/platform-browser';
-import { CountrySVGPipe } from '../../../../../common/src/lib/pipes/country-svg.pipe';
-import { ConfirmComponent } from '../../../../../common/src/lib/confirm/confirm.component';
-import { AvailabilityComponent } from '../../../../../common/src/lib/availability/availability.component';
import { NgIf, NgFor } from '@angular/common';
@Component({
@@ -21,7 +21,17 @@ import { NgIf, NgFor } from '@angular/common';
templateUrl: './team-details.component.html',
styleUrls: ['./team-details.component.scss'],
standalone: true,
- imports: [NgIf, AvailabilityComponent, IgxCardModule, NgFor, IgxAvatarModule, IgxDragDropModule, RouterLink, ConfirmComponent, CountrySVGPipe]
+ imports: [
+ NgIf,
+ AvailabilityComponent,
+ IGX_CARD_DIRECTIVES,
+ NgFor,
+ IgxAvatarComponent,
+ IGX_DRAG_DROP_DIRECTIVES,
+ RouterLink,
+ ConfirmComponent,
+ CountrySVGPipe
+ ]
})
export class TeamDetailsComponent extends BaseComponent {
@ViewChildren(IgxAvatarComponent, { read: ElementRef }) public emptyRoles: QueryList;
@@ -49,40 +59,38 @@ export class TeamDetailsComponent extends BaseComponent {
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.authService.applicationUser.subscribe((data: ApplicationUser) => {
- this.authUser = data;
- }),
- this.activeRoute.parent.params.subscribe(params => {
- const teamId = params['teamid'];
+ this.authService.applicationUser.subscribe((data: ApplicationUser) => {
+ this.authUser = data;
+ });
+ this.activeRoute.parent.params.subscribe(params => {
+ const teamId = params['teamid'];
- if (teamId) {
- this.apiService.getTeam(teamId).subscribe(team => {
- if (team) {
- this.team = team;
- this.authService.getUserIsTeamAdmin(team.teamId).subscribe(admin => this.isAdmin = admin);
+ if (teamId) {
+ this.apiService.getTeam(teamId).subscribe(team => {
+ if (team) {
+ this.team = team;
+ this.authService.getUserIsTeamAdmin(team.teamId).subscribe(admin => this.isAdmin = admin);
- this.apiService.getTeamSchedule(team.teamId).subscribe(schedule => this.teamPractice = schedule);
- this.apiService.getTeamMembers(team.teamId).subscribe(members => {
- if (members) {
- this.teamMembers = members;
- this.roleSlots.forEach((role) => {
- const member = this.teamMembers.find(m => m.role === role.role);
- if (member) {
- role.user = member;
- } else {
- role.user = null;
- }
- });
- this.activeMembers = this.teamMembers.filter(m => m.isActive && m.role === PlaystyleRole.NotSet);
- this.inactiveMembers = this.teamMembers.filter(m => !m.isActive);
- }
- });
- }
- });
- }
- })
- );
+ this.apiService.getTeamSchedule(team.teamId).subscribe(schedule => this.teamPractice = schedule);
+ this.apiService.getTeamMembers(team.teamId).subscribe(members => {
+ if (members) {
+ this.teamMembers = members;
+ this.roleSlots.forEach((role) => {
+ const member = this.teamMembers.find(m => m.role === role.role);
+ if (member) {
+ role.user = member;
+ } else {
+ role.user = null;
+ }
+ });
+ this.activeMembers = this.teamMembers.filter(m => m.isActive && m.role === PlaystyleRole.NotSet);
+ this.inactiveMembers = this.teamMembers.filter(m => !m.isActive);
+ }
+ });
+ }
+ });
+ }
+ });
}
public removeFromRole(role: RoleSlot) {
diff --git a/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html b/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
index 686a7bf34..0306c082d 100644
--- a/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
+++ b/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
@@ -1,4 +1,4 @@
-
-
-
Manage your CS:GO Team
Recruit your team and manage your team member roles, team strategies, practice times and more. The only online CS:GO strategy editor freely available to everyone! Discuss public strategies with everyone and build private strategies for your team.
- +About us
Esports Events
Bellum Gens is the organizer of the premier Bellum Gen Elite esports event. First held in the town of Stara Zagora, under the name Bellum Gens Elite - Stara Zagora, BGE brought the top Counter-Strike talent in the region to compete under one roof for a prize pool of $10,000!
- Bellum Gens Elite + Bellum Gens Elite
@@ -59,7 +59,7 @@
![CS:GO Team Overview]()
diff --git a/projects/bellumgens/src/app/notifications/notifications-routing.module.ts b/projects/bellumgens/src/app/notifications/notifications-routing.module.ts
deleted file mode 100644
index c08f14a2f..000000000
--- a/projects/bellumgens/src/app/notifications/notifications-routing.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { NotificationsComponent } from './notifications.component';
-
-const routes: Routes = [
- { path: '', component: NotificationsComponent }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class NotificationsRoutingModule { }
diff --git a/projects/bellumgens/src/app/notifications/notifications.module.ts b/projects/bellumgens/src/app/notifications/notifications.module.ts
deleted file mode 100644
index 14e27026a..000000000
--- a/projects/bellumgens/src/app/notifications/notifications.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { NotificationsRoutingModule } from './notifications-routing.module';
-import { NotificationsComponent } from './notifications.component';
-import { PlayerNotificationsComponent } from './player-notifications/player-notifications.component';
-import { TeamNotificationsComponent } from './team-notifications/team-notifications.component';
-import { DisabledNotificationsPipe } from '../pipes/disabled-notifications.pipe';
-import { SortNotificationsPipe } from '../pipes/sort-notifications.pipe';
-import { SortApplicationsPipe } from '../pipes/sort-applications.pipe';
-import { IgxAvatarModule, IgxButtonModule, IgxListModule, IgxRippleModule } from '@infragistics/igniteui-angular';
-import { NotificationStatePipe } from '../pipes/notification-state.pipe';
-
-
-@NgModule({
- imports: [
- CommonModule,
- NotificationsRoutingModule,
- IgxAvatarModule,
- IgxListModule,
- IgxButtonModule,
- IgxRippleModule,
- NotificationsComponent,
- PlayerNotificationsComponent,
- TeamNotificationsComponent,
- DisabledNotificationsPipe,
- SortNotificationsPipe,
- SortApplicationsPipe,
- NotificationStatePipe
- ]
-})
-export class NotificationsModule { }
diff --git a/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts b/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
index d1e9e2496..55683172c 100644
--- a/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
+++ b/projects/bellumgens/src/app/player-section/map-pool/map-pool.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, EventEmitter, Output } from '@angular/core';
import { ACTIVE_DUTY, CSGOMapPool } from '../../../../../common/src/public_api';
import { ActiveDutyMapsPipe } from '../../../../../common/src/lib/pipes/active-duty-maps.pipe';
import { FormsModule } from '@angular/forms';
-import { IgxCardModule, IgxCheckboxModule } from '@infragistics/igniteui-angular';
+import { IGX_CARD_DIRECTIVES, IgxCheckboxComponent } from '@infragistics/igniteui-angular';
import { NgFor, NgClass, NgOptimizedImage } from '@angular/common';
@Component({
@@ -15,8 +15,8 @@ import { NgFor, NgClass, NgOptimizedImage } from '@angular/common';
NgClass,
NgOptimizedImage,
FormsModule,
- IgxCardModule,
- IgxCheckboxModule,
+ IGX_CARD_DIRECTIVES,
+ IgxCheckboxComponent,
ActiveDutyMapsPipe
]
})
diff --git a/projects/bellumgens/src/app/player-section/player-routing.module.ts b/projects/bellumgens/src/app/player-section/player-routing.module.ts
deleted file mode 100644
index bd1d080c3..000000000
--- a/projects/bellumgens/src/app/player-section/player-routing.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { PlayerComponent } from './player.component';
-
-const routes: Routes = [
- { path: ':userid', component: PlayerComponent },
- { path: ':userid/:newuser', component: PlayerComponent }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class PlayerRoutingModule { }
diff --git a/projects/bellumgens/src/app/player-section/player.component.html b/projects/bellumgens/src/app/player-section/player.component.html
index 66b276ba9..d4651000e 100644
--- a/projects/bellumgens/src/app/player-section/player.component.html
+++ b/projects/bellumgens/src/app/player-section/player.component.html
@@ -79,7 +79,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
@@ -152,7 +152,7 @@
-
+
diff --git a/projects/bellumgens/src/app/strategies/strategies.component.ts b/projects/bellumgens/src/app/strategies/strategies.component.ts
index ebabb8ece..50e462d93 100644
--- a/projects/bellumgens/src/app/strategies/strategies.component.ts
+++ b/projects/bellumgens/src/app/strategies/strategies.component.ts
@@ -1,5 +1,7 @@
import { Component } from '@angular/core';
import { ActivatedRoute, RouterLink } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/common';
import {
BellumgensApiService,
CSGOStrategy, VoteDirection,
@@ -14,8 +16,20 @@ import {
CSGOActiveDutyMap,
ACTIVE_DUTY
} from '../../../../common/src/public_api';
-import { IChipSelectEventArgs, IgxButtonModule, IgxRippleModule, IgxChipsModule, IgxSelectModule, IgxInputGroupModule, IgxCardModule, IgxIconModule, IgxToggleModule, IgxBadgeModule, IgxDropDownModule, IgxAvatarModule } from '@infragistics/igniteui-angular';
-import { SafeResourceUrl } from '@angular/platform-browser';
+import {
+ IChipSelectEventArgs,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_CHIPS_DIRECTIVES,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ IGX_CARD_DIRECTIVES,
+ IgxIconComponent,
+ IgxToggleActionDirective,
+ IGX_SELECT_DIRECTIVES,
+ IgxBadgeComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ IgxAvatarComponent
+} from '@infragistics/igniteui-angular';
import { StratFilterPipe } from '../pipes/strat-filter.pipe';
import { SideStratsPipe } from '../pipes/sidestrats.pipe';
import { IsStratOwnerPipe } from '../pipes/is-strat-owner.pipe';
@@ -29,8 +43,6 @@ import { CSGOMapnamePipe } from '../../../../common/src/lib/pipes/csgomapname.pi
import { ConfirmComponent } from '../../../../common/src/lib/confirm/confirm.component';
import { NewStrategyComponent } from './new-strategy/new-strategy.component';
import { LoadingComponent } from '../../../../common/src/lib/loading/loading.component';
-import { FormsModule } from '@angular/forms';
-import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/common';
@Component({
selector: 'app-team-strategies',
@@ -45,18 +57,18 @@ import { NgFor, NgIf, NgClass, DatePipe, NgOptimizedImage } from '@angular/commo
DatePipe,
RouterLink,
FormsModule,
- IgxButtonModule,
- IgxRippleModule,
- IgxChipsModule,
- IgxSelectModule,
- IgxInputGroupModule,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_CHIPS_DIRECTIVES,
+ IGX_SELECT_DIRECTIVES,
+ IGX_INPUT_GROUP_DIRECTIVES,
LoadingComponent,
- IgxCardModule,
- IgxIconModule,
- IgxToggleModule,
- IgxBadgeModule,
- IgxDropDownModule,
- IgxAvatarModule,
+ IGX_CARD_DIRECTIVES,
+ IgxIconComponent,
+ IgxToggleActionDirective,
+ IgxBadgeComponent,
+ IGX_DROP_DOWN_DIRECTIVES,
+ IgxAvatarComponent,
NewStrategyComponent,
ConfirmComponent,
CSGOMapnamePipe,
@@ -75,10 +87,9 @@ export class StrategiesComponent {
public isEditor: boolean = null;
public strats: CSGOStrategy [];
- public maps: CSGOActiveDutyMap [] = ACTIVE_DUTY;
+ public maps: CSGOActiveDutyMap [] = structuredClone(ACTIVE_DUTY);
public team: CSGOTeam;
public authUser: ApplicationUser;
- public sanitizedUrl: SafeResourceUrl;
public pipeTrigger = 0;
public viewAll = false;
public loading = false;
@@ -96,6 +107,7 @@ export class StrategiesComponent {
private authManager: LoginService,
private commService: CommunicationService,
private socialMedia: SocialMediaStrategyService) {
+ this.maps.forEach(map => map.isPlayed = true);
this.activatedRoute.url.subscribe(value => {
if (value?.length && value[0]?.path === 'user') {
this.authManager.applicationUser.subscribe(user => {
diff --git a/projects/bellumgens/src/app/strategies/strategies.module.ts b/projects/bellumgens/src/app/strategies/strategies.module.ts
deleted file mode 100644
index 15d15b6a5..000000000
--- a/projects/bellumgens/src/app/strategies/strategies.module.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import {
- IgxAvatarModule,
- IgxBadgeModule,
- IgxButtonGroupModule,
- IgxButtonModule,
- IgxCardModule,
- IgxCheckboxModule,
- IgxChipsModule,
- IgxDialogModule,
- IgxDividerModule,
- IgxDragDropModule,
- IgxDropDownModule,
- IgxIconModule,
- IgxLayoutModule,
- IgxListModule,
- IgxRadioModule,
- IgxRippleModule,
- IgxSelectModule,
- IgxSwitchModule,
- IgxToggleModule
-} from '@infragistics/igniteui-angular';
-
-import { StrategiesRoutingModule } from './strategies-routing.module';
-import { StrategiesComponent } from './strategies.component';
-import { StrategyDetailsComponent } from './strategy-details/strategy-details.component';
-import { NewStrategyComponent } from './new-strategy/new-strategy.component';
-import { StrategyEditorComponent } from './strategy-editor/strategy-editor.component';
-import { TruncateTextPipe } from '../pipes/truncate-text.pipe';
-import { SafeVideoLinkPipe } from '../pipes/safe-video-link.pipe';
-import { IsVideoPipe } from '../pipes/is-video.pipe';
-import { HasVotedPipe } from '../pipes/has-voted.pipe';
-import { VotesPipe } from '../pipes/votes.pipe';
-import { IsStratOwnerPipe } from '../pipes/is-strat-owner.pipe';
-import { SideStratsPipe } from '../pipes/sidestrats.pipe';
-
-import { StratFilterPipe } from '../pipes/strat-filter.pipe';
-
-
-@NgModule({
- imports: [
- CommonModule,
- FormsModule,
- StrategiesRoutingModule,
- IgxCardModule,
- IgxAvatarModule,
- IgxIconModule,
- IgxBadgeModule,
- IgxButtonModule,
- IgxRippleModule,
- IgxButtonGroupModule,
- IgxDragDropModule,
- IgxSelectModule,
- IgxListModule,
- IgxDropDownModule,
- IgxToggleModule,
- IgxDividerModule,
- IgxChipsModule,
- IgxLayoutModule,
- IgxRadioModule,
- IgxDialogModule,
- IgxSwitchModule,
- IgxCheckboxModule,
- StrategiesComponent,
- StrategyDetailsComponent,
- NewStrategyComponent,
- StrategyEditorComponent,
- TruncateTextPipe,
- SafeVideoLinkPipe,
- IsVideoPipe,
- HasVotedPipe,
- VotesPipe,
- IsStratOwnerPipe,
- SideStratsPipe,
- StratFilterPipe
-]
-})
-export class StrategiesModule { }
diff --git a/projects/bellumgens/src/app/strategies/strategies-routing.module.ts b/projects/bellumgens/src/app/strategies/strategies.routes.ts
similarity index 73%
rename from projects/bellumgens/src/app/strategies/strategies-routing.module.ts
rename to projects/bellumgens/src/app/strategies/strategies.routes.ts
index 819481823..47ce667f1 100644
--- a/projects/bellumgens/src/app/strategies/strategies-routing.module.ts
+++ b/projects/bellumgens/src/app/strategies/strategies.routes.ts
@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes } from '@angular/router';
import { StrategiesComponent } from './strategies.component';
import { StrategyDetailsComponent } from './strategy-details/strategy-details.component';
import { StrategyEditorComponent } from './strategy-editor/strategy-editor.component';
-const routes: Routes = [
+export const routes: Routes = [
{ path: '', component: StrategiesComponent },
{ path: 'public', component: StrategiesComponent },
{ path: 'user', component: StrategiesComponent },
@@ -12,9 +11,3 @@ const routes: Routes = [
{ path: 'edit/:stratid', component: StrategyEditorComponent },
{ path: 'details/:stratid', component: StrategyDetailsComponent, data: { title: 'Bellum Gens CS:GO Strategy' } },
];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class StrategiesRoutingModule { }
diff --git a/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts b/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
index f5d977502..a26f2e2cd 100644
--- a/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
+++ b/projects/bellumgens/src/app/strategies/strategy-details/strategy-details.component.ts
@@ -72,27 +72,25 @@ export class StrategyDetailsComponent extends BaseComponent {
meta: Meta,
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.activeRoute.params.subscribe(params => {
- const stratid = params['stratid'];
- if (stratid) {
- this.meta.updateTag({ name: 'og:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
- this.meta.updateTag({ name: 'twitter:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
- this.apiService.getStrategy(stratid).subscribe(strat => {
- if (strat) {
- this.strat = strat;
- this.newComment.stratId = strat.id;
- }
- });
- }
- }),
- this.authManager.applicationUser.subscribe(user => {
- this.authUser = user;
- if (user) {
- this.newComment.userId = user.id;
- }
- })
- );
+ this.activeRoute.params.subscribe(params => {
+ const stratid = params['stratid'];
+ if (stratid) {
+ this.meta.updateTag({ name: 'og:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
+ this.meta.updateTag({ name: 'twitter:image', content: `${environment.rootApiEndpoint}/Content/Strats/${stratid}.png` });
+ this.apiService.getStrategy(stratid).subscribe(strat => {
+ if (strat) {
+ this.strat = strat;
+ this.newComment.stratId = strat.id;
+ }
+ });
+ }
+ });
+ this.authManager.applicationUser.subscribe(user => {
+ this.authUser = user;
+ if (user) {
+ this.newComment.userId = user.id;
+ }
+ });
this.resize();
}
diff --git a/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html b/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
index 8002c55d2..9c2161164 100644
--- a/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
+++ b/projects/bellumgens/src/app/strategies/strategy-editor/strategy-editor.component.html
@@ -97,7 +97,7 @@
Esports Events
Team Building and Gaming
Bellum Gens is the organizer of the Esports Business League - a competitive amateur gaming event for the office. Miltiple companies in Bulgaria participated in seasons one and two of the Esports Business League both for fun and team building and to show which company has the best gamers among their employees!
- Esports Business League + Esports Business LeagueSteam account is private.
To do this go to Steam Profile --> Edit Profile --> Privacy Settings --> Set: 'My profile: Public' and 'Game details: public'
KDR
KDR
Headshot %
Headshot %
Accuracy
Accuracy
Top weapon
{{ player.userStats.favouriteWeapon?.name }}
Availability
Availability
Weapons
Weapons
{{ viewAll ? 'Showing All' : 'Showing Active Duty' }} Maps
diff --git a/projects/bellumgens/src/app/player-section/player.component.scss b/projects/bellumgens/src/app/player-section/player.component.scss index 604f41240..ebb552294 100644 --- a/projects/bellumgens/src/app/player-section/player.component.scss +++ b/projects/bellumgens/src/app/player-section/player.component.scss @@ -56,6 +56,7 @@ app-player .card-wrapper { height: fit-content; background: transparent; box-shadow: none; + border: none; } .player-detail__stats .igx-circular-bar__text { @@ -87,8 +88,14 @@ app-player .card-wrapper { } } -@media only screen and (min-width: 1992px) { +@media only screen and (min-width: 1760px) { .player-detail__stats.map-pool { grid-column: 2 / -1; } } + +@media only screen and (min-width: 2330px) { + .player-detail__stats.map-pool { + grid-column: 2 / 8; + } +} diff --git a/projects/bellumgens/src/app/player-section/player.component.spec.ts b/projects/bellumgens/src/app/player-section/player.component.spec.ts index 193edadf2..a9ec99240 100644 --- a/projects/bellumgens/src/app/player-section/player.component.spec.ts +++ b/projects/bellumgens/src/app/player-section/player.component.spec.ts @@ -1,30 +1,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IgxProgressBarModule, - IgxCardModule, - IgxAvatarModule, - IgxToggleModule, - IgxDropDownModule, - IgxIconModule, - IgxDialogModule, - IgxChipsModule, - IgxTimePickerModule, - IgxCheckboxModule, - IgxListModule, - IgxSelectModule, - IgxTabsModule, - IgxSwitchModule, - IgxInputGroupModule, - IgxDividerModule, - IgxButtonModule} from '@infragistics/igniteui-angular'; -import { SteamCustomUrlPipe } from 'projects/bellumgens/src/app/pipes/steam-custom-url.pipe'; -import { TopWeaponAltPipe } from 'projects/bellumgens/src/app/pipes/top-weapon-alt.pipe'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SortWeaponsPipe } from 'projects/bellumgens/src/app/pipes/sort-weapons.pipe'; import { ServiceWorkerModule } from '@angular/service-worker'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MapPoolComponent } from './map-pool/map-pool.component'; import { PlayerComponent } from './player.component'; describe('PlayerComponent', () => { @@ -38,28 +17,7 @@ describe('PlayerComponent', () => { RouterTestingModule, NoopAnimationsModule, ServiceWorkerModule.register('', { enabled: false }), - IgxProgressBarModule, - IgxCardModule, - IgxAvatarModule, - IgxToggleModule, - IgxDropDownModule, - IgxIconModule, - IgxDialogModule, - IgxChipsModule, - IgxTimePickerModule, - IgxCheckboxModule, - IgxSelectModule, - IgxListModule, - IgxTabsModule, - IgxSwitchModule, - IgxDividerModule, - IgxButtonModule, - IgxInputGroupModule, PlayerComponent, - MapPoolComponent, - SteamCustomUrlPipe, - TopWeaponAltPipe, - SortWeaponsPipe ] }).compileComponents(); })); diff --git a/projects/bellumgens/src/app/player-section/player.component.ts b/projects/bellumgens/src/app/player-section/player.component.ts index cfe2f154c..0b5f353be 100644 --- a/projects/bellumgens/src/app/player-section/player.component.ts +++ b/projects/bellumgens/src/app/player-section/player.component.ts @@ -2,7 +2,20 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, RouterLink } from '@angular/router'; import { Title, Meta } from '@angular/platform-browser'; -import { ISelectionEventArgs, IgxIconService, IgxAvatarModule, IgxButtonModule, IgxRippleModule, IgxToggleModule, IgxIconModule, IgxDropDownModule, IgxSelectModule, IgxInputGroupModule, IgxCardModule, IgxProgressBarModule, IgxListModule } from '@infragistics/igniteui-angular'; +import { + ISelectionEventArgs, + IgxIconService, + IgxAvatarComponent, + IgxButtonDirective, + IgxRippleDirective, + IgxToggleActionDirective, + IgxIconComponent, + IGX_DROP_DOWN_DIRECTIVES, + IGX_SELECT_DIRECTIVES, + IGX_CARD_DIRECTIVES, + IgxCircularProgressBarComponent, + IGX_LIST_DIRECTIVES +} from '@infragistics/igniteui-angular'; import { LoginService, @@ -34,7 +47,30 @@ import { NgIf, NgFor, AsyncPipe } from '@angular/common'; styleUrls: ['./player.component.scss'], encapsulation: ViewEncapsulation.None, standalone: true, - imports: [NgIf, LoadingComponent, IgxAvatarModule, IgxButtonModule, IgxRippleModule, IgxToggleModule, IgxIconModule, IgxDropDownModule, NgFor, RouterLink, IgxSelectModule, FormsModule, IgxInputGroupModule, IgxCardModule, IgxProgressBarModule, AvailabilityComponent, IgxListModule, MapPoolComponent, AsyncPipe, CountrySVGPipe, SteamCustomUrlPipe, SortWeaponsPipe, TopWeaponAltPipe] + imports: [ + NgIf, + LoadingComponent, + IgxAvatarComponent, + IgxButtonDirective, + IgxRippleDirective, + IgxToggleActionDirective, + IgxIconComponent, + IGX_DROP_DOWN_DIRECTIVES, + NgFor, + RouterLink, + IGX_SELECT_DIRECTIVES, + FormsModule, + IGX_CARD_DIRECTIVES, + IgxCircularProgressBarComponent, + AvailabilityComponent, + IGX_LIST_DIRECTIVES, + MapPoolComponent, + AsyncPipe, + CountrySVGPipe, + SteamCustomUrlPipe, + SortWeaponsPipe, + TopWeaponAltPipe + ] }) export class PlayerComponent extends BaseComponent { public authUser: ApplicationUser; @@ -56,42 +92,40 @@ export class PlayerComponent extends BaseComponent { meta: Meta, activeRoute: ActivatedRoute) { super(title, meta, activeRoute); - this.subs.push( - this.authManager.applicationUser.subscribe((data: ApplicationUser) => { - if (data) { - this.authUser = data; - this.authManager.teamsAdmin.subscribe(teams => this.teamsAdmin = teams); - } - }), - this.activatedRoute.params.subscribe(params => { - const userid = params['userid']; - this.newUser = params['newuser']; - if (userid) { - this.subs.push(this.apiService.getPlayer(userid).subscribe( - player => { - if (player) { - this.player = player; - if (player && !player.steamUserException) { - this.titleService.setTitle('CS:GO Player: ' + player.steamUser.steamID); - if (player.registered) { - this.userTeams = this.apiService.getUserTeams(player.id); - this.apiService.getAvailability(player.id).subscribe(data => this.availability = data); - this.apiService.getMapPool(player.id).subscribe(maps => this.mapPool = maps); - } - if (player.userStats) { - const weapons = new SortWeaponsPipe().transform(player.userStats.weapons); - this.loadSvgs(weapons); - } - } + this.authManager.applicationUser.subscribe((data: ApplicationUser) => { + if (data) { + this.authUser = data; + this.authManager.teamsAdmin.subscribe(teams => this.teamsAdmin = teams); + } + }); + + this.activatedRoute.params.subscribe(params => { + const userid = params['userid']; + this.newUser = params['newuser']; + if (userid) { + this.apiService.getPlayer(userid).subscribe( + player => { + if (player) { + this.player = player; + if (player && !player.steamUserException) { + this.titleService.setTitle('CS:GO Player: ' + player.steamUser.steamID); + if (player.registered) { + this.userTeams = this.apiService.getUserTeams(player.id); + this.apiService.getAvailability(player.id).subscribe(data => this.availability = data); + this.apiService.getMapPool(player.id).subscribe(maps => this.mapPool = maps); + } + if (player.userStats) { + const weapons = new SortWeaponsPipe().transform(player.userStats.weapons); + this.loadSvgs(weapons); + } } } - ), - this.apiService.loadingPlayer.subscribe(loading => this.loading = loading) + } ); - } - }) - ); + this.apiService.loadingPlayer.subscribe(loading => this.loading = loading); + } + }); } public openLogin() { diff --git a/projects/bellumgens/src/app/player-section/player.module.ts b/projects/bellumgens/src/app/player-section/player.module.ts deleted file mode 100644 index c17775f7f..000000000 --- a/projects/bellumgens/src/app/player-section/player.module.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { - IgxAvatarModule, - IgxButtonModule, - IgxCardModule, - IgxCheckboxModule, - IgxDropDownModule, - IgxListModule, - IgxProgressBarModule, - IgxRippleModule, - IgxSelectModule, - IgxToggleModule -} from '@infragistics/igniteui-angular'; - -import { PlayerRoutingModule } from './player-routing.module'; -import { PlayerComponent } from './player.component'; -import { MapPoolComponent } from './map-pool/map-pool.component'; -import { FormsModule } from '@angular/forms'; -import { SteamCustomUrlPipe } from '../pipes/steam-custom-url.pipe'; -import { SortWeaponsPipe } from '../pipes/sort-weapons.pipe'; -import { TopWeaponAltPipe } from '../pipes/top-weapon-alt.pipe'; - - - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - PlayerRoutingModule, - IgxCardModule, - IgxProgressBarModule, - IgxButtonModule, - IgxRippleModule, - IgxSelectModule, - IgxAvatarModule, - IgxDropDownModule, - IgxToggleModule, - IgxListModule, - IgxCheckboxModule, - PlayerComponent, - MapPoolComponent, - SteamCustomUrlPipe, - SortWeaponsPipe, - TopWeaponAltPipe -] -}) -export class PlayerModule { } diff --git a/projects/bellumgens/src/app/player-section/player.routes.ts b/projects/bellumgens/src/app/player-section/player.routes.ts new file mode 100644 index 000000000..d133b240e --- /dev/null +++ b/projects/bellumgens/src/app/player-section/player.routes.ts @@ -0,0 +1,7 @@ +import { Routes } from '@angular/router'; +import { PlayerComponent } from './player.component'; + +export const routes: Routes = [ + { path: ':userid', component: PlayerComponent }, + { path: ':userid/:newuser', component: PlayerComponent } +]; diff --git a/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts b/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts index 52021597f..723fe5596 100644 --- a/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts +++ b/projects/bellumgens/src/app/search/search-results/player-results/player-results.component.ts @@ -27,16 +27,14 @@ export class PlayerResultsComponent extends BaseComponent { meta: Meta, activeRoute: ActivatedRoute) { super(title, meta, activeRoute); - this.subs.push( - this.activeRoute.params.subscribe(params => { - if (params.query) { - this.query = params.query; - this.apiService.searchPlayers(params.query); - } - }), - this.apiService.loadingSearch.subscribe(loading => this.loading = loading), - this.apiService.playerSearchResult.subscribe(players => this.players = players) - ); + this.activeRoute.params.subscribe(params => { + if (params.query) { + this.query = params.query; + this.apiService.searchPlayers(params.query); + } + }); + this.apiService.loadingSearch.subscribe(loading => this.loading = loading); + this.apiService.playerSearchResult.subscribe(players => this.players = players); this.iconService.addSvgIcon('headshot', '/assets/headshot24x24.svg', 'weapon-icons'); } diff --git a/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts b/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts index c2f1e39f5..5e5e0fb69 100644 --- a/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts +++ b/projects/bellumgens/src/app/search/search-results/team-results/team-results.component.ts @@ -25,15 +25,13 @@ export class TeamResultsComponent extends BaseComponent { meta: Meta, activeRoute: ActivatedRoute) { super(title, meta, activeRoute); - this.subs.push( - this.activeRoute.params.subscribe(params => { - if (params.query) { - this.query = params.query; - this.apiService.searchTeams(params.query); - } - }), - this.apiService.loadingSearch.subscribe(loading => this.loading = loading), - this.apiService.teamSearchResult.subscribe(players => this.teams = players) - ); + this.activeRoute.params.subscribe(params => { + if (params.query) { + this.query = params.query; + this.apiService.searchTeams(params.query); + } + }); + this.apiService.loadingSearch.subscribe(loading => this.loading = loading); + this.apiService.teamSearchResult.subscribe(players => this.teams = players); } } diff --git a/projects/bellumgens/src/app/strategies/strategies.component.html b/projects/bellumgens/src/app/strategies/strategies.component.html index 17f3bc615..232c695b8 100644 --- a/projects/bellumgens/src/app/strategies/strategies.component.html +++ b/projects/bellumgens/src/app/strategies/strategies.component.html @@ -4,7 +4,7 @@
-
diff --git a/projects/bellumgens/src/app/team-section/team-application/team-application.component.css b/projects/bellumgens/src/app/team-section/team-application/team-application.component.scss
similarity index 100%
rename from projects/bellumgens/src/app/team-section/team-application/team-application.component.css
rename to projects/bellumgens/src/app/team-section/team-application/team-application.component.scss
diff --git a/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts b/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
index 754633e1e..25e82910f 100644
--- a/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
+++ b/projects/bellumgens/src/app/team-section/team-application/team-application.component.ts
@@ -1,5 +1,11 @@
import { Component, ViewChild, Input } from '@angular/core';
-import { IgxDialogComponent, IgxButtonModule, IgxRippleModule, IgxDialogModule, IgxInputGroupModule, IgxIconModule } from '@infragistics/igniteui-angular';
+import {
+ IgxDialogComponent,
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ IgxIconComponent
+} from '@infragistics/igniteui-angular';
import {
ApplicationUser,
TeamApplication, CSGOTeam,
@@ -12,9 +18,17 @@ import { FormsModule } from '@angular/forms';
@Component({
selector: 'app-team-application',
templateUrl: './team-application.component.html',
- styleUrls: ['./team-application.component.css'],
+ styleUrls: ['./team-application.component.scss'],
standalone: true,
- imports: [IgxButtonModule, IgxRippleModule, IgxDialogModule, IgxInputGroupModule, FormsModule, NgIf, IgxIconModule]
+ imports: [
+ IgxButtonDirective,
+ IgxRippleDirective,
+ IgxDialogComponent,
+ IGX_INPUT_GROUP_DIRECTIVES,
+ FormsModule,
+ NgIf,
+ IgxIconComponent
+ ]
})
export class TeamApplicationComponent {
@ViewChild(IgxDialogComponent, { static: true }) public dialog: IgxDialogComponent;
diff --git a/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts b/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
index ac2d9ca3d..a0ea21891 100644
--- a/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
+++ b/projects/bellumgens/src/app/team-section/team-details/team-details.component.ts
@@ -1,19 +1,19 @@
import { Component, ViewChildren, QueryList, ElementRef } from '@angular/core';
-import { IDropDroppedEventArgs, IgxAvatarComponent, IgxCardModule, IgxAvatarModule, IgxDragDropModule } from '@infragistics/igniteui-angular';
+import { IDropDroppedEventArgs, IgxAvatarComponent, IGX_CARD_DIRECTIVES, IGX_DRAG_DROP_DIRECTIVES } from '@infragistics/igniteui-angular';
import {
PlaystyleRole, RoleSlot,
TeamMember, TEAM_PLACEHOLDER,
BellumgensApiService,
Availability,
LoginService,
- ApplicationUser
+ ApplicationUser,
+ AvailabilityComponent,
+ ConfirmComponent,
+ CountrySVGPipe
} from '../../../../../common/src/public_api';
import { ActivatedRoute, RouterLink } from '@angular/router';
import { BaseComponent } from '../../base/base.component';
import { Title, Meta } from '@angular/platform-browser';
-import { CountrySVGPipe } from '../../../../../common/src/lib/pipes/country-svg.pipe';
-import { ConfirmComponent } from '../../../../../common/src/lib/confirm/confirm.component';
-import { AvailabilityComponent } from '../../../../../common/src/lib/availability/availability.component';
import { NgIf, NgFor } from '@angular/common';
@Component({
@@ -21,7 +21,17 @@ import { NgIf, NgFor } from '@angular/common';
templateUrl: './team-details.component.html',
styleUrls: ['./team-details.component.scss'],
standalone: true,
- imports: [NgIf, AvailabilityComponent, IgxCardModule, NgFor, IgxAvatarModule, IgxDragDropModule, RouterLink, ConfirmComponent, CountrySVGPipe]
+ imports: [
+ NgIf,
+ AvailabilityComponent,
+ IGX_CARD_DIRECTIVES,
+ NgFor,
+ IgxAvatarComponent,
+ IGX_DRAG_DROP_DIRECTIVES,
+ RouterLink,
+ ConfirmComponent,
+ CountrySVGPipe
+ ]
})
export class TeamDetailsComponent extends BaseComponent {
@ViewChildren(IgxAvatarComponent, { read: ElementRef }) public emptyRoles: QueryList;
@@ -49,40 +59,38 @@ export class TeamDetailsComponent extends BaseComponent {
activeRoute: ActivatedRoute) {
super(title, meta, activeRoute);
- this.subs.push(
- this.authService.applicationUser.subscribe((data: ApplicationUser) => {
- this.authUser = data;
- }),
- this.activeRoute.parent.params.subscribe(params => {
- const teamId = params['teamid'];
+ this.authService.applicationUser.subscribe((data: ApplicationUser) => {
+ this.authUser = data;
+ });
+ this.activeRoute.parent.params.subscribe(params => {
+ const teamId = params['teamid'];
- if (teamId) {
- this.apiService.getTeam(teamId).subscribe(team => {
- if (team) {
- this.team = team;
- this.authService.getUserIsTeamAdmin(team.teamId).subscribe(admin => this.isAdmin = admin);
+ if (teamId) {
+ this.apiService.getTeam(teamId).subscribe(team => {
+ if (team) {
+ this.team = team;
+ this.authService.getUserIsTeamAdmin(team.teamId).subscribe(admin => this.isAdmin = admin);
- this.apiService.getTeamSchedule(team.teamId).subscribe(schedule => this.teamPractice = schedule);
- this.apiService.getTeamMembers(team.teamId).subscribe(members => {
- if (members) {
- this.teamMembers = members;
- this.roleSlots.forEach((role) => {
- const member = this.teamMembers.find(m => m.role === role.role);
- if (member) {
- role.user = member;
- } else {
- role.user = null;
- }
- });
- this.activeMembers = this.teamMembers.filter(m => m.isActive && m.role === PlaystyleRole.NotSet);
- this.inactiveMembers = this.teamMembers.filter(m => !m.isActive);
- }
- });
- }
- });
- }
- })
- );
+ this.apiService.getTeamSchedule(team.teamId).subscribe(schedule => this.teamPractice = schedule);
+ this.apiService.getTeamMembers(team.teamId).subscribe(members => {
+ if (members) {
+ this.teamMembers = members;
+ this.roleSlots.forEach((role) => {
+ const member = this.teamMembers.find(m => m.role === role.role);
+ if (member) {
+ role.user = member;
+ } else {
+ role.user = null;
+ }
+ });
+ this.activeMembers = this.teamMembers.filter(m => m.isActive && m.role === PlaystyleRole.NotSet);
+ this.inactiveMembers = this.teamMembers.filter(m => !m.isActive);
+ }
+ });
+ }
+ });
+ }
+ });
}
public removeFromRole(role: RoleSlot) {
diff --git a/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html b/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
index 686a7bf34..0306c082d 100644
--- a/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
+++ b/projects/bellumgens/src/app/team-section/team-nav/team-nav.component.html
@@ -1,4 +1,4 @@
-
-
-