diff --git a/package.json b/package.json index 58bf657..004bca1 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "start-e2e": "npm run deploy-static && npm run e2e --prefix ./api", "test-e2e": "npm run e2e --prefix ./static" }, + "dependencies": { + "uglify-js": "^3.0.26" + }, "devDependencies": { "concurrently": "^3.4.0", "wait-on": "^2.0.2" - }, - "dependencies": { - "uglify-js": "^3.0.26" } } diff --git a/static/package-lock.json b/static/package-lock.json index 34db079..5f561fb 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -523,12 +523,6 @@ "integrity": "sha1-dMt3+2BS7a/yqJhN2v2I1BnyXKw=", "dev": true }, - "@types/socket.io-client": { - "version": "1.4.29", - "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.29.tgz", - "integrity": "sha1-+HQwcM7pMXXjbgtqd6ivc+WMyzI=", - "dev": true - }, "abbrev": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", @@ -4865,6 +4859,11 @@ "minimist": "0.0.8" } }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -4894,6 +4893,14 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, + "ngx-bootstrap": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-1.8.1.tgz", + "integrity": "sha512-f6l1HmyQPY72bvprKd0yt1WkrEFzynbps8+OvEp4KE0beg/UYPoBXAmPyv7sOtn7grOTBUJJcMO147LEqKjW0Q==", + "requires": { + "moment": "2.18.1" + } + }, "ngx-clipboard": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-8.0.2.tgz", diff --git a/static/package.json b/static/package.json index 21caec7..6f8dcca 100644 --- a/static/package.json +++ b/static/package.json @@ -30,6 +30,7 @@ "jquery": "^3.1.0", "jquery-ui": "^1.12.0", "jquery-ui-bundle": "^1.11.4", + "ngx-bootstrap": "^1.8.1", "ngx-clipboard": "^8.0.2", "rxjs": "^5.2.0", "ts-helpers": "^1.1.1", diff --git a/static/src/app/app.module.ts b/static/src/app/app.module.ts index b7f158b..51f4444 100644 --- a/static/src/app/app.module.ts +++ b/static/src/app/app.module.ts @@ -35,10 +35,11 @@ import {WarService} from "./services/war-service/war.service"; import {DataTableModule} from "angular2-datatable"; import {NgxChartsModule} from "@swimlane/ngx-charts"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; +import {AccordionModule} from "ngx-bootstrap"; @NgModule({ imports: [BrowserModule, FormsModule, ReactiveFormsModule, appRouting, HttpModule, ClipboardModule, DataTableModule, - BrowserAnimationsModule, NgxChartsModule], + BrowserAnimationsModule, NgxChartsModule, AccordionModule.forRoot()], providers: [ HttpClient, LoginService, diff --git a/static/src/app/statistic/war-list/war-list.component.html b/static/src/app/statistic/war-list/war-list.component.html index 47bd42f..58ecb9b 100644 --- a/static/src/app/statistic/war-list/war-list.component.html +++ b/static/src/app/statistic/war-list/war-list.component.html @@ -5,7 +5,8 @@ -