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

Commit a752572

Browse files
committed
Revert "[WIP] docs(quickstart): QuickStart reboot (#2762)"
This reverts commit 8ccc33e.
1 parent 8ccc33e commit a752572

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+564
-855
lines changed

public/_includes/_next-item.jade

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
- var currentPage = false
22
- var nextPage = false
3-
- var hideNextPage = false;
4-
53
- var data = public.docs[current.path[1]][current.path[2]][current.path[3]]._data
64

75
for page, slug in data
86

97
// CHECK IF CURRENT PAGE IS SET, THEN SET NEXT PAGE
108
if currentPage
119
if !nextPage && page.nextable && !page.hide
12-
if !hideNextPage
13-
.l-sub-section
14-
h3 Next Step
15-
a(href="/docs/#{current.path[1]}/#{current.path[2]}/#{current.path[3]}/#{slug}.html") #{page.title}
10+
.l-sub-section
11+
h3 Next Step
12+
a(href="/docs/#{current.path[1]}/#{current.path[2]}/#{current.path[3]}/#{slug}.html") #{page.title}
1613

1714
//NEXT PAGE HAS NOW BEEN SET
1815
- var nextPage = true
1916

20-
- hideNextPage = page.hideNextPage
21-
2217
// SET CURRENT PAGE FLAG WHEN YOU PASS IT
2318
if current.path[4] == slug
2419
- var currentPage = true

