Skip to content

Commit ecad8ed

Browse files
christopherthielenchristopherthielen
committed
switch from /tutorial/ng1 to /ng1/tutorial
1 parent 59e4545 commit ecad8ed

20 files changed

+95
-81
lines changed

‎Gemfile.lock

Lines changed: 55 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.6)
4+
activesupport (4.2.7)
65
i18n (~> 0.7)
76
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
@@ -13,125 +12,128 @@ GEM
1312
coffee-script-source
1413
execjs
1514
coffee-script-source (1.10.0)
16-
colorator (0.1)
17-
ethon (0.8.1)
15+
colorator (1.1.0)
16+
ethon (0.9.1)
1817
ffi (>= 1.3.0)
19-
execjs (2.6.0)
18+
execjs (2.7.0)
2019
faraday (0.9.2)
2120
multipart-post (>= 1.2, < 3)
22-
ffi (1.9.10)
23-
ffi (1.9.10-x64-mingw32)
21+
ffi (1.9.14)
22+
forwardable-extended (2.6.0)
2423
gemoji (2.1.0)
25-
github-pages (69)
26-
RedCloth (= 4.2.9)
27-
github-pages-health-check (= 1.1.0)
28-
jekyll (= 3.0.3)
24+
github-pages (99)
25+
activesupport (= 4.2.7)
26+
github-pages-health-check (= 1.2.0)
27+
jekyll (= 3.2.1)
2928
jekyll-coffeescript (= 1.0.1)
30-
jekyll-feed (= 0.4.0)
29+
jekyll-feed (= 0.7.2)
3130
jekyll-gist (= 1.4.0)
32-
jekyll-github-metadata (= 1.11.0)
33-
jekyll-mentions (= 1.1.2)
31+
jekyll-github-metadata (= 2.1.1)
32+
jekyll-mentions (= 1.2.0)
3433
jekyll-paginate (= 1.1.0)
35-
jekyll-redirect-from (= 0.10.0)
34+
jekyll-redirect-from (= 0.11.0)
3635
jekyll-sass-converter (= 1.3.0)
37-
jekyll-seo-tag (= 1.3.3)
36+
jekyll-seo-tag (= 2.0.0)
3837
jekyll-sitemap (= 0.10.0)
39-
jekyll-textile-converter (= 0.1.0)
40-
jemoji (= 0.6.2)
41-
kramdown (= 1.10.0)
38+
jekyll-swiss (= 0.4.0)
39+
jemoji (= 0.7.0)
40+
kramdown (= 1.11.1)
4241
liquid (= 3.0.6)
42+
listen (= 3.0.6)
4343
mercenary (~> 0.3)
44-
rdiscount (= 2.1.8)
45-
redcarpet (= 3.3.3)
46-
rouge (= 1.10.1)
44+
minima (= 1.2.0)
45+
rouge (= 1.11.1)
4746
terminal-table (~> 1.4)
48-
github-pages-health-check (1.1.0)
47+
github-pages-health-check (1.2.0)
4948
addressable (~> 2.3)
5049
net-dns (~> 0.8)
5150
octokit (~> 4.0)
5251
public_suffix (~> 1.4)
5352
typhoeus (~> 0.7)
54-
html-pipeline (2.4.0)
55-
activesupport (>= 2, < 5)
53+
html-pipeline (2.4.2)
54+
activesupport (>= 2)
5655
nokogiri (>= 1.4)
5756
i18n (0.7.0)
58-
jekyll (3.0.3)
59-
colorator (~> 0.1)
57+
jekyll (3.2.1)
58+
colorator (~> 1.0)
6059
jekyll-sass-converter (~> 1.0)
6160
jekyll-watch (~> 1.1)
6261
kramdown (~> 1.3)
6362
liquid (~> 3.0)
6463
mercenary (~> 0.3.3)
64+
pathutil (~> 0.9)
6565
rouge (~> 1.7)
6666
safe_yaml (~> 1.0)
6767
jekyll-coffeescript (1.0.1)
6868
coffee-script (~> 2.2)
69-
jekyll-feed (0.4.0)
69+
jekyll-feed (0.7.2)
7070
jekyll-gist (1.4.0)
7171
octokit (~> 4.2)
72-
jekyll-github-metadata (1.11.0)
72+
jekyll-github-metadata (2.1.1)
73+
jekyll (~> 3.1)
7374
octokit (~> 4.0)
74-
jekyll-mentions (1.1.2)
75+
jekyll-mentions (1.2.0)
76+
activesupport (~> 4.0)
7577
html-pipeline (~> 2.3)
7678
jekyll (~> 3.0)
7779
jekyll-paginate (1.1.0)
78-
jekyll-redirect-from (0.10.0)
80+
jekyll-redirect-from (0.11.0)
7981
jekyll (>= 2.0)
8082
jekyll-sass-converter (1.3.0)
8183
sass (~> 3.2)
82-
jekyll-seo-tag (1.3.3)
83-
jekyll (~> 3.0)
84+
jekyll-seo-tag (2.0.0)
85+
jekyll (~> 3.1)
8486
jekyll-sitemap (0.10.0)
85-
jekyll-textile-converter (0.1.0)
86-
RedCloth (~> 4.0)
87-
jekyll-watch (1.3.1)
88-
listen (~> 3.0)
89-
jemoji (0.6.2)
87+
jekyll-swiss (0.4.0)
88+
jekyll-watch (1.5.0)
89+
listen (~> 3.0, < 3.1)
90+
jemoji (0.7.0)
91+
activesupport (~> 4.0)
9092
gemoji (~> 2.0)
9193
html-pipeline (~> 2.2)
9294
jekyll (>= 3.0)
9395
json (1.8.3)
94-
kramdown (1.10.0)
96+
kramdown (1.11.1)
9597
liquid (3.0.6)
9698
listen (3.0.6)
9799
rb-fsevent (>= 0.9.3)
98100
rb-inotify (>= 0.9.7)
99101
mercenary (0.3.6)
100-
mini_portile2 (2.0.0)
101-
minitest (5.8.4)
102+
mini_portile2 (2.1.0)
103+
minima (1.2.0)
104+
minitest (5.9.1)
102105
multipart-post (2.0.0)
103106
net-dns (0.8.0)
104-
nokogiri (1.6.7.2)
105-
mini_portile2 (~> 2.0.0.rc2)
106-
nokogiri (1.6.7.2-x64-mingw32)
107-
mini_portile2 (~> 2.0.0.rc2)
108-
octokit (4.3.0)
107+
nokogiri (1.6.8.1)
108+
mini_portile2 (~> 2.1.0)
109+
octokit (4.4.1)
109110
sawyer (~> 0.7.0, >= 0.5.3)
111+
pathutil (0.14.0)
112+
forwardable-extended (~> 2.6)
110113
public_suffix (1.5.3)
111-
rb-fsevent (0.9.7)
114+
rb-fsevent (0.9.8)
112115
rb-inotify (0.9.7)
113116
ffi (>= 0.5.0)
114-
rdiscount (2.1.8)
115-
redcarpet (3.3.3)
116-
rouge (1.10.1)
117+
rouge (1.11.1)
117118
safe_yaml (1.0.4)
118119
sass (3.4.22)
119120
sawyer (0.7.0)
120121
addressable (>= 2.3.5, < 2.5)
121122
faraday (~> 0.8, < 0.10)
122-
terminal-table (1.5.2)
123+
terminal-table (1.7.3)
124+
unicode-display_width (~> 1.1.1)
123125
thread_safe (0.3.5)
124126
typhoeus (0.8.0)
125127
ethon (>= 0.8.0)
126128
tzinfo (1.2.2)
127129
thread_safe (~> 0.1)
130+
unicode-display_width (1.1.1)
128131

