Mercurial > hg > ng2-query-ismi

changeset 51:1245781e2575 ng2-table

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
working on updating ng2-table.
author Robert Casties <casties@mpiwg-berlin.mpg.de>
date Thu, 23 Mar 2017 11:04:48 +0100
parents 31fb4ebdc406
children 738e90238443
files package.json src/app/query-app.module.ts src/systemjs.config.js
diffstat 3 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/package.json	Mon Mar 20 18:51:42 2017 +0100
+++ b/package.json	Thu Mar 23 11:04:48 2017 +0100
@@ -31,18 +31,17 @@
     "@angular/platform-browser": "~2.4.0",
     "@angular/platform-browser-dynamic": "~2.4.0",
     "@angular/router": "~3.4.0",
-
     "angular-in-memory-web-api": "~0.2.4",
+    "core-js": "^2.4.1",
+    "ng2-bootstrap": "^1.4.2",
+    "rxjs": "5.0.1",
     "systemjs": "0.19.40",
-    "core-js": "^2.4.1",
-    "rxjs": "5.0.1",
     "zone.js": "^0.7.4"
   },
   "devDependencies": {
     "concurrently": "^3.2.0",
     "lite-server": "^2.2.2",
     "typescript": "~2.0.10",
-
     "canonical-path": "0.0.2",
     "tslint": "^3.15.1",
     "lodash": "^4.16.4",
@@ -54,7 +53,6 @@
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~4.0.14",
     "rimraf": "^2.5.4",
-
     "@types/node": "^6.0.46",
     "@types/jasmine": "2.5.36"
   },
--- a/src/app/query-app.module.ts	Mon Mar 20 18:51:42 2017 +0100
+++ b/src/app/query-app.module.ts	Thu Mar 23 11:04:48 2017 +0100
@@ -3,19 +3,24 @@
 import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 
+import { Ng2TableModule } from 'ng2-table/ng2-table';
+import { PaginationModule } from 'ng2-bootstrap/pagination';
+
 import { QueryAppComponent }  from './query-app.component';
 import { QuerySelectComponent }  from './query-select.component';
-import { QueryResultComponent }  from './query-result.component';
-import { QueryResultRowComponent }  from './query-result-row.component';
-//import { QueryResultTableComponent }  from './query-result-table.component';
+//import { QueryResultComponent }  from './query-result.component';
+//import { QueryResultRowComponent }  from './query-result-row.component';
+import { QueryResultTableComponent }  from './query-result-table.component';
 import { QueryService } from './query.service';
 import { NormalizationService } from './normalization.service';
 
 
 @NgModule({
-  imports:      [ BrowserModule, FormsModule, HttpModule ],
+  imports:      [ BrowserModule, FormsModule, HttpModule,
+                  Ng2TableModule, PaginationModule ],
   declarations: [ QueryAppComponent, QuerySelectComponent, 
-                  QueryResultComponent, QueryResultRowComponent ],
+//                  QueryResultComponent, QueryResultRowComponent 
+                  QueryResultTableComponent ],
   providers:    [ QueryService, NormalizationService ],
   bootstrap:    [ QueryAppComponent ]
 })
--- a/src/systemjs.config.js	Mon Mar 20 18:51:42 2017 +0100
+++ b/src/systemjs.config.js	Thu Mar 23 11:04:48 2017 +0100
@@ -25,7 +25,10 @@
 
       // other libraries
       'rxjs':                      'npm:rxjs',
-      'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js'
+      'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
+      
+      'ng2-bootstrap': 'npm:ng2-bootstrap',
+      'ng2-table': 'npm:ng2-table'
     },
     // packages tells the System loader how to load when no filename and/or no extension
     packages: {