diff --git a/api/package-lock.json b/api/package-lock.json index d9d8d8e..81eed94 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -2239,9 +2239,9 @@ } }, "kareem": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.4.1.tgz", - "integrity": "sha1-7XYgAET6BB7zK02oJh4lU/EXNTE=" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz", + "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg=" }, "kind-of": { "version": "3.2.2", @@ -2800,20 +2800,20 @@ } }, "mongoose": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.11.1.tgz", - "integrity": "sha1-JWC22J50SwWFfQJMq4sxYGZxbj4=", + "version": "4.11.4", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.11.4.tgz", + "integrity": "sha1-PXQREQXui2GescHXkOe/xOjLp7s=", "requires": { "async": "2.1.4", "bson": "1.0.4", "hooks-fixed": "2.0.0", - "kareem": "1.4.1", + "kareem": "1.5.0", "mongodb": "2.2.27", "mpath": "0.3.0", "mpromise": "0.5.5", "mquery": "2.3.1", "ms": "2.0.0", - "muri": "1.2.1", + "muri": "1.2.2", "regexp-clone": "0.0.1", "sliced": "1.0.1" }, @@ -2953,9 +2953,9 @@ } }, "muri": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/muri/-/muri-1.2.1.tgz", - "integrity": "sha1-7H6lzmympSPrGrNbrNpfqBbJqjw=" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/muri/-/muri-1.2.2.tgz", + "integrity": "sha1-YxmBMmUNsIoEzHnM0A3Tia/SYxw=" }, "negotiator": { "version": "0.5.3", @@ -3641,7 +3641,7 @@ "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", "requires": { "resolve-from": "2.0.0", "semver": "5.3.0" diff --git a/api/package.json b/api/package.json index dda9829..9cfdf82 100644 --- a/api/package.json +++ b/api/package.json @@ -24,7 +24,7 @@ "jsonwebtoken": "^7.4.0", "lodash": "^4.17.4", "mkdirp": "^0.5.1", - "mongoose": "^4.11.1", + "mongoose": "^4.11.4", "morgan": "~1.6.1", "multer": "^1.3.0", "node-sha1": "^1.0.1", diff --git a/static/package.json b/static/package.json index 8821e30..21caec7 100644 --- a/static/package.json +++ b/static/package.json @@ -40,7 +40,6 @@ "devDependencies": { "@types/jasmine": "2.5.38", "@types/node": "~6.0.60", - "@types/socket.io-client": "^1.4.26", "codelyzer": "~2.0.0-beta.1", "jasmine-core": "^2.5.2", "jasmine-spec-reporter": "^3.2.0", diff --git a/static/src/app/models/model-interfaces.ts b/static/src/app/models/model-interfaces.ts index a3d5dd2..cfc4ca3 100644 --- a/static/src/app/models/model-interfaces.ts +++ b/static/src/app/models/model-interfaces.ts @@ -33,6 +33,8 @@ export interface War { date?: string; ptBlufor?: number; ptOpfor?: number; + playersBlufor?: number; + playersOpfor?: number; bestPlayerId?: Player; players: Player[]; } diff --git a/static/src/app/wars/war-detail.component.html b/static/src/app/wars/war-detail.component.html index 783cbd6..fb4ed68 100644 --- a/static/src/app/wars/war-detail.component.html +++ b/static/src/app/wars/war-detail.component.html @@ -9,7 +9,22 @@ {{war.ptOpfor}} CSAT -