129132
PLATFORMS
130133
ruby
131-
x64-mingw32
132134

133135
DEPENDENCIES
134136
github-pages
135137

136138
BUNDLED WITH
137-
1.13.0
139+
1.13.6

‎_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ collections:
221221
permalink: /react/:path
222222
tutorial_ng1:
223223
output: true
224-
permalink: /tutorial/ng1/:path
224+
permalink: /ng1/tutorial/:path
225225
tutorial_ng2:
226226
output: true
227-
permalink: /tutorial/ng2/:path
227+
permalink: /ng2/tutorial/:path
228228
tutorial_react:
229229
output: true
230-
permalink: /tutorial/react/:path
230+
permalink: /react/tutorial/:path
231231
guide:
232232
output: true
233233
permalink: /guide/:path

‎_data/navigation.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ tutorial_ng1:
3030
- title: "Tutorial - Angular"
3131
children:
3232
- title: "1. Hello World!"
33-
url: /tutorial/ng1/helloworld
33+
url: /ng1/tutorial/helloworld
3434
- title: "2. Hello Solar System!"
35-
url: /tutorial/ng1/hellosolarsystem
35+
url: /ng1/tutorial/hellosolarsystem
3636
- title: "3. Hello Galaxy!"
37-
url: /tutorial/ng1/hellogalaxy
37+
url: /ng1/tutorial/hellogalaxy
3838

