diff --git a/angular.json b/angular.json index 0a59bea..41c2705 100644 --- a/angular.json +++ b/angular.json @@ -1,168 +1,187 @@ { - "$schema":"./node_modules/@angular/cli/lib/config/schema.json", - "version":1, - "newProjectRoot":"", - "projects":{ - "angular5-example":{ - "root":"apps/angular5-example", - "sourceRoot":"apps/angular5-example/src", - "projectType":"application", - "architect":{ - "build":{ - "builder":"@angular-devkit/build-angular:browser", - "options":{ - "outputPath":"dist/apps/angular5-example", - "index":"apps/angular5-example/src/index.html", - "main":"apps/angular5-example/src/main.ts", - "polyfills":"apps/angular5-example/src/polyfills.ts", - "tsConfig":"apps/angular5-example/tsconfig.app.json", - "assets":[ - - ], - "styles":[ - + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "", + "projects": { + "angular5-example": { + "root": "apps/angular5-example", + "sourceRoot": "apps/angular5-example/src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/apps/angular5-example", + "index": "apps/angular5-example/src/index.html", + "main": "apps/angular5-example/src/main.ts", + "polyfills": "apps/angular5-example/src/polyfills.ts", + "tsConfig": "apps/angular5-example/tsconfig.app.json", + "assets": [ + "apps/angular5-example/src/favicon.ico", + "apps/angular5-example/src/assets", + "apps/angular5-example/src/assets/images", + "apps/angular5-example/src/assets/fontawesome" ], - "scripts":[ - + "styles": [ + "apps/angular5-example/src/styles.scss" ], - "vendorChunk":true, - "extractLicenses":false, - "buildOptimizer":false, - "sourceMap":true, - "optimization":false, - "namedChunks":true, - "aot":false + "scripts": [], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true, + "aot": false }, - "configurations":{ - "production":{ - "budgets":[ + "configurations": { + "production": { + "budgets": [ { - "type":"anyComponentStyle", - "maximumWarning":"6kb" + "type": "anyComponentStyle", + "maximumWarning": "6kb" } ], - "fileReplacements":[ + "fileReplacements": [ { - "replace":"apps/angular5-example/src/environments/environment.ts", - "with":"apps/angular5-example/src/environments/environment.prod.ts" + "replace": "apps/angular5-example/src/environments/environment.ts", + "with": "apps/angular5-example/src/environments/environment.prod.ts" } ], - "optimization":true, - "outputHashing":"all", - "sourceMap":false, - "namedChunks":false, - "aot":true, - "extractLicenses":true, - "vendorChunk":false, - "buildOptimizer":true + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true }, - "test":{ - "budgets":[ + "test": { + "budgets": [ { - "type":"anyComponentStyle", - "maximumWarning":"6kb" + "type": "anyComponentStyle", + "maximumWarning": "6kb" } ], - "fileReplacements":[ + "fileReplacements": [ { - "replace":"apps/angular5-example/src/environments/environment.ts", - "with":"apps/angular5-example/src/environments/environment.prod.ts" + "replace": "apps/angular5-example/src/environments/environment.ts", + "with": "apps/angular5-example/src/environments/environment.prod.ts" } ], - "optimization":true, - "outputHashing":"all", - "sourceMap":false, - "namedChunks":false, - "aot":true, - "extractLicenses":true, - "vendorChunk":false, - "buildOptimizer":true + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true }, - "development":{ - "budgets":[ + "development": { + "budgets": [ { - "type":"anyComponentStyle", - "maximumWarning":"6kb" + "type": "anyComponentStyle", + "maximumWarning": "6kb" } ], - "fileReplacements":[ + "fileReplacements": [ { - "replace":"libs/environments/src/environment.ts", - "with":"libs/environments/src/environment.dev.ts" + "replace": "libs/environments/src/environment.ts", + "with": "libs/environments/src/environment.dev.ts" } ], - "optimization":true, - "outputHashing":"all", - "sourceMap":false, - "namedChunks":false, - "aot":true, - "extractLicenses":true, - "vendorChunk":false, - "buildOptimizer":true + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true } } }, - "serve":{ - "builder":"@angular-devkit/build-angular:dev-server", - "options":{ - "browserTarget":"angular5-example:build" + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "angular5-example:build" }, - "configurations":{ - "production":{ - "browserTarget":"angular5-example:build:production" + "configurations": { + "production": { + "browserTarget": "angular5-example:build:production" }, - "test":{ - "browserTarget":"angular5-example:build:test" + "test": { + "browserTarget": "angular5-example:build:test" }, - "development":{ - "browserTarget":"angular5-example:build:development" + "development": { + "browserTarget": "angular5-example:build:development" } } }, - "extract-i18n":{ - "builder":"@angular-devkit/build-angular:extract-i18n", - "options":{ - "browserTarget":"angular5-example:build" + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "angular5-example:build" } }, - "test":{ - "builder":"@angular-devkit/build-angular:karma", - "options":{ - "main":"apps/angular5-example/src/test.ts", - "polyfills":"apps/angular5-example/src/polyfills.ts", - "tsConfig":"apps/angular5-example/tsconfig.spec.json", - "karmaConfig":"apps/angular5-example/karma.conf.js", - "codeCoverage":true, - "browsers":"ChromeHeadlessNoSandbox", - "styles":[ - "apps/angular5-example/src/styles.scss" - ], - "scripts":[ - - ], - "assets":[ + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "apps/angular5-example/src/test.ts", + "polyfills": "apps/angular5-example/src/polyfills.ts", + "tsConfig": "apps/angular5-example/tsconfig.spec.json", + "karmaConfig": "apps/angular5-example/karma.conf.js", + "codeCoverage": true, + "browsers": "ChromeHeadlessNoSandbox", + "styles": ["apps/angular5-example/src/styles.scss"], + "scripts": [], + "assets": [ "apps/angular5-example/src/favicon.ico", "apps/angular5-example/src/assets" ] } }, - "lint":{ - "builder":"@nrwl/linter:eslint", - "options":{ - "lintFilePatterns":[ + "lint": { + "builder": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": [ "apps/angular5-example/**/*.ts", "apps/angular5-example/**/*.html" ] } } } + }, + "angular-star-rating": { + "projectType": "library", + "root": "libs/angular-star-rating", + "sourceRoot": "libs/angular-star-rating/src", + "architect": { + "lint": { + "builder": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": [ + "libs/angular-star-rating/**/*.ts", + "libs/angular-star-rating/**/*.html" + ] + } + }, + "test": { + "builder": "@nrwl/jest:jest", + "options": { + "jestConfig": "libs/angular-star-rating/jest.config.js", + "passWithNoTests": true, + "codeCoverage": true + } + } + } } }, - "defaultProject":"angular5-example", - "schematics":{ - - }, - "cli":{ - "defaultCollection":"@nrwl/angular" + "defaultProject": "angular5-example", + "schematics": {}, + "cli": { + "defaultCollection": "@nrwl/angular" } } diff --git a/apps/angular5-example/src/app/components/property-bindings/property-bindings.component.ts b/apps/angular5-example/src/app/components/property-bindings/property-bindings.component.ts index 4a1a664..965c83f 100644 --- a/apps/angular5-example/src/app/components/property-bindings/property-bindings.component.ts +++ b/apps/angular5-example/src/app/components/property-bindings/property-bindings.component.ts @@ -6,7 +6,7 @@ import { } from '@angular-star-rating-lib/angular-star-rating'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { Subject } from 'rxjs/Subject'; +import { Subject } from 'rxjs'; import 'rxjs/add/operator/takeUntil'; import { starRatingColor, diff --git a/apps/angular5-example/src/assets/fontawesome/fontawesome-all.min.css b/apps/angular5-example/src/assets/fontawesome/css/fontawesome-all.min.css similarity index 100% rename from apps/angular5-example/src/assets/fontawesome/fontawesome-all.min.css rename to apps/angular5-example/src/assets/fontawesome/css/fontawesome-all.min.css diff --git a/apps/angular5-example/src/styles.scss b/apps/angular5-example/src/styles.scss index 910ce91..b1d5fa1 100644 --- a/apps/angular5-example/src/styles.scss +++ b/apps/angular5-example/src/styles.scss @@ -1,20 +1,27 @@ /* You can add global styles to this file, and also import other style files */ -@import "~css-star-rating/scss/star-rating"; +// TODO after merge of css-star-rating. +// @import "~css-star-rating/scss/star-rating"; +@import "~css-star-rating/css/star-rating.min.css"; @import "~bootstrap/scss/bootstrap"; -$fa-font-path: "assets/fontawesome/webfonts"; -@import "assets/fontawesome/scss/fontawesome"; -@import "assets/fontawesome/scss/fa-brands"; -@import "assets/fontawesome/scss/fa-regular"; -@import "assets/fontawesome/scss/fa-solid"; +$fa-font-path: "assets/fontawesome/webfonts"; +@import "assets/fontawesome/css/fontawesome-all.min.css"; +// @import "assets/fontawesome/scss/fontawesome"; +// @import "assets/fontawesome/scss/fa-brands"; +// @import "assets/fontawesome/scss/fa-regular"; +// @import "assets/fontawesome/scss/fa-solid"; -#main-container, html, body { - height:100%; - margin:0; +#main-container, +html, +body { + height: 100%; + margin: 0; } + body { padding-top: 3.5rem; } + #main-container { display: flex; flex-direction: column;