Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

Commit f37bf3a

Browse files
natmegsnatmegs
authored
Merge branch 'master' into doc-creation-map
2 parents 7ea9eca + 980bd0b commit f37bf3a

20 files changed

+219
-146
lines changed

‎package.json‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,30 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "4.4.4",
31-
"@angular/cdk": "2.0.0-beta.12",
32-
"@angular/common": "4.4.4",
33-
"@angular/compiler": "4.4.4",
34-
"@angular/core": "4.4.4",
35-
"@angular/flex-layout": "2.0.0-beta.9",
36-
"@angular/forms": "4.4.4",
37-
"@angular/http": "4.4.4",
38-
"@angular/material": "2.0.0-beta.12",
39-
"@angular/platform-browser": "4.4.4",
40-
"@angular/platform-browser-dynamic": "4.4.4",
41-
"@angular/router": "4.4.4",
30+
"@angular/animations": "5.0.2",
31+
"@angular/cdk": "5.0.0-rc0",
32+
"@angular/common": "5.0.2",
33+
"@angular/compiler": "5.0.2",
34+
"@angular/core": "5.0.2",
35+
"@angular/flex-layout": "2.0.0-beta.10",
36+
"@angular/forms": "5.0.2",
37+
"@angular/http": "5.0.2",
38+
"@angular/material": "5.0.0-rc0",
39+
"@angular/platform-browser": "5.0.2",
40+
"@angular/platform-browser-dynamic": "5.0.2",
41+
"@angular/router": "5.0.2",
4242
"@types/hammerjs": "2.0.35",
4343
"core-js": "2.4.1",
4444
"hammerjs": "2.0.8",
4545
"ngx-clipboard": "8.1.0",
46-
"rxjs": "5.4.2",
46+
"rxjs": "5.5.2",
47+
"ts-loader": "3.1.1",
4748
"zone.js": "0.8.14"
4849
},
4950
"devDependencies": {
50-
"@angular/cli": "1.4.5",
51-
"@angular/compiler-cli": "4.4.4",
52-
"@angular/language-service": "4.4.4",
51+
"@angular/cli": "1.5.2",
52+
"@angular/compiler-cli": "5.0.2",
53+
"@angular/language-service": "5.0.2",
5354
"@angular/service-worker": "1.0.0-beta.16",
5455
"@types/jasmine": "2.5.53",
5556
"@types/jasminewd2": "2.0.2",
@@ -78,7 +79,7 @@
7879
"ts-node": "3.2.0",
7980
"tslint": "5.3.2",
8081
"tslint-config-prettier": "1.6.0",
81-
"typescript": "2.3.3",
82+
"typescript": "2.4.2",
8283
"validate-commit-msg": "2.14.0",
8384
"wallaby-webpack": "*"
8485
},

‎src/app/app-routing.module.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { ModuleWithProviders, NgModule } from '@angular/core';
2+
import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
3+
4+
export const routes: Routes = [
5+
{ path: '', loadChildren: './rxjs/rxjs.module#RxjsModule' },
6+
{
7+
path: 'operators',
8+
loadChildren: './operators/operators.module#OperatorsModule'
9+
},
10+
{ path: 'team', loadChildren: './team/team.module#TeamModule' },
11+
{
12+
path: 'companies',
13+
loadChildren: './companies/companies.module#CompaniesModule'
14+
},
15+
{ path: '**', redirectTo: '' }
16+
];
17+
18+
@NgModule({
19+
imports: [
20+
RouterModule.forRoot(routes, {
21+
preloadingStrategy: PreloadAllModules
22+
})
23+
],
24+
exports: [RouterModule]
25+
})
26+
export class AppRoutingModule {}

‎src/app/app.component.html‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<header>
33
<app-toolbar (navToggle)="sidenav.toggle()"></app-toolbar>
44
</header>
5-
<main class="app-content">
6-
<mat-sidenav-container>
7-
<mat-sidenav #sidenav role="navigation">
8-
<mat-nav-list (click)="sidenav.toggle()">
9-
<a *ngFor="let menu of menus" mat-list-item routerLinkActive="active" [routerLinkActiveOptions]="menu.options" [routerLink]="menu.link">
5+
<mat-sidenav-container>
6+
<mat-sidenav #sidenav role="navigation">
7+
<mat-nav-list (click)="sidenav.toggle()">
8+
<a *ngFor="let menu of menus" mat-list-item routerLinkActive="active" [routerLinkActiveOptions]="menu.options" [routerLink]="menu.link">
109
{{menu.title}}
1110
</a>
12-
</mat-nav-list>
13-
</mat-sidenav>
14-
<router-outlet></router-outlet>
15-
</mat-sidenav-container>
16-
</main>
17-
</div>
11+
</mat-nav-list>
12+
</mat-sidenav>
13+
<router-outlet></router-outlet>
14+
</mat-sidenav-container>
15+
</div>

