Skip to content
Permalink
Browse files

docs(tutorial): update to use `v1.5.x` and best practices

This is a major re-structuring of the tutorial app's codebase, aiming at applying established best
practices (in terms of file naming/layout and code organization) and utilizing several new features
and enhancements (most notably components) introduced in recent versions of Angular (especially
v1.5).

Apart from the overall changes, two new chapters were introduced: one on components and one on code
organization.

--
In the process, several other things were (incidentally) taken care of, including:

* Dependencies were upgraded to latest versions.
* Animations were polished.
* Outdated links were updated.
* The app's base URL was changed to `/` (instead of `/app/`).

BTW, this has been tested with the following versions of Node (on Windows 10) and everything worked
fine:

* 0.11.16
* 4.2.6
* 4.4.2
* 5.10.0
* 6.2.0

--
This was inspired by (and loosely based on) #13834.
Again, mad props to @teropa for leading the way :)

--
**Note:**
The old version of the tutorial, that is compatible with Angular version 1.4 or older, has been
saved on the `pre-v1.5.0-snapshot` branch of
[angular-phonecat](https://github.com/angular/angular-phonecat). The `v1.4.x` version of the
tutorial should be pointed to that branch instead of `master`.

--
Related to angular/angular-phonecat#326.
Related to angular/angular-seed#341.

Closes #14416
  • Loading branch information
gkalpak committed Mar 27, 2016
1 parent 4ae4cc9 commit c2033d7ff04ed5507ee5911a98eb2b2adf7f2092
Showing with 14,277 additions and 2,176 deletions.
  1. +5 −0 docs/app/assets/css/docs.css
  2. +4 −3 docs/app/src/tutorials.js
  3. +4 −4 docs/config/templates/indexPage.template.html
  4. +141 −96 docs/content/tutorial/index.ngdoc
  5. +89 −74 docs/content/tutorial/step_00.ngdoc
  6. +9 −5 docs/content/tutorial/step_01.ngdoc
  7. +171 −114 docs/content/tutorial/step_02.ngdoc
  8. +212 −153 docs/content/tutorial/step_03.ngdoc
  9. +241 −125 docs/content/tutorial/step_04.ngdoc
  10. +103 −212 docs/content/tutorial/step_05.ngdoc
  11. +196 −63 docs/content/tutorial/step_06.ngdoc
  12. +214 −282 docs/content/tutorial/step_07.ngdoc
  13. +63 −143 docs/content/tutorial/step_08.ngdoc
  14. +366 −81 docs/content/tutorial/step_09.ngdoc
  15. +145 −111 docs/content/tutorial/step_10.ngdoc
  16. +106 −223 docs/content/tutorial/step_11.ngdoc
  17. +112 −465 docs/content/tutorial/step_12.ngdoc
  18. +321 −0 docs/content/tutorial/step_13.ngdoc
  19. +564 −0 docs/content/tutorial/step_14.ngdoc
  20. +13 −6 docs/content/tutorial/the_end.ngdoc
  21. BIN docs/img/tutorial/tutorial_00_final.png
  22. BIN docs/img/tutorial/tutorial_02.png
  23. BIN docs/img/tutorial/tutorial_03.png
  24. BIN docs/img/tutorial/tutorial_04.png
  25. BIN docs/img/tutorial/tutorial_05.png
  26. BIN docs/img/tutorial/tutorial_05.pptx
  27. BIN docs/img/tutorial/tutorial_06.png
  28. BIN docs/img/tutorial/tutorial_07_final.png
  29. BIN docs/img/tutorial/tutorial_08-09_final.png
  30. BIN docs/img/tutorial/tutorial_09.png
  31. BIN docs/img/tutorial/tutorial_10-11_final.png
  32. BIN docs/img/tutorial/tutorial_10.png
  33. BIN docs/img/tutorial/tutorial_12.png
  34. BIN docs/img/tutorial/xhr_service_final.png
  35. BIN images/docs/tutorial/tutorial_02.svg/image11.png
  36. +1,351 −2 images/docs/tutorial/tutorial_02.svg/tutorial_02.svg
  37. BIN images/docs/tutorial/tutorial_03.svg/image11.png
  38. BIN images/docs/tutorial/tutorial_03.svg/image13.png
  39. +1,376 −2 images/docs/tutorial/tutorial_03.svg/tutorial_03.svg
  40. BIN images/docs/tutorial/tutorial_04.svg/image15.png
  41. +0 −3 images/docs/tutorial/tutorial_04.svg/tutorial_04.svg
  42. BIN images/docs/tutorial/{tutorial_03.graffle → tutorial_05.graffle}/QuickLook/Preview.pdf
  43. BIN images/docs/tutorial/{tutorial_03.graffle → tutorial_05.graffle}/QuickLook/Thumbnail.tiff
  44. 0 images/docs/tutorial/{tutorial_03.graffle → tutorial_05.graffle}/data.plist
  45. BIN images/docs/tutorial/{tutorial_03.graffle → tutorial_05.graffle}/image13.png
  46. BIN images/docs/tutorial/tutorial_05.svg/image13.png
  47. +1,569 −0 images/docs/tutorial/tutorial_05.svg/tutorial_05.svg
  48. BIN images/docs/tutorial/{tutorial_04.graffle → tutorial_06.graffle}/QuickLook/Preview.pdf
  49. BIN images/docs/tutorial/{tutorial_04.graffle → tutorial_06.graffle}/QuickLook/Thumbnail.tiff
  50. 0 images/docs/tutorial/{tutorial_04.graffle → tutorial_06.graffle}/data.plist
  51. BIN images/docs/tutorial/{tutorial_04.graffle → tutorial_06.graffle}/image15.png
  52. BIN images/docs/tutorial/tutorial_06.svg/image15.png
  53. +1,625 −0 images/docs/tutorial/tutorial_06.svg/tutorial_06.svg
  54. BIN images/docs/tutorial/tutorial_07.svg/image9.png
  55. +0 −3 images/docs/tutorial/tutorial_07.svg/tutorial_07.svg
  56. +0 −3 images/docs/tutorial/tutorial_08-09.svg/tutorial_08-09.svg
  57. BIN images/docs/tutorial/{tutorial_07.graffle → tutorial_09.graffle}/QuickLook/Preview.pdf
  58. BIN images/docs/tutorial/{tutorial_07.graffle → tutorial_09.graffle}/QuickLook/Thumbnail.tiff
  59. 0 images/docs/tutorial/{tutorial_07.graffle → tutorial_09.graffle}/data.plist
  60. BIN images/docs/tutorial/{tutorial_07.graffle → tutorial_09.graffle}/image9.png
  61. BIN images/docs/tutorial/tutorial_09.svg/image9.png
  62. +1,727 −0 images/docs/tutorial/tutorial_09.svg/tutorial_09.svg
  63. BIN images/docs/tutorial/tutorial_10-11.graffle/image10.png
  64. BIN images/docs/tutorial/tutorial_10-11.svg/image10.png
  65. +0 −3 images/docs/tutorial/tutorial_10-11.svg/tutorial_10-11.svg
  66. BIN images/docs/tutorial/{tutorial_08-09.graffle → tutorial_10.graffle}/QuickLook/Preview.pdf
  67. BIN images/docs/tutorial/{tutorial_08-09.graffle → tutorial_10.graffle}/QuickLook/Thumbnail.tiff
  68. 0 images/docs/tutorial/{tutorial_08-09.graffle → tutorial_10.graffle}/data.plist
  69. BIN images/docs/tutorial/{tutorial_08-09.graffle → tutorial_10.graffle}/image10.png
  70. BIN images/docs/tutorial/tutorial_10.svg/image10.png
  71. +1,706 −0 images/docs/tutorial/tutorial_10.svg/tutorial_10.svg
  72. BIN images/docs/tutorial/{tutorial_10-11.graffle → tutorial_12.graffle}/QuickLook/Preview.pdf
  73. BIN images/docs/tutorial/{tutorial_10-11.graffle → tutorial_12.graffle}/QuickLook/Thumbnail.tiff
  74. 0 images/docs/tutorial/{tutorial_10-11.graffle → tutorial_12.graffle}/data.plist
  75. BIN images/docs/tutorial/{tutorial_08-09.svg → tutorial_12.graffle}/image10.png
  76. BIN images/docs/tutorial/tutorial_12.svg/image10.png
  77. +1,844 −0 images/docs/tutorial/tutorial_12.svg/tutorial_12.svg
@@ -647,6 +647,11 @@ ul.events > li {
padding-top: 50px;
}

.diagram {
margin-bottom: 10px;
margin-top: 30px;
}

@media only screen and (min-width: 769px) and (max-width: 991px) {
.main-body-grid {
margin-top: 160px;
@@ -5,7 +5,8 @@ angular.module('tutorials', [])
'',
'step_00', 'step_01', 'step_02', 'step_03', 'step_04',
'step_05', 'step_06', 'step_07', 'step_08', 'step_09',
'step_10', 'step_11', 'step_12', 'the_end'
'step_10', 'step_11', 'step_12', 'step_13', 'step_14',
'the_end'
];
return {
scope: {},
@@ -43,7 +44,7 @@ angular.module('tutorials', [])
'<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
'</div>\n' +
'<p>The most important changes are listed below. You can see the full diff on ' +
'<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>\n' +
'<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>.\n' +
'</p>'
};
});
});
@@ -228,10 +228,10 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
)
</p>
<p>
Code licensed under the
<a href="https://github.com/angular/angular.js/blob/master/LICENSE" target="_blank">The
MIT License</a>. Documentation licensed under <a
href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
Code licensed under
<a href="https://github.com/angular/angular.js/blob/master/LICENSE" target="_blank">The MIT License</a>.
Documentation licensed under
<a href="http://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.
</p>
</div>
</footer>

