Skip to content

Commit

Permalink
attempt to use jsonp
Browse files Browse the repository at this point in the history
  • Loading branch information
fisenkodv committed Mar 30, 2018
1 parent 14539e7 commit 5d0d69b
Show file tree
Hide file tree
Showing 9 changed files with 113 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "itinerary-1488041928048"
}
}
6 changes: 6 additions & 0 deletions database.rules.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"rules": {
".read": "auth != null",
".write": "auth != null"
}
}
19 changes: 19 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"database": {
"rules": "database.rules.json"
},
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
65 changes: 65 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Welcome to Firebase Hosting</title>

<!-- update the version number as needed -->
<script defer src="/__/firebase/4.12.1/firebase-app.js"></script>
<!-- include only the Firebase features as you need -->
<script defer src="/__/firebase/4.12.1/firebase-auth.js"></script>
<script defer src="/__/firebase/4.12.1/firebase-database.js"></script>
<script defer src="/__/firebase/4.12.1/firebase-messaging.js"></script>
<script defer src="/__/firebase/4.12.1/firebase-storage.js"></script>
<!-- initialize the SDK after all desired features are loaded -->
<script defer src="/__/firebase/init.js"></script>

<style media="screen">
body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
#message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px; border-radius: 3px; }
#message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
#message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
#message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
#message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
#message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
#load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
@media (max-width: 600px) {
body, #message { margin-top: 0; background: white; box-shadow: none; }
body { border-top: 16px solid #ffa100; }
}
</style>
</head>
<body>
<div id="message">
<h2>Welcome</h2>
<h1>Firebase Hosting Setup Complete</h1>
<p>You're seeing this because you've successfully setup Firebase Hosting. Now it's time to go build something extraordinary!</p>
<a target="_blank" href="https://firebase.google.com/docs/hosting/">Open Hosting Documentation</a>
</div>
<p id="load">Firebase SDK Loading&hellip;</p>

<script>
document.addEventListener('DOMContentLoaded', function() {
// // 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
// // The Firebase SDK is initialized and available here!
//
// firebase.auth().onAuthStateChanged(user => { });
// firebase.database().ref('/path/to/ref').on('value', snapshot => { });
// firebase.messaging().requestPermission().then(() => { });
// firebase.storage().ref('/path/to/ref').getDownloadURL().then(() => { });
//
// // 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥

try {
let app = firebase.app();
let features = ['auth', 'database', 'messaging', 'storage'].filter(feature => typeof app[feature] === 'function');
document.getElementById('load').innerHTML = `Firebase SDK loaded with ${features.join(', ')}`;
} catch (e) {
console.error(e);
document.getElementById('load').innerHTML = 'Error loading the Firebase SDK, check the console.';
}
});
</script>
</body>
</html>
3 changes: 2 additions & 1 deletion src/app/modules/places/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';

import { PipesModule } from '../../../shared/pipes';
import { MaterialModule } from '../../material.module';
import { TranslationModule } from '../../translation.module';
import { PlaceSearchComponent } from './place-search/place-search.component';
import { CommonModule } from '@angular/common';

export const COMPONENTS = [PlaceSearchComponent];

@NgModule({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h2 class="search-panel__title" translate>places.search.title</h2>
<div class="search-panel__content">
<div class="control-group">
<mat-form-field>
<input matInput [matAutocomplete]="autocomplete" [formControl]="placeCtrl" placeholder="{{'places.search.location.placeholder' | translate }}">
<input id="au" matInput [matAutocomplete]="autocomplete" [formControl]="placeCtrl" placeholder="{{'places.search.location.placeholder' | translate }}">
<mat-autocomplete #autocomplete="matAutocomplete">
<mat-option *ngFor="let place of filteredPlaces | async" [value]="place.place_id">
{{ place.description }}
Expand Down
15 changes: 13 additions & 2 deletions src/app/modules/places/places.module.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
import { CommonModule } from '@angular/common';
import { HttpClientJsonpModule, JsonpClientBackend, JsonpInterceptor, HTTP_INTERCEPTORS } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { ComponentsModule } from './components';
import { FindPlacesPageComponent } from './containers/find-places-page/find-places-page.component';
import { routes } from './places.routes';
import { GooglePlacesService } from './services';
import { JsonpCallbackContext } from '@angular/common/http/src/jsonp';

export function jsonpCallbackContext(){
console.log(arguments)
}

@NgModule({
imports: [CommonModule, ComponentsModule, RouterModule.forChild(routes)],
imports: [CommonModule, ComponentsModule, RouterModule.forChild(routes), HttpClientJsonpModule],
declarations: [FindPlacesPageComponent],
providers: [GooglePlacesService]
providers: [
GooglePlacesService,
JsonpClientBackend,
//{ provide: JsonpCallbackContext, useFactory: jsonpCallbackContext },
{ provide: HTTP_INTERCEPTORS, useClass: JsonpInterceptor, multi: true }
]
})
export class PlacesModule {}
2 changes: 1 addition & 1 deletion src/app/modules/places/services/google-places.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class GooglePlacesService {
const query = this.getQuery(queryParameters);
const url = `https://maps.googleapis.com/maps/api/place/autocomplete/json?${query}`;

return this.httpClient.get<GoogleAutocomplete[]>(url);
return this.httpClient.jsonp<GoogleAutocomplete[]>(url, 'ad');
}

private getQuery(parameters: object): string {
Expand Down
1 change: 1 addition & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<meta name="description" content="Itinerary is your starting point for searching interesting places and planning your trip">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<!-- <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAHtJrpKyxsARFESBwI-a0qaWjsD5ZW-3w&libraries=places"></script> -->
</head>

<body>
Expand Down

0 comments on commit 5d0d69b

Please sign in to comment.