From e4edeaf627bafee249b834dcc66fc76fdb4574a5 Mon Sep 17 00:00:00 2001 From: Ofek Ashery Date: Sat, 17 Nov 2018 08:02:22 +0200 Subject: [PATCH 1/5] Allows build --- src/app/app.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 308945aa..61520f82 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -37,7 +37,7 @@ export class TheOrangeAllianceComponent { private _mediaMatcher: MediaQueryList = matchMedia(`(max-width: ${SMALL_WIDTH_BREAKPOINT}px)`); @ViewChild(MdcTopAppBar) appBar: MdcTopAppBar; - constructor(private router: Router, private ftc: FTCDatabase, private globaltoa: TheOrangeAllianceGlobals, private _ngZone: NgZone, + constructor(public router: Router, private ftc: FTCDatabase, private _ngZone: NgZone, db: AngularFireDatabase, auth: AngularFireAuth) { auth.authState.subscribe(user => { if (user !== null && user !== undefined) { From e6d7da72752ddb0410bda5232e8bd445ad3aee76 Mon Sep 17 00:00:00 2001 From: Ofek Ashery Date: Sat, 17 Nov 2018 09:54:21 +0200 Subject: [PATCH 2/5] Fixed the FUN banner --- src/app/views/home/home.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/views/home/home.component.ts b/src/app/views/home/home.component.ts index 5f94502b..b152b9e2 100755 --- a/src/app/views/home/home.component.ts +++ b/src/app/views/home/home.component.ts @@ -135,7 +135,7 @@ export class HomeComponent { public willFUNstartSoon(): boolean { const diff = (new Date(this.firstupdatesnow.startDateTime).valueOf() - this.today.valueOf()) / 1000 / 60 / 60;// Convert milliseconds to hours - return diff <= 24; + return diff <= 24 && diff >= 0; } public isFUNonLive(): boolean { From 3ca7d6b9019ecebf6e60c1d8bc4c6118e19c7aec Mon Sep 17 00:00:00 2001 From: Ofek Ashery Date: Sun, 18 Nov 2018 17:09:04 +0200 Subject: [PATCH 3/5] Fixed incorrect teams in the match-table --- src/app/components/match-table/match-table.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/match-table/match-table.component.html b/src/app/components/match-table/match-table.component.html index fe4d8b2a..8d8a82a3 100644 --- a/src/app/components/match-table/match-table.component.html +++ b/src/app/components/match-table/match-table.component.html @@ -158,10 +158,10 @@ - {{ getParticipantString(match, 2) }} + {{ getParticipantString(match, 3) }} - {{ getParticipantString(match, 3) }} + {{ getParticipantString(match, 4) }} {{ getParticipantString(match, 5) }} @@ -323,10 +323,10 @@ - {{ getParticipantString(match, 2) }} + {{ getParticipantString(match, 3) }} - {{ getParticipantString(match, 3) }} + {{ getParticipantString(match, 4) }} {{ getParticipantString(match, 5) }} From 5d95e98484363f8213e3a9d3b5fbdd6125644580 Mon Sep 17 00:00:00 2001 From: Ofek Ashery Date: Mon, 19 Nov 2018 15:12:38 +0200 Subject: [PATCH 4/5] Updated to angular-mdc 0.41.2, Closed #194 --- package-lock.json | 42 ++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87c152bb..10a294a6 100755 --- a/package-lock.json +++ b/package-lock.json @@ -202,16 +202,16 @@ } }, "@angular-mdc/theme": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@angular-mdc/theme/-/theme-0.41.0.tgz", - "integrity": "sha512-JUeBKMHbzxTuB2GGFA+I0J2YJPYaq2s66yru3vevRHZieBoEFdxuNEf+y269iJ1VDOVC6sdKvRl1N+UT6tV/Ig==" + "version": "0.41.2", + "resolved": "https://registry.npmjs.org/@angular-mdc/theme/-/theme-0.41.2.tgz", + "integrity": "sha512-X+yFxz0T3O0U/9iVc7ssilRn8YCGXcJMbUDs1hreZS5Gr1PZZyGP2Azwjrz2tfW36Th344Ane40X46V7frNFCA==" }, "@angular-mdc/web": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@angular-mdc/web/-/web-0.41.0.tgz", - "integrity": "sha512-DYB7dL1/7SKv1L9IIXeNmJBaJzeK/mxcDVKaoNn2or5uOE2+jkuMJu5CIjiF7Qph9/orwGUi8N09eyAdlQ/Fbg==", + "version": "0.41.2", + "resolved": "https://registry.npmjs.org/@angular-mdc/web/-/web-0.41.2.tgz", + "integrity": "sha512-pvbSNXQshZU9Q4Jx9XO0dRGaFT4g29LYSkeIH/JxjZH89F+YnAB6M5jk27/6bQ8ERxerPIZ9fBj911OgLVmShA==", "requires": { - "@angular-mdc/theme": "0.41.0" + "@angular-mdc/theme": "0.41.2" } }, "@angular/animations": { @@ -4222,13 +4222,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4241,18 +4239,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -4355,8 +4350,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -4366,7 +4360,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4379,20 +4372,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.2.4", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4409,7 +4399,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4482,8 +4471,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -4493,7 +4481,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4599,7 +4586,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/package.json b/package.json index 9e5500bf..1200a478 100755 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "private": true, "dependencies": { - "@angular-mdc/web": "^0.41.0", + "@angular-mdc/web": "^0.41.2", "@angular/animations": "^6.0.0", "@angular/cdk": "^6.4.6", "@angular/common": "^6.0.0", From 075af56b06c5fdb472269c1fd08c4baf3fef07bc Mon Sep 17 00:00:00 2001 From: Ofek Ashery Date: Mon, 19 Nov 2018 15:23:10 +0200 Subject: [PATCH 5/5] Change the items order --- src/app/app.component.html | 80 ++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 4d6c8ba3..1194dfb5 100755 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ - + @@ -13,37 +13,6 @@ - - -
@@ -89,22 +58,19 @@ Streaming - - API - + + Android App + + Add Data - - - Android App + + + API @@ -146,6 +112,36 @@ + + +