Skip to content

Commit d456b7b

Browse files
author
pigr2
committed
all parts in place...
1 parent 5851c23 commit d456b7b

12 files changed

+13
-321
lines changed

app/app.component.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import {Store} from "@ngrx/store";
44

55
import {CurrentSearch} from "./models/current-search.model";
66
import {SearchResult} from "./models/search-result.model";
7+
import {YouTubeService} from "./services/youtube.service";
8+
import {SearchBox} from "./components/search-box.component";
9+
import {ProximitySelector} from "./components/proximity-selector.component";
710

811
/*
912
<div class="row col-md-8">
@@ -54,19 +57,18 @@ export class AppComponent implements OnInit {
5457

5558
constructor(
5659
private store: Store<CurrentSearch>,
57-
// private youtube: YouTubeService
60+
private youtube: YouTubeService
5861
) {
5962
this.currentSearch = this.store.select<CurrentSearch>('currentSearch');
60-
console.log(`component~!!!`);
61-
// this.youtube.searchResults.subscribe((results: SearchResult[]) => this.searchResults = results);
63+
this.youtube.searchResults.subscribe((results: SearchResult[]) => this.searchResults = results);
6264
}
6365

6466
ngOnInit() {
6567
this.currentSearch.subscribe((state: CurrentSearch) => {
6668
this.state = state;
6769
if (state && state.name && state.name.length > 0) {
6870
this.disableSearch = false;
69-
// this.youtube.search(state)
71+
this.youtube.search(state)
7072
} else {
7173
this.disableSearch = true;
7274
this.searchResults = [];

app/app.module.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ import { BrowserModule } from '@angular/platform-browser';
33
import {AppComponent} from "./app.component";
44
import {Store, StoreModule} from "@ngrx/store";
55
import {SearchReducer} from "./reducers/search.reducer";
6+
import {YouTubeService} from "./services/youtube.service";
7+
import {HttpModule} from "@angular/http";
8+
import {SearchBox} from "./components/search-box.component";
9+
import {ProximitySelector} from "./components/proximity-selector.component";
610

711
const storeManager = StoreModule.provideStore ({ currentSearch: SearchReducer });
812

913
@NgModule({
10-
imports: [ BrowserModule, StoreModule, storeManager ],
11-
declarations: [ AppComponent ],
14+
imports: [ BrowserModule, StoreModule, storeManager, HttpModule ],
15+
declarations: [ AppComponent, SearchBox, ProximitySelector ],
1216
bootstrap: [ AppComponent ],
13-
// providers: [ storeManager ]
17+
providers: [ YouTubeService ]
1418
})
1519
export class AppModule { }

old/components/proximity-selector.component.ts renamed to app/components/proximity-selector.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {Store} from '@ngrx/store';
33

44
@Component({
55
selector: 'proximity-selector',
6-
inputs: ['store', 'disabled'],
76
template: `
87
<div class="input-group">
98
<label for="useLocation">Use current location</label>

old/components/search-box.component.ts renamed to app/components/search-box.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {ElementRef, OnInit, Component, Input} from '@angular/core';
33
import {Store} from '@ngrx/store';
44

55
@Component({
6-
inputs: ['store'],
76
selector: 'search-box',
87
template: `
98
<input type="text" class="form-control" placeholder="Search" autofocus>
File renamed without changes.

old/app.component.ts

Lines changed: 0 additions & 80 deletions
This file was deleted.

old/components/proximity-selector.component.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

old/components/search-box.component.js

Lines changed: 0 additions & 43 deletions
This file was deleted.

old/main.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

old/reducers/search.reducer.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)