diff --git a/.angular-cli.json b/.angular-cli.json index 9dfe689..4de643c 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -35,7 +35,7 @@ ], "stylePreprocessorOptions": { "includePaths": [ - "../node_modules/bourbon/app/assets/stylesheets/", + "../node_modules/bourbon/core/", "../node_modules/bourbon-neat/app/assets/stylesheets/", "../node_modules/bourbon-neat/app/assets/stylesheets/", "../node_modules/scss-base/src/", diff --git a/.travis.yml b/.travis.yml index c3e536a..fc0ae39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_script: - nvm use 4 - npm i -g npm@4 - npm i + - npm i -g @angular/cli - touch tests.db - chmod a+w tests.db script: diff --git a/package-lock.json b/package-lock.json index 3a5b0bb..4045032 100644 --- a/package-lock.json +++ b/package-lock.json @@ -291,9 +291,9 @@ } }, "@types/node": { - "version": "9.4.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.4.6.tgz", - "integrity": "sha512-CTUtLb6WqCCgp6P59QintjHWqzf4VL1uPA27bipLAPxFqrtK1gEYllePzTICGqQ8rYsCbpnsNypXjjDzGAAjEQ==", + "version": "9.4.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.4.7.tgz", + "integrity": "sha512-4Ba90mWNx8ddbafuyGGwjkZMigi+AWfYLSDCpovwsE63ia8w93r3oJ8PIAQc3y8U+XHcnMOHPIzNe3o438Ywcw==", "dev": true }, "@types/q": { @@ -1172,9 +1172,9 @@ } }, "bourbon": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz", - "integrity": "sha1-TaOAAp6SwMj5dkx3lFGhNLEefMM=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-5.0.0.tgz", + "integrity": "sha512-1BOgwfr0dvAqdL3mj0HZbuYJjt/Ilz6fLhSz55kIo9zYTYsQDg4AzrpwepWJoVLY3tKKYV5Z/0dKHEUz3ecXAg==", "dev": true }, "bourbon-neat": { @@ -6111,12 +6111,20 @@ "exit": "0.1.2", "glob": "7.1.2", "jasmine-core": "2.8.0" + }, + "dependencies": { + "jasmine-core": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz", + "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=", + "dev": true + } } }, "jasmine-core": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz", - "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz", + "integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=", "dev": true }, "jasmine-spec-reporter": { @@ -7470,11 +7478,6 @@ "integrity": "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=", "dev": true }, - "node-normalize-scss": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/node-normalize-scss/-/node-normalize-scss-3.0.0.tgz", - "integrity": "sha1-EZv11btxFgRl6fEgTEH2kdJuz3c=" - }, "node-sass": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz", @@ -9424,9 +9427,9 @@ } }, "scss-base": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/scss-base/-/scss-base-1.3.4.tgz", - "integrity": "sha1-LHReKgTGPmkmB0UpNtLFF3lnYeE=" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/scss-base/-/scss-base-1.4.0.tgz", + "integrity": "sha512-C25LNmfyysHr8xj1GOHBOXaf05FwX2hueDHavPhYk5BVHYGSYxWZOAf5TNYW8z50pewCoh8xRR/1hXcVP2pwfw==" }, "scss-tokenizer": { "version": "0.2.3", @@ -10945,9 +10948,9 @@ "dev": true }, "typescript": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", - "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index af44882..ce73819 100644 --- a/package.json +++ b/package.json @@ -31,49 +31,48 @@ "postinstall": "cd src/api/ && composer install && cd ../.." }, "dependencies": { - "@angular/animations": "^5.2.0", - "@angular/common": "^5.2.0", - "@angular/compiler": "^5.2.0", - "@angular/core": "^5.2.0", - "@angular/forms": "^5.2.0", - "@angular/http": "^5.2.0", - "@angular/platform-browser": "^5.2.0", - "@angular/platform-browser-dynamic": "^5.2.0", - "@angular/router": "^5.2.0", + "@angular/animations": "^5.2.8", + "@angular/common": "^5.2.8", + "@angular/compiler": "^5.2.8", + "@angular/core": "^5.2.8", + "@angular/forms": "^5.2.8", + "@angular/http": "^5.2.8", + "@angular/platform-browser": "^5.2.8", + "@angular/platform-browser-dynamic": "^5.2.8", + "@angular/router": "^5.2.8", "chartist": "^0.11.0", "chartist-plugin-tooltips": "^0.0.17", "classlist.js": "^1.1.20150312", - "core-js": "^2.4.1", + "core-js": "^2.5.3", "dragula": "^3.7.2", "highlight.js": "^9.12.0", "marked": "^0.3.17", "ng2-dragula": "^1.5.0", - "node-normalize-scss": "^3.0.0", "rxjs": "^5.5.6", - "scss-base": "^1.3.4", - "zone.js": "^0.8.19" + "scss-base": "^1.4.0", + "zone.js": "^0.8.20" }, "devDependencies": { "@angular/cli": "~1.7.3", - "@angular/compiler-cli": "^5.2.0", - "@angular/language-service": "^5.2.0", - "@types/jasmine": "~2.8.3", - "@types/jasminewd2": "~2.0.2", - "@types/node": "~9.4.6", - "bourbon": "4.3.4", + "@angular/compiler-cli": "^5.2.8", + "@angular/language-service": "^5.2.8", + "@types/jasmine": "~2.8.6", + "@types/jasminewd2": "~2.0.3", + "@types/node": "~9.4.7", + "bourbon": "5.0.0", "bourbon-neat": "1.9.0", - "codelyzer": "^4.0.1", - "jasmine-core": "~2.8.0", + "codelyzer": "^4.2.1", + "jasmine-core": "~3.1.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~2.0.0", "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "^1.2.1", - "karma-jasmine": "~1.1.0", + "karma-coverage-istanbul-reporter": "^1.4.2", + "karma-jasmine": "~1.1.1", "karma-jasmine-html-reporter": "^0.2.2", "karma-phantomjs-launcher": "^1.0.4", "protractor": "~5.3.0", "ts-node": "~5.0.1", "tslint": "~5.9.1", - "typescript": "^2.6.2" + "typescript": "^2.7.2" } } diff --git a/src/index.html b/src/index.html index 6e25eba..41bb129 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@