From 36f95137d5018c8042b8aecdfb6578860314bc31 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 08 Jun 2017 08:58:46 +0000
Subject: [PATCH] #0 config - Updated covalent and angular versions to 1.0-b4 and 4.1.3
---
securis/src/main/webapp/jspm.config.js | 40 ++++++-------
securis/src/main/webapp/src/app/resources/packs.ts | 8 +-
securis/src/main/webapp/jspm.browser.js | 6 +-
securis/src/main/webapp/src/app/app.module.ts | 12 ++-
securis/src/main/webapp/package.json | 57 +++++++++---------
5 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/securis/src/main/webapp/jspm.browser.js b/securis/src/main/webapp/jspm.browser.js
index 3b9e882..e791283 100644
--- a/securis/src/main/webapp/jspm.browser.js
+++ b/securis/src/main/webapp/jspm.browser.js
@@ -1,6 +1,6 @@
SystemJS.config({
- "paths": {
- "github:": "jspm_packages/github/",
- "npm:": "jspm_packages/npm/"
+ paths: {
+ "github:": "jspm_packages/github/",
+ "npm:": "jspm_packages/npm/"
}
});
diff --git a/securis/src/main/webapp/jspm.config.js b/securis/src/main/webapp/jspm.config.js
index ae27d42..3d9d723 100644
--- a/securis/src/main/webapp/jspm.config.js
+++ b/securis/src/main/webapp/jspm.config.js
@@ -36,8 +36,8 @@
}
},
map: {
- "@angular/animations/browser": "npm:@angular/animations@4.0.2/bundles/animations-browser.umd.min.js",
- "@angular/platform-browser/animations": "npm:@angular/platform-browser@4.0.2/bundles/platform-browser-animations.umd.min.js",
+ "@angular/animations/browser": "npm:@angular/animations@4.1.3/bundles/animations-browser.umd.min.js",
+ "@angular/platform-browser/animations": "npm:@angular/platform-browser@4.1.3/bundles/platform-browser-animations.umd.min.js",
"app": "src/app"
}
});
@@ -49,19 +49,19 @@
"npm:*.json"
],
map: {
- "@angular/animations": "npm:@angular/animations@4.0.2",
- "@angular/common": "npm:@angular/common@4.0.2",
- "@angular/compiler": "npm:@angular/compiler@4.0.2",
- "@angular/core": "npm:@angular/core@4.0.2",
- "@angular/forms": "npm:@angular/forms@4.0.2",
- "@angular/http": "npm:@angular/http@4.0.2",
- "@angular/material": "npm:@angular/material@2.0.0-beta.3",
- "@angular/platform-browser": "npm:@angular/platform-browser@4.0.2",
- "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@4.0.2",
- "@angular/router": "npm:@angular/router@4.0.2",
- "@covalent/core": "npm:@covalent/core@1.0.0-beta.3-1",
- "@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@1.0.0-beta.3-1",
- "@covalent/http": "npm:@covalent/http@1.0.0-beta.3-1",
+ "@angular/animations": "npm:@angular/animations@4.1.3",
+ "@angular/common": "npm:@angular/common@4.1.3",
+ "@angular/compiler": "npm:@angular/compiler@4.1.3",
+ "@angular/core": "npm:@angular/core@4.1.3",
+ "@angular/forms": "npm:@angular/forms@4.1.3",
+ "@angular/http": "npm:@angular/http@4.1.3",
+ "@angular/material": "npm:@angular/material@2.0.0-beta.6",
+ "@angular/platform-browser": "npm:@angular/platform-browser@4.1.3",
+ "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@4.1.3",
+ "@angular/router": "npm:@angular/router@4.1.3",
+ "@covalent/core": "npm:@covalent/core@1.0.0-beta.4",
+ "@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@1.0.0-beta.4",
+ "@covalent/http": "npm:@covalent/http@1.0.0-beta.4",
"angular-in-memory-web-api": "npm:angular-in-memory-web-api@0.3.1",
"angular-safeguard": "npm:angular-safeguard@1.0.1",
"assert": "npm:jspm-nodelibs-assert@0.2.1",
@@ -317,17 +317,15 @@
"process": "npm:process@0.11.9"
}
},
- "npm:@covalent/core@1.0.0-beta.3-1": {
+ "npm:@covalent/dynamic-forms@1.0.0-beta.4": {
"map": {
- "@angular/flex-layout": "npm:@angular/flex-layout@2.0.0-beta.7",
- "@angular/material": "npm:@angular/material@2.0.0-beta.3"
+ "@covalent/core": "npm:@covalent/core@1.0.0-beta.4"
}
},
- "npm:@covalent/dynamic-forms@1.0.0-beta.3-1": {
+ "npm:@angular/material@2.0.0-beta.6": {
"map": {
- "@covalent/core": "npm:@covalent/core@1.0.0-beta.3-1"
+ "tslib": "npm:tslib@1.7.1"
}
}
}
-
});
diff --git a/securis/src/main/webapp/package.json b/securis/src/main/webapp/package.json
index 3887c25..b36d861 100644
--- a/securis/src/main/webapp/package.json
+++ b/securis/src/main/webapp/package.json
@@ -22,21 +22,21 @@
},
"keywords": [],
"author": "",
- "license": "MIT",
+ "license": "Commercial",
"dependencies": {
- "@angular/animations": "~4.0.2",
- "@angular/common": "^4.0.2",
- "@angular/compiler": "~4.0.2",
- "@angular/core": "~4.0.2",
- "@angular/forms": "~4.0.2",
- "@angular/http": "~4.0.2",
- "@angular/material": "^2.0.0-beta.3",
- "@angular/platform-browser": "~4.0.2",
- "@angular/platform-browser-dynamic": "~4.0.2",
- "@angular/router": "^4.0.2",
- "@covalent/core": "^1.0.0-beta.3",
- "@covalent/dynamic-forms": "^1.0.0-beta.3",
- "@covalent/http": "^1.0.0-beta.3",
+ "@angular/core": "~4.1.3",
+ "@angular/animations": "~4.1.3",
+ "@angular/common": "^4.1.3",
+ "@angular/compiler": "~4.1.3",
+ "@angular/forms": "~4.1.3",
+ "@angular/http": "~4.1.3",
+ "@angular/router": "^4.1.3",
+ "@angular/platform-browser": "~4.1.3",
+ "@angular/platform-browser-dynamic": "~4.1.3",
+ "@angular/material": "^2.0.0-beta.4",
+ "@covalent/core": "^1.0.0-beta.4",
+ "@covalent/dynamic-forms": "^1.0.0-beta.4",
+ "@covalent/http": "^1.0.0-beta.4",
"angular-in-memory-web-api": "~0.2.4",
"angular-safeguard": "^1.0.1",
"core-js": "^2.4.1",
@@ -72,9 +72,8 @@
"name": "securis",
"main": "src/main.js",
"dependencies": {
- "@angular/animations": "npm:@angular/animations@^4.0.2",
- "@angular/material": "npm:@angular/material@^2.0.0-beta.3",
- "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^4.0.2",
+ "@angular/animations": "npm:@angular/animations@^4.1.3",
+ "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^4.1.3",
"@covalent/core": "npm:@covalent/core@^1.0.0-beta.3-1",
"@covalent/dynamic-forms": "npm:@covalent/dynamic-forms@^1.0.0-beta.3-1",
"@covalent/http": "npm:@covalent/http@^1.0.0-beta.3-1",
@@ -94,12 +93,13 @@
"typescript": "npm:typescript@^2.2.2"
},
"peerDependencies": {
- "@angular/common": "npm:@angular/common@4.0.2",
- "@angular/compiler": "npm:@angular/compiler@^4.0.2",
- "@angular/core": "npm:@angular/core@4.0.2",
- "@angular/forms": "npm:@angular/forms@^4.0.0",
- "@angular/http": "npm:@angular/http@^4.0.0",
- "@angular/platform-browser": "npm:@angular/platform-browser@4.0.2",
+ "@angular/common": "npm:@angular/common@^4.0.0",
+ "@angular/compiler": "npm:@angular/compiler@^4.1.3",
+ "@angular/core": "npm:@angular/core@4.1.3",
+ "@angular/forms": "npm:@angular/forms@^4.1.3",
+ "@angular/http": "npm:@angular/http@^4.1.3",
+ "@angular/material": "npm:@angular/material@^2.0.0-beta.3",
+ "@angular/platform-browser": "npm:@angular/platform-browser@4.1.3",
"@angular/router": "npm:@angular/router@^4.0.0",
"assert": "npm:jspm-nodelibs-assert@^0.2.0",
"buffer": "npm:jspm-nodelibs-buffer@^0.2.0",
@@ -124,12 +124,11 @@
"test.js"
]
},
- "npm:reflect-metadata@0.1.10": {
- "jspmNodeConversion": false,
- "map": {
- "crypto": {
- "node": "@node/crypto",
- "default": "@empty"
+ "npm:tslib@1.7.1": {
+ "format": "cjs",
+ "meta": {
+ "tslib.js": {
+ "esModule": true
}
}
},
diff --git a/securis/src/main/webapp/src/app/app.module.ts b/securis/src/main/webapp/src/app/app.module.ts
index 66a8a52..57e6a1e 100644
--- a/securis/src/main/webapp/src/app/app.module.ts
+++ b/securis/src/main/webapp/src/app/app.module.ts
@@ -5,8 +5,10 @@
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule } from '@angular/forms';
import { MaterialModule } from '@angular/material';
-import { CovalentCoreModule } from '@covalent/core';
-import { CovalentHttpModule } from '@covalent/http';
+import { CovalentPagingModule, CovalentLayoutModule, CovalentNotificationsModule, CovalentMenuModule,CovalentFileModule,CovalentDataTableModule,
+ CovalentDialogsModule, CovalentCommonModule, CovalentChipsModule, CovalentExpansionPanelModule, CovalentLoadingModule, CovalentMediaModule,
+ CovalentSearchModule } from '@covalent/core';
+import { CovalentHttpModule } from '@covalent/http';
import { CovalentDynamicFormsModule } from '@covalent/dynamic-forms';
import { LockerModule, DRIVERS } from 'angular-safeguard';
@@ -64,9 +66,11 @@
HttpModule,
FormsModule,
MaterialModule,
- CovalentCoreModule.forRoot(),
+ CovalentPagingModule, CovalentLayoutModule, CovalentNotificationsModule, CovalentMenuModule,CovalentFileModule,CovalentDataTableModule,
+ CovalentDialogsModule, CovalentCommonModule, CovalentChipsModule, CovalentExpansionPanelModule, CovalentLoadingModule, CovalentMediaModule,
+ CovalentSearchModule,
CovalentHttpModule.forRoot(),
- CovalentDynamicFormsModule.forRoot(),
+ CovalentDynamicFormsModule,
ToastModule.forRoot(),
appRoutes,
],
diff --git a/securis/src/main/webapp/src/app/resources/packs.ts b/securis/src/main/webapp/src/app/resources/packs.ts
index ba39408..58649bd 100644
--- a/securis/src/main/webapp/src/app/resources/packs.ts
+++ b/securis/src/main/webapp/src/app/resources/packs.ts
@@ -86,13 +86,13 @@
super($L, http, 'pack');
}
- public get(filter?: PacksFilter) {
+ public get(filter?: PacksFilter | number) {
+ if (!filter || typeof filter === "number") {
+ return super.get(filter);
+ }
let searchParams = new MySearchParams(filter);
let url = `${this.resource}/?${searchParams}`;
return this.http.get(url).map(response => response.json()).catch(err => super.processErrorResponse(err));
- }
- public get(id: number) {
- return super.get(id);
}
--
Gitblit v1.3.2