public/docs/_examples/_boilerplate/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "angular-examples",
33
"version": "1.0.0",
4-
"private": true,
54
"description": "Example package.json, only contains needed scripts for examples. See _examples/package.json for master package.json.",
65
"scripts": {
76
"start": "tsc && concurrently \"tsc -w\" \"lite-server\" ",

public/docs/_examples/cb-aot-compiler/e2e-spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict'; // necessary for es6 output in node
1+
'use strict'; // necessary for es6 output in node
22

33
import { browser, element, by } from 'protractor';
44

@@ -11,7 +11,7 @@ describe('AOT Compilation', function () {
1111

1212
it('should load page and click button', function (done) {
1313
let headingSelector = element.all(by.css('h1')).get(0);
14-
expect(headingSelector.getText()).toEqual('Hello Angular');
14+
expect(headingSelector.getText()).toEqual('My First Angular App');
1515

1616
expect(element.all(by.xpath('//div[text()="Magneta"]')).get(0).isPresent()).toBe(true);
1717
expect(element.all(by.xpath('//div[text()="Bombasto"]')).get(0).isPresent()).toBe(true);

public/docs/_examples/cb-aot-compiler/ts/app/app.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- #docregion -->
22
<button (click)="toggleHeading()">Toggle Heading</button>
3-
<h1 *ngIf="showHeading">Hello Angular</h1>
3+
<h1 *ngIf="showHeading">My First Angular App</h1>
44

55
<h3>List of Heroes</h3>
66
<div *ngFor="let hero of heroes">{{hero}}</div>

public/docs/_examples/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "angular-examples-master",
33
"version": "1.0.0",
4-
"private": true,
54
"description": "Master package.json, the superset of all dependencies for all of the _example package.json files. See _boilerplate/package.json for example npm scripts.",
65
"scripts": {
76
"protractor": "protractor",

public/docs/_examples/quickstart/dart/lib/app_component.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:angular2/core.dart';
55
// #docregion metadata
66
@Component(
77
selector: 'my-app',
8-
template: '<h1>Hello Angular</h1>')
8+
template: '<h1>Hello Angular!</h1>')
99
// #enddocregion metadata
1010
// #docregion class
1111
class AppComponent {}

public/docs/_examples/quickstart/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { browser, element, by } from 'protractor';
44

55
describe('QuickStart E2E Tests', function () {
66

7-
let expectedMsg = 'Hello Angular';
7+
let expectedMsg = 'Hello Angular!';
88

99
beforeEach(function () {
1010
browser.get('');

public/docs/_examples/quickstart/js/app/app.component.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ng.core.Component({
1111
// #enddocregion ng-namespace-funcs
1212
selector: 'my-app',
13-
template: '<h1>Hello Angular</h1>'
13+
template: '<h1>Hello Angular!</h1>'
1414
// #docregion ng-namespace-funcs
1515
})
1616
// #enddocregion component
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!systemjs.config.1.js
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
// #docregion
2+
// #docregion import
23
import { Component } from '@angular/core';
4+
// #enddocregion import
35

6+
// #docregion metadata
47
@Component({
58
selector: 'my-app',
6-
template: `<h1>Hello {{name}}</h1>`
9+
template: '<h1>Hello Angular!</h1>'
710
})
8-
export class AppComponent { name = 'Angular'; }
11+
// #enddocregion metadata
12+
// #docregion class
13+
export class AppComponent { }
14+
// #enddocregion class
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
// #docregion
22
import { NgModule } from '@angular/core';
33
import { BrowserModule } from '@angular/platform-browser';
4-
import { AppComponent } from './app.component';
54

65
@NgModule({
7-
imports: [ BrowserModule ],
8-
declarations: [ AppComponent ],
9-
bootstrap: [ AppComponent ]
6+
imports: [ BrowserModule ]
107
})
118
export class AppModule { }
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
// #docregion
22
import { NgModule } from '@angular/core';
33
import { BrowserModule } from '@angular/platform-browser';
4-
import { AppComponent } from './app.component';
4+
5+
import { AppComponent } from './app.component';
56

67
@NgModule({
78
imports: [ BrowserModule ],
89
declarations: [ AppComponent ],
910
bootstrap: [ AppComponent ]
1011
})
12+
1113
export class AppModule { }
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
// #docregion
2+
// #docregion import
13
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
24

35
import { AppModule } from './app.module';
6+
// #enddocregion import
47

5-
platformBrowserDynamic().bootstrapModule(AppModule);
8+
const platform = platformBrowserDynamic();
9+
platform.bootstrapModule(AppModule);
+14-13
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
<!DOCTYPE html>
2+
<!-- #docregion -->
23
<html>
34
<head>
4-
<title>Hello Angular</title>
5+
<title>Angular QuickStart</title>
56
<meta charset="UTF-8">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<style>
8-
body {color:#369;font-family: Arial,Helvetica,sans-serif;}
9-
</style>
8+
<link rel="stylesheet" href="styles.css">
109

11-
<!-- Polyfills for older browsers -->
10+
<!-- 1. Load libraries -->
11+
<!-- #docregion libraries -->
1212
<!-- #docregion polyfills -->
13+
<!-- Polyfill for older browsers -->
1314
<script src="node_modules/core-js/client/shim.min.js"></script>
1415
<!-- #enddocregion polyfills -->
1516

1617
<script src="node_modules/zone.js/dist/zone.js"></script>
1718
<script src="node_modules/reflect-metadata/Reflect.js"></script>
1819
<script src="node_modules/systemjs/dist/system.src.js"></script>
20+
<!-- #enddocregion libraries -->
1921

20-
<!-- #docregion autobootstrap-->
21-
<script> window.autoBootstrap = true; </script>
22-
<!-- #enddocregion autobootstrap-->
23-
22+
<!-- 2. Configure SystemJS -->
23+
<!-- #docregion systemjs -->
2424
<script src="systemjs.config.js"></script>
2525
<script>
2626
System.import('app').catch(function(err){ console.error(err); });
2727
</script>
28+
<!-- #enddocregion systemjs -->
2829
</head>
2930

31+
<!-- 3. Display the application -->
32+
<!-- #docregion my-app -->
3033
<body>
31-
<!-- #docregion my-app-->
32-
<my-app>Loading AppComponent content here ...</my-app>
33-
<!-- #enddocregion my-app-->
34+
<my-app>Loading...</my-app>
3435
</body>
35-
36+
<!-- #enddocregion my-app -->
3637
</html>
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"description": "QuickStart",
33
"files": [
4-
"app/app.component.ts",
5-
"index.html"
4+
"!**/*.d.ts",
5+
"!**/*.js",
6+
"!**/*.[1].*"
67
],
7-
"open": "app/app.component.ts",
88
"tags": ["quickstart"]
9-
}
9+
}

public/docs/_examples/setup/e2e-spec.ts

-17
This file was deleted.

public/docs/_examples/setup/ts/app/app.component.spec.ts

-35
This file was deleted.

public/docs/_examples/setup/ts/app/app.component.ts

-8
This file was deleted.

public/docs/_examples/setup/ts/app/main.ts

-5
This file was deleted.

public/docs/_examples/setup/ts/example-config.json

Whitespace-only changes.

public/docs/_examples/setup/ts/index.html

-31
This file was deleted.

public/docs/_examples/setup/ts/plnkr.json

-11
This file was deleted.

public/docs/js/latest/quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ code-example(format="").
208208
:marked
209209
The `template` property holds the component's companion template.
210210
A template is a form of HTML that tells Angular how to render a view.
211-
Our template is a single line of HTML announcing "Hello Angular".
211+
Our template is a single line of HTML announcing "Hello Angular!".
212212

213213
Now we need something to tell Angular to load this component.
214214

public/docs/ts/latest/_data.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"icon": "query-builder",
2020
"title": "Quickstart",
2121
"subtitle": "TypeScript",
22-
"description": "Discover Angular",
23-
"banner": "Discover Angular in a live-coding environment."
22+
"description": "Get up and running with Angular",
23+
"banner": "This QuickStart guide demonstrates how to build and run a simple Angular application."
2424
},
2525

2626
"tutorial": {

public/docs/ts/latest/cli-quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ h3#component-decorator @Component decorator
199199
+makeExample('src/app/cli-quickstart.component.html', null, 'src/app/cli-quickstart.component.html')(format='.')
200200
:marked
201201
The `{{title}}` is an _interpolation_ binding that causes Angular to display the component's
202-
`title` property. After out edit, Angular displays "Hello Angular".
202+
`title` property. After out edit, Angular displays "Hello Angular!".
203203
We'll learn more about data binding as we read through the documentation.
204204

205205
The **styleUrls** array specifies the location(s) of the component's private CSS style file(s).

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"index": {
33
"title": "Cookbook",
44
"navTitle": "Overview",
5-
"intro": "A collection of recipes for common Angular application scenarios"
5+
"description": "A collection of recipes for common Angular application scenarios"
66
},
77

88
"aot-compiler": {

public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ table(width="100%")
137137
in `main.ts`
138138
and the application's root component (`AppComponent`) in `app.module.ts`.
139139

140-
For more information see the [Setup](../guide/setup.html) page.
140+
For more information see [Quick Start](../quickstart.html).
141141
tr(style=top)
142142
td
143143
:marked

public/docs/ts/latest/cookbook/aot-compiler.jade

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ a#compile
9191
## Compile with AoT
9292

9393
### Prepare for offline compilation
94-
Take the <a href='../guide/setup.html'>Setup</a> as a starting point.
94+
95+
Take the <a href='/docs/ts/latest/quickstart.html'>QuickStart</a> as a starting point.
9596
A few minor changes to the lone `app.component` lead to these two class and html files:
9697

9798
+makeTabs(

0 commit comments

Comments
 (0)