From 1bacf4ccf55922d8d867ddbd6a5b8ab584eaac0c Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Fri, 20 Sep 2019 01:03:18 +0530 Subject: [PATCH 1/7] gdg image fixed --- src/app/components/home-page/home-page.component.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/home-page/home-page.component.sass b/src/app/components/home-page/home-page.component.sass index ccad3b9..76edf5b 100644 --- a/src/app/components/home-page/home-page.component.sass +++ b/src/app/components/home-page/home-page.component.sass @@ -42,9 +42,9 @@ flex-direction: row .gdg-image - max-width: 300px + max-width: 19rem height: 10rem - margin: auto + margin: 5rem auto font-family: "Product Sans" @media screen and (max-width: 930px) max-width: 200px From 515f329f9dc6f8805290bfd08e9941b8924b03ac Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Wed, 2 Oct 2019 00:57:31 +0530 Subject: [PATCH 2/7] Filters Added --- .../speakers-page.component.html | 42 ++++++- .../speakers-page/speakers-page.component.ts | 115 ++++++++++++++++-- 2 files changed, 144 insertions(+), 13 deletions(-) diff --git a/src/app/components/speakers-page/speakers-page.component.html b/src/app/components/speakers-page/speakers-page.component.html index bdbe98e..a894c43 100644 --- a/src/app/components/speakers-page/speakers-page.component.html +++ b/src/app/components/speakers-page/speakers-page.component.html @@ -9,18 +9,58 @@ Hear from the Googlers, Partners, and Guest Speakers who are building the future of cloud. Check back often as we add more speakers, including our customers and partners. +
+
+ + + + + + +

Rockstars🤘 are on the way!

