Skip to content

docs: Update router guide to use Angular CLI #20023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brandonroberts wants to merge 6 commits into from
Closed

docs: Update router guide to use Angular CLI #20023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e86a487
docs: Refresh content on routable animations for router guide
brandonroberts Oct 10, 2017
ef4450e
docs: Update router guide to use Angular CLI
brandonroberts Oct 23, 2017
816f001
docs: router guide review feedback changes
brandonroberts Sep 10, 2018
bef3c45
docs: clean up providedIn: 'root' syntax for router examples
brandonroberts Sep 12, 2018
7074c0f
docs: add section on router integration
brandonroberts Sep 12, 2018
74cbf94
docs: update routing integration section based on feedback
brandonroberts Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions aio/content/examples/router/e2e/src/app.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { browser, element, by, ExpectedConditions } from 'protractor';

const numDashboardTabs = 5;
const numCrises = 4;
const numHeroes = 6;
const numHeroes = 10;
const EC = ExpectedConditions;

describe('Router', () => {
Expand All @@ -13,33 +13,34 @@ describe('Router', () => {

function getPageStruct() {
const hrefEles = element.all(by.css('app-root > nav a'));
const crisisDetail = element.all(by.css('app-root > ng-component > ng-component > ng-component > div')).first();
const heroDetail = element(by.css('app-root > ng-component > div'));
const crisisDetail = element.all(by.css('app-root > div > app-crisis-center > app-crisis-list > app-crisis-detail > div')).first();
const heroDetail = element(by.css('app-root > div > app-hero-detail'));

return {
hrefs: hrefEles,
activeHref: element(by.css('app-root > nav a.active')),

crisisHref: hrefEles.get(0),
crisisList: element.all(by.css('app-root > ng-component > ng-component li')),
crisisList: element.all(by.css('app-root > div > app-crisis-center > app-crisis-list li')),
crisisDetail: crisisDetail,
crisisDetailTitle: crisisDetail.element(by.xpath('*[1]')),

heroesHref: hrefEles.get(1),
heroesList: element.all(by.css('app-root > ng-component li')),
heroesList: element.all(by.css('app-root > div > app-hero-list li')),
heroDetail: heroDetail,
heroDetailTitle: heroDetail.element(by.xpath('*[1]')),
heroDetailTitle: heroDetail.element(by.xpath('*[2]')),

adminHref: hrefEles.get(2),
adminPreloadList: element.all(by.css('app-root > ng-component > ng-component > ul > li')),
adminPreloadList: element.all(by.css('app-root > div > app-admin > app-admin-dashboard > ul > li')),

loginHref: hrefEles.get(3),
loginButton: element.all(by.css('app-root > ng-component > p > button')),
loginButton: element.all(by.css('app-root > div > app-login > p > button')),

contactHref: hrefEles.get(4),
contactCancelButton: element.all(by.buttonText('Cancel')),

outletComponents: element.all(by.css('app-root > ng-component'))
primaryOutlet: element.all(by.css('app-root > div > app-hero-list')),
secondaryOutlet: element.all(by.css('app-root > app-compose-message'))
};
}

Expand Down Expand Up @@ -98,13 +99,15 @@ describe('Router', () => {
it('saves changed hero details', async () => {
const page = getPageStruct();
await page.heroesHref.click();
await browser.sleep(600);
const heroEle = page.heroesList.get(4);
let text = await heroEle.getText();
expect(text.length).toBeGreaterThan(0, 'hero item text length');
// remove leading id from text
const heroText = text.substr(text.indexOf(' ')).trim();

await heroEle.click();
await browser.sleep(600);
expect(page.heroesList.count()).toBe(0, 'hero list count');
expect(page.heroDetail.isPresent()).toBe(true, 'hero detail');
expect(page.heroDetailTitle.getText()).toContain(heroText);
Expand All @@ -114,6 +117,7 @@ describe('Router', () => {

let buttonEle = page.heroDetail.element(by.css('button'));
await buttonEle.click();
await browser.sleep(600);
expect(heroEle.getText()).toContain(heroText + '-foo');
});

Expand All @@ -130,7 +134,8 @@ describe('Router', () => {
const page = getPageStruct();
await page.heroesHref.click();
await page.contactHref.click();
expect(page.outletComponents.count()).toBe(2, 'route count');
expect(page.primaryOutlet.count()).toBe(1, 'primary outlet');
expect(page.secondaryOutlet.count()).toBe(1, 'secondary outlet');
});

async function crisisCenterEdit(index: number, save: boolean) {
Expand Down
9 changes: 0 additions & 9 deletions aio/content/examples/router/src/app/admin/admin-dashboard.component.1.ts
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions aio/content/examples/router/src/app/admin/admin-dashboard/admin-dashboard.component.1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Dashboard</p>
10 changes: 3 additions & 7 deletions .../app/admin/admin-dashboard.component.2.ts → ...-dashboard/admin-dashboard.component.1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

@Component({
template: `
<p>Dashboard</p>

<p>Session ID: {{ sessionId | async }}</p>
<a id="anchor"></a>
<p>Token: {{ token | async }}</p>
`
selector: 'app-admin-dashboard',
templateUrl: './admin-dashboard.component.html',
styleUrls: ['./admin-dashboard.component.css']
})
export class AdminDashboardComponent implements OnInit {
sessionId: Observable<string>;
Expand Down
5 changes: 5 additions & 0 deletions aio/content/examples/router/src/app/admin/admin-dashboard/admin-dashboard.component.2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<p>Dashboard</p>

<p>Session ID: {{ sessionId | async }}</p>
<a id="anchor"></a>
<p>Token: {{ token | async }}</p>
Empty file added aio/content/examples/router/src/app/admin/admin-dashboard/admin-dashboard.component.css
View file
Open in desktop
Empty file.
10 changes: 10 additions & 0 deletions aio/content/examples/router/src/app/admin/admin-dashboard/admin-dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<p>Dashboard</p>

<p>Session ID: {{ sessionId | async }}</p>
<a id="anchor"></a>
<p>Token: {{ token | async }}</p>

Preloaded Modules
<ul>
<li *ngFor="let module of modules">{{ module }}</li>
</ul>
20 changes: 5 additions & 15 deletions ...rc/app/admin/admin-dashboard.component.ts → ...in-dashboard/admin-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,12 @@ import { ActivatedRoute } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { SelectivePreloadingStrategy } from '../selective-preloading-strategy';

import { SelectivePreloadingStrategyService } from '../../selective-preloading-strategy.service';

@Component({
template: `
<p>Dashboard</p>

<p>Session ID: {{ sessionId | async }}</p>
<a id="anchor"></a>
<p>Token: {{ token | async }}</p>

Preloaded Modules
<ul>
<li *ngFor="let module of modules">{{ module }}</li>
</ul>
`
selector: 'app-admin-dashboard',
templateUrl: './admin-dashboard.component.html',
styleUrls: ['./admin-dashboard.component.css']
})
export class AdminDashboardComponent implements OnInit {
sessionId: Observable<string>;
Expand All @@ -28,7 +18,7 @@ export class AdminDashboardComponent implements OnInit {

constructor(
private route: ActivatedRoute,
private preloadStrategy: SelectivePreloadingStrategy
preloadStrategy: SelectivePreloadingStrategyService
) {
this.modules = preloadStrategy.preloadedModules;
}
Expand Down
8 changes: 4 additions & 4 deletions aio/content/examples/router/src/app/admin/admin-routing.module.1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { AdminComponent } from './admin.component';
import { AdminDashboardComponent } from './admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes.component';
import { AdminComponent } from './admin/admin.component';
import { AdminDashboardComponent } from './admin-dashboard/admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises/manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes/manage-heroes.component';

// #docregion admin-routes
const adminRoutes: Routes = [
Expand Down
10 changes: 5 additions & 5 deletions aio/content/examples/router/src/app/admin/admin-routing.module.2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { AdminComponent } from './admin.component';
import { AdminDashboardComponent } from './admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes.component';
import { AdminComponent } from './admin/admin.component';
import { AdminDashboardComponent } from './admin-dashboard/admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises/manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes/manage-heroes.component';

// #docregion admin-route
import { AuthGuard } from '../auth-guard.service';
import { AuthGuard } from '../auth/auth.guard';

const adminRoutes: Routes = [
{
Expand Down
10 changes: 5 additions & 5 deletions aio/content/examples/router/src/app/admin/admin-routing.module.3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { AdminComponent } from './admin.component';
import { AdminDashboardComponent } from './admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes.component';
import { AdminComponent } from './admin/admin.component';
import { AdminDashboardComponent } from './admin-dashboard/admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises/manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes/manage-heroes.component';

// #docregion admin-route
import { AuthGuard } from '../auth-guard.service';
import { AuthGuard } from '../auth/auth.guard';

// #docregion can-activate-child
const adminRoutes: Routes = [
Expand Down
10 changes: 5 additions & 5 deletions aio/content/examples/router/src/app/admin/admin-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

import { AdminComponent } from './admin.component';
import { AdminDashboardComponent } from './admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes.component';
import { AdminComponent } from './admin/admin.component';
import { AdminDashboardComponent } from './admin-dashboard/admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises/manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes/manage-heroes.component';

import { AuthGuard } from '../auth-guard.service';
import { AuthGuard } from '../auth/auth.guard';

const adminRoutes: Routes = [
{
Expand Down
17 changes: 0 additions & 17 deletions aio/content/examples/router/src/app/admin/admin.component.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions aio/content/examples/router/src/app/admin/admin.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { AdminComponent } from './admin.component';
import { AdminDashboardComponent } from './admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes.component';
import { AdminComponent } from './admin/admin.component';
import { AdminDashboardComponent } from './admin-dashboard/admin-dashboard.component';
import { ManageCrisesComponent } from './manage-crises/manage-crises.component';
import { ManageHeroesComponent } from './manage-heroes/manage-heroes.component';

import { AdminRoutingModule } from './admin-routing.module';

Expand Down
Empty file added aio/content/examples/router/src/app/admin/admin/admin.component.css
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions aio/content/examples/router/src/app/admin/admin/admin.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<h3>ADMIN</h3>
<nav>
<a routerLink="./" routerLinkActive="active"
[routerLinkActiveOptions]="{ exact: true }">Dashboard</a>
<a routerLink="./crises" routerLinkActive="active">Manage Crises</a>
<a routerLink="./heroes" routerLinkActive="active">Manage Heroes</a>
</nav>
<router-outlet></router-outlet>
10 changes: 10 additions & 0 deletions aio/content/examples/router/src/app/admin/admin/admin.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// #docregion
import { Component } from '@angular/core';

@Component({
selector: 'app-admin',
templateUrl: './admin.component.html',
styleUrls: ['./admin.component.css']
})
export class AdminComponent {
}
9 changes: 0 additions & 9 deletions aio/content/examples/router/src/app/admin/manage-crises.component.ts
View file
Open in desktop

This file was deleted.

Empty file added aio/content/examples/router/src/app/admin/manage-crises/manage-crises.component.css
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions aio/content/examples/router/src/app/admin/manage-crises/manage-crises.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Manage your crises here</p>
9 changes: 9 additions & 0 deletions aio/content/examples/router/src/app/admin/manage-crises/manage-crises.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// #docregion
import { Component } from '@angular/core';

@Component({
selector: 'app-manage-crises',
templateUrl: './manage-crises.component.html',
styleUrls: ['./manage-crises.component.css']
})
export class ManageCrisesComponent { }
9 changes: 0 additions & 9 deletions aio/content/examples/router/src/app/admin/manage-heroes.component.ts
View file
Open in desktop

This file was deleted.

Empty file added aio/content/examples/router/src/app/admin/manage-heroes/manage-heroes.component.css
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions aio/content/examples/router/src/app/admin/manage-heroes/manage-heroes.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Manage your heroes here</p>
9 changes: 9 additions & 0 deletions aio/content/examples/router/src/app/admin/manage-heroes/manage-heroes.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// #docregion
import { Component } from '@angular/core';

@Component({
selector: 'app-manage-hereos',
templateUrl: './manage-heroes.component.html',
styleUrls: ['./manage-heroes.component.css']
})
export class ManageHeroesComponent { }
51 changes: 30 additions & 21 deletions aio/content/examples/router/src/app/animations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
// #docregion
import { animate, state, style, transition, trigger } from '@angular/animations';
import {
trigger, animateChild, group,
transition, animate, style, query
} from '@angular/animations';

// Component transition animations
export const slideInDownAnimation =

// Routable animations
export const slideInAnimation =
trigger('routeAnimation', [
state('*',
style({
opacity: 1,
transform: 'translateX(0)'
})
),
transition(':enter', [
style({
opacity: 0,
transform: 'translateX(-100%)'
}),
animate('0.2s ease-in')
]),
transition(':leave', [
animate('0.5s ease-out', style({
opacity: 0,
transform: 'translateY(100%)'
}))
transition('heroes <=> hero', [
style({ position: 'relative' }),
query(':enter, :leave', [
style({
position: 'absolute',
top: 0,
left: 0,
width: '100%'
})
]),
query(':enter', [
style({ left: '-100%'})
]),
query(':leave', animateChild()),
group([
query(':leave', [
animate('300ms ease-out', style({ left: '100%'}))
]),
query(':enter', [
animate('300ms ease-out', style({ left: '0%'}))
])
]),
query(':enter', animateChild()),
])
]);
Loading