Skip to content

Commit 54a464d

Browse files
committed
Cleanup
1 parent 59fcb13 commit 54a464d

File tree

22 files changed

+71
-180
lines changed

22 files changed

+71
-180
lines changed

NOTICE.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ The following components are provided under the MIT License (MIT). See project l
2020
GraphQL Java implementation (https://github.com/graphql-java/graphql-java)
2121
Angular (https://github.com/angular/angular)
2222
ng2-charts (https://github.com/valor-software/ng2-charts)
23-
Angular2 Materialize (https://github.com/InfomediaLtd/angular2-materialize)
24-
Materialize (https://github.com/Dogfalo/materialize)
2523
Chart.js (https://github.com/chartjs/Chart.js)
2624
Annotation plugin for Chart.js (https://github.com/chartjs/chartjs-plugin-annotation)
2725
angular2-moment (https://github.com/urish/angular2-moment)
@@ -47,12 +45,12 @@ The following components are provided under the Apache License 2.0. See project
4745

4846
Less (https://github.com/less/less.js)
4947
Typescript (https://github.com/Microsoft/TypeScript)
50-
48+
5149

5250
========================================================================
5351
Creative Commons - Attribution-NonCommercial-NoDerivs 2.0 Generic
54-
========================================================================
55-
DC Comics LEGO variant covers
52+
========================================================================
53+
DC Comics LEGO variant covers
5654
Origin: https://www.flickr.com/photos/toomuchdew/albums/72157645848803730/with/14667325240
5755
License: https://creativecommons.org/licenses/by-nc-nd/2.0/
5856

src/angular/app/app.component.ts

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,7 @@ export class AppComponent implements OnInit {
5858
this.pageTitleService.resetTitle();
5959
});
6060
}
61-
/*
62-
ngAfterViewInit(): void {
63-
this.initSidenav();
64-
this.initUserDropdown();
65-
}
6661

67-
initSidenav(): void {
68-
const elems = document.querySelectorAll('.sidenav');
69-
M.Sidenav.init(elems, {
70-
edge: 'right'
71-
});
72-
}
73-
74-
initUserDropdown(): void {
75-
const elems = document.querySelectorAll('.dropdown-trigger');
76-
M.Dropdown.init(elems);
77-
}
78-
*/
7962
toggleSidenav(): void {
8063
this.sidenav.toggle();
8164
this.sidenavOpened = !this.sidenavOpened;
@@ -111,8 +94,7 @@ export class AppComponent implements OnInit {
11194
this.playerName = player.name;
11295
this.isNewUser = false;
11396
this.isAuthenticated = true;
114-
this.displayMenu = false;
115-
setTimeout(() => this.displayMenu = true, 100); // hack to force refresh materialize SideNav menu
97+
this.displayMenu = true;
11698
} else {
11799
this.playerImage = ImageService.playerDefault();
118100
this.playerName = '';

src/angular/app/app.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {UserProfileService} from './services/user-profile.service';
2424
import {WindowRefService} from './services/window-ref.service';
2525
import {AudioService} from './services/audio.service';
2626
import {PushNotificationService} from './services/push-notification.sevice';
27-
//import { MaterializeModule } from 'angular2-materialize';
2827
import { MatSidenavModule } from '@angular/material/sidenav';
2928
import { MatToolbarModule } from '@angular/material/toolbar';
3029
import { MatListModule } from '@angular/material/list';

src/angular/app/common/common.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {PlayerSelectComponent} from './player-select/player-select.component';
1515
import {ChipsComponent} from './chips/chips.component';
1616
import {ReactiveFormsModule} from "@angular/forms";
1717
import {ConnectionErrorComponent} from './connection-error/connection-error.component';
18-
//import { MaterializeModule } from 'angular2-materialize';
1918
import { MatSnackBarModule } from '@angular/material/snack-bar';
2019
import { MatChipsModule } from '@angular/material/chips';
2120
import { MatIconModule } from '@angular/material/icon';

src/angular/app/common/player-select/player-select.component.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {GraphQLService} from '../../services/graphql.service';
1616
export class PlayerSelectComponent extends List2Component {
1717
@Input() playerIds: string[];
1818
@Input() excludedPlayerIds: string[] = [];
19-
@Input() materializeActions: EventEmitter<any> = new EventEmitter<any>();
2019
@Output() playerSelected: EventEmitter<Player> = new EventEmitter<Player>();
2120
allPlayers: Player[] = [];
2221
players: Player[] = [];
@@ -30,18 +29,9 @@ export class PlayerSelectComponent extends List2Component {
3029
ngOnInit(): void {
3130
super.ngOnInit();
3231
this.searchValue = '';
33-
if (this.materializeActions) {
34-
this.materializeActions.subscribe((materialAction: any) => {
35-
if (materialAction.params && materialAction.params[0] === 'open') {
36-
this.searchValue = '';
37-
this.onSearchFieldModified();
38-
}
39-
});
40-
}
4132
this.observer = this;
4233
}
4334

44-
4535
ngOnChanges(changes: SimpleChanges): void {
4636
let playerIdsChange = changes['playerIds'];
4737
let excludedPlayerIdsChange = changes['excludedPlayerIds'];
@@ -113,10 +103,6 @@ export class PlayerSelectComponent extends List2Component {
113103
this.notifySelected();
114104
}
115105

116-
private refresh(currentPage: number = 1, searchValue: string = '') {
117-
this.filterPlayers(searchValue);
118-
}
119-
120106
static readonly GetPlayersQuery = `query ($playerIds: [ID], $first:Int) {
121107
players(ids: $playerIds, first: $first) {
122108
id

src/angular/app/games/game-delete-dialog/game-delete-dialog.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
22

33
@Component({
44
selector: 'game-delete-dialog',
5-
templateUrl: 'game-delete-dialog.component.html',
6-
styleUrls: ['game-delete-dialog.component.less']
5+
templateUrl: 'game-delete-dialog.component.html'
76
})
87
export class GameDeleteDialogComponent {
98
@Output() deleteConfirmed = new EventEmitter<void>();

src/angular/app/games/game-profile/game-profile.component.less

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,8 @@
1111
padding: 0 0 20px;
1212
}
1313

14-
textarea.materialize-textarea:focus:not([readonly]) {
15-
border-left: 0;
16-
}
17-
18-
textarea.materialize-textarea:focus {
19-
border-bottom: 1px solid #0091ea;
20-
box-shadow: 0 1px 0 0 #0091ea;
21-
}
22-
23-
textarea.materialize-textarea:focus + label {
24-
color: #0091ea;
25-
}
26-
2714
.fixed-action-btn {
2815
ul.game-profile__btn-menu {
2916
bottom: 40px;
3017
}
31-
}
18+
}

src/angular/app/games/games.module.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import {NgChartsModule} from 'ng2-charts';
1515
import {GameFlowComponent} from './game-flow/game-flow.component';
1616
import {GameSelection} from './GameSelection';
1717
import {RatingPointsComponent} from './rating-points/rating-points.component';
18-
//import {MomentModule} from 'angular2-moment'
19-
//import { MaterializeModule } from 'angular2-materialize';
2018
import { MatDialogModule } from '@angular/material/dialog';
2119
import { MatFormFieldModule } from '@angular/material/form-field';
2220
import { MatButtonModule } from '@angular/material/button';
@@ -56,7 +54,6 @@ const gameRoutes: Routes = [
5654
],
5755
imports: [
5856
CommonModule,
59-
//MaterializeModule,
6057
RouterModule.forChild(gameRoutes),
6158
FormsModule,
6259
NgChartsModule,

src/angular/app/games/new-game-player/new-game-player.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Component, Input, Output, EventEmitter, ElementRef} from '@angular/core';
22
import {Player} from '../../../graphql/schemas/Player';
33
import { Config } from '../../app.config';
4-
//import {MaterializeAction} from 'angular2-materialize';
54
import { MatDialog } from '@angular/material/dialog';
65
import {PlayerSelectDialogComponent} from '../player-select-dialog/player-select-dialog.component';
76

src/angular/app/info-page/info-page.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {CommonModule} from '../common/common.module';
44
import {InfoPageComponent} from './info-page.component';
55
import {FormsModule} from '@angular/forms';
66
import {PlayerRouteGuard, } from '../guards/player.route.guard';
7-
//import { MaterializeModule } from 'angular2-materialize';
87

98
const pageInfoRoutes: Routes = [
109
{path: ':info-page', component: InfoPageComponent, canActivate: [PlayerRouteGuard,]}
@@ -16,7 +15,6 @@ const pageInfoRoutes: Routes = [
1615
],
1716
imports: [
1817
CommonModule,
19-
//MaterializeModule,
2018
RouterModule.forChild(pageInfoRoutes),
2119
FormsModule
2220
],

0 commit comments

Comments
 (0)