Skip to content

Commit 7194573

Browse files
committed
CreateLoginScreen- added to overall login screen UI
1 parent e805945 commit 7194573

35 files changed

+250
-248
lines changed

src/app/app.component.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
<app-toolbar></app-toolbar>
2-
<div style="text-align:center">
3-
<app-login></app-login>
4-
</div>
1+
<div class="page">
2+
<app-toolbar title="UltiCar"></app-toolbar>
3+
<div class="main">
4+
<div class="navLinks">
5+
<a [routerLink]="['']">Register</a>
6+
<a [routerLink]="['/login']">Sign In</a>
7+
</div>
8+
<div id="routing">
9+
<div class="container">
10+
<router-outlet></router-outlet>
11+
</div>
12+
</div>
13+
</div>
14+

src/app/app.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.page {
2+
background-color: rgb(31, 95, 121);
3+
}
4+
.main {
5+
text-align: center;
6+
}

src/app/app.component.spec.ts

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

src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
66
styleUrls: ['./app.component.scss']
77
})
88
export class AppComponent {
9-
title = 'Lit';
9+
title = 'UltiCar';
1010
}

src/app/app.module.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import { BrowserModule } from '@angular/platform-browser';
22
import { NgModule } from '@angular/core';
33
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
4-
4+
import { Routes, RouterModule } from '@angular/router';
55
import { FeCommonModule } from './common/common.module';
66
import { AppComponent } from './app.component';
7+
import { LoginComponent } from 'app/common/components/smart/login/login.component';
78

8-
import { MatToolbarModule} from '@angular/material';
9+
const routes:Routes = [
10+
{path: '', redirectTo: 'login', pathMatch: 'full'},
11+
{path: 'login', component: LoginComponent},
12+
{path: 'dashboard', component: LoginComponent}
13+
]
914

1015
@NgModule({
1116
declarations: [
@@ -15,15 +20,8 @@ import { MatToolbarModule} from '@angular/material';
1520
BrowserModule,
1621
BrowserAnimationsModule,
1722
FeCommonModule,
18-
MatToolbarModule
19-
],
20-
exports: [
21-
BrowserModule,
22-
BrowserAnimationsModule,
23-
FeCommonModule,
24-
MatToolbarModule
23+
RouterModule.forRoot(routes)
2524
],
26-
providers: [],
2725
bootstrap: [AppComponent]
2826
})
2927
export class AppModule { }

src/app/common/common.module.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import { CheckBoxComponent } from './components/presentation/check-box/check-box
66
import { ToolbarComponent } from './components/presentation/toolbar/toolbar.component';
77
import { RaisedButtonComponent } from './components/presentation/raised-button/raised-button.component';
88
import { BasicButtonComponent } from './components/presentation/basic-button/basic-button.component';
9-
import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatInputModule, MatIconModule} from '@angular/material';
9+
import { IconButtonComponent } from './components/presentation/icon-button/icon-button.component';
10+
import { MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatFormFieldControl, MatInputModule, MatIconModule, MatCardModule } from '@angular/material';
1011

1112
@NgModule({
1213
imports: [
13-
CommonModule, MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatInputModule, MatIconModule
14+
CommonModule, MatToolbarModule, MatCheckboxModule, MatButtonModule, MatFormFieldModule, MatInputModule, MatIconModule, MatCardModule
1415
],
15-
declarations: [TextBoxComponent, LoginComponent, CheckBoxComponent, ToolbarComponent, RaisedButtonComponent, BasicButtonComponent],
16-
exports: [LoginComponent, TextBoxComponent, CheckBoxComponent, ToolbarComponent, RaisedButtonComponent, MatFormFieldModule],
16+
declarations: [TextBoxComponent, LoginComponent, CheckBoxComponent, ToolbarComponent, RaisedButtonComponent, BasicButtonComponent, IconButtonComponent],
17+
exports: [ToolbarComponent],
1718
})
19+
1820
export class FeCommonModule { }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<button mat-button color="accent">{{label}}</button>
1+
<button mat-button [color]="color" (click)="click($event)">{{label}}</button>

src/app/common/components/presentation/basic-button/basic-button.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit } from '@angular/core';
1+
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
22

33
@Component({
44
selector: 'app-basic-button',
@@ -7,11 +7,18 @@ import { Component, OnInit } from '@angular/core';
77
})
88
export class BasicButtonComponent implements OnInit {
99

10-
label = 'Register'
10+
@Input() private label:string
11+
@Input() private color:string
1112

13+
@Output() public clickEvent:EventEmitter<any> = new EventEmitter();
14+
1215
constructor() { }
1316

1417
ngOnInit() {
1518
}
1619

20+
click(event) {
21+
this.clickEvent.emit(event);
22+
}
23+
1724
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<mat-checkbox>{{label}}</mat-checkbox>
1+
<mat-checkbox [color]="color">{{label}}</mat-checkbox>

0 commit comments

Comments
 (0)