Skip to content

Commit

Permalink
Merge pull request #385 from BellumGens/roster-update
Browse files Browse the repository at this point in the history
feat(events): updating roster with forfeits
  • Loading branch information
kdinev authored Sep 1, 2024
2 parents 3b1a12b + 363f8b3 commit c893030
Show file tree
Hide file tree
Showing 9 changed files with 448 additions and 347 deletions.
725 changes: 412 additions & 313 deletions package-lock.json

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,40 @@
},
"private": true,
"dependencies": {
"@angular/animations": "17.3.9",
"@angular/common": "17.3.9",
"@angular/compiler": "17.3.9",
"@angular/core": "17.3.9",
"@angular/forms": "17.3.9",
"@angular/platform-browser": "17.3.9",
"@angular/platform-browser-dynamic": "17.3.9",
"@angular/platform-server": "17.3.9",
"@angular/router": "17.3.9",
"@angular/service-worker": "17.3.9",
"@angular/ssr": "^17.3.7",
"@angular/animations": "17.3.12",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/core": "17.3.12",
"@angular/forms": "17.3.12",
"@angular/platform-browser": "17.3.12",
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/platform-server": "17.3.12",
"@angular/router": "17.3.12",
"@angular/service-worker": "17.3.12",
"@angular/ssr": "^17.3.9",
"@igniteui/material-icons-extended": "^3.0.2",
"@infragistics/igniteui-angular": "17.2.9",
"@infragistics/igniteui-angular": "17.2.15",
"@types/express": "^4.17.17",
"compression": "^1.7.4",
"express": "^4.19.2",
"hammerjs": "^2.0.8",
"igniteui-angular-i18n": "17.2.9",
"igniteui-angular-i18n": "17.2.15",
"minireset.css": "0.0.4",
"rxjs": "^7.8.0",
"tslib": "^2.6.2",
"zone.js": "~0.14.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.7",
"@angular-eslint/builder": "^17.4.1",
"@angular-eslint/eslint-plugin": "^17.4.1",
"@angular-eslint/eslint-plugin-template": "^17.4.1",
"@angular-eslint/schematics": "^17.4.1",
"@angular-eslint/template-parser": "^17.4.1",
"@angular/cli": "^17.3.7",
"@angular/compiler-cli": "^17.3.9",
"@angular/language-service": "^17.3.9",
"@angular/localize": "^17.3.9",
"@angular-devkit/build-angular": "^17.3.9",
"@angular-eslint/builder": "^17.5.2",
"@angular-eslint/eslint-plugin": "^17.5.2",
"@angular-eslint/eslint-plugin-template": "^17.5.2",
"@angular-eslint/schematics": "^17.5.2",
"@angular-eslint/template-parser": "^17.5.2",
"@angular/cli": "^17.3.9",
"@angular/compiler-cli": "^17.3.12",
"@angular/language-service": "^17.3.12",
"@angular/localize": "^17.3.12",
"@cypress/schematic": "^2.5.0",
"@types/jasmine": "^5.1.4",
"@types/jasminewd2": "^2.0.9",
Expand Down
3 changes: 3 additions & 0 deletions projects/bellumgens/src/app/events/events.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ <h2 i18n>Invited Players</h2>
</div>
<h4 igxCardHeaderSubtitle>{{player.team}}</h4>
</igx-card-header>
<igx-card-content *ngIf="player.source">
<p>{{player.source}}</p>
</igx-card-content>
</igx-card>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions projects/bellumgens/src/app/events/events.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ $new-palette: palette(
height: 88px;
}

@media screen and (min-width: 750px) and (max-width: 1024px) {
.content-container-column iframe, .content-container-row iframe {
width: 100%;
height: 500px;
}
}

@media screen and (max-width: 1024px) {
background-position: center;

Expand Down
6 changes: 3 additions & 3 deletions projects/bellumgens/src/app/events/events.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ export class EventsComponent extends BaseDirective {
{name: 'Diego "Kelazhur" Schwimer', country: 'Brazil', race: 'Terran', team: 'R8 Esports', image: '/assets/bge/players/3-kelazhur.png'},
{name: 'Tobias "ShoWTimE" Sieber', country: 'Germany', race: 'Protoss', team: 'BIG', image: '/assets/bge/players/6-showtime.png'},
{name: 'Li "Oliveira" Peinan', country: 'China', race: 'Terran', team: 'DKZ Gaming', image: '/assets/bge/players/5-oliveira.png'},
{name: 'Piotr "Spirit" Walukiewicz', country: 'Poland', race: 'Terran', team: 'Natus Vincere', image: '/assets/bge/players/7-spirit.png'},
{name: 'Peycho "Nitix" Ivanov', country: 'Bulgaria', race: 'Zerg', team: 'BSL', source: 'Replaces Piotr "Spirit" Walukiewicz', image: '/assets/bge/players/21-nitix.png'},
{name: 'Kim "Stats" Dae-yeob', country: 'South-Korea', race: 'Protoss', team: 'Twisted Minds', image: '/assets/bge/players/4-stats.png'},
{name: 'Riccardo "Reynor" Romiti', country: 'Italy', race: 'Zerg', team: 'BASILISK', image: '/assets/bge/players/8-reynor.png'},
];

public qualifiedPlayers = [
{name: 'Nikita "SKillous" Gurevich', country: '', race: 'Protoss', team: 'Team Liquid', source: 'Global Open Qualifier', image: '/assets/bge/players/10-skillous.png'},
{name: 'Huang "Lancer" Min', country: 'China', race: 'Protoss', team: 'Mystery Gaming', source: 'Global Open Qualifier', image: '/assets/bge/players/14-lancer.png'},
{name: 'Martin "Fjant" Koffman', country: 'Sweden', race: 'Zerg', team: 'Team Rotti', source: 'Replaces Huang "Lancer" Min', image: '/assets/bge/players/20-fjant.png'},
{name: 'Yoon "trigger" Hong', country: 'Canada', race: 'Protoss', team: 'BASILISK', source: 'Global Open Qualifier', image: '/assets/bge/players/9-trigger.png'},
{name: 'Adrien "DnS" Bouet', country: 'France', race: 'Protoss', team: 'Berserker eSports', source: 'Global Open Qualifier', image: '/assets/bge/players/15-dns.png'},
{name: 'Maxwell "Astrea" Angel', country: 'United-States-of-America', race: 'Protoss', source: 'Global Open Qualifier', team: 'Virtus.pro', image: '/assets/bge/players/12-astrea.png'},
{name: 'Mateusz "Gerald" Budziak', country: 'Poland', race: 'Protoss', source: 'Replaces Maxwell "Astrea" Angel', team: 'PSISTORM Gaming', image: '/assets/bge/players/22-gerald.png'},
{name: 'Julian "Lambo" Brosig', country: 'Germany', race: 'Zerg', team: 'Shopify Rebellion', source: 'Global Open Qualifier', image: '/assets/bge/players/11-lambo.png'},
{name: 'Kevin "Harstem" Koning', country: 'Netherlands', race: 'Protoss', team: 'Shopify Rebellion', source: 'Global Open Qualifier', image: '/assets/bge/players/13-harstem.png'},
{name: 'Mihail "msrm" Mihaylov', country: 'Bulgaria', race: 'Zerg', team: 'BSL', source: 'Bulgarian Open Qualifier', image: '/assets/bge/players/16-msrm.png'}
Expand Down
8 changes: 0 additions & 8 deletions projects/bellumgens/src/app/home/home.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ describe('HomeComponent', () => {
expect(carousel).toBeTruthy();
});

it('should have navigation set to true by default', () => {
expect(component.navigation).toBeTrue();
});

it('should have userEmail set to null by default', () => {
expect(component.userEmail).toBeNull();
});

it('should call resize method on window resize', () => {
spyOn(component, 'resize');
window.dispatchEvent(new Event('resize'));
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c893030

Please sign in to comment.