From 553dc492a6b7ce4f9b1e88d635650b8e46dd22e1 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 11 Feb 2018 12:26:53 +0100 Subject: [PATCH 1/8] Add automation 3rd party software install script --- README.md | 35 ++++++++------------ docs/opt-cc-environment/3rd-party-install.sh | 34 +++++++++++++++++++ 2 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 docs/opt-cc-environment/3rd-party-install.sh diff --git a/README.md b/README.md index b725ee7..2de78e9 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,29 @@ # Operation Pandora Trigger Commandcenter -[MEAN Application](http://mean.io/) created for [www.operation-pandora.com](www.operation-pandora.com) Arma3 Community +[MEAN Application](http://mean.io/) created for [www.operation-pandora.com](https://www.operation-pandora.com) Arma3 Community ## Installation -### Setup mongoDB +### Setup 3rd Party Software -https://docs.mongodb.com/manual/administration/install-community/ +Run the installation script located in the docs folder: -### Setup node and npm + ./docs/opt-cc-environment/3rd-party-install - sudo apt-get install npm nodejs-legacy - -update to latest npm version - - sudo npm install -g npm@latest - -update node to latest version - - sudo npm install -g n@latest - n latest - -check versions - - npm -v - node -v +It installs NPM, Node and MongoDB on latest versions. +In addition, it sets up the mongo deamon to start up automatically with the system. ## Development and Execution -### Run in dev mode +Before running any execution run + + npm install + +inside the main folder to trigger all needed npm package installations for the program execution. + +### Run in Dev Mode *TODO* ### Run in Production @@ -47,4 +40,4 @@ Main concept for API Server, pagination and MongoDB usage by [Prof. Dr.-Ing. Joh All endpoints, signature image builder and Arma3 RPT-Log parsing by [Florian Hartwich](https://de.linkedin.com/in/florian-hartwich-b67b02125) ### Angular 5 Frontend (`/static`) -published under [MIT License](https://opensource.org/licenses/MIT) \ No newline at end of file +published under [MIT License](https://opensource.org/licenses/MIT) diff --git a/docs/opt-cc-environment/3rd-party-install.sh b/docs/opt-cc-environment/3rd-party-install.sh new file mode 100644 index 0000000..b7754d6 --- /dev/null +++ b/docs/opt-cc-environment/3rd-party-install.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +##################################################### +###### INSTALL ALL REQUIRED 3RD-PARTY SOFTWARE ###### +##################################################### +# MONGO DB COMMUNITY +# NPM +# NODE + + +# mongodb key & repo +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + +echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | \ + sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list + +# install from apt +sudo apt-get update +sudo apt-get install -y mongodb-org npm + +# enable mongod for autostart +sudo systemctl enable mongod.service + +# install latest node version +wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash +source ~/.nvm/nvm.sh +nvm install stable +sudo ln -s ~/.nvm/versions/node/$(node -v)/bin/node /usr/bin/node + +# upgrade to latest npm version +sudo npm install -g npm@latest + +npm -v +node -v From bcfe6cf49a2556da8051ad5f6a327ab9c3c0a734 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 15:34:31 +0100 Subject: [PATCH 2/8] Add pm2 setup to 3rd party init --- .../{opt-cc-environment => infra}/3rd-party-install.sh | 10 +++++++--- .../nginx-https-cc-site.txt | 0 api/pm2-start.json => pm2-start.json | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) rename docs/{opt-cc-environment => infra}/3rd-party-install.sh (87%) rename docs/{opt-cc-environment => infra}/nginx-https-cc-site.txt (100%) rename api/pm2-start.json => pm2-start.json (52%) diff --git a/docs/opt-cc-environment/3rd-party-install.sh b/docs/infra/3rd-party-install.sh similarity index 87% rename from docs/opt-cc-environment/3rd-party-install.sh rename to docs/infra/3rd-party-install.sh index b7754d6..957320a 100644 --- a/docs/opt-cc-environment/3rd-party-install.sh +++ b/docs/infra/3rd-party-install.sh @@ -1,5 +1,7 @@ #!/bin/bash +cd $(dirname $0) + ##################################################### ###### INSTALL ALL REQUIRED 3RD-PARTY SOFTWARE ###### ##################################################### @@ -10,7 +12,6 @@ # mongodb key & repo sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | \ sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list @@ -30,5 +31,8 @@ sudo ln -s ~/.nvm/versions/node/$(node -v)/bin/node /usr/bin/node # upgrade to latest npm version sudo npm install -g npm@latest -npm -v -node -v +if [ "${1}" == "prod" ]; then + sudo npm install -g pm2 + pm2 start ./../../pm2-start.json + pm2 startup systemd +fi diff --git a/docs/opt-cc-environment/nginx-https-cc-site.txt b/docs/infra/nginx-https-cc-site.txt similarity index 100% rename from docs/opt-cc-environment/nginx-https-cc-site.txt rename to docs/infra/nginx-https-cc-site.txt diff --git a/api/pm2-start.json b/pm2-start.json similarity index 52% rename from api/pm2-start.json rename to pm2-start.json index 34ec242..0de55db 100644 --- a/api/pm2-start.json +++ b/pm2-start.json @@ -5,7 +5,10 @@ "script": "./api/server.js", "watch": false, "env": { - "TZ": "Europe/Berlin" + "NODE_ENV": "production", + "DEBUG": "cc:*", + "TZ": "Europe/Berlin", + "JWS_SECRET": "secret" } } ] From 6ffc4de42a235a9663f6c5632dc8e9572540b88a Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 15:58:49 +0100 Subject: [PATCH 3/8] complete readme --- README.md | 53 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2de78e9..7ff7660 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ # Operation Pandora Trigger Commandcenter -[MEAN Application](http://mean.io/) created for [www.operation-pandora.com](https://www.operation-pandora.com) Arma3 Community +A [MEAN Application](http://mean.io/) created for [operation-pandora.com](https://www.operation-pandora.com) Arma3 Community ## Installation -### Setup 3rd Party Software +All steps described here are working with a Debian based Linux system + +### Setup required 3rd Party Software + +#### Setup for development Run the installation script located in the docs folder: @@ -15,28 +19,51 @@ Run the installation script located in the docs folder: It installs NPM, Node and MongoDB on latest versions. In addition, it sets up the mongo deamon to start up automatically with the system. -## Development and Execution +#### Setup for production -Before running any execution run +**NOTE:** It his highly recommended not to run the following steps as _root_ user! + +Before triggering the environment execution run npm install -inside the main folder to trigger all needed npm package installations for the program execution. +inside the main folder, to process all needed npm package installations for the program execution. -### Run in Dev Mode -*TODO* +For production setup run the script, described in _Setup for development_, adding the parameter `prod` -### Run in Production -*TODO* + ./docs/opt-cc-environment/3rd-party-install prod + +This adds the [`pm2` process manager](http://pm2.keymetrics.io/) to be installed and start the _opt-cc_ server as `pm2` process. +Run the `sudo` command printed as last output to configure the `pm2` process for automatic start on the system, as the current user. + +## Development + +Before triggering the environment execution run + + npm install + +inside the main folder, to process all needed npm package installations for the program execution. + +Do not use the execution described here in any production environment! +It will make the running application highly vulnerable. \ +To compile the Angular code and afterwards start the Express server with `nodemon` for development purpose run + + npm run dev + +Any changes on `api` code will trigger an automatic restart of the Express server. + +Changes on `static` code can be submitted with + + npm run deploy-static + +The page must be reloaded after this build step is finished, in order to make changes visible. ## License Information ### Express API (`/api`) -published under [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt) - -Main concept for API Server, pagination and MongoDB usage by [Prof. Dr.-Ing. Johannes Konert](https://prof.beuth-hochschule.de/konert/) - +published under [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt) \ +Main concept for API Server, pagination and MongoDB usage by [Prof. Dr.-Ing. Johannes Konert](https://prof.beuth-hochschule.de/konert/) \ All endpoints, signature image builder and Arma3 RPT-Log parsing by [Florian Hartwich](https://de.linkedin.com/in/florian-hartwich-b67b02125) ### Angular 5 Frontend (`/static`) From 31c41f3bab2848ab688ce428a76ea09b663dff5f Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 16:11:26 +0100 Subject: [PATCH 4/8] replace markdown links with html for new window direct --- README.md | 10 +++++----- docs/infra/nginx-https-cc-site.txt | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7ff7660..9ec5030 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Operation Pandora Trigger Commandcenter -A [MEAN Application](http://mean.io/) created for [operation-pandora.com](https://www.operation-pandora.com) Arma3 Community +A [MEAN Application](http://mean.io/) created for operation-pandora.com Arma3 Community ## Installation @@ -33,22 +33,22 @@ For production setup run the script, described in _Setup for development_, addin ./docs/opt-cc-environment/3rd-party-install prod -This adds the [`pm2` process manager](http://pm2.keymetrics.io/) to be installed and start the _opt-cc_ server as `pm2` process. +This adds the `pm2` process manager to be installed and start the _opt-cc_ server as `pm2` process. Run the `sudo` command printed as last output to configure the `pm2` process for automatic start on the system, as the current user. ## Development +**NOTE:** Do not use the execution described here in any production environment! It will make the running application highly vulnerable. + Before triggering the environment execution run npm install inside the main folder, to process all needed npm package installations for the program execution. -Do not use the execution described here in any production environment! -It will make the running application highly vulnerable. \ To compile the Angular code and afterwards start the Express server with `nodemon` for development purpose run - npm run dev + npm run dev Any changes on `api` code will trigger an automatic restart of the Express server. diff --git a/docs/infra/nginx-https-cc-site.txt b/docs/infra/nginx-https-cc-site.txt index 9e0f743..286668b 100644 --- a/docs/infra/nginx-https-cc-site.txt +++ b/docs/infra/nginx-https-cc-site.txt @@ -1,4 +1,3 @@ - server { listen 80; server_name cc.noarch.de; @@ -9,6 +8,8 @@ server { listen 443 ssl; server_name cc.noarch.de; + server_tokens off; + ssl on; ssl_certificate /etc/letsencrypt/live/noarch.de/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/noarch.de/privkey.pem; From d3f091253afef3bcb416cfb970a707e9d781b7cb Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 16:13:33 +0100 Subject: [PATCH 5/8] revert hyperlink html change --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ec5030..b052075 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Operation Pandora Trigger Commandcenter -A [MEAN Application](http://mean.io/) created for operation-pandora.com Arma3 Community +A [MEAN Application](http://mean.io/) created for [operation-pandora.com](https://www.operation-pandora.com) Arma3 Community ## Installation @@ -33,7 +33,7 @@ For production setup run the script, described in _Setup for development_, addin ./docs/opt-cc-environment/3rd-party-install prod -This adds the `pm2` process manager to be installed and start the _opt-cc_ server as `pm2` process. +This adds the [`pm2` process manager](http://pm2.keymetrics.io/) to be installed and start the _opt-cc_ server as `pm2` process. Run the `sudo` command printed as last output to configure the `pm2` process for automatic start on the system, as the current user. ## Development From b49a17eecbe30743c2488968e8d8378fe96ae580 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 16:26:40 +0100 Subject: [PATCH 6/8] Add test run todo for readme.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b052075..4a4cf66 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ All steps described here are working with a Debian based Linux system ### Setup required 3rd Party Software -#### Setup for development +#### Setup for Development Run the installation script located in the docs folder: @@ -19,7 +19,7 @@ Run the installation script located in the docs folder: It installs NPM, Node and MongoDB on latest versions. In addition, it sets up the mongo deamon to start up automatically with the system. -#### Setup for production +#### Setup for Production **NOTE:** It his highly recommended not to run the following steps as _root_ user! @@ -38,6 +38,7 @@ Run the `sudo` command printed as last output to configure the `pm2` process for ## Development +### Run and Modify Application **NOTE:** Do not use the execution described here in any production environment! It will make the running application highly vulnerable. Before triggering the environment execution run @@ -58,6 +59,9 @@ Changes on `static` code can be submitted with The page must be reloaded after this build step is finished, in order to make changes visible. +## Run Tests +_TODO_ + ## License Information From ad3dd61c32e42ae85601521811592af3b9133c15 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 16:43:39 +0100 Subject: [PATCH 7/8] update ngx-chart for firefox cursor-pos fix; remove highscore box horizontal scrollbar as firefox fix --- static/package-lock.json | 819 +++++++++++++++++- static/package.json | 2 +- .../highscore/highscore.component.css | 4 + 3 files changed, 821 insertions(+), 4 deletions(-) diff --git a/static/package-lock.json b/static/package-lock.json index c956c85..ea9bd46 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -208,9 +208,32 @@ } }, "@swimlane/ngx-charts": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-6.1.0.tgz", - "integrity": "sha512-918ksaRl8RvGWGOjpUCywTS1MnLTqHki53XXibyhZkmHGSP5yLkcArBAFhFLvtQTTbuX8KSz2WFKxwaJ3JuJFw==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-7.1.0.tgz", + "integrity": "sha512-1WMIsqcAczveN4M2WJO51BvqsFfTJ8mmq/nmvkaNBYoG98n1USoqo52itxzKJKLRnImItZnYdl+pW9WueyRlsw==", + "requires": { + "d3-array": "1.2.1", + "d3-brush": "1.0.4", + "d3-color": "1.0.3", + "d3-force": "1.1.0", + "d3-format": "1.2.0", + "d3-hierarchy": "1.1.5", + "d3-interpolate": "1.1.5", + "d3-scale": "1.0.6", + "d3-selection": "1.1.0", + "d3-shape": "1.2.0", + "d3-time-format": "2.1.1" + }, + "dependencies": { + "d3-time-format": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz", + "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==", + "requires": { + "d3-time": "1.0.7" + } + } + } }, "@swimlane/ngx-datatable": { "version": "11.0.4", @@ -1160,6 +1183,7 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", + "fsevents": "1.1.3", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -3164,6 +3188,795 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", + "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "optional": true, + "requires": { + "nan": "2.7.0", + "node-pre-gyp": "0.6.39" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "bundled": true, + "optional": true, + "requires": { + "detect-libc": "1.0.2", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "bundled": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } + }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", diff --git a/static/package.json b/static/package.json index 818a180..10057fe 100644 --- a/static/package.json +++ b/static/package.json @@ -23,7 +23,7 @@ "@angular/platform-browser": "^5.0.0", "@angular/platform-browser-dynamic": "^5.0.0", "@angular/router": "^5.0.0", - "@swimlane/ngx-charts": "^6.1.0", + "@swimlane/ngx-charts": "^7.1.0", "@swimlane/ngx-datatable": "^11.0.4", "bootstrap": "^3.3.7", "d3": "^4.11.0", diff --git a/static/src/app/statistic/highscore/highscore.component.css b/static/src/app/statistic/highscore/highscore.component.css index 7392fa2..5bbfa98 100644 --- a/static/src/app/statistic/highscore/highscore.component.css +++ b/static/src/app/statistic/highscore/highscore.component.css @@ -43,6 +43,10 @@ ngx-datatable { top: 10px; } +:host /deep/ .datatable-body { + overflow-x: hidden; +} + :host /deep/ .datatable-body-row { color: #222222; border-bottom: 1px solid grey; From 82fdec3d620e4708851b76c43eb7c1fc39b5859c Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 16 Feb 2018 16:44:17 +0100 Subject: [PATCH 8/8] update visible version # --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2bb779..f4a8bf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.6.10", + "version": "1.6.11", "author": "Florian Hartwich ", "private": true, "scripts": {