diff --git a/app/demo2/data-table-demo2.ts b/src/app/demo2/data-table-demo2.ts
similarity index 79%
rename from app/demo2/data-table-demo2.ts
rename to src/app/demo2/data-table-demo2.ts
index 79399af1..690d0d9e 100644
--- a/app/demo2/data-table-demo2.ts
+++ b/src/app/demo2/data-table-demo2.ts
@@ -1,14 +1,15 @@
import { Component, ViewChild } from '@angular/core';
-import { DataTable, DataTableResource } from 'angular-2-data-table';
+import { DataTable, DataTableResource } from 'angular-4-data-table';
import { cars } from './data-table-demo2-data';
@Component({
selector: 'data-table-demo-2',
- templateUrl: 'app/demo2/data-table-demo2.html'
+ templateUrl: './data-table-demo2.html'
})
export class DataTableDemo2 {
+ yearLimit = 1999;
carResource = new DataTableResource(cars);
cars = [];
carCount = 0;
@@ -31,9 +32,8 @@ export class DataTableDemo2 {
alert(car.model);
}
- yearLimit = 1999;
rowColors(car) {
- if (car.year >= this.yearLimit) return 'rgb(255, 255, 197)';
+ if (car.year >= this.yearLimit) {return 'rgb(255, 255, 197)'; };
}
}
diff --git a/app/demo3/data-table-demo3-data.ts b/src/app/demo3/data-table-demo3-data.ts
similarity index 99%
rename from app/demo3/data-table-demo3-data.ts
rename to src/app/demo3/data-table-demo3-data.ts
index 85968b61..209dbf3d 100644
--- a/app/demo3/data-table-demo3-data.ts
+++ b/src/app/demo3/data-table-demo3-data.ts
@@ -1,4 +1,4 @@
-export var films = [
+export const films = [
{ title: 'The Shawshank Redemption', year: 1994, rating: 9.2, director: 'Frank Darabont', description: 'Two imprisoned men bond over a number of years, finding solace and eventual redemption through acts of common decency.'},
{ title: 'The Godfather', year: 1972, rating: 9.2, director: 'Francis Ford Coppola', description: 'The aging patriarch of an organized crime dynasty transfers control of his clandestine empire to his reluctant son.'},
{ title: 'The Godfather: Part II', year: 1974, rating: 9.0, director: 'Francis Ford Coppola', description: 'The early life and career of Vito Corleone in 1920s New York is portrayed while his son, Michael, expands and tightens his grip on his crime syndicate stretching from Lake Tahoe, Nevada to pre-revolution 1958 Cuba.'},
diff --git a/app/demo3/data-table-demo3.css b/src/app/demo3/data-table-demo3.css
similarity index 100%
rename from app/demo3/data-table-demo3.css
rename to src/app/demo3/data-table-demo3.css
diff --git a/app/demo3/data-table-demo3.html b/src/app/demo3/data-table-demo3.html
similarity index 95%
rename from app/demo3/data-table-demo3.html
rename to src/app/demo3/data-table-demo3.html
index 91182d06..d156074b 100644
--- a/app/demo3/data-table-demo3.html
+++ b/src/app/demo3/data-table-demo3.html
@@ -17,9 +17,9 @@
[indexColumnHeader]="'#'"
[selectOnRowClick]="true"
>
-
+
-
+
{
+ indexColumn: 'Index column',
+ expandColumn: 'Expand column',
+ selectColumn: 'Select column',
+ paginationLimit: 'Max results',
+ paginationRange: 'Result range'
+ };
@ViewChild(DataTable) filmsTable;
constructor() {
@@ -28,13 +34,4 @@ export class DataTableDemo3 {
return 'rgb(255, 255,' + (155 + Math.floor(100 - ((car.rating - 8.7)/1.3)*100)) + ')';
};
- // special params:
-
- translations = {
- indexColumn: 'Index column',
- expandColumn: 'Expand column',
- selectColumn: 'Select column',
- paginationLimit: 'Max results',
- paginationRange: 'Result range'
- };
}
diff --git a/app/main.ts b/src/app/main.ts
similarity index 100%
rename from app/main.ts
rename to src/app/main.ts
diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
new file mode 100644
index 00000000..3612073b
--- /dev/null
+++ b/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+ production: true
+};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
new file mode 100644
index 00000000..b7f639ae
--- /dev/null
+++ b/src/environments/environment.ts
@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+ production: false
+};
diff --git a/favicon.ico b/src/favicon.ico
similarity index 100%
rename from favicon.ico
rename to src/favicon.ico
diff --git a/src/index.html b/src/index.html
new file mode 100644
index 00000000..b319c308
--- /dev/null
+++ b/src/index.html
@@ -0,0 +1,15 @@
+
+
+
+
+ TestT
+
+
+
+
+
+
+
+
+
diff --git a/src/main.ts b/src/main.ts
new file mode 100644
index 00000000..a9ca1caf
--- /dev/null
+++ b/src/main.ts
@@ -0,0 +1,11 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+ enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/polyfills.ts b/src/polyfills.ts
new file mode 100644
index 00000000..7831e97b
--- /dev/null
+++ b/src/polyfills.ts
@@ -0,0 +1,72 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ * 2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ * file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js'; // Run `npm install --save classlist.js`.
+
+/** Evergreen browsers require these. **/
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
+
+/**
+ * Required to support Web Animations `@angular/animation`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
+ **/
+// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl'; // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';
diff --git a/src/styles.css b/src/styles.css
new file mode 100644
index 00000000..90d4ee00
--- /dev/null
+++ b/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/src/test.ts b/src/test.ts
new file mode 100644
index 00000000..cd612eeb
--- /dev/null
+++ b/src/test.ts
@@ -0,0 +1,32 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare const __karma__: any;
+declare const require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function () {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
new file mode 100644
index 00000000..5e2507db
--- /dev/null
+++ b/src/tsconfig.app.json
@@ -0,0 +1,13 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/app",
+ "module": "es2015",
+ "baseUrl": "",
+ "types": []
+ },
+ "exclude": [
+ "test.ts",
+ "**/*.spec.ts"
+ ]
+}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
new file mode 100644
index 00000000..510e3f1f
--- /dev/null
+++ b/src/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "module": "commonjs",
+ "target": "es5",
+ "baseUrl": "",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
diff --git a/src/typings.d.ts b/src/typings.d.ts
new file mode 100644
index 00000000..ef5c7bd6
--- /dev/null
+++ b/src/typings.d.ts
@@ -0,0 +1,5 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+ id: string;
+}
diff --git a/systemjs.config.js b/systemjs.config.js
deleted file mode 100644
index 2194a3d8..00000000
--- a/systemjs.config.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * System configuration for Angular 2 samples
- * Adjust as necessary for your application needs.
- */
-(function (global) {
- System.config({
- paths: {
- // paths serve as alias
- 'npm:': 'node_modules/'
- },
- // map tells the System loader where to look for things
- map: {
- // our app is within the app folder
- app: 'app',
-
- // angular bundles
- '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
- '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
- '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
- '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
- '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
- '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
- '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
- '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
-
- // other libraries
- 'rxjs': 'npm:rxjs',
- 'angular2-in-memory-web-api': 'npm:angular2-in-memory-web-api',
- 'angular-2-data-table': 'npm:angular-2-data-table/dist'
- },
- // packages tells the System loader how to load when no filename and/or no extension
- packages: {
- app: {
- main: './main.js',
- defaultExtension: 'js'
- },
- rxjs: {
- defaultExtension: 'js'
- },
- 'angular2-in-memory-web-api': {
- main: './index.js',
- defaultExtension: 'js'
- },
- 'angular-2-data-table': {
- format: 'cjs',
- defaultExtension: 'js',
- main: 'index.js'
- }
- }
- });
-})(this);
diff --git a/tsconfig.json b/tsconfig.json
index 53da36ca..6769b09b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,13 +1,20 @@
{
+ "compileOnSave": false,
"compilerOptions": {
- "target": "es5",
- "module": "commonjs",
- "moduleResolution": "node",
+ "outDir": "./dist",
+ "baseUrl": "src",
"sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "removeComments": false,
- "noImplicitAny": false,
- "suppressImplicitAnyIndexErrors": true
+ "target": "es5",
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "lib": [
+ "es2016",
+ "dom"
+ ]
}
}
diff --git a/tslint.json b/tslint.json
index 276453f4..dd117b38 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,5 +1,10 @@
{
+ "rulesDirectory": [
+ "node_modules/codelyzer"
+ ],
"rules": {
+ "arrow-return-shorthand": true,
+ "callable-types": true,
"class-name": true,
"comment-format": [
true,
@@ -8,12 +13,17 @@
"curly": true,
"eofline": true,
"forin": true,
+ "import-blacklist": [
+ true,
+ "rxjs"
+ ],
+ "import-spacing": true,
"indent": [
true,
"spaces"
],
+ "interface-over-type-literal": true,
"label-position": true,
- "label-undefined": true,
"max-line-length": [
true,
140
@@ -36,18 +46,23 @@
],
"no-construct": true,
"no-debugger": true,
- "no-duplicate-key": true,
- "no-duplicate-variable": true,
+ "no-duplicate-super": true,
"no-empty": false,
+ "no-empty-interface": true,
"no-eval": true,
- "no-inferrable-types": true,
+ "no-inferrable-types": [
+ true,
+ "ignore-params"
+ ],
+ "no-misused-new": true,
+ "no-non-null-assertion": true,
"no-shadowed-variable": true,
"no-string-literal": false,
+ "no-string-throw": true,
"no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
+ "no-unnecessary-initializer": true,
"no-unused-expression": true,
- "no-unused-variable": true,
- "no-unreachable": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-literal-sort-keys": false,
@@ -58,6 +73,7 @@
"check-else",
"check-whitespace"
],
+ "prefer-const": true,
"quotemark": [
true,
"single"
@@ -80,6 +96,8 @@
"variable-declaration": "nospace"
}
],
+ "typeof-compare": true,
+ "unified-signatures": true,
"variable-name": false,
"whitespace": [
true,
@@ -88,6 +106,30 @@
"check-operator",
"check-separator",
"check-type"
- ]
+ ],
+ "directive-selector": [
+ true,
+ "attribute",
+ "app",
+ "camelCase"
+ ],
+ "component-selector": [
+ true,
+ "element",
+ "app",
+ "kebab-case"
+ ],
+ "use-input-property-decorator": true,
+ "use-output-property-decorator": true,
+ "use-host-property-decorator": true,
+ "no-input-rename": true,
+ "no-output-rename": true,
+ "use-life-cycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true,
+ "no-access-missing-member": true,
+ "templates-use-public": true,
+ "invoke-injectable": true
}
}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index 146c8759..00000000
--- a/typings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "globalDependencies": {
- "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
- "core-js": "registry:dt/core-js#0.0.0+20160725163759",
- "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
- "node": "registry:dt/node#6.0.0+20160831021119",
- "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
- }
-}
diff --git a/wallaby.js b/wallaby.js
deleted file mode 100644
index ba8397a7..00000000
--- a/wallaby.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// Configuration for the Wallaby Visual Studio Code testing extension
-// https://marketplace.visualstudio.com/items?itemName=WallabyJs.wallaby-vscode
-// Note: Wallaby is not open source and costs money
-
-module.exports = function () {
- return {
- files: [
- // System.js for module loading
- {pattern: 'node_modules/systemjs/dist/system.js', instrument: false},
- {pattern: 'systemjs.config.js', instrument: false},
- {pattern: 'systemjs.config.extras.js', instrument: false},
-
- // Polyfills
- {pattern: 'node_modules/core-js/client/shim.min.js', instrument: false},
- {pattern: 'node_modules/reflect-metadata/Reflect.js', instrument: false},
-
- // zone.js
- {pattern: 'node_modules/zone.js/dist/zone.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/long-stack-trace-zone.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/proxy.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/sync-test.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/jasmine-patch.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/async-test.js', instrument: false},
- {pattern: 'node_modules/zone.js/dist/fake-async-test.js', instrument: false},
-
- // application (but not specs) loaded via module imports
- {pattern: 'app/**/*+(ts|html|css)', load: false},
- {pattern: 'app/**/*.spec.ts', ignore: true},
-
- {pattern: 'testing/**/*+(ts|html|css)', load: false},
- ],
-
- tests: [
- {pattern: 'app/**/*.spec.ts', load: false}
- ],
-
- middleware: function (app, express) {
- app.use('/node_modules', express.static(require('path').join(__dirname, 'node_modules')));
- },
-
- testFramework: 'jasmine',
-
- debug: true,
-
- bootstrap: bootstrap
- };
-};
-
-// Like karma-test-shim.js
-function bootstrap (wallaby) {
- wallaby.delayStart();
-
- System.config({
- // Extend usual application package list with test folder
- packages: { 'testing': { main: 'index.js', defaultExtension: 'js' } },
-
- // Assume npm: is set in `paths` in systemjs.config
- // Map the angular testing umd bundles
- map: {
- '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js',
- '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js',
- '@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js',
- '@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
- '@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
- '@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js',
- '@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js',
- '@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js',
- },
- });
-
- System.import('systemjs.config.js')
- .then(importSystemJsExtras)
- .then(initTestBed)
- .then(initTesting);
-
- /** Optional SystemJS configuration extras. Keep going w/o it */
- function importSystemJsExtras(){
- return System.import('systemjs.config.extras.js')
- .catch(function(reason) {
- console.log(
- 'WARNING: System.import could not load "systemjs.config.extras.js"; continuing without it.'
- );
- console.log(reason);
- });
- }
-
- function initTestBed(){
- return Promise.all([
- System.import('@angular/core/testing'),
- System.import('@angular/platform-browser-dynamic/testing')
- ])
-
- .then(function (providers) {
- var coreTesting = providers[0];
- var browserTesting = providers[1];
-
- coreTesting.TestBed.initTestEnvironment(
- browserTesting.BrowserDynamicTestingModule,
- browserTesting.platformBrowserDynamicTesting());
- })
- }
-
- // Load all spec files and start wallaby
- function initTesting () {
- return Promise.all(
- wallaby.tests.map(function (specFile) {
- return System.import(specFile);
- })
- )
- .then(function () {
- wallaby.start();
- })
- .catch(function (e) {
- setTimeout(function () {
- throw e;
- }, 0);
- });
- }
-}