Large diffs are not rendered by default.

@@ -7,130 +7,143 @@


In this step of the tutorial, you will become familiar with the most important source code files of
the AngularJS phonecat app. You will also learn how to start the development servers bundled with
angular-seed, and run the application in the browser.
the AngularJS Phonecat App. You will also learn how to start the development servers bundled with
[angular-seed][angular-seed], and run the application in the browser.

Before you continue, make sure you have set up your development environment and installed all necessary
dependencies, as described in {@link index#get-started Get Started}.
Before you continue, make sure you have set up your development environment and installed all
necessary dependencies, as described in the {@link tutorial/#environment-setup Environment Setup}
section.

In the `angular-phonecat` directory, run this command:

```
git checkout -f step-0
```


This resets your workspace to step 0 of the tutorial app.

You must repeat this for every future step in the tutorial and change the number to the number of
the step you are on. This will cause any changes you made within your working directory to be lost.

If you haven't already done so you need to install the dependencies by running:
If you haven't already done so, you need to install the dependencies by running:

```
npm install
```

To see the app running in a browser, open a *separate* terminal/command line tab or window, then
run `npm start` to start the web server. Now, open a browser window for the app and navigate to
<a href="http://localhost:8000/app/" target="_blank" title="Open app on localhost">`http://localhost:8000/app/`</a>
To see the app running in a browser, open a _separate_ terminal/command line tab or window, then run
`npm start` to start the web server. Now, open a browser window for the app and navigate to
http://localhost:8000/index.html.

Note that if you already ran the master branch app prior to checking out step-0, you may see the cached
master version of the app in your browser window at this point. Just hit refresh to re-load the page.
Note that if you already ran the master branch app prior to checking out step-0, you may see the
cached master version of the app in your browser window at this point. Just hit refresh to re-load
the page.

You can now see the page in your browser. It's not very exciting, but that's OK.

The HTML page that displays "Nothing here yet!" was constructed with the HTML code shown below.
The code contains some key Angular elements that we will need as we progress.

__`app/index.html`:__
**`app/index.html`:**

```html
<!doctype html>
<html lang="en" ng-app>
<head>
<meta charset="utf-8">
<title>My HTML File</title>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" href="css/app.css">
<script src="bower_components/angular/angular.js"></script>
</head>
<body>

<p>Nothing here {{'yet' + '!'}}</p>

</body>
<head>
<meta charset="utf-8">
<title>My HTML File</title>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<script src="bower_components/angular/angular.js"></script>
</head>
<body>

<p>Nothing here {{'yet' + '!'}}</p>

</body>
</html>
```



## What is the code doing?

**`ng-app` directive:**
<br />
**`ng-app` attribute:**

<html ng-app>
```html
<html ng-app>
```

The `ng-app` attribute represents an Angular directive, named `ngApp` (Angular uses `kebab-case` for
its custom attributes and `camelCase` for the corresponding directives which implement them). This
directive is used to flag the HTML element that Angular should consider to be the root element of
our application. This gives application developers the freedom to tell Angular if the entire HTML
page or only a portion of it should be treated as the AngularJS application.

The `ng-app` attribute represents an Angular directive named `ngApp` (Angular uses
`spinal-case` for its custom attributes and `camelCase` for the corresponding directives
which implement them).
This directive is used to flag the html element that Angular should consider to be the root element
of our application.
This gives application developers the freedom to tell Angular if the entire html page or only a
portion of it should be treated as the Angular application.
For more info on `ngApp`, check out the {@link ngApp API Reference}.

**AngularJS script tag:**
<br />
**`angular.js` script tag:**

<script src="bower_components/angular/angular.js">
```html
<script src="bower_components/angular/angular.js"></script>
```

This code downloads the `angular.js` script which registers a callback that will be executed by the
This code downloads the `angular.js` script which registers a callback that will be executed by the
browser when the containing HTML page is fully downloaded. When the callback is executed, Angular
looks for the {@link ng.directive:ngApp ngApp} directive. If
Angular finds the directive, it will bootstrap the application with the root of the application DOM
being the element on which the `ngApp` directive was defined.
looks for the {@link ngApp ngApp} directive. If Angular finds the directive, it will bootstrap the
application with the root of the application DOM being the element on which the `ngApp` directive
was defined.

For more info on bootstrapping your app, checkout the [Bootstrap](guide/bootstrap) section of the
Developer Guide.

<br />
**Double-curly binding with an expression:**

Nothing here {{'yet' + '!'}}
```html
Nothing here {{'yet' + '!'}}
```

This line demonstrates two core features of Angular's templating capabilities:

* a binding, denoted by double-curlies `{{ }}`
* a simple expression `'yet' + '!'` used in this binding.
* A binding, denoted by double-curlies: `{{ }}`
* A simple expression used in this binding: `'yet' + '!'`

The binding tells Angular that it should evaluate an expression and insert the result into the
DOM in place of the binding. Rather than a one-time insert, as we'll see in the next steps, a
binding will result in efficient continuous updates whenever the result of the expression
evaluation changes.
The binding tells Angular that it should evaluate an expression and insert the result into the DOM
in place of the binding. As we will see in the next steps, rather than a one-time insert, a binding
will result in efficient continuous updates whenever the result of the expression evaluation
changes.

{@link guide/expression Angular expression} is a JavaScript-like code snippet that is
evaluated by Angular in the context of the current model scope, rather than within the scope of
the global context (`window`).
{@link guide/expression Angular expressions} are JavaScript-like code snippets that are evaluated by
Angular in the context of the current model scope, rather than within the scope of the global
context (`window`).

As expected, once this template is processed by Angular, the html page contains the text:
"Nothing here yet!".
As expected, once this template is processed by Angular, the HTML page contains the text:

## Bootstrapping AngularJS apps
```
Nothing here yet!
```

Bootstrapping AngularJS apps automatically using the `ngApp` directive is very easy and suitable
for most cases. In advanced cases, such as when using script loaders, you can use the
{@link guide/bootstrap imperative / manual way} to bootstrap the app.
## Bootstrapping Angular Applications

There are 3 important things that happen during the app bootstrap:
Bootstrapping Angular applications automatically using the `ngApp` directive is very easy and
suitable for most cases. In advanced cases, such as when using script loaders, you can use the
{@link guide/bootstrap#manual-initialization imperative/manual way} to bootstrap the application.

There are 3 important things that happen during the bootstrap phase:

1. The {@link auto.$injector injector} that will be used for dependency injection is created.

2. The injector will then create the {@link ng.$rootScope root scope} that will
become the context for the model of our application.
2. The injector will then create the {@link ng.$rootScope root scope} that will become the context
for the model of our application.

3. Angular will then "compile" the DOM starting at the `ngApp` root element, processing any
directives and bindings found along the way.


Once an application is bootstrapped, it will then wait for incoming browser events (such as mouse
click, key press or incoming HTTP response) that might change the model. Once such an event occurs,
Angular detects if it caused any model changes and if changes are found, Angular will reflect them
in the view by updating all of the affected bindings.
clicks, key presses or incoming HTTP responses) that might change the model. Once such an event
occurs, Angular detects if it caused any model changes and if changes are found, Angular will
reflect them in the view by updating all of the affected bindings.

The structure of our application is currently very simple. The template contains just one directive
and one static binding, and our model is empty. That will soon change!
@@ -140,27 +153,29 @@ and one static binding, and our model is empty. That will soon change!

## What are all these files in my working directory?


Most of the files in your working directory come from the [angular-seed project][angular-seed] which
is typically used to bootstrap new Angular projects. The seed project is pre-configured to install
the angular framework (via `bower` into the `app/bower_components/` folder) and tools for developing
a typical web app (via `npm`).
Most of the files in your working directory come from the [angular-seed project][angular-seed],
which is typically used to bootstrap new AngularJS projects. The seed project is pre-configured to
install the AngularJS framework (via `bower` into the `app/bower_components/` directory) and tools
for developing and testing a typical web application (via `npm`).

For the purposes of this tutorial, we modified the angular-seed with the following changes:

* Removed the example app
* Added phone images to `app/img/phones/`
* Added phone data files (JSON) to `app/phones/`
* Removed the example app.
* Removed unused dependencies.
* Added phone images to `app/img/phones/`.
* Added phone data files (JSON) to `app/phones/`.
* Added a dependency on [Bootstrap](http://getbootstrap.com) in the `bower.json` file.



# Experiments

* Try adding a new expression to the `index.html` that will do some math:
<div></div>

<p>1 + 2 = {{ 1 + 2 }}</p>
* Try adding a new expression to `index.html` that will do some math:

```html
<p>1 + 2 = {{1 + 2}}</p>
```


# Summary
@@ -12,11 +12,11 @@ dynamically display the same result with any set of data.

In this step you will add some basic information about two cell phones to an HTML page.

- The page now contains a list with information about two phones.
* The page now contains a list with information about two phones.

<div doc-tutorial-reset="1"></div>


<br />
**`app/index.html`:**

```html
@@ -39,15 +39,19 @@ In this step you will add some basic information about two cell phones to an HTM

# Experiments

<div></div>

* Try adding more static HTML to `index.html`. For example:

<p>Total number of phones: 2</p>
```html
<p>Total number of phones: 2</p>
```


# Summary

This addition to your app uses static HTML to display the list. Now, let's go to {@link step_02
step 2} to learn how to use AngularJS to dynamically generate the same list.
This addition to your app uses static HTML to display the list. Now, let's go to
{@link step_02 step 2} to learn how to use Angular to dynamically generate the same list.


<ul doc-tutorial-nav="1"></ul>

0 comments on commit c2033d7

Please sign in to comment.
You can’t perform that action at this time.