Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'TBSliver/CoreUI' into finn/MoreCoreUI

Browse source
This commit is contained in:
piratefinn 2017-08-25 12:20:44 +01:00
commit 4fd1b60369
12 changed files with 962 additions and 3271 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/app/app.component.html
View file

4
src/app/app.component.spec.ts
View file

@ -25,12 +25,14 @@ describe('AppComponent', () => {
]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AppComponent);
app = fixture.componentInstance;
de = fixture.debugElement;
appDocument = de.nativeElement;
}));
});
it('should create the app', async(() => {
expect(app).toBeTruthy();

3
src/app/app.component.ts
View file

@ -1,8 +1,7 @@
import { Component } from '@angular/core';
@Component({
// tslint:disable-next-line
selector: 'body',
selector: 'app-root',
template: '<router-outlet></router-outlet>'
})
export class AppComponent { }

4
src/app/auth/login.component.html
View file

@ -10,11 +10,11 @@
<form [formGroup]="signin" (ngSubmit)="onSubmit()">
<div class="input-group mb-3">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" formControlName="email" placeholder="Email">
<input id="username" type="text" class="form-control" formControlName="email" placeholder="Email">
</div>
<div class="input-group mb-4">
<span class="input-group-addon"><i class="icon-lock"></i></span>
<input type="password" class="form-control" formControlName="password" placeholder="Password">
<input id="password" type="password" class="form-control" formControlName="password" placeholder="Password">
</div>
<div class="mb-4">
<div [ngSwitch]="loginStatus">

3
src/index.html
View file

@ -21,8 +21,7 @@
<body class="app header-fixed sidebar-fixed">
<!-- Enable bootstrap 4 theme -->
<script>window.__theme = 'bs4';</script>
<!-- App Loading... -->
<app-root><i>Loading...</i></app-root>
</body>
</html>