From cca0de9812362a347f10e81d5b3302caa7995a5e Mon Sep 17 00:00:00 2001 From: Chris Chen Date: Sat, 6 Apr 2024 10:07:36 -0700 Subject: [PATCH] Update libs --- package-lock.json | 153 ++++++++++-------- package.json | 15 +- .../components/footer/footer.component.scss | 6 +- .../components/header/header.component.scss | 8 +- .../layouts/one-column/one-column.layout.scss | 6 +- .../@theme/layouts/plain/plain.layout.scss | 6 +- .../three-columns/three-columns.layout.scss | 6 +- .../two-columns/two-columns.layout.scss | 6 +- src/app/@theme/styles/styles.scss | 25 ++- src/app/@theme/styles/themes.scss | 148 +++++++++-------- src/app/admin/admin.module.ts | 2 - .../assign-member-cell-group.component.ts | 1 - src/app/app.module.ts | 1 - src/app/games/games.module.ts | 2 - src/app/happiness/happiness.module.ts | 1 - .../styles/form-controls/_rbj-inputs.scss | 2 +- .../styles/form-controls/_scrollbars.scss | 28 ++-- src/assets/styles/globals/_heights.scss | 6 +- 18 files changed, 225 insertions(+), 197 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a1bd5b..9375fc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "ngx-admin", "version": "8.0.0", - "hasInstallScript": true, "license": "MIT", "dependencies": { "@angular/animations": "^16.2.12", @@ -40,10 +39,10 @@ "leaflet": "1.2.0", "nebular-icons": "1.1.0", "ng-in-viewport": "^13.0.1", - "ng2-ckeditor": "~1.2.9", + "ng2-ckeditor": "~1.3.7", "ng2-completer": "^9.0.1", "ngx-echarts": "^4.2.2", - "ngx-infinite-scroll": "^13.0.2", + "ngx-infinite-scroll": "^16.0.0", "ngx-mask": "^12.0.0", "node-sass": "^4.14.1", "normalize.css": "6.0.0", @@ -71,18 +70,18 @@ "@types/jasmine": "~3.3.0", "@types/jasminewd2": "2.0.3", "@types/leaflet": "1.2.3", - "@types/node": "^12.12.70", + "@types/node": "^18.19.30", "codelyzer": "^6.0.2", "conventional-changelog-cli": "1.3.4", "husky": "0.13.3", - "jasmine-core": "~3.6.0", + "jasmine-core": "~5.1.2", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.3.19", "karma-chrome-launcher": "~3.1.1", "karma-cli": "1.0.1", "karma-coverage-istanbul-reporter": "~3.0.2", - "karma-jasmine": "~4.0.2", - "karma-jasmine-html-reporter": "^1.7.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "^2.1.0", "npm-run-all": "4.0.2", "protractor": "~7.0.0", "rimraf": "2.6.1", @@ -4877,6 +4876,12 @@ "@types/node": "*" } }, + "node_modules/@types/ckeditor": { + "version": "4.9.10", + "resolved": "https://registry.npmjs.org/@types/ckeditor/-/ckeditor-4.9.10.tgz", + "integrity": "sha512-dcOPCXM0Cr5Z0i6eF/aW5LvECrS+cdl2Gi7lU+rEUNWby0w9Yl6mBubjrs29OVAducpuZjB4mfDayE+o4/gGdQ==", + "peer": true + }, "node_modules/@types/component-emitter": { "version": "1.2.11", "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", @@ -5024,9 +5029,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "version": "18.19.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz", + "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/node-forge": { "version": "1.3.11", @@ -13868,9 +13876,9 @@ } }, "node_modules/jasmine-core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz", - "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz", + "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==", "dev": true }, "node_modules/jasmine-spec-reporter": { @@ -14364,31 +14372,37 @@ } }, "node_modules/karma-jasmine": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz", - "integrity": "sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz", + "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==", "dev": true, "dependencies": { - "jasmine-core": "^3.6.0" + "jasmine-core": "^4.1.0" }, "engines": { - "node": ">= 10" + "node": ">=12" }, "peerDependencies": { - "karma": "*" + "karma": "^6.0.0" } }, "node_modules/karma-jasmine-html-reporter": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz", - "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.1.0.tgz", + "integrity": "sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ==", "dev": true, "peerDependencies": { - "jasmine-core": ">=3.8", - "karma": ">=0.9", - "karma-jasmine": ">=1.1" + "jasmine-core": "^4.0.0 || ^5.0.0", + "karma": "^6.0.0", + "karma-jasmine": "^5.0.0" } }, + "node_modules/karma-jasmine/node_modules/jasmine-core": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz", + "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==", + "dev": true + }, "node_modules/karma-source-map-support": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", @@ -15947,16 +15961,14 @@ } }, "node_modules/ng2-ckeditor": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/ng2-ckeditor/-/ng2-ckeditor-1.2.9.tgz", - "integrity": "sha512-Olsq3fWc7eG8BsVDgCW9NZFuUfay1VJ9c2QlzLbtXoxilwRhtHJsPxuAjE9DjxhQWgYa0TSgosk43JKkBqT2lQ==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ng2-ckeditor/-/ng2-ckeditor-1.3.7.tgz", + "integrity": "sha512-3VdJLc/MUlFBbLg0rDwO3L+G3ofIn/zulV8rz/L4QVScQHpbJXGLJe6hIYNnAWOPaYFoGpczPC03YR+px3oJdQ==", "dependencies": { - "tslib": "^2.0.0" + "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^10.0.4", - "@angular/core": "^10.0.4", - "@angular/forms": "^10.0.4" + "@types/ckeditor": "^4.9.10" } }, "node_modules/ng2-completer": { @@ -15988,15 +16000,15 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/ngx-infinite-scroll": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-13.0.2.tgz", - "integrity": "sha512-RSezL0DUxo1B57SyRMOSt3a/5lLXJs6P8lavtxOh10uhX+hn662cMYHUO7LiU2a/vJxef2R020s4jkUqhnXTcg==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz", + "integrity": "sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^13.1.0", - "@angular/core": "^13.1.0" + "@angular/common": ">=16.0.0 <17.0.0", + "@angular/core": ">=16.0.0 <17.0.0" } }, "node_modules/ngx-mask": { @@ -22834,10 +22846,7 @@ "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true, - "optional": true, - "peer": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", @@ -27421,6 +27430,12 @@ "@types/node": "*" } }, + "@types/ckeditor": { + "version": "4.9.10", + "resolved": "https://registry.npmjs.org/@types/ckeditor/-/ckeditor-4.9.10.tgz", + "integrity": "sha512-dcOPCXM0Cr5Z0i6eF/aW5LvECrS+cdl2Gi7lU+rEUNWby0w9Yl6mBubjrs29OVAducpuZjB4mfDayE+o4/gGdQ==", + "peer": true + }, "@types/component-emitter": { "version": "1.2.11", "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", @@ -27568,9 +27583,12 @@ "dev": true }, "@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" + "version": "18.19.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz", + "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==", + "requires": { + "undici-types": "~5.26.4" + } }, "@types/node-forge": { "version": "1.3.11", @@ -34392,9 +34410,9 @@ } }, "jasmine-core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz", - "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz", + "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==", "dev": true }, "jasmine-spec-reporter": { @@ -34851,18 +34869,26 @@ } }, "karma-jasmine": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz", - "integrity": "sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz", + "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==", "dev": true, "requires": { - "jasmine-core": "^3.6.0" + "jasmine-core": "^4.1.0" + }, + "dependencies": { + "jasmine-core": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz", + "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==", + "dev": true + } } }, "karma-jasmine-html-reporter": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz", - "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.1.0.tgz", + "integrity": "sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ==", "dev": true, "requires": {} }, @@ -36045,11 +36071,11 @@ } }, "ng2-ckeditor": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/ng2-ckeditor/-/ng2-ckeditor-1.2.9.tgz", - "integrity": "sha512-Olsq3fWc7eG8BsVDgCW9NZFuUfay1VJ9c2QlzLbtXoxilwRhtHJsPxuAjE9DjxhQWgYa0TSgosk43JKkBqT2lQ==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ng2-ckeditor/-/ng2-ckeditor-1.3.7.tgz", + "integrity": "sha512-3VdJLc/MUlFBbLg0rDwO3L+G3ofIn/zulV8rz/L4QVScQHpbJXGLJe6hIYNnAWOPaYFoGpczPC03YR+px3oJdQ==", "requires": { - "tslib": "^2.0.0" + "tslib": "^2.3.0" } }, "ng2-completer": { @@ -36074,9 +36100,9 @@ } }, "ngx-infinite-scroll": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-13.0.2.tgz", - "integrity": "sha512-RSezL0DUxo1B57SyRMOSt3a/5lLXJs6P8lavtxOh10uhX+hn662cMYHUO7LiU2a/vJxef2R020s4jkUqhnXTcg==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz", + "integrity": "sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==", "requires": { "tslib": "^2.3.0" } @@ -41361,10 +41387,7 @@ "undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true, - "optional": true, - "peer": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", diff --git a/package.json b/package.json index 214fad2..6b41066 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ "docs": "compodoc -p src/tsconfig.app.json -d docs", "docs:serve": "compodoc -p src/tsconfig.app.json -d docs -s", "prepush": "npm run lint:ci", - "release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s", - "postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\"" + "release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s" }, "dependencies": { "@angular/animations": "^16.2.12", @@ -60,10 +59,10 @@ "leaflet": "1.2.0", "nebular-icons": "1.1.0", "ng-in-viewport": "^13.0.1", - "ng2-ckeditor": "~1.2.9", + "ng2-ckeditor": "~1.3.7", "ng2-completer": "^9.0.1", "ngx-echarts": "^4.2.2", - "ngx-infinite-scroll": "^13.0.2", + "ngx-infinite-scroll": "^16.0.0", "ngx-mask": "^12.0.0", "node-sass": "^4.14.1", "normalize.css": "6.0.0", @@ -91,18 +90,18 @@ "@types/jasmine": "~3.3.0", "@types/jasminewd2": "2.0.3", "@types/leaflet": "1.2.3", - "@types/node": "^12.12.70", + "@types/node": "^18.19.30", "codelyzer": "^6.0.2", "conventional-changelog-cli": "1.3.4", "husky": "0.13.3", - "jasmine-core": "~3.6.0", + "jasmine-core": "~5.1.2", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.3.19", "karma-chrome-launcher": "~3.1.1", "karma-cli": "1.0.1", "karma-coverage-istanbul-reporter": "~3.0.2", - "karma-jasmine": "~4.0.2", - "karma-jasmine-html-reporter": "^1.7.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "^2.1.0", "npm-run-all": "4.0.2", "protractor": "~7.0.0", "rimraf": "2.6.1", diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss index c56f5d8..70cae37 100644 --- a/src/app/@theme/components/footer/footer.component.scss +++ b/src/app/@theme/components/footer/footer.component.scss @@ -1,6 +1,6 @@ -@import '../../styles/themes'; -@import '~@nebular/theme/styles/global/breakpoints'; -@import '~bootstrap/scss/mixins/breakpoints'; +@import "../../styles/themes"; +@import "@nebular/theme/styles/global/breakpoints"; +@import "bootstrap/scss/mixins/breakpoints"; @include nb-install-component() { width: 100%; diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss index 104d2fd..71d7999 100644 --- a/src/app/@theme/components/header/header.component.scss +++ b/src/app/@theme/components/header/header.component.scss @@ -1,6 +1,6 @@ -@import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/breakpoints'; -@import '../../styles/themes'; +@import "bootstrap/scss/mixins/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; +@import "../../styles/themes"; @include nb-install-component() { display: flex; @@ -24,7 +24,7 @@ } ::ng-deep nb-search button { - padding: 0!important; + padding: 0 !important; } .header-container { diff --git a/src/app/@theme/layouts/one-column/one-column.layout.scss b/src/app/@theme/layouts/one-column/one-column.layout.scss index 448cb73..312914d 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.scss +++ b/src/app/@theme/layouts/one-column/one-column.layout.scss @@ -1,6 +1,6 @@ -@import '../../styles/themes'; -@import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import "../../styles/themes"; +@import "bootstrap/scss/mixins/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; @include nb-install-component() { .menu-sidebar ::ng-deep .scrollable { diff --git a/src/app/@theme/layouts/plain/plain.layout.scss b/src/app/@theme/layouts/plain/plain.layout.scss index 448cb73..312914d 100644 --- a/src/app/@theme/layouts/plain/plain.layout.scss +++ b/src/app/@theme/layouts/plain/plain.layout.scss @@ -1,6 +1,6 @@ -@import '../../styles/themes'; -@import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import "../../styles/themes"; +@import "bootstrap/scss/mixins/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; @include nb-install-component() { .menu-sidebar ::ng-deep .scrollable { diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/src/app/@theme/layouts/three-columns/three-columns.layout.scss index 448cb73..312914d 100644 --- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss +++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss @@ -1,6 +1,6 @@ -@import '../../styles/themes'; -@import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import "../../styles/themes"; +@import "bootstrap/scss/mixins/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; @include nb-install-component() { .menu-sidebar ::ng-deep .scrollable { diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/src/app/@theme/layouts/two-columns/two-columns.layout.scss index 448cb73..312914d 100644 --- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss +++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss @@ -1,6 +1,6 @@ -@import '../../styles/themes'; -@import '~bootstrap/scss/mixins/breakpoints'; -@import '~@nebular/theme/styles/global/breakpoints'; +@import "../../styles/themes"; +@import "bootstrap/scss/mixins/breakpoints"; +@import "@nebular/theme/styles/global/breakpoints"; @include nb-install-component() { .menu-sidebar ::ng-deep .scrollable { diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss index b35d980..7fe5044 100644 --- a/src/app/@theme/styles/styles.scss +++ b/src/app/@theme/styles/styles.scss @@ -1,26 +1,25 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap'); +@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap"); // themes - our custom or/and out of the box themes -@import 'themes'; +@import "themes"; // framework component themes (styles tied to theme variables) -@import '~@nebular/theme/styles/globals'; -@import '~@nebular/auth/styles/globals'; +@import "@nebular/theme/styles/globals"; +@import "@nebular/auth/styles/globals"; -@import '~bootstrap/scss/functions'; -@import '~bootstrap/scss/variables'; -@import '~bootstrap/scss/mixins'; -@import '~bootstrap/scss/grid'; +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; +@import "bootstrap/scss/grid"; // loading progress bar theme -@import './pace.theme'; +@import "./pace.theme"; -@import './layout'; -@import './overrides'; +@import "./layout"; +@import "./overrides"; // install the framework and custom global styles @include nb-install() { - // framework global styles @include nb-theme-global(); @include nb-auth-global(); @@ -30,4 +29,4 @@ @include ngx-pace-theme(); @include nb-overrides(); -}; +} ; diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss index c5d5aa8..8b6cfca 100644 --- a/src/app/@theme/styles/themes.scss +++ b/src/app/@theme/styles/themes.scss @@ -1,88 +1,104 @@ // @nebular theming framework -@import '~@nebular/theme/styles/theming'; +@import "@nebular/theme/styles/theming"; // @nebular out of the box themes -@import '~@nebular/theme/styles/themes'; +@import "@nebular/theme/styles/themes"; -$nb-themes: nb-register-theme(( - layout-padding-top: 2.25rem, +$nb-themes: nb-register-theme( + ( + layout-padding-top: 2.25rem, - menu-item-icon-margin: 0 0.5rem 0 0, + menu-item-icon-margin: 0 0.5rem 0 0, - card-height-tiny: 13.5rem, - card-height-small: 21.1875rem, - card-height-medium: 28.875rem, - card-height-large: 36.5625rem, - card-height-giant: 44.25rem, - card-margin-bottom: 1.875rem, - card-header-with-select-padding-top: 0.5rem, - card-header-with-select-padding-bottom: 0.5rem, + card-height-tiny: 13.5rem, + card-height-small: 21.1875rem, + card-height-medium: 28.875rem, + card-height-large: 36.5625rem, + card-height-giant: 44.25rem, + card-margin-bottom: 1.875rem, + card-header-with-select-padding-top: 0.5rem, + card-header-with-select-padding-bottom: 0.5rem, - select-min-width: 6rem, + select-min-width: 6rem, - slide-out-background: #f7f9fc, - slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, - slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, -), default, default); + slide-out-background: #f7f9fc, + slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, + slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, + ), + default, + default +); -$nb-themes: nb-register-theme(( - layout-padding-top: 2.25rem, +$nb-themes: nb-register-theme( + ( + layout-padding-top: 2.25rem, - menu-item-icon-margin: 0 0.5rem 0 0, + menu-item-icon-margin: 0 0.5rem 0 0, - card-height-tiny: 13.5rem, - card-height-small: 21.1875rem, - card-height-medium: 28.875rem, - card-height-large: 36.5625rem, - card-height-giant: 44.25rem, - card-margin-bottom: 1.875rem, - card-header-with-select-padding-top: 0.5rem, - card-header-with-select-padding-bottom: 0.5rem, + card-height-tiny: 13.5rem, + card-height-small: 21.1875rem, + card-height-medium: 28.875rem, + card-height-large: 36.5625rem, + card-height-giant: 44.25rem, + card-margin-bottom: 1.875rem, + card-header-with-select-padding-top: 0.5rem, + card-header-with-select-padding-bottom: 0.5rem, - select-min-width: 6rem, + select-min-width: 6rem, - slide-out-background: #252547, - slide-out-shadow-color: 2px 0 3px #29157a, - slide-out-shadow-color-rtl: -2px 0 3px #29157a, -), cosmic, cosmic); + slide-out-background: #252547, + slide-out-shadow-color: 2px 0 3px #29157a, + slide-out-shadow-color-rtl: -2px 0 3px #29157a, + ), + cosmic, + cosmic +); -$nb-themes: nb-register-theme(( - layout-padding-top: 2.25rem, +$nb-themes: nb-register-theme( + ( + layout-padding-top: 2.25rem, - menu-item-icon-margin: 0 0.5rem 0 0, + menu-item-icon-margin: 0 0.5rem 0 0, - card-height-tiny: 13.5rem, - card-height-small: 21.1875rem, - card-height-medium: 28.875rem, - card-height-large: 36.5625rem, - card-height-giant: 44.25rem, - card-margin-bottom: 1.875rem, - card-header-with-select-padding-top: 0.5rem, - card-header-with-select-padding-bottom: 0.5rem, + card-height-tiny: 13.5rem, + card-height-small: 21.1875rem, + card-height-medium: 28.875rem, + card-height-large: 36.5625rem, + card-height-giant: 44.25rem, + card-margin-bottom: 1.875rem, + card-header-with-select-padding-top: 0.5rem, + card-header-with-select-padding-bottom: 0.5rem, - select-min-width: 6rem, + select-min-width: 6rem, - slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%), - slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, - slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, -), corporate, corporate); + slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%), + slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, + slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, + ), + corporate, + corporate +); -$nb-themes: nb-register-theme(( - layout-padding-top: 2.25rem, +$nb-themes: nb-register-theme( + ( + layout-padding-top: 2.25rem, - menu-item-icon-margin: 0 0.5rem 0 0, + menu-item-icon-margin: 0 0.5rem 0 0, - card-height-tiny: 13.5rem, - card-height-small: 21.1875rem, - card-height-medium: 28.875rem, - card-height-large: 36.5625rem, - card-height-giant: 44.25rem, - card-margin-bottom: 1.875rem, - card-header-with-select-padding-top: 0.5rem, - card-header-with-select-padding-bottom: 0.5rem, + card-height-tiny: 13.5rem, + card-height-small: 21.1875rem, + card-height-medium: 28.875rem, + card-height-large: 36.5625rem, + card-height-giant: 44.25rem, + card-margin-bottom: 1.875rem, + card-header-with-select-padding-top: 0.5rem, + card-header-with-select-padding-bottom: 0.5rem, - select-min-width: 6rem, + select-min-width: 6rem, - slide-out-background: linear-gradient(270deg, #222b45 0%, #151a30 100%), - slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, - slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, -), dark, dark); + slide-out-background: linear-gradient(270deg, #222b45 0%, #151a30 100%), + slide-out-shadow-color: 0 4px 14px 0 #8f9bb3, + slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3, + ), + dark, + dark +); diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts index e4c8622..831ab0f 100644 --- a/src/app/admin/admin.module.ts +++ b/src/app/admin/admin.module.ts @@ -12,7 +12,6 @@ import { FancyTableModule } from '../ui/fancy-table/fancy-table.module'; import { FamilyMembersComponent } from './family-members/family-members.component'; import { FamilyMemberEditorComponent } from './family-members/family-member-editor/family-member-editor.component'; import { DropDownListModule } from '../ui/drop-down-list/drop-down-list.module'; -import { NgxMaskModule } from 'ngx-mask'; import { PastoralDomainsComponent } from './pastoral-domains/pastoral-domains.component'; import { PastoralDomainEditorComponent } from './pastoral-domains/pastoral-domain-editor/pastoral-domain-editor.component'; import { AssignMemberCellGroupComponent } from './family-members/assign-member-cell-group/assign-member-cell-group.component'; @@ -61,7 +60,6 @@ import { LineMessagingAccountEditorComponent } from './lines/line-messaging-acco AlertDlgModule, FancyTableModule, DropDownListModule, - NgxMaskModule, CurrencyInputModule, MaskDirectiveModule, DateInputModule diff --git a/src/app/admin/family-members/assign-member-cell-group/assign-member-cell-group.component.ts b/src/app/admin/family-members/assign-member-cell-group/assign-member-cell-group.component.ts index 8533415..6b2d414 100644 --- a/src/app/admin/family-members/assign-member-cell-group/assign-member-cell-group.component.ts +++ b/src/app/admin/family-members/assign-member-cell-group/assign-member-cell-group.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { NbDialogRef } from '@nebular/theme'; import { DropDownOption } from '../../../entity/dropDownOption'; import { DomainMemberRelationship, PastoralDomain } from '../../../entity/PastoralDomain'; -import { DialogComponent } from '../../../pages/modal-overlays/dialog/dialog.component'; import { ArrayUtils } from '../../../utilities/array-utils'; import { first } from "rxjs/operators" import { FamilyMember } from '../../../entity/Member'; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d3cba49..5953632 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -74,7 +74,6 @@ const socialLinks = [ closeOnBackdropClick: false, closeOnEsc: false }), - NgxMaskModule.forRoot(maskConfig), NbDateFnsDateModule.forRoot({ format: 'MM/dd/yyyy' }), CoreModule.forRoot(), ThemeModule.forRoot(), diff --git a/src/app/games/games.module.ts b/src/app/games/games.module.ts index 590a4e2..885cf1e 100644 --- a/src/app/games/games.module.ts +++ b/src/app/games/games.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { QRCodeModule } from 'angular2-qrcode'; import { GamesRoutingModule } from './games-routing.module'; import { GamesComponent } from './games.component'; import { FormsModule } from '@angular/forms'; @@ -90,7 +89,6 @@ import { MobStandInfoComponent } from './massive-darkness2/mobs/mob-stand-info/m CurrencyInputModule, NbDialogModule.forRoot(), AlertDlgModule, - QRCodeModule, DropDownListModule ] }) diff --git a/src/app/happiness/happiness.module.ts b/src/app/happiness/happiness.module.ts index bd3cf9c..e9e3a37 100644 --- a/src/app/happiness/happiness.module.ts +++ b/src/app/happiness/happiness.module.ts @@ -54,7 +54,6 @@ import { AddNewCostDlgComponent } from './week-task-editor/add-new-cost-dlg/add- AlertDlgModule, FancyTableModule, DropDownListModule, - NgxMaskModule, CurrencyInputModule, MaskDirectiveModule, DateInputModule, diff --git a/src/assets/styles/form-controls/_rbj-inputs.scss b/src/assets/styles/form-controls/_rbj-inputs.scss index 177c9d9..cfec76c 100644 --- a/src/assets/styles/form-controls/_rbj-inputs.scss +++ b/src/assets/styles/form-controls/_rbj-inputs.scss @@ -1,4 +1,4 @@ -@use '../../themes' as *; +@import "../../../app/@theme/styles/themes"; input.rbj-CbField, textarea.rbj-CbField { diff --git a/src/assets/styles/form-controls/_scrollbars.scss b/src/assets/styles/form-controls/_scrollbars.scss index 26bb505..5198bbc 100644 --- a/src/assets/styles/form-controls/_scrollbars.scss +++ b/src/assets/styles/form-controls/_scrollbars.scss @@ -1,19 +1,17 @@ -@use '../../themes' as *; +@use "../../../app/@theme/styles/themes"; - ::-webkit-scrollbar { - width: 1rem!important; - } +::-webkit-scrollbar { + width: 1rem !important; +} - ::-webkit-scrollbar-thumb { - background-color: nb-theme(color-primary-300)!important; - } - - ::-webkit-scrollbar-track { - background: nb-theme(color-primary-200)!important; - } - - .label { - color: #736f6f; - } +::-webkit-scrollbar-thumb { + background-color: nb-theme(color-primary-300) !important; +} +::-webkit-scrollbar-track { + background: nb-theme(color-primary-200) !important; +} +.label { + color: #736f6f; +} diff --git a/src/assets/styles/globals/_heights.scss b/src/assets/styles/globals/_heights.scss index 270b64b..2a2e1c3 100644 --- a/src/assets/styles/globals/_heights.scss +++ b/src/assets/styles/globals/_heights.scss @@ -33,14 +33,14 @@ $i: 200; $i: 50; @while $i < 100 { .g-height-#{$i}x#{$infix} { - height: #{$i} * 1%; + height: #{$i}#{"%"}; } .g-max-height-#{$i}x#{$infix} { - max-height: #{$i} * 1%; + max-height: #{$i}#{"%"}; } .g-min-height-#{$i}x#{$infix} { - min-height: #{$i} * 1%; + min-height: #{$i}#{"%"}; } $i: $i + 10;