diff --git a/src/app/common/components/presentation/text-box/text-box.component.ts b/src/app/common/components/presentation/text-box/text-box.component.ts
index 0e7dd25..2d8dd02 100644
--- a/src/app/common/components/presentation/text-box/text-box.component.ts
+++ b/src/app/common/components/presentation/text-box/text-box.component.ts
@@ -20,7 +20,6 @@ export class TextBoxComponent implements OnInit {
ngOnInit() {}
onChange(event) {
- console.log(this.textboxValue);
}
}
diff --git a/src/app/common/components/presentation/toolbar/toolbar.component.ts b/src/app/common/components/presentation/toolbar/toolbar.component.ts
index 9232b51..4cf084e 100644
--- a/src/app/common/components/presentation/toolbar/toolbar.component.ts
+++ b/src/app/common/components/presentation/toolbar/toolbar.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit, Input } from '@angular/core';
+import { Router } from '@angular/router';
@Component({
selector: 'app-toolbar',
@@ -7,15 +8,18 @@ import { Component, OnInit, Input } from '@angular/core';
})
export class ToolbarComponent implements OnInit {
- @Input() private title:string
+ @Input() private title:string;
+ private router:Router;
- constructor() { }
+ constructor(router:Router) {
+ this.router = router;
+ }
ngOnInit() {
}
goHome(event) {
- console.log("Clicked home: " + event);
+ this.router.navigateByUrl('/login');
}
}
diff --git a/src/app/common/components/smart/login/login.component.ts b/src/app/common/components/smart/login/login.component.ts
index dacb1b5..d2284eb 100644
--- a/src/app/common/components/smart/login/login.component.ts
+++ b/src/app/common/components/smart/login/login.component.ts
@@ -8,7 +8,11 @@ import { Routes, RouterModule, Router } from '@angular/router';
})
export class LoginComponent implements OnInit {
- constructor(private router: Router) { }
+ private router : Router;
+
+ constructor(router: Router) {
+ this.router = router;
+ }
@Input() private disabled:string
@@ -16,19 +20,10 @@ export class LoginComponent implements OnInit {
}
signIn(event) {
- console.log("Signed in: " + event);
+ this.router.navigateByUrl('/dashboard');
}
register(event) {
- console.log("Registered: " + event);
- }
-
- rememberUser(event, checkboxValue) {
- if(checkboxValue) {
- console.log("Will remember.");
- } else {
- console.log("Will not remember.")
- }
}
rememberUserValue = true;
diff --git a/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.html b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.html
new file mode 100644
index 0000000..ba3ceed
--- /dev/null
+++ b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.html
@@ -0,0 +1,18 @@
+
+ Trip Confirmation
+ Please review the details of your trip, and then press confirm below.
+ {{message}}
+
+
+ {{message}}
+ Trip Details
+ Driver:
+ Origin:
+ Destination:
+ Duration:
+ Cost:
+
+
+
+
+
diff --git a/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.scss b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.scss
new file mode 100644
index 0000000..3075e7b
--- /dev/null
+++ b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.scss
@@ -0,0 +1,3 @@
+.details {
+ text-align: left;
+}
diff --git a/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.ts b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.ts
new file mode 100644
index 0000000..2b15e5c
--- /dev/null
+++ b/src/app/common/components/smart/trip-confirmation/trip-confirmation.component.ts
@@ -0,0 +1,34 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { APIGatewayService } from 'app/common/services/api-gateway.service';
+import { MessageService } from 'app/common/services/message.service';
+import { Subscription } from 'rxjs/Subscription';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'app-trip-confirmation',
+ templateUrl: './trip-confirmation.component.html',
+ styleUrls: ['./trip-confirmation.component.scss']
+})
+export class TripConfirmationComponent implements OnInit {
+
+ subscription: Subscription;
+ message: string;
+
+ constructor(
+ private apiGatewayService:APIGatewayService,
+ private messageService:MessageService,
+ private router:Router) {
+ this.subscription = this.messageService.getMessageTest().subscribe(
+ message => {
+ this.message = message.text; });
+ }
+
+ ngOnInit() {
+ //this.apiGatewayService.getTrip(this.message);
+ }
+
+ confirm(event) {
+ this.router.navigateByUrl('/temp');
+ }
+
+}
diff --git a/src/app/common/services/api-gateway.service.ts b/src/app/common/services/api-gateway.service.ts
new file mode 100644
index 0000000..f88710f
--- /dev/null
+++ b/src/app/common/services/api-gateway.service.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
+import { Subject } from 'rxjs/Subject';
+
+@Injectable()
+export class APIGatewayService {
+
+ private http:Http;
+ private apiUrl = "http://10.55.13.61:8082/api/";
+ private driverApiUrl = "http://10.55.13.61:8082/api/drivers/";
+ private tripApiUrl = "http://10.55.13.61:8081/api/trips/";
+ private availableDriversList:any;
+ private latlng:any;
+ private trip:any;
+ private results:any;
+
+ constructor(http:Http) {
+ this.http = http;
+ this.results = [];
+ }
+
+ // Trip Management
+ getLatLng(address:string) {
+ let postUrl = this.tripApiUrl.concat("getlatlng");
+ let promise = new Promise((resolve, reject) => {
+ this.http.post(postUrl, {
+ "address": address
+ }).toPromise().then(
+ result => {
+ this.latlng = result.json();
+ resolve(result.json());
+ },
+ message => {
+ reject(message);
+ }
+ );
+ });
+ return promise;
+ }
+
+ getTrip(driverName:string) {
+ let postUrl = this.driverApiUrl.concat("");
+ let promise = new Promise((resolve, reject) => {
+ this.http.post(postUrl, {
+ "driverName":driverName
+ }).toPromise().then(
+ result => {
+ this.trip = result.json();
+ resolve(result.json());
+ },
+ message => {
+ reject(message);
+ }
+ );
+ });
+ return promise;
+ }
+
+ // Driver Management
+ addDriver() {
+ let postUrl = this.driverApiUrl.concat();
+ this.http.post(postUrl, {
+ "fname": "Cage",
+ "lname": "The",
+ "id": "Elephant"
+ })
+ }
+
+ getAvailableDrivers() {
+ let getUrl = this.driverApiUrl.concat("available-drivers");
+ let promise = new Promise((resolve, reject) => {
+ this.http.get(getUrl).toPromise().then(
+ result => {
+ this.availableDriversList = result.json();
+ resolve(result.json());
+ },
+ message => {
+ reject(message);
+ }
+ );
+ });
+ return promise;
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/common/states/gmaps.service.ts b/src/app/common/services/gmaps.service.ts
similarity index 72%
rename from src/app/common/states/gmaps.service.ts
rename to src/app/common/services/gmaps.service.ts
index a76e6a2..2731921 100644
--- a/src/app/common/states/gmaps.service.ts
+++ b/src/app/common/services/gmaps.service.ts
@@ -1,4 +1,4 @@
-import { GoogleMapsAPIWrapper } from '@agm/core';
+import { GoogleMapsAPIWrapper, LatLng } from '@agm/core';
import { Directive, Input, Output } from '@angular/core';
declare var google: any;
@@ -11,8 +11,6 @@ export class GMapsDirectionsService {
@Input() origin: any;
@Input() destination: any;
- @Input() originPlaceId: any;
- @Input() destinationPlaceId: any;
@Input() waypoints: any;
@Input() directionsDisplay: any;
@Input() estimatedTime: any;
@@ -20,18 +18,13 @@ export class GMapsDirectionsService {
constructor(private gmapsApi: GoogleMapsAPIWrapper) { }
- updateDirections() {
+ updateDirections(originLocation:LatLng, destinationLocation:LatLng, directionsDisplay:any) {
this.gmapsApi.getNativeMap().then(map => {
// Prepare Map and Display Settings
- if (!this.originPlaceId || !this.destinationPlaceId) {
- return;
- }
-
const directionsService = new google.maps.DirectionsService;
const service = this;
- const origin = new google.maps.LatLng({ lat: this.origin.latitude, lng: this.origin.longitude });
- const destination = new google.maps.LatLng({ lat: this.destination.latitude, lng: this.destination.longitude });
-
+ const origin = new google.maps.LatLng(originLocation);
+ const destination = new google.maps.LatLng(destinationLocation);
this.directionsDisplay.setMap(map);
this.directionsDisplay.setOptions({
polylineOptions: {
@@ -47,8 +40,8 @@ export class GMapsDirectionsService {
// Determine Directions
// Request
directionsService.route({
- origin: { placeId: this.originPlaceId },
- destination: { placeId: this.destinationPlaceId },
+ origin: origin,
+ destination: destination,
avoidHighways: true,
travelMode: google.maps.DirectionsTravelMode.DRIVING
},
@@ -60,7 +53,6 @@ export class GMapsDirectionsService {
const point = response.routes[0].legs[0];
service.estimatedTime = point.duration.text;
service.estimatedDistance = point.distance.text;
- console.log('Estimated travel time: ' + point.duration.text + ' (' + point.distance.text + ')');
} else {
console.log('Directions request failed due to ' + status);
}
@@ -71,4 +63,5 @@ export class GMapsDirectionsService {
private getcomputeDistance(origin: any, destination: any) {
return (google.maps.geometry.spherical.computeDistanceBetween(origin, destination) / 1000).toFixed(2);
}
+
}
diff --git a/src/app/common/services/message.service.ts b/src/app/common/services/message.service.ts
new file mode 100644
index 0000000..7161b88
--- /dev/null
+++ b/src/app/common/services/message.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Subject } from 'rxjs/Subject';
+
+@Injectable()
+export class MessageService {
+ private subject = new Subject
();
+
+ sendMessageTest(message: string) {
+ this.subject.next({ text: message });
+ }
+
+ clearMessageTest() {
+ this.subject.next();
+ }
+
+ getMessageTest(): Observable {
+ return this.subject.asObservable();
+ }
+}
diff --git a/src/app/common/states/gmaps.directive.spec.ts b/src/app/common/states/gmaps.directive.spec.ts
deleted file mode 100644
index b20bec1..0000000
--- a/src/app/common/states/gmaps.directive.spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-
-describe('AppComponent', () => {
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [
- ],
- }).compileComponents();
- }));
-});
diff --git a/src/app/passengers/components/presentation/temp/temp.component.html b/src/app/passengers/components/presentation/temp/temp.component.html
new file mode 100644
index 0000000..22f5ee8
--- /dev/null
+++ b/src/app/passengers/components/presentation/temp/temp.component.html
@@ -0,0 +1,4 @@
+
+ Your driver is on their way!
+ Please proceed to the specified pickup location.
+
diff --git a/src/app/passengers/components/presentation/temp/temp.component.scss b/src/app/passengers/components/presentation/temp/temp.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/passengers/components/presentation/temp/temp.component.ts b/src/app/passengers/components/presentation/temp/temp.component.ts
new file mode 100644
index 0000000..ef57502
--- /dev/null
+++ b/src/app/passengers/components/presentation/temp/temp.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-temp',
+ templateUrl: './temp.component.html',
+ styleUrls: ['./temp.component.scss']
+})
+export class TempComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/passengers/components/smart/driver-list/driver-list.component.html b/src/app/passengers/components/smart/driver-list/driver-list.component.html
new file mode 100644
index 0000000..eada3ca
--- /dev/null
+++ b/src/app/passengers/components/smart/driver-list/driver-list.component.html
@@ -0,0 +1,37 @@
+
+
+
+ Available Drivers
+
+
+
+
+ ID >
+ {{row.id}}
+
+
+
+
+ Name
+ {{row.name}}
+
+
+
+
+ Distance
+ {{row.time}}
+
+
+
+
+ Rating
+ {{row.rating}}
+
+
+
+
+
+
+ Select a driver from the list above in order to continue.
+
+
{{ title }}
-
-
+
-
+
+
+
+
diff --git a/src/app/passengers/components/smart/trip-planner/trip-planner.component.ts b/src/app/passengers/components/smart/trip-planner/trip-planner.component.ts
index 20884df..815a0d1 100644
--- a/src/app/passengers/components/smart/trip-planner/trip-planner.component.ts
+++ b/src/app/passengers/components/smart/trip-planner/trip-planner.component.ts
@@ -1,9 +1,12 @@
import { Component, OnInit, Input, ElementRef, NgZone, ViewChild } from '@angular/core';
+import { Routes, Router, RouterModule } from '@angular/router';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { GMapsDirectionsService } from 'app/common/states/gmaps.service';
+import { GMapsDirectionsService } from 'app/common/services/gmaps.service';
+import { APIGatewayService } from 'app/common/services/api-gateway.service';
import { } from '@types/googlemaps';
import { GoogleMapsAPIWrapper, MapsAPILoader } from '@agm/core';
import { error } from 'util';
+import { MessageService } from 'app/common/services/message.service';
@Component({
selector: 'app-trip-planner',
@@ -17,28 +20,26 @@ export class TripPlannerComponent implements OnInit {
@Input() private latitude: number;
@Input() private longitude: number;
@Input() private zoom: number;
- @Input() private origin: any;
- @Input() private destinationInput: FormControl;
- @Input() private destinationOutput: FormControl;
- @Input() private destination: any;
- @Input() private estimatedTime: any;
- @Input() private estimatedDistance: any;
- @Input() private initialLat: number;
- @Input() private initialLng: number;
-
- @ViewChild('pickupInput')
- public pickupInputElementRef: ElementRef;
-
- @ViewChild('pickupOutput')
- public pickupOutputElementRef: ElementRef;
+ @Input() private pickupTextboxValue : any;
+ @Input() private destinationTextboxValue: any;
+ private destinationInput: FormControl;
+ private destinationOutput: FormControl;
+ private estimatedTime: any;
+ private estimatedDistance: any;
+ private directionsDisplay: any;
+ private message: String;
+ private originLocation:any;
+ private destinationLocation:any;
@ViewChild(GMapsDirectionsService) service: GMapsDirectionsService;
constructor(
- private ngZone: NgZone,
private mapsAPILoader: MapsAPILoader,
private gmapsApi: GoogleMapsAPIWrapper,
- private _elementRef: ElementRef) {
+ private _elementRef: ElementRef,
+ private apiGatewayService: APIGatewayService,
+ private messageService: MessageService,
+ private router: Router) {
}
ngOnInit() {
@@ -47,32 +48,37 @@ export class TripPlannerComponent implements OnInit {
this.latitude = cords.lat;
this.longitude = cords.lng;
this.zoom = 14;
- console.log('set lat and lng')
})
.catch((error) => {
console.log(error);
});
-
this.destinationInput = new FormControl();
this.destinationOutput = new FormControl();
// Update Map View
this.setCurrentPosition();
- // Load Autocomplete for Inputs
this.mapsAPILoader.load().then(() => {
- const autocompleteInput = new google.maps.places.Autocomplete(this.pickupInputElementRef.nativeElement, {
- types: ['address']
- });
-
- const autocompleteOutput = new google.maps.places.Autocomplete(this.pickupOutputElementRef.nativeElement, {
- types: ['address']
- });
- this.setupPlaceChangedListener(autocompleteInput, 'pickup');
- this.setupPlaceChangedListener(autocompleteOutput, 'destination');
+ this.service.directionsDisplay = new google.maps.DirectionsRenderer;
});
}
+ onConfirmClick(event) {
+ this.originLocation = this.apiGatewayService.getLatLng(this.pickupTextboxValue);
+ this.destinationLocation = this.apiGatewayService.getLatLng(this.destinationTextboxValue);
+ Promise.all([this.originLocation, this.destinationLocation]).then(values => {
+ this.service.updateDirections(values[0], values[1], this.service.directionsDisplay);
+ })
+ }
+
+ onFindRideClick(event) {
+ this.router.navigateByUrl('/pick-driver');
+ }
+
+ onPickupTextChange(event) {}
+
+ onDestinationTextChange(event) {}
+
setCurrentPosition() {
if ('geolocation' in navigator) {
navigator.geolocation.getCurrentPosition((position) => {
@@ -82,31 +88,6 @@ export class TripPlannerComponent implements OnInit {
}
}
- private setupPlaceChangedListener(autocomplete:any, inputType:string) {
- autocomplete.addListener('place_changed', () => {
- this.ngZone.run(() => {
- const place: google.maps.places.PlaceResult = autocomplete.getPlace();
- if (place.geometry === undefined) {
- return;
- }
- if (inputType === 'pickup') {
- this.service.origin = { longitude: place.geometry.location.lng(), latitude: place.geometry.location.lat() };
- this.service.originPlaceId = place.place_id;
- } else {
- this.service.destination = { longitude: place.geometry.location.lng(), latitude: place.geometry.location.lat() };
- this.service.destinationPlaceId = place.place_id;
- }
- if (this.service.directionsDisplay === undefined) {
- this.mapsAPILoader.load().then(() => {
- this.service.directionsDisplay = new google.maps.DirectionsRenderer;
- });
- }
- this.service.updateDirections();
- this.zoom = 12;
- });
- });
- }
-
getDistanceAndDuration() {
this.estimatedTime = this.service.estimatedTime;
this.estimatedDistance = this.service.estimatedDistance;
diff --git a/src/app/passengers/passengers.module.ts b/src/app/passengers/passengers.module.ts
index 1894ef4..57749b9 100644
--- a/src/app/passengers/passengers.module.ts
+++ b/src/app/passengers/passengers.module.ts
@@ -1,10 +1,16 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
+import { FeCommonModule } from 'app/common/common.module';
+import { MatTableModule} from '@angular/material';
+import { CdkTableModule, DataSource} from '@angular/cdk/table';
+//import { DriverListComponent } from './components/smart/driver-list/driver-list.component';
+import { TempComponent } from './components/presentation/temp/temp.component';
@NgModule({
imports: [
- CommonModule
+ CommonModule, FeCommonModule, CdkTableModule
],
- declarations: []
+ declarations: [ TempComponent],
+ exports: [CdkTableModule,MatTableModule, TempComponent],
})
export class PassengersModule { }