Skip to content

Commit 781e930

Browse files
dotansimhadotansimha
committed
more fixes
1 parent 929594e commit 781e930

File tree

6 files changed

+116
-43
lines changed

6 files changed

+116
-43
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ This repository contains the actual source code of the `angular-meteor.com` webs
44

55
## Generate static website for local usage
66

7-
$ npm install
8-
$ npm run generate
7+
$ yarn
8+
$ yarn generate
99

1010
Then all of the generated HTML files will be in: `./static-website/` directory.
1111

12+
If you have an issue with GitHub API rate-limiter, create a GitHub developer application (https://github.com/settings/developers) and then run as follow:
13+
14+
$ CLIENT_ID="??" CLIENT_SECRET="??" yarn generate
15+
1216
## Generate static website for publishing to gh-pages
1317

1418
$ npm install
@@ -27,7 +31,3 @@ And in two different Terminal tabs:
2731
$ npm run watch
2832

2933
Open your browser [http://localhost:3000](http://localhost:3000) !
30-
31-
## TODO
32-
33-
- [ ] Angular 2 API docs missing `bootstrap` page

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@angular2-material/core": "2.0.0-alpha.8-2",
3636
"@angular2-material/icon": "2.0.0-alpha.8-2",
3737
"@angular2-material/toolbar": "2.0.0-alpha.8-2",
38-
"angular-meteor-tutorials-infrastructure": "0.1.10",
38+
"angular-meteor-tutorials-infrastructure": "0.1.18",
3939
"angular2-component-outlet": "3.0.1",
4040
"angular2-express-engine": "2.1.0-rc.1",
4141
"angular2-platform-node": "2.1.0-rc.1",

‎src/app/tutorials/angular2-whatsapp-meteor-cli/1.0.0.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,42 @@ export const V1_0_0 = {
99
{
1010
url: '/setup',
1111
name: 'Initial setup',
12-
template: markdownUrlBase + 'templates/step1.md',
12+
template: markdownUrlBase + 'templates/step1.md.tmpl',
1313
},
1414
{
1515
url: '/chats-page',
1616
name: 'Chats page',
17-
template: markdownUrlBase + 'templates/step2.md',
17+
template: markdownUrlBase + 'templates/step2.md.tmpl',
1818
},
1919
{
2020
url: '/meteor-server-side',
2121
name: 'Realtime Meteor Server',
22-
template: markdownUrlBase + 'templates/step3.md',
22+
template: markdownUrlBase + 'templates/step3.md.tmpl',
2323
},
2424
{
2525
url: '/messages-page',
2626
name: 'Messages Page',
27-
template: markdownUrlBase + 'templates/step4.md',
27+
template: markdownUrlBase + 'templates/step4.md.tmpl',
2828
},
2929
{
3030
url: '/authentication',
3131
name: 'Authentication',
32-
template: markdownUrlBase + 'templates/step5.md',
32+
template: markdownUrlBase + 'templates/step5.md.tmpl',
3333
},
3434
{
3535
url: '/chats-mutations',
3636
name: 'Chats Creation & Removal',
37-
template: markdownUrlBase + 'templates/step6.md',
37+
template: markdownUrlBase + 'templates/step6.md.tmpl',
3838
},
3939
{
4040
url: '/privacy',
4141
name: 'Privacy & Security',
42-
template: markdownUrlBase + 'templates/step7.md',
42+
template: markdownUrlBase + 'templates/step7.md.tmpl',
4343
},
4444
{
4545
url: '/summary',
4646
name: 'Summary',
47-
template: markdownUrlBase + 'templates/step8.md',
47+
template: markdownUrlBase + 'templates/step8.md.tmpl',
4848
hideCodeDiff: true
4949
}
5050
]

‎src/app/tutorials/angular2-whatsapp-meteor-cli/2.0.0.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,72 +9,72 @@ export const V2_0_0 = {
99
{
1010
url: '/setup',
1111
name: 'Bootstrapping',
12-
template: markdownUrlBase + 'templates/step1.md'
12+
template: markdownUrlBase + 'templates/step1.md.tmpl'
1313
},
1414
{
1515
url: '/chats-page',
1616
name: 'Chats page',
17-
template: markdownUrlBase + 'templates/step2.md'
17+
template: markdownUrlBase + 'templates/step2.md.tmpl'
1818
},
1919
{
2020
url: '/rxjs',
2121
name: 'RxJS',
22-
template: markdownUrlBase + 'templates/step3.md'
22+
template: markdownUrlBase + 'templates/step3.md.tmpl'
2323
},
2424
{
2525
url: '/meteor-server-side',
2626
name: 'Realtime Meteor Server',
27-
template: markdownUrlBase + 'templates/step4.md'
27+
template: markdownUrlBase + 'templates/step4.md.tmpl'
2828
},
2929
{
3030
url: '/folder-structure',
3131
name: 'Folder Structure',
32-
template: markdownUrlBase + 'templates/step5.md'
32+
template: markdownUrlBase + 'templates/step5.md.tmpl'
3333
},
3434
{
3535
url: '/messages-page',
3636
name: 'Messages Page',
37-
template: markdownUrlBase + 'templates/step6.md'
37+
template: markdownUrlBase + 'templates/step6.md.tmpl'
3838
},
3939
{
4040
url: '/authentication',
4141
name: 'Authentication',
42-
template: markdownUrlBase + 'templates/step7.md'
42+
template: markdownUrlBase + 'templates/step7.md.tmpl'
4343
},
4444
{
4545
url: '/chats-mutations',
4646
name: 'Chats Creation & Removal',
47-
template: markdownUrlBase + 'templates/step8.md'
47+
template: markdownUrlBase + 'templates/step8.md.tmpl'
4848
},
4949
{
5050
url: '/privacy',
5151
name: 'Privacy & Security',
52-
template: markdownUrlBase + 'templates/step9.md'
52+
template: markdownUrlBase + 'templates/step9.md.tmpl'
5353
},
5454
{
5555
url: '/filter-and-pagination',
5656
name: 'Filter & Pagination',
57-
template: markdownUrlBase + 'templates/step10.md'
57+
template: markdownUrlBase + 'templates/step10.md.tmpl'
5858
},
5959
{
6060
url: '/google-maps',
6161
name: 'Google Maps',
62-
template: markdownUrlBase + 'templates/step11.md'
62+
template: markdownUrlBase + 'templates/step11.md.tmpl'
6363
},
6464
{
6565
url: '/file-upload',
6666
name: 'File Upload & Images',
67-
template: markdownUrlBase + 'templates/step12.md'
67+
template: markdownUrlBase + 'templates/step12.md.tmpl'
6868
},
6969
{
7070
url: '/native-mobile',
7171
name: 'Native Mobile',
72-
template: markdownUrlBase + 'templates/step13.md'
72+
template: markdownUrlBase + 'templates/step13.md.tmpl'
7373
},
7474
{
7575
url: '/summary',
7676
name: 'Summary',
77-
template: markdownUrlBase + 'templates/step14.md',
77+
template: markdownUrlBase + 'templates/step14.md.tmpl',
7878
hideCodeDiff: true
7979
}
8080
]

‎src/app/website/tutorials-container/tutorials-container.component.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
import {Component, Injectable} from "@angular/core";
22
import {ActivatedRoute} from "@angular/router";
3-
import {PageTitleService, StepsUtils, TutorialDefinition, TutorialStep, ActivatedTutorial} from "angular-meteor-tutorials-infrastructure";
3+
import {
4+
PageTitleService,
5+
StepsUtils,
6+
TutorialDefinition,
7+
TutorialStep,
8+
ActivatedTutorial
9+
} from "angular-meteor-tutorials-infrastructure";
410
import {ANGULAR2_METEOR_SOCIALLY} from "../../tutorials/angular2-meteor-socially";
511
import {ANGULAR1_METEOR_SOCIALLY} from "../../tutorials/angular-meteor-socially";
612
import {DomSanitizer} from "@angular/platform-browser";
713
import {Observable} from "rxjs";
814
import * as _ from 'lodash';
9-
import { ANGULAR2_WHATSAPP_IONIC_CLI } from '../../tutorials/angular2-whatsapp-ionic-cli';
10-
import { ANGULAR2_WHATSAPP_METEOR_CLI } from '../../tutorials/angular2-whatsapp-meteor-cli';
15+
import {ANGULAR2_WHATSAPP_IONIC_CLI} from '../../tutorials/angular2-whatsapp-ionic-cli';
16+
import {ANGULAR2_WHATSAPP_METEOR_CLI} from '../../tutorials/angular2-whatsapp-meteor-cli';
1117

1218
@Component({
1319
selector: "tutorial",
@@ -40,7 +46,7 @@ export class TutorialsContainer {
4046
const timeline = [];
4147

4248
if (versions) {
43-
for(let i = 0; i < versions.length; i++) {
49+
for (let i = 0; i < versions.length; i++) {
4450
if (i > 0) {
4551
// At the moment, we don't want to create those diff links, so the code is commented
4652
// timeline.push({
@@ -66,7 +72,7 @@ export class TutorialsContainer {
6672
}
6773

6874
versionClass(version) {
69-
return _.isEqual(this.steps, version.steps) ? 'current-version': '';
75+
return _.isEqual(this.steps, version.steps) ? 'current-version' : '';
7076
}
7177

7278
getTutorialMarkdownLink() {
@@ -106,12 +112,12 @@ export class TutorialsContainer {
106112
return [
107113
{
108114
name: "Angular 1",
109-
link: this.utils.createAbsoluteLink("angular1" + ANGULAR1_METEOR_SOCIALLY.versions['master'].steps[index].url, this.parentRoute),
115+
link: this.utils.createAbsoluteLink("angular1" + (ANGULAR1_METEOR_SOCIALLY.versions['master'].steps[index] || ANGULAR1_METEOR_SOCIALLY.versions['master'].steps[0]).url, this.parentRoute),
110116
active: this.tutorial.id === ANGULAR1_METEOR_SOCIALLY.id
111117
},
112118
{
113119
name: "Angular 2",
114-
link: this.utils.createAbsoluteLink("angular2" + ANGULAR2_METEOR_SOCIALLY.versions['master'].steps[index].url, this.parentRoute),
120+
link: this.utils.createAbsoluteLink("angular2" + (ANGULAR2_METEOR_SOCIALLY.versions['master'].steps[index] || ANGULAR2_METEOR_SOCIALLY.versions['master'].steps[0]).url, this.parentRoute),
115121
active: this.tutorial.id === ANGULAR2_METEOR_SOCIALLY.id
116122
}
117123
]
@@ -125,12 +131,12 @@ export class TutorialsContainer {
125131
return [
126132
{
127133
name: "Meteor",
128-
link: this.utils.createAbsoluteLink("meteor" + ANGULAR2_WHATSAPP_METEOR_CLI.versions['master'].steps[index].url, this.parentRoute),
134+
link: this.utils.createAbsoluteLink("meteor" + (ANGULAR2_WHATSAPP_METEOR_CLI.versions['master'].steps[index] || ANGULAR2_WHATSAPP_METEOR_CLI.versions['master'].steps[0]).url, this.parentRoute),
129135
active: this.tutorial.id === ANGULAR2_WHATSAPP_METEOR_CLI.id
130136
},
131137
{
132138
name: "Webpack",
133-
link: this.utils.createAbsoluteLink("ionic" + ANGULAR2_WHATSAPP_IONIC_CLI.versions['master'].steps[index].url, this.parentRoute),
139+
link: this.utils.createAbsoluteLink("ionic" + (ANGULAR2_WHATSAPP_IONIC_CLI.versions['master'].steps[index] || ANGULAR2_WHATSAPP_IONIC_CLI.versions['master'].steps[0]).url, this.parentRoute),
134140
active: this.tutorial.id === ANGULAR2_WHATSAPP_IONIC_CLI.id
135141
}
136142
]

0 commit comments

Comments
 (0)