3939
tutorial_ng2:
4040
- title: "Tutorial - Angular 2"
4141
children:
4242
- title: "Hello World!"
43-
url: /tutorial/ng2/helloworld
43+
url: /ng2/tutorial/helloworld
4444
- title: "Hello Solar System!"
45-
url: /tutorial/ng2/hellosolarsystem
45+
url: /ng2/tutorial/hellosolarsystem
4646
- title: "Hello Galaxy!"
47-
url: /tutorial/ng2/hellogalaxy
47+
url: /ng2/tutorial/hellogalaxy
4848

4949
tutorial_react:
5050
- title: "Tutorial - React"
5151
children:
5252
- title: "Hello World!"
53-
url: /tutorial/react/helloworld
53+
url: /react/tutorial/helloworld
5454
- title: "Hello Solar System!"
55-
url: /tutorial/react/hellosolarsystem
55+
url: /react/tutorial/hellosolarsystem
5656
- title: "Hello Galaxy!"
57-
url: /tutorial/react/hellogalaxy
57+
url: /react/tutorial/hellogalaxy
5858

5959
guide:
6060
- title: "Guide"

‎_ng2/about.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Other examples:
3232

3333
Learn UI-Router by following our tutorials.
3434

35-
- [Hello World](/tutorial/ng2/helloworld)
36-
- [Hello Solar System](/tutorial/ng2/hellosolarsystem)
37-
- [Hello Galaxy](/tutorial/ng2/hellogalaxy)
35+
- [Hello World](/ng2/tutorial/helloworld)
36+
- [Hello Solar System](/ng2/tutorial/hellosolarsystem)
37+
- [Hello Galaxy](/ng2/tutorial/hellogalaxy)
3838

3939
## Quick Start
4040

‎_pages/tutorials.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ permalink: "/tutorials/"
99
We have tutorials for the following frameworks:
1010

1111
<div class="about_frameworks">
12-
<div><a href="/tutorial/ng1/helloworld"><img src="/images/logos/angular1.png"><div>Angular 1</div></a></div>
13-
<div><a href="/tutorial/ng2/helloworld"><img src="/images/logos/angular2.png"><div>Angular 2</div></a></div>
14-
<div><a href="/tutorial/react/helloworld"><img src="/images/logos/react.png"><div>React</div></a></div>
12+
<div><a href="/ng1/tutorial/helloworld"><img src="/images/logos/angular1.png"><div>Angular 1</div></a></div>
13+
<div><a href="/ng2/tutorial/helloworld"><img src="/images/logos/angular2.png"><div>Angular 2</div></a></div>
14+
<div><a href="/react/tutorial/helloworld"><img src="/images/logos/react.png"><div>React</div></a></div>
1515
</div>
1616

‎_posts/2016-09-09-uirouter-1.0.0-beta.2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ It adds essential support for the latest version of Angular 2.
1414