- +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ diff --git a/src/app/components/speakers-page/speakers-page.component.ts b/src/app/components/speakers-page/speakers-page.component.ts index a7671de..4b05b6d 100644 --- a/src/app/components/speakers-page/speakers-page.component.ts +++ b/src/app/components/speakers-page/speakers-page.component.ts @@ -4,19 +4,110 @@ import { Speakers } from 'src/app/models/interfaces'; import { SpeakerCardComponent } from 'src/app/elements/speaker-card/speaker-card.component'; @Component({ - selector: 'app-speakers-page', - templateUrl: './speakers-page.component.html', - styleUrls: ['./speakers-page.component.sass'] + selector: 'app-speakers-page', + templateUrl: './speakers-page.component.html', + styleUrls: ['./speakers-page.component.sass'] }) export class SpeakersPageComponent implements OnInit { - speakers: Speakers = {}; - constructor(private db: AngularFirestore) { - db.doc('speakers/data').valueChanges().subscribe(data => { - this.speakers = data; - }); - } + speakers: Speakers = {}; + mobile = []; + web = []; + cloud = []; + ml = []; + others = []; + web_Active; + mobile_Active; + ml_Active; + cloud_Active; + others_Active; + webCount; + mobileCount; + mlCount; + cloudCount; + othersCount; + constructor(private db: AngularFirestore) { + db.doc('speakers/data').valueChanges().subscribe(data => { + this.speakers = { + enabled: data.enabled, + data: data.data.filter(ele => { + // console.log(ele); + if (ele.track == 'mobile') { + console.log(ele.track); + this.mobile.push(ele); + } + else if (ele.track == 'web') { + console.log(ele.track); + this.web.push(ele); + } + else if (ele.track == 'cloud') { + console.log(ele.track); + this.cloud.push(ele); + } + else if (ele.track == 'ml') { + console.log(ele.track); + this.ml.push(ele); + } else { + console.log(ele.track); + this.others.push(ele); + } + return true + }) + } + }); - ngOnInit() { - } + } + webActive(value) { + this.webCount += value; + if (this.webCount % 2 == 0) { + this.web_Active = false; + } else { + this.web_Active = true; + } + } + mobileActive(value) { + this.mobileCount += value; + if (this.mobileCount % 2 == 0) { + this.mobile_Active = false; + } else { + this.mobile_Active = true; + } + } + mlActive(count) { + this.mlCount += count; + if (this.mlCount % 2 == 0) { + this.ml_Active = false; + } else { + this.ml_Active = true; + } + } + cloudActive(value) { + this.cloudCount += value; + if (this.cloudCount % 2 == 0) { + this.cloud_Active = false; + } else { + this.cloud_Active = true; + } + } + othersActive(value) { + this.othersCount += value; + if (this.othersCount % 2 == 0) { + this.others_Active = false; + } else { + this.others_Active = true; + } + } -} + ngOnInit() { + this.web_Active = false; + this.mobile_Active = false; + this.ml_Active = false; + this.cloud_Active = false; + this.others_Active = false; + this.webCount = 0; + this.mobileCount = 0; + this.mlCount = 0; + this.cloudCount = 0; + this.othersCount = 0; + } + +} \ No newline at end of file From daa8f921b9942f4665d9079f92e9cc60e4a64de2 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Wed, 2 Oct 2019 05:12:03 +0530 Subject: [PATCH 3/7] Schedule Initialized --- src/app/app-routing.module.ts | 2 ++ src/app/app.module.ts | 4 ++- .../scheduler/scheduler.component.html | 33 +++++++++++++++++++ .../scheduler/scheduler.component.sass | 3 ++ .../scheduler/scheduler.component.spec.ts | 25 ++++++++++++++ .../scheduler/scheduler.component.ts | 22 +++++++++++++ 6 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 src/app/components/scheduler/scheduler.component.html create mode 100644 src/app/components/scheduler/scheduler.component.sass create mode 100644 src/app/components/scheduler/scheduler.component.spec.ts create mode 100644 src/app/components/scheduler/scheduler.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c83f9f6..343d054 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -7,6 +7,7 @@ import { TeamPageComponent } from './components/team-page/team-page.component'; import { SpeakersPageComponent } from './components/speakers-page/speakers-page.component'; import { AboutPageComponent } from './components/about-page/about-page.component'; import { HomePageHeaderComponent } from './elements/home-page-header/home-page-header.component'; +import { SchedulerComponent } from './components/scheduler/scheduler.component'; const routes: Routes = [ @@ -16,6 +17,7 @@ const routes: Routes = [ { path: 'speakers', component: SpeakersPageComponent }, { path: 'about', component: AboutPageComponent }, { path: 'profile', component: UserProfileComponent }, + { path: 'schedule', component: SchedulerComponent }, ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f158a6a..0531de3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -41,7 +41,8 @@ import { UserProfileComponent } from './components/user-profile/user-profile.com import { ServiceWorkerModule } from '@angular/service-worker'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { EnabledSpeaker } from '../app/elements/speaker-card/speaker-card.component' -import { FeaturedSpeaker } from '../app/elements/speaker-card/speaker-card.component' +import { FeaturedSpeaker } from '../app/elements/speaker-card/speaker-card.component'; +import { SchedulerComponent } from './components/scheduler/scheduler.component' @NgModule({ declarations: [ AppComponent, @@ -64,6 +65,7 @@ import { FeaturedSpeaker } from '../app/elements/speaker-card/speaker-card.compo FooterComponent, EnabledSpeaker, FeaturedSpeaker, + SchedulerComponent, ], imports: [ BrowserModule, diff --git a/src/app/components/scheduler/scheduler.component.html b/src/app/components/scheduler/scheduler.component.html new file mode 100644 index 0000000..16a46e2 --- /dev/null +++ b/src/app/components/scheduler/scheduler.component.html @@ -0,0 +1,33 @@ +
+
+
+ +
+
+ + +
+ + +

Start Time

+ + +

Speaker

+ + +

Topic

+ + +
+
+
+ + {{data.start_time}} + {{data.speaker_name}} + {{data.speaker_session}} + +
+
+ + +
diff --git a/src/app/components/scheduler/scheduler.component.sass b/src/app/components/scheduler/scheduler.component.sass new file mode 100644 index 0000000..c7eda26 --- /dev/null +++ b/src/app/components/scheduler/scheduler.component.sass @@ -0,0 +1,3 @@ +.box + border-left: 0.3rem solid #00fa21 + margin-bottom:2rem \ No newline at end of file diff --git a/src/app/components/scheduler/scheduler.component.spec.ts b/src/app/components/scheduler/scheduler.component.spec.ts new file mode 100644 index 0000000..efcc9d1 --- /dev/null +++ b/src/app/components/scheduler/scheduler.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SchedulerComponent } from './scheduler.component'; + +describe('SchedulerComponent', () => { + let component: SchedulerComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SchedulerComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SchedulerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/scheduler/scheduler.component.ts b/src/app/components/scheduler/scheduler.component.ts new file mode 100644 index 0000000..d03f2b9 --- /dev/null +++ b/src/app/components/scheduler/scheduler.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import { AngularFirestore } from '@angular/fire/firestore'; +import { Speakers } from 'src/app/models/interfaces'; + +@Component({ + selector: 'app-scheduler', + templateUrl: './scheduler.component.html', + styleUrls: ['./scheduler.component.sass'] +}) +export class SchedulerComponent implements OnInit { + schedule: Speakers = {}; + + constructor(private db: AngularFirestore) { + db.doc('speakers/data').valueChanges().subscribe(data => { + this.schedule = data; + }); + } + + ngOnInit() { + } + +} From 325c6fba7ec5411860a0966395786d3a797c88c5 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Wed, 2 Oct 2019 16:15:16 +0530 Subject: [PATCH 4/7] Added checkbox in Filters --- src/app/app.module.ts | 2 + .../speakers-page.component.html | 28 +++++++--- .../speakers-page.component.sass | 3 ++ .../speakers-page/speakers-page.component.ts | 51 +------------------ 4 files changed, 28 insertions(+), 56 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0531de3..212da69 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -43,6 +43,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { EnabledSpeaker } from '../app/elements/speaker-card/speaker-card.component' import { FeaturedSpeaker } from '../app/elements/speaker-card/speaker-card.component'; import { SchedulerComponent } from './components/scheduler/scheduler.component' +import { MatCheckboxModule } from '@angular/material/checkbox' @NgModule({ declarations: [ AppComponent, @@ -69,6 +70,7 @@ import { SchedulerComponent } from './components/scheduler/scheduler.component' ], imports: [ BrowserModule, + MatCheckboxModule, AppRoutingModule, ReactiveFormsModule, FormsModule, diff --git a/src/app/components/speakers-page/speakers-page.component.html b/src/app/components/speakers-page/speakers-page.component.html index a894c43..2360a60 100644 --- a/src/app/components/speakers-page/speakers-page.component.html +++ b/src/app/components/speakers-page/speakers-page.component.html @@ -11,14 +11,30 @@ as we add more speakers, including our customers and partners.

- - - - - +
+ +
+ + + Web + + + Mobile + + + ML + + + Cloud + + + Others + + +
+ -
diff --git a/src/app/components/speakers-page/speakers-page.component.sass b/src/app/components/speakers-page/speakers-page.component.sass index 9a739e5..fd5bbb0 100644 --- a/src/app/components/speakers-page/speakers-page.component.sass +++ b/src/app/components/speakers-page/speakers-page.component.sass @@ -37,3 +37,6 @@ .cdk-overlay-dark-backdrop.cdk-overlay-backdrop-showing background-color: rgba(255, 255, 255, 0.4)!important + +.check + font-size: 1.5rem \ No newline at end of file diff --git a/src/app/components/speakers-page/speakers-page.component.ts b/src/app/components/speakers-page/speakers-page.component.ts index 4b05b6d..34d01e6 100644 --- a/src/app/components/speakers-page/speakers-page.component.ts +++ b/src/app/components/speakers-page/speakers-page.component.ts @@ -20,11 +20,6 @@ export class SpeakersPageComponent implements OnInit { ml_Active; cloud_Active; others_Active; - webCount; - mobileCount; - mlCount; - cloudCount; - othersCount; constructor(private db: AngularFirestore) { db.doc('speakers/data').valueChanges().subscribe(data => { this.speakers = { @@ -56,46 +51,7 @@ export class SpeakersPageComponent implements OnInit { }); } - webActive(value) { - this.webCount += value; - if (this.webCount % 2 == 0) { - this.web_Active = false; - } else { - this.web_Active = true; - } - } - mobileActive(value) { - this.mobileCount += value; - if (this.mobileCount % 2 == 0) { - this.mobile_Active = false; - } else { - this.mobile_Active = true; - } - } - mlActive(count) { - this.mlCount += count; - if (this.mlCount % 2 == 0) { - this.ml_Active = false; - } else { - this.ml_Active = true; - } - } - cloudActive(value) { - this.cloudCount += value; - if (this.cloudCount % 2 == 0) { - this.cloud_Active = false; - } else { - this.cloud_Active = true; - } - } - othersActive(value) { - this.othersCount += value; - if (this.othersCount % 2 == 0) { - this.others_Active = false; - } else { - this.others_Active = true; - } - } + ngOnInit() { this.web_Active = false; @@ -103,11 +59,6 @@ export class SpeakersPageComponent implements OnInit { this.ml_Active = false; this.cloud_Active = false; this.others_Active = false; - this.webCount = 0; - this.mobileCount = 0; - this.mlCount = 0; - this.cloudCount = 0; - this.othersCount = 0; } } \ No newline at end of file From 75b1043a3eb62dfd99373c622f7494a4e4185621 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Wed, 2 Oct 2019 16:22:03 +0530 Subject: [PATCH 5/7] logs removed & case fixed --- .../speakers-page.component.html | 22 ++++++++-------- .../speakers-page/speakers-page.component.ts | 26 +++++++------------ 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/app/components/speakers-page/speakers-page.component.html b/src/app/components/speakers-page/speakers-page.component.html index 2360a60..577af6d 100644 --- a/src/app/components/speakers-page/speakers-page.component.html +++ b/src/app/components/speakers-page/speakers-page.component.html @@ -16,19 +16,19 @@
- Web + Web - Mobile + Mobile - ML + ML - Cloud + Cloud - Others + Others
@@ -42,37 +42,37 @@
+ *ngIf="(speakers.enabled && speakers.enabled.value && !webActive && !mobileActive && !mlActive && !cloudActive && !othersActive)">
- +
- +
- +
- +
- +
diff --git a/src/app/components/speakers-page/speakers-page.component.ts b/src/app/components/speakers-page/speakers-page.component.ts index 34d01e6..8d29d31 100644 --- a/src/app/components/speakers-page/speakers-page.component.ts +++ b/src/app/components/speakers-page/speakers-page.component.ts @@ -15,34 +15,28 @@ export class SpeakersPageComponent implements OnInit { cloud = []; ml = []; others = []; - web_Active; - mobile_Active; - ml_Active; - cloud_Active; - others_Active; + webActive; + mobileActive; + mlActive; + cloudActive; + othersActive; constructor(private db: AngularFirestore) { db.doc('speakers/data').valueChanges().subscribe(data => { this.speakers = { enabled: data.enabled, data: data.data.filter(ele => { - // console.log(ele); if (ele.track == 'mobile') { - console.log(ele.track); this.mobile.push(ele); } else if (ele.track == 'web') { - console.log(ele.track); this.web.push(ele); } else if (ele.track == 'cloud') { - console.log(ele.track); this.cloud.push(ele); } else if (ele.track == 'ml') { - console.log(ele.track); this.ml.push(ele); } else { - console.log(ele.track); this.others.push(ele); } return true @@ -54,11 +48,11 @@ export class SpeakersPageComponent implements OnInit { ngOnInit() { - this.web_Active = false; - this.mobile_Active = false; - this.ml_Active = false; - this.cloud_Active = false; - this.others_Active = false; + this.webActive = false; + this.mobileActive = false; + this.mlActive = false; + this.cloudActive = false; + this.othersActive = false; } } \ No newline at end of file From c6d300217b89e22b49f4bc269ca69f208f4b20d8 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Wed, 2 Oct 2019 16:26:25 +0530 Subject: [PATCH 6/7] review changes fixed --- .../components/speakers-page/speakers-page.component.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/components/speakers-page/speakers-page.component.html b/src/app/components/speakers-page/speakers-page.component.html index 577af6d..16d39e0 100644 --- a/src/app/components/speakers-page/speakers-page.component.html +++ b/src/app/components/speakers-page/speakers-page.component.html @@ -35,14 +35,13 @@
-
+

Rockstars🤘 are on the way!

+ *ngIf="(speakers.enabled?.value && !webActive && !mobileActive && !mlActive && !cloudActive && !othersActive)">
From 22d83fc0220965099f1faacdf8fcd47d7707d710 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Date: Fri, 4 Oct 2019 01:53:26 +0530 Subject: [PATCH 7/7] Checkbox color changed --- .../speakers-page/speakers-page.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/components/speakers-page/speakers-page.component.html b/src/app/components/speakers-page/speakers-page.component.html index 16d39e0..192a348 100644 --- a/src/app/components/speakers-page/speakers-page.component.html +++ b/src/app/components/speakers-page/speakers-page.component.html @@ -16,19 +16,19 @@
- Web + Web - Mobile + Mobile - ML + ML - Cloud + Cloud - Others + Others