Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

docs(tutorial): use the angular/angular-phonecat#1.5-snapshot branch #16752

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions docs/app/src/tutorials.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ angular.module('tutorials', [])
scope: {},
template:
'<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
'<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
'<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
'<a ng-href="https://github.com/angular/angular-phonecat/compare/1.5-step-{{diffLo}}...1.5-step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
'<a ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
link: function(scope, element, attrs) {
var seq = 1 * attrs.docTutorialNav;
Expand All @@ -41,12 +40,11 @@ angular.module('tutorials', [])
'<p><button class="btn" ng-click="show=!show">Workspace Reset Instructions ➤</button></p>\n' +
'<div class="alert alert-info" ng-show="show">\n' +
' <p>Reset the workspace to step {{step}}.</p>' +
' <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
' <p>Refresh your browser or check out this step online: ' +
'<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
' <p><pre>git checkout -f 1.5-step-{{step}}</pre></p>\n' +
' <p>Refresh your browser to see the changes.</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/1.5-step-{{step ? (step - 1): \'0~1\'}}...1.5-step-{{step}}" title="See diff on Github">GitHub</a>.\n' +
'</p>'
};
});
23 changes: 14 additions & 9 deletions docs/content/tutorial/index.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Clone the [angular-phonecat repository][angular-phonecat] located at GitHub by r
command:

```
git clone --depth=16 https://github.com/angular/angular-phonecat.git
git clone --depth=16 --branch=1.5-snapshot https://github.com/angular/angular-phonecat.git
```

This command creates an `angular-phonecat` sub-directory in your current directory.
Expand All @@ -87,6 +87,11 @@ This command creates an `angular-phonecat` sub-directory in your current directo
This makes the download much smaller and faster.
</div>

<div class="alert alert-info">
The `--branch=1.5-snapshot` option tells Git to pull down the `1.5-snapshot` branch.
The code for this older version of the tutorial is on that branch.
</div>

Change your current directory to `angular-phonecat`.

```
Expand Down Expand Up @@ -199,7 +204,7 @@ You can now browse to the application at http://localhost:8000/index.html.

<div class="alert alert-info">
To serve the web app on a different IP address or port, edit the "start" script within
`package.json`. You can use `-a` to set the address and `-p` to set the port. You also need to
`package.json`. You can use `-a` to set the address and `-p` to set the port. You also need to
update the `baseUrl` configuration property in `e2e-test/protractor.conf.js`.
</div>

Expand Down Expand Up @@ -284,9 +289,9 @@ a new commit of changes to a remote repository.
<br />
**Firewall / Proxy issues**

Git and other tools, often use the `git:` protocol for accessing files in remote repositories.
Some firewall configurations are blocking `git://` URLs, which leads to errors when trying to clone
repositories or download dependencies. (For example corporate firewalls are "notorious" for blocking
Git and other tools, often use the `git:` protocol for accessing files in remote repositories.
Some firewall configurations are blocking `git://` URLs, which leads to errors when trying to clone
repositories or download dependencies. (For example corporate firewalls are "notorious" for blocking
`git:`.)

If you run into this issue, you can force the use of `https:` instead, by running the following
Expand All @@ -304,17 +309,17 @@ In that case, you can delete the `node_modules/` directory and run `npm install`
<br />
**Protractor dependencies**

Under the hood, Protractor uses the [Selenium Standalone Server][selenium], which in turn requires
the [Java Development Kit (JDK)][jdk] to be installed on your local machine. Check this by running
Under the hood, Protractor uses the [Selenium Standalone Server][selenium], which in turn requires
the [Java Development Kit (JDK)][jdk] to be installed on your local machine. Check this by running
`java -version` from the command line.

If JDK is not already installed, you can download it [here][jdk-download].

<br />
**Error running the web server**

The web server is configured to use port 8000. If the port is already in use (for example by another
instance of a running web server) you will get an `EADDRINUSE` error. Make sure the port is
The web server is configured to use port 8000. If the port is already in use (for example by another
instance of a running web server) you will get an `EADDRINUSE` error. Make sure the port is
available, before running `npm start`.

<hr />
Expand Down
2 changes: 1 addition & 1 deletion docs/content/tutorial/step_00.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ section.
In the `angular-phonecat` directory, run this command:

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

This resets your workspace to step 0 of the tutorial app.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"devDependencies": {
"angular-benchpress": "0.x.x",
"benchmark": "1.x.x",
"bower": "~1.3.9",
"bower": "^1.8.4",
"browserstacktunnel-wrapper": "^1.4.2",
"canonical-path": "0.0.2",
"cheerio": "^0.17.0",
Expand Down
Loading