Skip to content

Commit f1340b9

Browse files
author
Till Hermsen
committed
cleanup:
- remove unused files - codestyle - fix or ignore lint errors
1 parent 0f782ad commit f1340b9

File tree

208 files changed

+1873
-1686
lines changed

Some content is hidden

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

208 files changed

+1873
-1686
lines changed

‎README.md‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
1-
# MigrationProject
2-
3-
This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.30.
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/module`.
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: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
{
2-
"project": {
3-
"version": "1.0.0-beta.30",
4-
"name": "migration-project"
5-
},
6-
"apps": [
7-
{
8-
"root": "src",
9-
"outDir": "dist",
10-
"assets": [
11-
"assets",
12-
"favicon.ico"
13-
],
14-
"index": "index.html",
15-
"main": "main.ts",
16-
"polyfills": "polyfills.ts",
17-
"test": "test.ts",
18-
"tsconfig": "tsconfig.json",
19-
"prefix": "app",
20-
"styles": [
21-
"styles.css"
22-
],
23-
"scripts": [],
24-
"environments": {
25-
"source": "environments/environment.ts",
26-
"dev": "environments/environment.ts",
27-
"prod": "environments/environment.prod.ts"
28-
}
29-
}
30-
],
31-
"e2e": {
32-
"protractor": {
33-
"config": "./protractor.conf.js"
34-
}
35-
},
36-
"lint": [
37-
{
38-
"files": "src/**/*.ts",
39-
"project": "src/tsconfig.json"
2+
"project": {
3+
"version": "1.0.0-beta.31",
4+
"name": "cd-demos"
405
},
41-
{
42-
"files": "e2e/**/*.ts",
43-
"project": "e2e/tsconfig.json"
44-
}
45-
],
46-
"test": {
47-
"karma": {
48-
"config": "./karma.conf.js"
49-
}
50-
},
51-
"defaults": {
52-
"styleExt": "css",
53-
"prefixInterfaces": false,
54-
"inline": {
55-
"style": false,
56-
"template": false
6+
"apps": [
7+
{
8+
"root": "src",
9+
"outDir": "dist",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
14+
"index": "index.html",
15+
"main": "main.ts",
16+
"polyfills": "polyfills.ts",
17+
"test": "test.ts",
18+
"tsconfig": "tsconfig.json",
19+
"prefix": "app",
20+
"styles": [
21+
"styles.css"
22+
],
23+
"scripts": [],
24+
"environments": {
25+
"source": "environments/environment.ts",
26+
"dev": "environments/environment.ts",
27+
"prod": "environments/environment.prod.ts"
28+
}
29+
}
30+
],
31+
"e2e": {
32+
"protractor": {
33+
"config": "./protractor.conf.js"
34+
}
35+
},
36+
"lint": [
37+
{
38+
"files": "src/**/*.ts",
39+
"project": "src/tsconfig.json"
40+
},
41+
{
42+
"files": "e2e/**/*.ts",
43+
"project": "e2e/tsconfig.json"
44+
}
45+
],
46+
"test": {
47+
"karma": {
48+
"config": "./karma.conf.js"
49+
}
5750
},
58-
"spec": {
59-
"class": false,
60-
"component": true,
61-
"directive": true,
62-
"module": false,
63-
"pipe": true,
64-
"service": true
51+
"defaults": {
52+
"styleExt": "css",
53+
"prefixInterfaces": false,
54+
"inline": {
55+
"style": false,
56+
"template": false
57+
},
58+
"spec": {
59+
"class": false,
60+
"component": true,
61+
"directive": true,
62+
"module": false,
63+
"pipe": true,
64+
"service": true
65+
}
6566
}
66-
}
6767
}

‎e2e/app.e2e-spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { CdDemosPage } from './app.po';
1+
import {CdDemosPage} from './app.po';
22

3-
describe('cd-demos App', function() {
4-
let page: CdDemosPage;
3+
describe('cd-demos App', function () {
4+
let page: CdDemosPage;
55

6-
beforeEach(() => {
7-
page = new CdDemosPage();
8-
});
6+
beforeEach(() => {
7+
page = new CdDemosPage();
8+
});
99

10-
it('should display message saying "Angular 2 Change Detection Demos"', () => {
11-
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('Angular 2 Change Detection Demos');
13-
});
10+
it('should display message saying "Angular 2 Change Detection Demos"', () => {
11+
page.navigateTo();
12+
expect(page.getParagraphText()).toEqual('Angular 2 Change Detection Demos');
13+
});
1414
});

‎karma.conf.js‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@
22
// https://karma-runner.github.io/0.13/config/configuration-file.html
33

44
module.exports = function (config) {
5-
config.set({
6-
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
8-
plugins: [
9-
require('karma-jasmine'),
10-
require('karma-chrome-launcher'),
11-
require('karma-remap-istanbul'),
12-
require('@angular/cli/plugins/karma')
13-
],
14-
files: [
15-
{ pattern: './src/test.ts', watched: false }
16-
],
17-
preprocessors: {
18-
'./src/test.ts': ['@angular/cli']
19-
},
20-
mime: {
21-
'text/x-typescript': ['ts','tsx']
22-
},
23-
remapIstanbulReporter: {
24-
reports: {
25-
html: 'coverage',
26-
lcovonly: './coverage/coverage.lcov'
27-
}
28-
},
29-
angularCli: {
30-
config: './angular-cli.json',
31-
environment: 'dev'
32-
},
33-
reporters: config.angularCli && config.angularCli.codeCoverage
34-
? ['progress', 'karma-remap-istanbul']
35-
: ['progress'],
36-
port: 9876,
37-
colors: true,
38-
logLevel: config.LOG_INFO,
39-
autoWatch: true,
40-
browsers: ['Chrome'],
41-
singleRun: false
42-
});
5+
config.set({
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular/cli'],
8+
plugins: [
9+
require('karma-jasmine'),
10+
require('karma-chrome-launcher'),
11+
require('karma-remap-istanbul'),
12+
require('@angular/cli/plugins/karma')
13+
],
14+
files: [
15+
{pattern: './src/test.ts', watched: false}
16+
],
17+
preprocessors: {
18+
'./src/test.ts': ['@angular/cli']
19+
},
20+
mime: {
21+
'text/x-typescript': ['ts', 'tsx']
22+
},
23+
remapIstanbulReporter: {
24+
reports: {
25+
html: 'coverage',
26+
lcovonly: './coverage/coverage.lcov'
27+
}
28+
},
29+
angularCli: {
30+
config: './angular-cli.json',
31+
environment: 'dev'
32+
},
33+
reporters: config.angularCli && config.angularCli.codeCoverage
34+
? ['progress', 'karma-remap-istanbul']
35+
: ['progress'],
36+
port: 9876,
37+
colors: true,
38+
logLevel: config.LOG_INFO,
39+
autoWatch: true,
40+
browsers: ['Chrome'],
41+
singleRun: false
42+
});
4343
};

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"license": "MIT",
55
"angular-cli": {},
66
"scripts": {
7+
"lint": "tslint --project src/tsconfig.json",
78
"ng": "ng",
89
"start": "ng serve",
910
"test": "ng test",

‎protractor.conf.js‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,29 @@
55
var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
66

77
exports.config = {
8-
allScriptsTimeout: 11000,
9-
specs: [
10-
'./e2e/**/*.e2e-spec.ts'
11-
],
12-
capabilities: {
13-
'browserName': 'chrome'
14-
},
15-
directConnect: true,
16-
baseUrl: 'http://localhost:4200/',
17-
framework: 'jasmine',
18-
jasmineNodeOpts: {
19-
showColors: true,
20-
defaultTimeoutInterval: 30000,
21-
print: function() {}
22-
},
23-
useAllAngular2AppRoots: true,
24-
beforeLaunch: function() {
25-
require('ts-node').register({
26-
project: 'e2e'
27-
});
28-
},
29-
onPrepare: function() {
30-
jasmine.getEnv().addReporter(new SpecReporter());
31-
}
8+
allScriptsTimeout: 11000,
9+
specs: [
10+
'./e2e/**/*.e2e-spec.ts'
11+
],
12+
capabilities: {
13+
'browserName': 'chrome'
14+
},
15+
directConnect: true,
16+
baseUrl: 'http://localhost:4200/',
17+
framework: 'jasmine',
18+
jasmineNodeOpts: {
19+
showColors: true,
20+
defaultTimeoutInterval: 30000,
21+
print: function () {
22+
}
23+
},
24+
useAllAngular2AppRoots: true,
25+
beforeLaunch: function () {
26+
require('ts-node').register({
27+
project: 'e2e'
28+
});
29+
},
30+
onPrepare: function () {
31+
jasmine.getEnv().addReporter(new SpecReporter());
32+
}
3233
};

0 commit comments

Comments
 (0)