\ No newline at end of file
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index c5af2bc..b9e08d9 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,5 +1,7 @@
.page {
- background-color: rgb(31, 95, 121);
+ background: rgb(31, 95, 121);
+ width: 100%;
+ height: 1080px;
}
.main {
text-align: center;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ca1f24a..349bb86 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,18 +5,25 @@ import { Routes, RouterModule } from '@angular/router';
import { FeCommonModule } from './common/common.module';
import { AppComponent } from './app.component';
import { LoginComponent } from 'app/common/components/smart/login/login.component';
+import { DriverListComponent } from 'app/passengers/components/smart/driver-list/driver-list.component';
import { TripPlannerComponent } from 'app/passengers/components/smart/trip-planner/trip-planner.component';
import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core';
+import { MatTableModule } from '@angular/material';
+import { CdkTableModule } from '@angular/cdk/table';
const routes:Routes = [
{path: '', redirectTo: 'login', pathMatch: 'full'},
{path: 'login', component: LoginComponent},
+ {path: 'dashboard', component: LoginComponent},
+ {path: 'drivers', component: DriverListComponent},
+ {path: 'trip-planner', component: TripPlannerComponent},
{path: 'dashboard', component: TripPlannerComponent}
]
@NgModule({
+ exports: [MatTableModule],
declarations: [
- AppComponent, TripPlannerComponent
+ AppComponent, TripPlannerComponent, DriverListComponent
],
imports: [
BrowserModule,
diff --git a/src/app/common/common.module.ts b/src/app/common/common.module.ts
index 8d23a61..4fd3204 100644
--- a/src/app/common/common.module.ts
+++ b/src/app/common/common.module.ts
@@ -11,8 +11,10 @@ import { RaisedButtonComponent } from './components/presentation/raised-button/r
import { BasicButtonComponent } from './components/presentation/basic-button/basic-button.component';
import { IconButtonComponent } from './components/presentation/icon-button/icon-button.component';
import { GMapsDirectionsService} from './states/gmaps.service';
-import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatFormFieldControl, MatInputModule, MatIconModule, MatCardModule, MatAutocompleteModule } from '@angular/material';
+import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatFormFieldControl, MatInputModule, MatIconModule, MatCardModule, MatAutocompleteModule, MatTableModule} from '@angular/material';
import { HeaderComponent } from './components/presentation/header/header.component';
+
+
@NgModule({
imports: [
@@ -28,10 +30,9 @@ import { HeaderComponent } from './components/presentation/header/header.compone
ReactiveFormsModule,
MatAutocompleteModule,
AgmCoreModule,
- RouterModule
+ RouterModule, MatTableModule
],
- declarations: [
- TextBoxComponent,
+ declarations: [ TextBoxComponent,
LoginComponent,
CheckBoxComponent,
ToolbarComponent,
@@ -39,17 +40,12 @@ import { HeaderComponent } from './components/presentation/header/header.compone
BasicButtonComponent,
IconButtonComponent,
GMapsDirectionsService,
- HeaderComponent
- ],
- exports: [
- ToolbarComponent,
- MatCardModule,
- RaisedButtonComponent,
+ HeaderComponent],
+ exports: [ToolbarComponent, RaisedButtonComponent,
ReactiveFormsModule,
MatAutocompleteModule,
GMapsDirectionsService,
- HeaderComponent
- ],
+ HeaderComponent, MatCardModule, MatTableModule]
+
})
-
export class FeCommonModule { }
diff --git a/src/app/common/components/smart/login/login.component.html b/src/app/common/components/smart/login/login.component.html
index e324e21..da4986a 100644
--- a/src/app/common/components/smart/login/login.component.html
+++ b/src/app/common/components/smart/login/login.component.html
@@ -13,5 +13,8 @@
UltiCar
+
diff --git a/src/app/common/components/smart/login/login.component.ts b/src/app/common/components/smart/login/login.component.ts
index dacb1b5..7a84984 100644
--- a/src/app/common/components/smart/login/login.component.ts
+++ b/src/app/common/components/smart/login/login.component.ts
@@ -23,6 +23,10 @@ export class LoginComponent implements OnInit {
console.log("Registered: " + event);
}
+ tripPlan(event) {
+ console.log("Plan trip: " + event);
+ }
+
rememberUser(event, checkboxValue) {
if(checkboxValue) {
console.log("Will remember.");
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..b0714db
--- /dev/null
+++ b/src/app/passengers/components/smart/driver-list/driver-list.component.html
@@ -0,0 +1,34 @@
+