+
+
+
+
+
+
9.823
+
Members online
+
+
+
+
+
-
-
-
-
-
-
9.823
-
Members online
-
-
-
diff --git a/src/app/views/dashboard/dashboard.component.ts b/src/app/views/dashboard/dashboard.component.ts
index 46ab28958..0f657192a 100644
--- a/src/app/views/dashboard/dashboard.component.ts
+++ b/src/app/views/dashboard/dashboard.component.ts
@@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
import { getStyle, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities';
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips';
@@ -178,7 +177,8 @@ export class DashboardComponent implements OnInit {
public barChart1Data: Array
= [
{
data: [78, 81, 80, 45, 34, 12, 40, 78, 81, 80, 45, 34, 12, 40, 12, 40],
- label: 'Series A'
+ label: 'Series A',
+ barPercentage: 0.6,
}
];
public barChart1Labels: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16'];
@@ -191,7 +191,6 @@ export class DashboardComponent implements OnInit {
scales: {
xAxes: [{
display: false,
- barPercentage: 0.6,
}],
yAxes: [{
display: false
diff --git a/src/app/views/dashboard/dashboard.module.ts b/src/app/views/dashboard/dashboard.module.ts
index 24db860b5..287b8a193 100644
--- a/src/app/views/dashboard/dashboard.module.ts
+++ b/src/app/views/dashboard/dashboard.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
-import { ChartsModule } from 'ng2-charts/ng2-charts';
+import { ChartsModule } from 'ng2-charts';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { ButtonsModule } from 'ngx-bootstrap/buttons';
diff --git a/src/app/views/icons/coreui-icons.component.html b/src/app/views/icons/coreui-icons.component.html
index ef9afe81e..d3e43a0d1 100644
--- a/src/app/views/icons/coreui-icons.component.html
+++ b/src/app/views/icons/coreui-icons.component.html
@@ -3,413 +3,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
yen
+
+
+
+
+
{{ toKebabCase(icon[0]) }}
-
diff --git a/src/app/views/icons/coreui-icons.component.scss b/src/app/views/icons/coreui-icons.component.scss
new file mode 100644
index 000000000..4457c38af
--- /dev/null
+++ b/src/app/views/icons/coreui-icons.component.scss
@@ -0,0 +1,88 @@
+.c-icon-fix {
+ color: rgb(92 104 115);
+ fill: rgb(92 104 115);
+}
+
+.c-icon {
+ display: inline-block;
+ color: inherit;
+ text-align: center;
+ fill: currentColor;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size) {
+ width: 1rem;
+ height: 1rem;
+ font-size: 1rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-2xl {
+ width: 2rem;
+ height: 2rem;
+ font-size: 2rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-3xl {
+ width: 3rem;
+ height: 3rem;
+ font-size: 3rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-4xl {
+ width: 4rem;
+ height: 4rem;
+ font-size: 4rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-5xl {
+ width: 5rem;
+ height: 5rem;
+ font-size: 5rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-6xl {
+ width: 6rem;
+ height: 6rem;
+ font-size: 6rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-7xl {
+ width: 7rem;
+ height: 7rem;
+ font-size: 7rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-8xl {
+ width: 8rem;
+ height: 8rem;
+ font-size: 8rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-9xl {
+ width: 9rem;
+ height: 9rem;
+ font-size: 9rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-xl {
+ width: 1.5rem;
+ height: 1.5rem;
+ font-size: 1.5rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-lg {
+ width: 1.25rem;
+ height: 1.25rem;
+ font-size: 1.25rem;
+}
+
+.c-icon:not(.c-icon-c-s):not(.c-icon-custom-size).c-icon-sm {
+ width: .875rem;
+ height: .875rem;
+ font-size: .875rem;
+}
+
+.c-icon-c-s, .c-icon-custom-size {
+ width: initial !important;
+ height: initial !important;
+}
diff --git a/src/app/views/icons/coreui-icons.component.ts b/src/app/views/icons/coreui-icons.component.ts
index 6d63719d3..9c81005f3 100644
--- a/src/app/views/icons/coreui-icons.component.ts
+++ b/src/app/views/icons/coreui-icons.component.ts
@@ -1,10 +1,50 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Platform } from '@angular/cdk/platform';
+
+import { IconSetService } from '@coreui/icons-angular';
+import { freeSet } from '@coreui/icons';
@Component({
- templateUrl: 'coreui-icons.component.html'
+ templateUrl: 'coreui-icons.component.html',
+ styleUrls: ['coreui-icons.component.scss'],
+ providers: [IconSetService],
})
-export class CoreUIIconsComponent {
+export class CoreUIIconsComponent implements OnInit {
+ public title = 'CoreUI Icons';
+ public icons = [];
+
+ constructor(
+ public platform: Platform,
+ private route: ActivatedRoute,
+ public iconSet: IconSetService
+ ) {
+ iconSet.icons = { ...freeSet };
+ }
+
+ ngOnInit() {
+ const path = this.route.routeConfig.path;
+ let prefix = 'cil';
+ if (path === 'coreui-icons') {
+ this.title = `${this.title} - Free`;
+ prefix = 'cil';
+ } else if (path === 'brands') {
+ this.title = `${this.title} - Brands`;
+ prefix = 'cib';
+ } else if (path === 'flags') {
+ this.title = `${this.title} - Flags`;
+ prefix = 'cif';
+ }
+ this.icons = this.getIconsView(prefix);
+ }
- constructor() { }
+ toKebabCase(str) {
+ return str.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, '$1-$2').toLowerCase();
+ }
+ getIconsView(prefix: string) {
+ return Object.entries(this.iconSet.icons).filter((icon) => {
+ return icon[0].startsWith(prefix);
+ });
+ }
}
diff --git a/src/app/views/icons/icons-routing.module.ts b/src/app/views/icons/icons-routing.module.ts
index ff769fa95..69e0e32f4 100644
--- a/src/app/views/icons/icons-routing.module.ts
+++ b/src/app/views/icons/icons-routing.module.ts
@@ -13,6 +13,10 @@ const routes: Routes = [
title: 'Icons'
},
children: [
+ {
+ path: '',
+ redirectTo: 'coreui-icons'
+ },
{
path: 'coreui-icons',
component: CoreUIIconsComponent,
diff --git a/src/app/views/icons/icons.module.ts b/src/app/views/icons/icons.module.ts
index 574696102..c8e601e39 100644
--- a/src/app/views/icons/icons.module.ts
+++ b/src/app/views/icons/icons.module.ts
@@ -1,4 +1,7 @@
import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IconModule } from '@coreui/icons-angular';
import { CoreUIIconsComponent } from './coreui-icons.component';
import { FlagsComponent } from './flags.component';
@@ -8,7 +11,11 @@ import { SimpleLineIconsComponent } from './simple-line-icons.component';
import { IconsRoutingModule } from './icons-routing.module';
@NgModule({
- imports: [ IconsRoutingModule ],
+ imports: [
+ CommonModule,
+ IconsRoutingModule,
+ IconModule
+ ],
declarations: [
CoreUIIconsComponent,
FlagsComponent,
diff --git a/src/app/views/notifications/modals.component.ts b/src/app/views/notifications/modals.component.ts
index c0d423c5c..b3dde680d 100644
--- a/src/app/views/notifications/modals.component.ts
+++ b/src/app/views/notifications/modals.component.ts
@@ -1,16 +1,16 @@
-import { Component, ViewChild } from '@angular/core';
-import { ModalDirective } from 'ngx-bootstrap/modal';
+import {Component, ViewChild} from '@angular/core';
+import {ModalDirective} from 'ngx-bootstrap/modal';
@Component({
templateUrl: 'modals.component.html'
})
export class ModalsComponent {
- public myModal;
- public largeModal;
- public smallModal;
- public primaryModal;
- public successModal;
- public warningModal;
- public dangerModal;
- public infoModal;
+ @ViewChild('myModal') public myModal: ModalDirective;
+ @ViewChild('largeModal') public largeModal: ModalDirective;
+ @ViewChild('smallModal') public smallModal: ModalDirective;
+ @ViewChild('primaryModal') public primaryModal: ModalDirective;
+ @ViewChild('successModal') public successModal: ModalDirective;
+ @ViewChild('warningModal') public warningModal: ModalDirective;
+ @ViewChild('dangerModal') public dangerModal: ModalDirective;
+ @ViewChild('infoModal') public infoModal: ModalDirective;
}
diff --git a/src/app/views/notifications/notifications-routing.module.ts b/src/app/views/notifications/notifications-routing.module.ts
index 775a541bd..4549737eb 100644
--- a/src/app/views/notifications/notifications-routing.module.ts
+++ b/src/app/views/notifications/notifications-routing.module.ts
@@ -12,6 +12,10 @@ const routes: Routes = [
title: 'Notifications'
},
children: [
+ {
+ path: '',
+ redirectTo: 'alerts'
+ },
{
path: 'alerts',
component: AlertsComponent,
diff --git a/src/app/views/theme/colors.component.html b/src/app/views/theme/colors.component.html
index 92502acd4..f7ad00173 100644
--- a/src/app/views/theme/colors.component.html
+++ b/src/app/views/theme/colors.component.html
@@ -92,7 +92,7 @@
Gray 900 Color
diff --git a/src/app/views/theme/colors.component.ts b/src/app/views/theme/colors.component.ts
index f63cc79ae..7d69748d8 100644
--- a/src/app/views/theme/colors.component.ts
+++ b/src/app/views/theme/colors.component.ts
@@ -1,16 +1,17 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
import { getStyle, rgbToHex } from '@coreui/coreui/dist/js/coreui-utilities';
@Component({
templateUrl: 'colors.component.html'
})
export class ColorsComponent implements OnInit {
- public themeColors(): void {
- Array.from(document.querySelectorAll('.theme-color')).forEach(function(el) {
- const elem = document.getElementsByClassName(el.classList[0])[0];
- const background = getStyle('background-color', elem);
+ constructor(@Inject(DOCUMENT) private _document: any) {}
- const table = document.createElement('table');
+ public themeColors(): void {
+ Array.from(this._document.querySelectorAll('.theme-color')).forEach((el: HTMLElement) => {
+ const background = getStyle('background-color', el);
+ const table = this._document.createElement('table');
table.innerHTML = `
@@ -23,10 +24,8 @@ export class ColorsComponent implements OnInit {
`;
-
el.parentNode.appendChild(table);
});
-
}
ngOnInit(): void {
diff --git a/src/app/views/theme/theme-routing.module.ts b/src/app/views/theme/theme-routing.module.ts
index cd63b2b55..177d7b7de 100644
--- a/src/app/views/theme/theme-routing.module.ts
+++ b/src/app/views/theme/theme-routing.module.ts
@@ -11,6 +11,10 @@ const routes: Routes = [
title: 'Theme'
},
children: [
+ {
+ path: '',
+ redirectTo: 'colors'
+ },
{
path: 'colors',
component: ColorsComponent,
diff --git a/src/app/views/widgets/widgets.component.ts b/src/app/views/widgets/widgets.component.ts
index eadadab3f..76a46bc9b 100644
--- a/src/app/views/widgets/widgets.component.ts
+++ b/src/app/views/widgets/widgets.component.ts
@@ -175,7 +175,8 @@ export class WidgetsComponent {
public barChart1Data: Array
= [
{
data: [78, 81, 80, 45, 34, 12, 40, 78, 81, 80, 45, 34, 12, 40, 12, 40],
- label: 'Series A'
+ label: 'Series A',
+ barPercentage: 0.6
}
];
public barChart1Labels: Array = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16'];
@@ -188,7 +189,6 @@ export class WidgetsComponent {
scales: {
xAxes: [{
display: false,
- barPercentage: 0.6,
}],
yAxes: [{
display: false
@@ -250,7 +250,8 @@ export class WidgetsComponent {
public barChart2Data: Array = [
{
data: [4, 18, 9, 17, 34, 22, 11, 3, 15, 12, 18, 9],
- label: 'Series A'
+ label: 'Series A',
+ barPercentage: 0.6
}
];
public barChart2Labels: Array = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
@@ -263,7 +264,6 @@ export class WidgetsComponent {
scales: {
xAxes: [{
display: false,
- barPercentage: 0.6,
}],
yAxes: [{
display: false,
diff --git a/src/app/views/widgets/widgets.module.ts b/src/app/views/widgets/widgets.module.ts
index 078cba516..482102c24 100644
--- a/src/app/views/widgets/widgets.module.ts
+++ b/src/app/views/widgets/widgets.module.ts
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
-import { ChartsModule } from 'ng2-charts/ng2-charts';
+import { ChartsModule } from 'ng2-charts';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { WidgetsComponent } from './widgets.component';
diff --git a/src/declarations.d.ts b/src/declarations.d.ts
new file mode 100644
index 000000000..99b497ae7
--- /dev/null
+++ b/src/declarations.d.ts
@@ -0,0 +1,8 @@
+declare module '@coreui/coreui/dist/js/coreui-utilities';
+declare module '@coreui/coreui-plugin-chartjs-custom-tooltips';
+
+declare module '*.json' {
+ const value: any;
+ export default value;
+}
+
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b7f639aec..f56ff4702 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,8 +1,16 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false
};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
diff --git a/src/index.html b/src/index.html
index 3e25546fa..daac025a5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,12 +1,12 @@
+
-
-
+
(id: string): T;
+ };
+};
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
- platformBrowserDynamicTesting()
+ platformBrowserDynamicTesting(),
+ { teardown: { destroyAfterEach: true }},
);
+
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
deleted file mode 100644
index 5c9795786..000000000
--- a/src/tsconfig.app.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/app",
- "baseUrl": "./",
- "module": "es2015",
- "types": [],
- "paths": {
- "@angular/*": [
- "../node_modules/@angular/*"
- ]
- }
- },
- "exclude": [
- "test.ts",
- "**/*.spec.ts"
- ]
-}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
deleted file mode 100644
index 1a18e6d00..000000000
--- a/src/tsconfig.spec.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "extends": "../tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/spec",
- "baseUrl": "./",
- "module": "commonjs",
- "types": [
- "jasmine",
- "node"
- ]
- },
- "files": [
- "test.ts",
- "polyfills.ts"
- ],
- "include": [
- "**/*.spec.ts",
- "**/*.d.ts"
- ]
-}
diff --git a/tsconfig.app.json b/tsconfig.app.json
new file mode 100644
index 000000000..82d91dc4a
--- /dev/null
+++ b/tsconfig.app.json
@@ -0,0 +1,15 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./out-tsc/app",
+ "types": []
+ },
+ "files": [
+ "src/main.ts",
+ "src/polyfills.ts"
+ ],
+ "include": [
+ "src/**/*.d.ts"
+ ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index a6c016bf3..86543633e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,19 +1,36 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"compileOnSave": false,
"compilerOptions": {
+ "baseUrl": "./",
"outDir": "./dist/out-tsc",
+ "forceConsistentCasingInFileNames": true,
+ "strict": false,
+ "noImplicitOverride": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
- "moduleResolution": "node",
- "emitDecoratorMetadata": true,
+ "downlevelIteration": true,
"experimentalDecorators": true,
- "target": "es5",
- "typeRoots": [
- "node_modules/@types"
- ],
+ "moduleResolution": "node",
+ "importHelpers": true,
+ "target": "es2017",
+ "module": "es2020",
"lib": [
- "es2017",
+ "es2018",
"dom"
]
- }
+ },
+ "angularCompilerOptions": {
+ "enableI18nLegacyMessageIdFormat": false,
+ "strictInjectionParameters": false,
+ "strictInputAccessModifiers": false,
+ "strictTemplates": false
+ },
+ "files": [],
+ "references": [
+ { "path": "./tsconfig.app.json" },
+ { "path": "./tsconfig.spec.json" },
+ ]
}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
new file mode 100644
index 000000000..092345b02
--- /dev/null
+++ b/tsconfig.spec.json
@@ -0,0 +1,18 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./out-tsc/spec",
+ "types": [
+ "jasmine"
+ ]
+ },
+ "files": [
+ "src/test.ts",
+ "src/polyfills.ts"
+ ],
+ "include": [
+ "src/**/*.spec.ts",
+ "src/**/*.d.ts"
+ ]
+}
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index d8d395663..000000000
--- a/tslint.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "rulesDirectory": [
- "node_modules/codelyzer"
- ],
- "rules": {
- "arrow-return-shorthand": true,
- "callable-types": true,
- "class-name": true,
- "comment-format": [
- true,
- "check-space"
- ],
- "curly": true,
- "deprecation": {
- "severity": "warn"
- },
- "eofline": true,
- "forin": true,
- "import-blacklist": [
- true,
- "rxjs/Rx"
- ],
- "import-spacing": true,
- "indent": [
- true,
- "spaces"
- ],
- "interface-over-type-literal": true,
- "label-position": true,
- "max-line-length": [
- true,
- 140
- ],
- "member-access": false,
- "member-ordering": [
- true,
- {
- "order": [
- "static-field",
- "instance-field",
- "static-method",
- "instance-method"
- ]
- }
- ],
- "no-arg": true,
- "no-bitwise": true,
- "no-console": [
- true,
- "debug",
- "info",
- "time",
- "timeEnd",
- "trace"
- ],
- "no-construct": true,
- "no-debugger": true,
- "no-duplicate-super": true,
- "no-empty": false,
- "no-empty-interface": true,
- "no-eval": true,
- "no-inferrable-types": [
- true,
- "ignore-params"
- ],
- "no-misused-new": true,
- "no-non-null-assertion": true,
- "no-shadowed-variable": true,
- "no-string-literal": false,
- "no-string-throw": true,
- "no-switch-case-fall-through": true,
- "no-trailing-whitespace": true,
- "no-unnecessary-initializer": true,
- "no-unused-expression": true,
- "no-use-before-declare": true,
- "no-var-keyword": true,
- "object-literal-sort-keys": false,
- "one-line": [
- true,
- "check-open-brace",
- "check-catch",
- "check-else",
- "check-whitespace"
- ],
- "prefer-const": true,
- "quotemark": [
- true,
- "single"
- ],
- "radix": true,
- "semicolon": [
- true,
- "always"
- ],
- "triple-equals": [
- true,
- "allow-null-check"
- ],
- "typedef-whitespace": [
- true,
- {
- "call-signature": "nospace",
- "index-signature": "nospace",
- "parameter": "nospace",
- "property-declaration": "nospace",
- "variable-declaration": "nospace"
- }
- ],
- "unified-signatures": true,
- "variable-name": false,
- "whitespace": [
- true,
- "check-branch",
- "check-decl",
- "check-operator",
- "check-separator",
- "check-type"
- ],
- "directive-selector": [
- true,
- "attribute",
- "app",
- "camelCase"
- ],
- "component-selector": [
- true,
- "element",
- "app",
- "kebab-case"
- ],
- "no-output-on-prefix": true,
- "use-input-property-decorator": true,
- "use-output-property-decorator": true,
- "use-host-property-decorator": true,
- "no-input-rename": true,
- "no-output-rename": true,
- "use-life-cycle-interface": true,
- "use-pipe-transform-interface": true,
- "component-class-suffix": true,
- "directive-class-suffix": true
- }
-}
-