Skip to content
This repository has been archived by the owner on Jul 10, 2018. It is now read-only.

Commit

Permalink
Merge d2f56bf into 46046ad
Browse files Browse the repository at this point in the history
  • Loading branch information
mtlynch committed May 31, 2018
2 parents 46046ad + d2f56bf commit bcf98da
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 19 deletions.
8 changes: 4 additions & 4 deletions src/app/app-routing.module.ts
@@ -1,18 +1,18 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { HomePageComponent } from './public/home-page/home-page.component';
import { DemoComponent } from './public/demo/demo.component';
import { SignUpComponent } from './public/sign-up/sign-up.component';

const appRoutes: Routes = [
{
path: '',
component: HomePageComponent,
component: DemoComponent,
pathMatch: 'full',
},
{
path: 'demo',
component: HomePageComponent,
component: DemoComponent,
pathMatch: 'full',
},
{
Expand All @@ -22,7 +22,7 @@ const appRoutes: Routes = [
},
{
path: '**',
component: HomePageComponent,
component: DemoComponent,
},
];

Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.spec.ts
@@ -1,7 +1,7 @@
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { HomePageComponent } from './public/home-page/home-page.component';
import { DemoComponent } from './public/demo/demo.component';
import { FormsModule } from '@angular/forms';
import { ParserService } from './_services/parser.service';
import { CurlCmdPipe } from './_pipes/curl-cmd.pipe';
Expand All @@ -13,7 +13,7 @@ describe('AppComponent', () => {
declarations: [
AppComponent,
CurlCmdPipe,
HomePageComponent,
DemoComponent,
],
imports: [
FormsModule,
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.module.ts
Expand Up @@ -27,17 +27,17 @@ import { ParserService } from './_services/parser.service';
// Components
import { MailingListComponent } from './_components/mailing-list/mailing-list.component';
import { NavComponent } from './_components/nav/nav.component';
import { CodeSnippetComponent } from './_components/code-snippet/code-snippet.component';

// Public pages
import { HomePageComponent } from './public/home-page/home-page.component';
import { SignUpComponent } from './public/sign-up/sign-up.component';
import { CodeSnippetComponent } from './_components/code-snippet/code-snippet.component';
import { DemoComponent } from './public/demo/demo.component';

@NgModule({
declarations: [
AppComponent,
CurlCmdPipe,
HomePageComponent,
DemoComponent,
MailingListComponent,
NavComponent,
SignUpComponent,
Expand Down
Expand Up @@ -5,11 +5,12 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import { HttpClientTestingModule } from '@angular/common/http/testing';

import { HomePageComponent } from './home-page.component';
import { ParseResult } from '../../_models/parse-result';
import { ParserService } from '../../_services/parser.service';
import { CurlCmdPipe } from '../../_pipes/curl-cmd.pipe';

import { DemoComponent } from './demo.component';

@Injectable()
export class MockParserService {

Expand All @@ -18,13 +19,13 @@ export class MockParserService {
}
}

describe('HomePageComponent', () => {
let component: HomePageComponent;
let fixture: ComponentFixture<HomePageComponent>;
describe('DemoComponent', () => {
let component: DemoComponent;
let fixture: ComponentFixture<DemoComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [HomePageComponent, CurlCmdPipe],
declarations: [DemoComponent, CurlCmdPipe],
imports: [
HttpClientTestingModule,
FormsModule,
Expand All @@ -39,7 +40,7 @@ describe('HomePageComponent', () => {
}));

beforeEach(() => {
fixture = TestBed.createComponent(HomePageComponent);
fixture = TestBed.createComponent(DemoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand All @@ -48,3 +49,4 @@ describe('HomePageComponent', () => {
expect(component).toBeTruthy();
});
});

Expand Up @@ -6,11 +6,11 @@ import { ParserService } from '../../_services/parser.service';
import { CurlCmdPipe } from '../../_pipes/curl-cmd.pipe';

@Component({
selector: 'app-home-page',
templateUrl: './home-page.component.html',
styleUrls: ['./home-page.component.scss'],
selector: 'app-demo',
templateUrl: './demo.component.html',
styleUrls: ['./demo.component.scss'],
})
export class HomePageComponent implements OnInit {
export class DemoComponent implements OnInit {
ingredientRaw: string;
isWaitingForParseResult: boolean = false;
ingredientParsed: IngredientParsed;
Expand Down

0 comments on commit bcf98da

Please sign in to comment.