Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit a42ba62

Browse files
committed
[WIP] Rebase for final edits
1 parent 3c3750a commit a42ba62

File tree

8 files changed

+1077
-1124
lines changed

8 files changed

+1077
-1124
lines changed

public/docs/ts/latest/tutorial/_data.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
},
88
"toh-pt1": {
99
"title": "The Hero Editor",
10-
"intro": "We build a simple hero editor",
10+
"intro": "Build a simple hero editor.",
1111
"nextable": true
1212
},
1313
"toh-pt2": {
1414
"title": "Master/Detail",
15-
"intro": "We build a master/detail page with a list of heroes",
15+
"intro": "Build a master/detail page with a list of heroes.",
1616
"nextable": true
1717
},
1818
"toh-pt3": {
1919
"title": "Multiple Components",
20-
"intro": "We refactor the master/detail view into separate components",
20+
"intro": "Refactor the master/detail view into separate components.",
2121
"nextable": true
2222
},
2323
"toh-pt4": {
2424
"title": "Services",
25-
"intro": "We create a reusable service to manage our hero data calls",
25+
"intro": "Create a reusable service to manage the hero data calls.",
2626
"nextable": true
2727
},
2828
"toh-pt5": {
2929
"title": "Routing",
30-
"intro": "We add the Angular Router and learn to navigate among the views",
30+
"intro": "Add the Angular component router and learn to navigate among the views.",
3131
"nextable": true
3232
},
3333
"toh-pt6": {
3434
"title": "HTTP",
3535
"subtitle": "Getting and saving data",
36-
"intro": "We convert our service and components to use Angular's HTTP service",
36+
"intro": "Convert the service and components to use Angular's HTTP service.",
3737
"nextable": true
3838
}
3939
}

public/docs/ts/latest/tutorial/index.jade

+38-36
Original file line numberDiff line numberDiff line change
@@ -2,80 +2,82 @@ block includes
22
include ../_util-fns
33

44
:marked
5-
Our grand plan for this tutorial is to build an app to help a staffing agency manage its stable of heroes.
6-
Even heroes need to find work.
5+
The grand plan for this tutorial is to build an app that helps a staffing agency manage its stable of heroes.
76

8-
Of course we'll only make a little progress in this tutorial. What we do build will
9-
have many of the features we expect to find in a full-blown, data-driven application: acquiring and displaying
7+
The Tour of Heroes app covers the core fundamentals of Angular. You'll build a basic app that
8+
has many of the features you'd expect to find in a full-blown, data-driven app: acquiring and displaying
109
a list of heroes, editing a selected hero's detail, and navigating among different
1110
views of heroic data.
1211

13-
The Tour of Heroes covers the core fundamentals of Angular.
14-
We’ll use built-in directives to show/hide elements and display lists of hero data.
15-
We’ll create a component to display hero details and another to show an array of heroes.
16-
We'll use one-way data binding for read-only data. We'll add editable fields to update a model
17-
with two-way data binding. We'll bind component methods to user events like key strokes and clicks.
18-
We’ll learn to select a hero from a master list and edit that hero in the details view. We'll
19-
format data with pipes. We'll create a shared service to assemble our heroes. And we'll use routing to navigate among different views and their components.
12+
You'll use built-in directives to show and hide elements and display lists of hero data.
13+
You'll create components to display hero details and show an array of heroes.
14+
You'll use one-way data binding for read-only data. You'll add editable fields to update a model
15+
with two-way data binding. You'll bind component methods to user events, like keystrokes and clicks.
16+
You'll enable users to select a hero from a master list and edit that hero in the details view. You'll
17+
format data with pipes. You'll create a shared service to assemble the heroes.
18+
And you'll use routing to navigate among different views and their components.
19+
<!-- CF: Should this be a bullet list? -->
2020

21-
We’ll learn enough core Angular to get started and gain confidence that
22-
Angular can do whatever we need it to do.
23-
We'll be covering a lot of ground at an introductory level but we’ll find plenty of links
24-
to chapters with greater depth.
21+
You'll learn enough core Angular to get started and gain confidence that
22+
Angular can do whatever you need it to do.
23+
You'll cover a lot of ground at an introductory level, and you'll find many links
24+
to pages with greater depth.
25+
26+
When you're done with this tutorial, the app will look like this <live-example name="toh-6"></live-example>.
2527

26-
Run the <live-example name="toh-6"></live-example>.
2728

2829
.l-main-section
2930
:marked
30-
## The End Game
31+
## The end game
3132

32-
Here's a visual idea of where we're going in this tour, beginning with the "Dashboard"
33-
view and our most heroic heroes:
33+
Here's a visual idea of where this tutorial leads, beginning with the "Dashboard"
34+
view and the most heroic heroes:
3435

3536
figure.image-display
3637
img(src='/resources/images/devguide/toh/heroes-dashboard-1.png' alt="Output of heroes dashboard")
3738

3839
:marked
39-
Above the dashboard are two links ("Dashboard" and "Heroes").
40-
We could click them to navigate between this Dashboard and a Heroes view.
40+
Users can click the two links above the dashboard ("Dashboard" and "Heroes")
41+
to navigate between this Dashboard view and a Heroes view.
4142

42-
Instead we click the dashboard hero named "Magneta" and the router takes us to a "Hero Details" view
43-
of that hero where we can change the hero's name.
43+
If a user clicks the dashboard hero "Magneta," the router opens a "Hero Details" view
44+
where the user can change the hero's name.
4445

4546
figure.image-display
4647
img(src='/resources/images/devguide/toh/hero-details-1.png' alt="Details of hero in app")
4748

4849
:marked
49-
Clicking the "Back" button would return us to the "Dashboard".
50-
Links at the top can take us to either of the main views.
51-
We'll click "Heroes". The app takes to the "Heroes" master list view.
50+
Clicking the "Back" button returns users to the Dashboard.
51+
Links at the top take them to either of the main views.
52+
If a user clicks "Heroes," the app displays the "Heroes" master list view.
5253

5354
figure.image-display
5455
img(src='/resources/images/devguide/toh/heroes-list-2.png' alt="Output of heroes list app")
56+
// CF: The ability to add heroes isn't shown in the images or discussed in this page. Should that be added?
5557
5658
:marked
57-
We click a different hero and the readonly mini-detail beneath the list reflects our new choice.
59+
When a user clicks a different hero name, the read-only mini detail beneath the list reflects the new choice.
5860

59-
We click the "View Details" button to drill into the
60-
editable details of our selected hero.
61+
Users can click the "View Details" button to drill into the
62+
editable details of the selected hero.
6163

62-
The following diagram captures all of our navigation options.
64+
The following diagram captures all of the navigation options.
6365

6466
figure.image-display
6567
img(src='/resources/images/devguide/toh/nav-diagram.png' alt="View navigations")
6668

6769
:marked
68-
Here's our app in action
70+
Here's the app in action:
6971

7072
figure.image-display
7173
img(src='/resources/images/devguide/toh/toh-anim.gif' alt="Tour of Heroes in Action")
7274

7375
.l-main-section
7476
:marked
75-
## Up Next
77+
## Up next
7678

77-
We’ll build this Tour of Heroes together, step by step.
78-
We'll motivate each step with a requirement that we've
79-
met in countless applications. Everything has a reason.
79+
You'll build the Tour of Heroes app, step by step.
80+
Each step is motivated with a requirement that you've likely
81+
met in many applications. Everything has a reason.
8082

81-
And we’ll meet many of the core fundamentals of Angular along the way.
83+
Along the way, you'll become familiar with many of the core fundamentals of Angular.

0 commit comments

Comments
 (0)