1515
[Full changelog](https://github.com/angular-ui/ui-router/releases/tag/1.0.0-beta.2)
1616

17-
[Angular 1 Tutorials](https://ui-router.github.io/tutorial/ng1/helloworld)
17+
[Angular 1 Tutorials](https://ui-router.github.io/ng1/tutorial/helloworld)
1818

19-
[Angular 2 Tutorials](https://ui-router.github.io/tutorial/ng2/helloworld)
19+
[Angular 2 Tutorials](https://ui-router.github.io/ng2/tutorial/helloworld)
2020

2121
## New Features
2222

‎_posts/2016-09-23-uirouter-1.0.0-beta.3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ permalink: /blog/:title/
1010
This beta.3 release primarily adds support for Angular 2.0.0 final.
1111

1212

13-
[Angular 1 Tutorials](https://ui-router.github.io/tutorial/ng1/helloworld)
13+
[Angular 1 Tutorials](https://ui-router.github.io/ng1/tutorial/helloworld)
1414

15-
[Angular 2 Tutorials](https://ui-router.github.io/tutorial/ng2/helloworld)
15+
[Angular 2 Tutorials](https://ui-router.github.io/ng2/tutorial/helloworld)
1616

1717

1818
## Bug fixes in core

‎_react/about.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ npm install --save ui-router-react
2626

2727
Learn UI-Router by following our tutorials.
2828

29-
- [Hello World](/tutorial/react/helloworld)
30-
- [Hello Solar System](/tutorial/react/hellosolarsystem)
31-
- [Hello Galaxy](/tutorial/react/hellogalaxy)
29+
- [Hello World](/react/tutorial/helloworld)
30+
- [Hello Solar System](/react/tutorial/hellosolarsystem)
31+
- [Hello Galaxy](/react/tutorial/hellogalaxy)
3232

3333
## Sample application
3434

‎_tutorial_ng1/hellogalaxy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "UI-Router for Angular 1 - Hello Galaxy!"
33
excerpt: "Learn about Nested States and Nested Views"
4+
redirect_from: /tutorial/ng1/hellogalaxy/
45
---
56
{% include toc icon="columns" title="Hello Galaxy!" %}
67

‎_tutorial_ng1/hellosolarsystem.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "UI-Router for Angular 1 - Hello Solar System!"
33
excerpt: "Learn about components, resolve data, and parameters"
4+
redirect_from: /tutorial/ng1/hellosolarsystem/
45
---
56
{% include toc icon="columns" title="Hello Solar System!" %}
67

‎_tutorial_ng1/helloworld.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: "UI-Router for Angular 1 - Hello World!"
33
layout: single
44
excerpt: "Getting started with UI-Router for Angular 1"
55
sitemap: true
6+
redirect_from: /tutorial/ng1/helloworld/
67
---
78

89
{% include toc icon="columns" title="Hello World!" %}

‎_tutorial_ng1/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: "UI-Router for Angular 1 - Tutorials"
33
sitemap: true
4-
permalink: /tutorial/ng1/
4+
redirect_from: /tutorial/ng1/
5+
permalink: /ng1/tutorial/
56
---
67

78
[Get started](helloworld)

‎_tutorial_ng2/hellogalaxy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "UI-Router for Angular 2 - Hello Galaxy!"
33
excerpt: "Learn about Nested States and Nested Views"
4+
redirect_from: /tutorial/ng2/hellogalaxy/
45
---
56
{% include toc icon="columns" title="Hello Galaxy!" %}
67

‎_tutorial_ng2/hellosolarsystem.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: "UI-Router for Angular 2 - Hello Solar System!"
33
excerpt: "Learn about parameters and resolve data"
4+
redirect_from: /tutorial/ng2/hellosolarsystem/
45
---
56
{% include toc icon="columns" title="Hello Solar System!" %}
67

‎_tutorial_ng2/helloworld.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: "UI-Router for Angular 2 - Hello World!"
33
layout: single
44
excerpt: "Getting started with UI-Router for Angular 2"
55
sitemap: true
6+
redirect_from: /tutorial/ng2/helloworld/
67
---
78

89
{% include toc classes="collapsible" icon="columns" title="Hello World!" %}

‎_tutorial_ng2/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: "UI-Router for Angular 2 - Tutorials"
33
sitemap: true
4-
permalink: /tutorial/ng2/
4+
redirect_from: /tutorial/ng2/
5+
permalink: /ng2/tutorial/
56
---
67

78
[Get started](helloworld)

‎_tutorial_react/hellogalaxy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: "UI-Router for React - Hello Galaxy!"
33
excerpt: "Learn about Nested States and Nested Views"
44
layout: single
55
sitemap: true
6+
redirect_from: /tutorial/react/hellogalaxy/
67
---
78
{% include toc icon="columns" title="Hello Galaxy!" %}
89

‎_tutorial_react/hellosolarsystem.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: "UI-Router for React - Hello Solar System!"
33
excerpt: "Learn about parameters and resolve data"
44
layout: single
55
sitemap: true
6+
redirect_from: /tutorial/react/hellosolarsystem/
67
---
78
{% include toc icon="columns" title="Hello Solar System!" %}
89

0 commit comments

Comments
 (0)