Skip to content

Commit a63aa6f

Browse files
authored
Merge pull request #6 from kidshenlong/ng-upgrade
Ng upgrade
2 parents 4ebf520 + e922f8c commit a63aa6f

File tree

138 files changed

+1681
-441
lines changed

Some content is hidden

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

138 files changed

+1681
-441
lines changed

.gitignore

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,26 @@
88
/node_modules
99
/bower_components
1010

11+
# IDEs and editors
12+
/.idea
13+
.project
14+
.classpath
15+
*.launch
16+
.settings/
17+
1118
# misc
1219
/.sass-cache
1320
/connect.lock
1421
/coverage/*
1522
/libpeerconnection.log
1623
npm-debug.log
1724
testem.log
25+
/typings
26+
27+
# e2e
28+
/e2e/*.js
29+
/e2e/*.map
1830

19-
#angular2
20-
typings
21-
app/**/*.js
22-
app/**/*.map
23-
jspm_packages
24-
bower_components
31+
#System Files
32+
.DS_Store
33+
Thumbs.db

README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# ComicCloudClient
2+
3+
This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.14.
4+
5+
## Development server
6+
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
7+
8+
## Code scaffolding
9+
10+
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class`.
11+
12+
## Build
13+
14+
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
15+
16+
## Running unit tests
17+
18+
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
19+
20+
## Running end-to-end tests
21+
22+
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
23+
Before running the tests make sure you are serving the app via `ng serve`.
24+
25+
## Deploying to Github Pages
26+
27+
Run `ng github-pages:deploy` to deploy to Github Pages.
28+
29+
## Further help
30+
31+
To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

angular-cli.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"project": {
3+
"version": "1.0.0-beta.14",
4+
"name": "comic-cloud-client"
5+
},
6+
"apps": [
7+
{
8+
"root": "src",
9+
"outDir": "dist",
10+
"assets": "assets",
11+
"index": "index.html",
12+
"main": "main.ts",
13+
"test": "test.ts",
14+
"tsconfig": "tsconfig.json",
15+
"prefix": "app",
16+
"mobile": false,
17+
"styles": [
18+
"styles.css"
19+
],
20+
"scripts": [],
21+
"environments": {
22+
"source": "environments/environment.ts",
23+
"dev": "environments/environment.ts",
24+
"prod": "environments/environment.prod.ts"
25+
}
26+
}
27+
],
28+
"addons": [],
29+
"packages": [],
30+
"e2e": {
31+
"protractor": {
32+
"config": "./protractor.conf.js"
33+
}
34+
},
35+
"test": {
36+
"karma": {
37+
"config": "./karma.conf.js"
38+
}
39+
},
40+
"defaults": {
41+
"styleExt": "css",
42+
"prefixInterfaces": false
43+
}
44+
}

app/app.component.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/app.module.ts

Lines changed: 0 additions & 59 deletions
This file was deleted.

app/main.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/register/register.component.ts

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/rxjs-operators.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/shared/data.service.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/shared/navigation/navigation.type.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/shared/stack/pretty-series-title.pipe.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

e2e/app.e2e-spec.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { ComicCloudClientPage } from './app.po';
2+
3+
describe('comic-cloud-client App', function() {
4+
let page: ComicCloudClientPage;
5+
6+
beforeEach(() => {
7+
page = new ComicCloudClientPage();
8+
});
9+
10+
it('should display message saying app works', () => {
11+
page.navigateTo();
12+
expect(page.getParagraphText()).toEqual('app works!');
13+
});
14+
});

e2e/app.po.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { browser, element, by } from 'protractor/globals';
2+
3+
export class ComicCloudClientPage {
4+
navigateTo() {
5+
return browser.get('/');
6+
}
7+
8+
getParagraphText() {
9+
return element(by.css('app-root h1')).getText();
10+
}
11+
}
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
2+
"compileOnSave": false,
23
"compilerOptions": {
3-
"target": "es5",
4+
"declaration": false,
5+
"emitDecoratorMetadata": true,
6+
"experimentalDecorators": true,
47
"module": "commonjs",
58
"moduleResolution": "node",
9+
"outDir": "../dist/out-tsc-e2e",
610
"sourceMap": true,
7-
"emitDecoratorMetadata": true,
8-
"experimentalDecorators": true,
9-
"removeComments": false,
10-
"noImplicitAny": false
11+
"target": "es5",
12+
"typeRoots": [
13+
"../node_modules/@types"
14+
]
1115
}
12-
}
16+
}

index.html

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)