Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
fisenkodv committed Nov 30, 2018
1 parent 87da8ce commit 53f222c
Show file tree
Hide file tree
Showing 8 changed files with 9,493 additions and 65 deletions.
91 changes: 45 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,61 +20,60 @@
},
"dependencies": {
"@agm/core": "^1.0.0-beta.3",
"@angular/animations": "^6.1.0",
"@angular/cdk": "^6.4.7",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/fire": "^5.0.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/material": "^6.4.7",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"@angular/service-worker": "^6.0.6",
"@ngx-translate/core": "10.0.2",
"@ngx-translate/http-loader": "3.0.1",
"@ngxs/devtools-plugin": "3.2.0",
"@ngxs/logger-plugin": "3.2.0",
"@ngxs/storage-plugin": "3.2.0",
"@ngxs/store": "3.2.0",
"@types/googlemaps": "^3.30.12",
"@types/lodash": "4.14.116",
"@angular/animations": "^7.1.1",
"@angular/cdk": "^7.1.0",
"@angular/common": "^7.1.1",
"@angular/compiler": "^7.1.1",
"@angular/core": "^7.1.1",
"@angular/fire": "^5.1.1",
"@angular/forms": "^7.1.1",
"@angular/http": "^7.1.1",
"@angular/material": "^7.1.0",
"@angular/platform-browser": "^7.1.1",
"@angular/platform-browser-dynamic": "^7.1.1",
"@angular/router": "^7.1.1",
"@angular/service-worker": "^7.1.1",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"@ngxs/devtools-plugin": "3.3.1",
"@ngxs/logger-plugin": "3.3.1",
"@ngxs/storage-plugin": "3.3.1",
"@ngxs/store": "3.3.1",
"@types/googlemaps": "^3.30.16",
"@types/lodash": "4.14.118",
"bootstrap": "4.1.3",
"core-js": "^2.5.7",
"firebase": "5.4.2",
"firebase": "5.6.0",
"git-describe": "^4.0.3",
"hammerjs": "^2.0.8",
"lodash": "4.17.10",
"rxjs": "6.2.1",
"rxjs-compat": "6.2.1",
"lodash": "4.17.11",
"rxjs": "6.3.3",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/cli": "~6.2.1",
"@angular-devkit/build-angular": "~0.8.0",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@types/jasmine": "2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/jest": "^23.3.1",
"@types/node": "10.9.4",
"codelyzer": "~4.4.4",
"firebase-tools": "^4.2.1",
"jasmine-core": "3.2.1",
"@angular/cli": "~7.1.0",
"@angular-devkit/build-angular": "~0.11.0",
"@angular/compiler-cli": "^7.1.1",
"@angular/language-service": "^7.1.1",
"@types/jasmine": "3.3.0",
"@types/jasminewd2": "~2.0.6",
"@types/jest": "^23.3.10",
"@types/node": "10.12.10",
"codelyzer": "~4.5.0",
"firebase-tools": "^6.1.1",
"jasmine-core": "3.3.0",
"jasmine-spec-reporter": "~4.2.1",
"jest": "^23.5.0",
"jest-preset-angular": "6.0.0",
"jest-junit": "5.1.0",
"karma": "3.0.0",
"jest": "^23.6.0",
"jest-preset-angular": "6.0.1",
"jest-junit": "5.2.0",
"karma": "3.1.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.3",
"karma-jasmine": "1.1.2",
"karma-jasmine-html-reporter": "1.3.1",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0",
"protractor": "~5.4.1",
"ts-node": "~7.0.1",
"tslint": "~5.11.0",
"typescript": "~2.9.2"
"typescript": "~3.1.1"
}
}
4 changes: 2 additions & 2 deletions src/app/modules/core/containers/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component } from '@angular/core';
import { LayoutState } from '@app/modules/core/state/layout.state';
import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';

import * as layout from '../../state/layout.actions';
import { LayoutState } from '@app/modules/core/state/layout.state';

@Component({
moduleId: module.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import { FormControl } from '@angular/forms';
import { MatAutocompleteSelectedEvent } from '@angular/material';
import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs/Observable';
import { Observable, Subject } from 'rxjs';
import { debounceTime, filter, switchMap, takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject';

import { GooglePlacesAutocomplete, GooglePlacesPlace } from '../../models';
import { GetAutocomplete, SelectPlace } from '../../state/autocomplete.actions';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';

import { Place } from '../../models';
import { FilterState } from '../../state/filter.state';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Select, Store } from '@ngxs/store';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';

import { Place } from '../../models';
import { GetPlaceDetails } from '../../state/places.actions';
Expand Down
15 changes: 4 additions & 11 deletions src/app/modules/places/services/google-places.service.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/// <reference types="@types/googlemaps" />
import 'rxjs/add/observable/bindCallback';

import { MapsAPILoader } from '@agm/core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { bindCallback, Observable, pipe } from 'rxjs';

import { GooglePlacesAutocomplete, GooglePlacesPlace } from '../models';

Expand All @@ -15,14 +13,9 @@ export class GooglePlacesService {

constructor(private apiLoader: MapsAPILoader) {
this.apiLoader.load();
this.autocompleteObservableFactory = Observable.bindCallback(
this.autocompleteCallback,
this.autocompleteResultSelector
);

this.placeDetailsObservableFactory = Observable.bindCallback(
this.getPlaceDetailsCallback.bind(this),
this.getPlaceDetailsResultSelector
this.autocompleteObservableFactory = pipe(bindCallback(this.autocompleteCallback, this.autocompleteResultSelector));
this.placeDetailsObservableFactory = pipe(
bindCallback(this.getPlaceDetailsCallback.bind(this), this.getPlaceDetailsResultSelector)
);
}

Expand Down
2 changes: 0 additions & 2 deletions src/app/modules/places/state/places.state.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'rxjs/add/observable/empty';

import { Place } from '@app/modules/places/models';
import { ItineraryPlacesService } from '@app/modules/places/services';
import { FilterState, FilterStateModel } from '@app/modules/places/state/filter.state';
Expand Down
Loading

0 comments on commit 53f222c

Please sign in to comment.