diff --git a/package-lock.json b/package-lock.json index 58f9f8fc28..840ca20a24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -379,19 +379,19 @@ } }, "@nebular/auth": { - "version": "2.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.0-rc.2.tgz", - "integrity": "sha512-ZXxH4tVQuY/xjdasaroHKb5xnE6uSG+s8DiSnhbupUGZwLMQboU8HjxemL45IQluHVTuLAuTVev2tYLKGNpHnw==" + "version": "2.0.0-rc.3", + "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-2.0.0-rc.3.tgz", + "integrity": "sha512-VVEt8PimJ1l3GwGD+UdrgfXpKL5kM586cKAuSlhw+kKakVA1KQPLOZhGe6GUqeqt761ySiwGH3efi15bs3a+tg==" }, "@nebular/theme": { - "version": "2.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.0-rc.2.tgz", - "integrity": "sha512-TaF2ACM2CIDl4pBDMy9wyypl29S/P95tSgEXu0xALexlb9luhxSLTgw0KXKQKNoIsIeYc0RAuIV4k5Yhbku1lQ==" + "version": "2.0.0-rc.3", + "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-2.0.0-rc.3.tgz", + "integrity": "sha512-xCRJHqw1MtpqU6amgVAPvlEbRVsnUAnw9BrQdh9Zp39ZnLOJNPLmyeIT/eV0S06uGR4W9aV5Tpa9vCkVC6NKsQ==" }, "@ng-bootstrap/ng-bootstrap": { - "version": "1.0.0-alpha.26", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.26.tgz", - "integrity": "sha1-89nha1aC7CDts/E5fT1FpXbz9qQ=" + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.5.tgz", + "integrity": "sha1-2iuQZrNwGihMrFoWFop33vlHtKs=" }, "@ngtools/json-schema": { "version": "1.1.0", @@ -1178,13 +1178,9 @@ } }, "bootstrap": { - "version": "4.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz", - "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=", - "requires": { - "jquery": "3.2.1", - "tether": "1.4.0" - } + "version": "4.0.0-beta.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.2.tgz", + "integrity": "sha512-DzGtdTlKbrMoGMpz0LigKSqJ+MgtFKxA791PU/q062OlRG0HybNZcTLH7rpDAmLS66Y3esN9yzKHLLbqa5UR3w==" }, "brace-expansion": { "version": "1.1.8", @@ -2077,16 +2073,6 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, - "cors": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz", - "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "vary": "1.1.2" - } - }, "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", @@ -6540,11 +6526,6 @@ "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, - "jquery": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" - }, "js-base64": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", @@ -7007,6 +6988,31 @@ "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "dev": true }, + "cors": { + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz", + "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "vary": "1.1.2" + } + }, + "event-stream": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, "faye-websocket": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", @@ -7031,6 +7037,12 @@ "is-wsl": "1.1.0" } }, + "proxy-middleware": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz", + "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=", + "dev": true + }, "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", @@ -9401,12 +9413,6 @@ "ipaddr.js": "1.5.2" } }, - "proxy-middleware": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz", - "integrity": "sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=", - "dev": true - }, "prr": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", diff --git a/package.json b/package.json index 6d2005a239..86a8af75b7 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,13 @@ "name": "ngx-admin", "version": "2.0.0", "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/akveo/ngx-admin.git" + }, + "bugs": { + "url": "https://github.com/akveo/ngx-admin/issues" + }, "scripts": { "ng": "ng", "start": "ng serve", @@ -35,13 +42,13 @@ "@angular/platform-browser-dynamic": "^4.4.6", "@angular/router": "^4.4.6", "@asymmetrik/angular2-leaflet": "2.1.4", - "@nebular/auth": "2.0.0-rc.2", - "@nebular/theme": "2.0.0-rc.2", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.26", + "@nebular/auth": "2.0.0-rc.3", + "@nebular/theme": "2.0.0-rc.3", + "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5", "@swimlane/ngx-charts": "5.2.0", "angular2-chartjs": "^0.3.0", "angular2-toaster": "4.0.0", - "bootstrap": "4.0.0-alpha.6", + "bootstrap": "4.0.0-beta.2", "chart.js": "2.5.0", "ckeditor": "4.6.2", "classlist.js": "1.1.20150312", diff --git a/protractor.conf.js b/protractor.conf.js index 7ee3b5ee86..5bc5b19271 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -9,7 +9,10 @@ exports.config = { './e2e/**/*.e2e-spec.ts' ], capabilities: { - 'browserName': 'chrome' + 'browserName': 'chrome', + 'chromeOptions': { + 'args': ['show-fps-counter=true', '--no-sandbox'] + } }, directConnect: true, baseUrl: 'http://localhost:4200/', @@ -23,6 +26,7 @@ exports.config = { require('ts-node').register({ project: 'e2e/tsconfig.e2e.json' }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + + jasmine.getEnv().addReporter(new SpecReporter({ acspec: { displayStacktrace: true } })); } }; diff --git a/src/app/pages/components/notifications/notifications.component.html b/src/app/pages/components/notifications/notifications.component.html index 12d3f022a4..50a71ba56f 100644 --- a/src/app/pages/components/notifications/notifications.component.html +++ b/src/app/pages/components/notifications/notifications.component.html @@ -9,11 +9,11 @@
-
+
-
    +
    • {{ p }}
      • @@ -22,11 +22,11 @@
-
+
-
    +
    • {{ at }}
      • @@ -56,11 +56,11 @@
-
+
-
    +
    • {{ t }}
diff --git a/src/app/pages/dashboard/electricity/electricity.component.html b/src/app/pages/dashboard/electricity/electricity.component.html index 7627e193d2..44b4e3f949 100644 --- a/src/app/pages/dashboard/electricity/electricity.component.html +++ b/src/app/pages/dashboard/electricity/electricity.component.html @@ -40,12 +40,12 @@
-
+
-
    +
    • {{ t }}
diff --git a/src/app/pages/dashboard/traffic/traffic.component.ts b/src/app/pages/dashboard/traffic/traffic.component.ts index e1b30848b2..1fab4bdc1e 100644 --- a/src/app/pages/dashboard/traffic/traffic.component.ts +++ b/src/app/pages/dashboard/traffic/traffic.component.ts @@ -8,12 +8,12 @@ import { NbThemeService } from '@nebular/theme'; Traffic Consumption -
+
-
    +
    • {{ t }}
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html index 8da652a7d1..0e3b3d42e0 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.html +++ b/src/app/pages/forms/form-inputs/form-inputs.component.html @@ -72,11 +72,11 @@
-
+
-
    +
    • Action
    • Another action
    • Something else here
      • diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html index 437c848d96..8c2b625d22 100644 --- a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html +++ b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.html @@ -7,25 +7,25 @@
      Toggle Types
      -
      -
@@ -34,20 +34,20 @@
Pagination
-
@@ -55,20 +55,20 @@
Icon Toolbar
-
@@ -77,26 +77,26 @@
Divided Button Group
- - -
@@ -106,26 +106,26 @@
-
-
diff --git a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html index 97e5f1a5e1..3346b9cd69 100644 --- a/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html +++ b/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.html @@ -1,11 +1,11 @@ Default Buttons -
+
-
    +
    • {{ v.title }}
diff --git a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html index 9b645f4012..7ad12f1800 100644 --- a/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html +++ b/src/app/pages/ui-features/buttons/dropdown-buttons/dropdown-button.component.html @@ -1,40 +1,40 @@ Button Dropdowns -
+
-
    +
    • Icon Button
    • Hero Button
    • Default
-
+
-
    +
    • Icon Button
    • Hero Button
    • Default
-
+
-
    +
    • Icon Button
    • Hero Button
    • Default
-
+
-
    +
    • Icon Button
    • Hero Button
    • Default
      • diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index 39ba8dbacb..1222b0abf4 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -2,9 +2,17 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "baseUrl": "./", "module": "es2015", - "types": [] + "baseUrl": "./", + "types": [], + "paths": { + "@angular/*": [ + "../node_modules/@angular/*" + ], + "@nebular/*": [ + "../node_modules/@nebular/*" + ] + } }, "exclude": [ "test.ts",