‎src/app/app.component.scss‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@
1111
}
1212
}
1313

14-
.app-content {
15-
min-height: 100%;
16-
overflow: auto;
17-
display: flex;
18-
flex-direction: column;
19-
}
20-
2114
mat-sidenav-container {
2215
flex: 1 1 auto;
2316
width: 100%;

‎src/app/app.component.spec.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { async, ComponentFixture, TestBed } from "@angular/core/testing";
2-
import { RouterTestingModule } from "@angular/router/testing";
3-
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4-
import { AppComponent } from "./app.component";
5-
import { ToolbarModule } from "./toolbar/toolbar.module";
6-
import { MatSidenavModule } from "@angular/material";
1+
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { RouterTestingModule } from '@angular/router/testing';
3+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
4+
import { AppComponent } from './app.component';
5+
import { ToolbarModule } from './toolbar/toolbar.module';
6+
import { MatSidenavModule, MatListModule } from '@angular/material';
77

8-
describe("AppComponent", () => {
8+
describe('AppComponent', () => {
99
let component: AppComponent;
1010
let fixture: ComponentFixture<AppComponent>;
1111

@@ -16,7 +16,8 @@ describe("AppComponent", () => {
1616
RouterTestingModule,
1717
BrowserAnimationsModule,
1818
ToolbarModule,
19-
MatSidenavModule
19+
MatSidenavModule,
20+
MatListModule
2021
],
2122
declarations: [AppComponent]
2223
}).compileComponents();
@@ -29,7 +30,7 @@ describe("AppComponent", () => {
2930
fixture.detectChanges();
3031
});
3132

32-
it("should create", () => {
33+
it('should create', () => {
3334
expect(component).toBeTruthy();
3435
});
3536
});

‎src/app/app.module.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { BrowserModule } from "@angular/platform-browser";
2-
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
3-
import { NgModule } from "@angular/core";
4-
import { RouterModule, PreloadAllModules } from "@angular/router";
1+
import { BrowserModule } from '@angular/platform-browser';
2+
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
3+
import { NgModule } from '@angular/core';
54

6-
import { AppComponent } from "./app.component";
7-
import { RXJS_DOC_ROUTES } from "./app.routing";
8-
import { ToolbarModule } from "./toolbar/toolbar.module";
9-
import { MatSidenavModule, MatListModule } from "@angular/material";
5+
import { AppComponent } from './app.component';
6+
import { ToolbarModule } from './toolbar/toolbar.module';
7+
import { MatSidenavModule, MatListModule } from '@angular/material';
8+
import { AppRoutingModule } from './app-routing.module';
109

1110
@NgModule({
1211
declarations: [AppComponent],
@@ -16,9 +15,7 @@ import { MatSidenavModule, MatListModule } from "@angular/material";
1615
ToolbarModule,
1716
MatListModule,
1817
MatSidenavModule,
19-
RouterModule.forRoot(RXJS_DOC_ROUTES, {
20-
preloadingStrategy: PreloadAllModules
21-
})
18+
AppRoutingModule
2219
],
2320
providers: [],
2421
bootstrap: [AppComponent]

‎src/app/app.routing.ts‎

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

‎src/app/companies/companies-routing.module.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { NgModule } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
3+
4+
import { CompaniesComponent } from './companies.component';
5+
6+
const routes: Routes = [{ path: '', component: CompaniesComponent }];
7+
8+
@NgModule({
9+
imports: [RouterModule.forChild(routes)],
10+
exports: [RouterModule]
11+
})
12+
export class CompaniesRoutingModule {}

‎src/app/companies/companies.module.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { NgModule } from "@angular/core";
1+
import { NgModule } from '@angular/core';
22

3-
import { CompaniesComponent } from "./companies.component";
4-
import { routing } from "./companies.routing";
5-
import { SharedModule } from "../shared.module";
6-
import { environment } from "../../environments/environment";
3+
import { CompaniesComponent } from './companies.component';
4+
import { CompaniesRoutingModule } from './companies-routing.module';
5+
import { SharedModule } from '../shared.module';
6+
import { environment } from '../../environments/environment';
77

88
@NgModule({
9-
imports: [routing, SharedModule],
9+
imports: [CompaniesRoutingModule, SharedModule],
1010
declarations: [CompaniesComponent]
1111
})
1212
export class CompaniesModule {}

‎src/app/companies/companies.routing.ts‎

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

0 commit comments

Comments
 (0)